Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 01:03:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33425 commits 76 branches 59 tags 1.2 GiB
Commit graph

33425 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
941f95c7d4 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-16 18:07:25 -07:00
samcake
20416455db Adding the loadMapping feature 2015-10-16 18:06:58 -07:00
samcake
f675035fd1 Merge pull request #6101 from jherico/controllers 
Hydra controller updates and test code
 2015-10-16 17:43:44 -07:00
Brad Davis
5bac1aae2d Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-16 17:23:30 -07:00
Brad Davis
db0fa6b8ed Update hydra mappings and test code 2015-10-16 17:23:09 -07:00
Brad Davis
1dcf03d61e Put standard 'makeinput' functions on the base class 2015-10-16 17:20:52 -07:00
Eric Levin
6738455a5a Merge pull request #6099 from ctrlaltdavid/20709 
QA for 20709 - Fix reading of QVector<float> from models files - polyline strokeWidths
 2015-10-16 17:12:18 -07:00
David Rowe
8c22db17cc Fix reading of QVector<float> from models files - polyline strokeWidths 2015-10-16 15:43:23 -07:00
samcake
974d2e20ff Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-16 15:25:06 -07:00
samcake
6d3d29b6b7 Adding a new mapping 2015-10-16 15:24:44 -07:00
Brad Davis
94ff1893d4 Merge pull request #6098 from samcake/controllers 
Controllers : Wiring the Endpoint to actions and actually replace the legacy system
 2015-10-16 15:19:44 -07:00
samcake
0fc04ab297 Fixing the review comments and setting the StandardDevice of USerINputMapper in the registeredDevices just like any other, only the ID is special 2015-10-16 14:45:38 -07:00
samcake
f0034844e7 Actions working from the Controller layer 2015-10-16 12:24:12 -07:00
Eric Levin
9a87f5c574 Merge pull request #6096 from imgntn/resetter_acs 
[Scripts] - Move resetting basketballs and targets to an AC script
 2015-10-16 12:18:15 -07:00
James B. Pollack
4b21bdf308 testing 2015-10-16 11:50:13 -07:00
Brad Hefta-Gaub
88a66d3c52 Merge pull request #6088 from hyperlogic/tony/regen-english-translation-strings 
Updated english translation file
 2015-10-16 10:59:26 -07:00
Seth Alves
8338491c3b Merge pull request #6095 from Atlante45/master 
Fix export bug
 2015-10-16 07:32:56 -07:00
Seth Alves
b18bb1e076 Merge pull request #6084 from AndrewMeadows/physics-cleanup 
move DIRTY_FLAGS out of EntityItem namespace
 2015-10-16 07:22:40 -07:00
Atlante45
a84fdecec9 Fix export bug 2015-10-15 18:43:32 -07:00
samcake
43d7fe491e wiring the actions 2015-10-15 17:53:53 -07:00
Brad Hefta-Gaub
26f82e899e Merge pull request #6079 from ericrius1/whiteboard 
Entity whitelist for raypicking and whiteboard painting example
 2015-10-15 17:50:35 -07:00
Brad Hefta-Gaub
c3ee419ad7 Merge pull request #6086 from imgntn/flashlight_life 
[Scripts] Add lifetime to lights created by flashlight
 2015-10-15 17:42:57 -07:00
ericrius1
97fe0170cb glowing box for black color 2015-10-15 17:09:41 -07:00
Stephen Birarda
e5825daa57 Merge pull request #6090 from ZappoMan/fixStat 
Add some additional stats for debugging edit lags
 2015-10-15 16:00:29 -07:00
Brad Hefta-Gaub
3718149157 include inbound queue PPS stats in server stats page 2015-10-15 15:49:12 -07:00
samcake
d44beca29f Merge pull request #6092 from jherico/controllers 
Controllers Branch - Fix hardware access from JS...
 2015-10-15 15:41:36 -07:00
Ryan Huffman
421e2a6c21 Merge pull request #6078 from imgntn/top_tool_tabs 
Move  Edit.js Tool Window Tabs to the Top
 2015-10-15 15:40:42 -07:00
Brad Hefta-Gaub
e1570e3197 include inbound queue PPS stats in server stats page 2015-10-15 15:31:52 -07:00
Brad Hefta-Gaub
82a211174b added packet recieved,lost,recovered stats to detailed server stats page 2015-10-15 15:23:12 -07:00
Brad Hefta-Gaub
1f6a2f3c21 Merge pull request #6081 from samcake/controllers 
Controllers mapping created from JSON, first draft
 2015-10-15 15:19:42 -07:00
James B. Pollack
aee11d4c06 cleanup merge 2015-10-15 15:05:34 -07:00
samcake
63ad9ae198 Fixing the include file names... 2015-10-15 15:02:55 -07:00
samcake
1b03b6867c Fixing the include file names... 2015-10-15 15:01:34 -07:00
James B. Pollack
112007e5a9 cleanup 2015-10-15 14:58:05 -07:00
samcake
249efa383e MErging maybe finally ?????? 2015-10-15 14:49:22 -07:00
samcake
2ad6c2067b MErging maybe finally ?????? 2015-10-15 14:43:15 -07:00
samcake
416df1c44c Fixing the mac build 2015-10-15 14:21:08 -07:00
James B. Pollack
8b57b3c0ff fix memory leak 2015-10-15 14:13:07 -07:00
ericrius1
e8b6b32572 Remembering whiteboards last color between sessions 2015-10-15 14:12:15 -07:00
Brad Davis
eff8c28a28 Fixing access to hardware devices 2015-10-15 14:04:55 -07:00
Andrew Meadows
3d17c57910 Merge pull request #6083 from sethalves/groundwork-for-hold-action-changes 
Groundwork for hold action changes
 2015-10-15 13:30:02 -07:00
Brad Davis
4f8e2c9f6b Fix JSON format errors 2015-10-15 13:18:04 -07:00
Brad Davis
80cffdb764 Merge pull request #6082 from ZappoMan/renameInputPlugins 
Controllers branch - Rename input plugins
 2015-10-15 12:29:35 -07:00
James B. Pollack
e63ed5cf84 Merge pull request #6087 from thoys/20708 
CR for Job #20708 - Script Editor Improvements
 2015-10-15 12:28:32 -07:00
Brad Davis
80c962a4cc Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-15 12:27:53 -07:00
Brad Hefta-Gaub
923e1ed208 add more processing stats 2015-10-15 12:21:36 -07:00
Brad Hefta-Gaub
93113af2d2 improve server error message for failed edit 2015-10-15 11:55:20 -07:00
Stephen Birarda
b6a2cc396c Merge pull request #6089 from ZappoMan/fixStat 
fix Queue OUT stat
 2015-10-15 11:53:34 -07:00
ericrius1
dc6875f5b5 Strokes moving forward to avoid zfighting and incorrect overlaps 2015-10-15 11:50:23 -07:00
Brad Hefta-Gaub
b7c40c2df1 fix Queue OUT stat 2015-10-15 11:41:04 -07:00