Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-28 05:05:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2
33792 commits 71 branches 56 tags 1.2 GiB
Commit graph

33792 commits

Author SHA1 Message Date
Brad Hefta-Gaub
ed87ae3d5a remove some debugging 2015-10-29 10:57:30 -07:00
Brad Hefta-Gaub
bab2a7d80f Merge branch 'controllers' of https://github.com/highfidelity/hifi into hardwareChanged 
Conflicts:
	libraries/input-plugins/src/input-plugins/SixenseManager.cpp
	libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
 2015-10-29 10:56:01 -07:00
Brad Hefta-Gaub
a3cd032a41 register/remove devices when the input plugins are activated/deactivated 2015-10-29 10:06:21 -07:00
Brad Hefta-Gaub
af20c64c84 Merge pull request from jherico/killDeviceProxy 
Remove DeviceProxy in favor of InputDevice
 2015-10-29 10:04:39 -07:00
Brad Davis
c4e82a85d9 Remove DeviceProxy in favor of InputDevice 2015-10-29 09:32:56 -07:00
Brad Hefta-Gaub
9785c55c58 Merge pull request from jherico/controllers 
Fixing controller test link requirements
 2015-10-28 17:43:02 -07:00
Brad Davis
d61b3e5790 Fixing controller link requirements 2015-10-28 17:41:52 -07:00
Brad Davis
570b4a32da Merge pull request from samcake/controllers 
Controllers : Add a new kind onf controller to expose ReadOnly state from the application
 2015-10-28 13:42:15 -07:00
Brad Davis
3c1a0930da Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	interface/src/avatar/MyAvatar.h
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2015-10-28 13:38:22 -07:00
samcake
b90af1a1ce Fixing typo and review comments 2015-10-28 13:21:45 -07:00
samcake
07c13f4d66 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-28 12:54:46 -07:00
samcake
bbc6d9f5e7 Fixing typo and review comments 2015-10-28 12:52:21 -07:00
samcake
b37a6f689a Fixing typo and review comments 2015-10-28 12:51:22 -07:00
Clément Brisset
3be06a576a Merge pull request from ZappoMan/hardwareChanged 
emit hardwareChanged signal to scripts
 2015-10-28 12:26:09 -07:00
samcake
fc15c7cd98 Adding the ApplicationStateDevice to the APplication class and add one entry ythere 2015-10-28 12:15:14 -07:00
Brad Hefta-Gaub
731fab6ffc Merge pull request from jherico/gl 
Move GL utilities to their own library
 2015-10-28 12:10:52 -07:00
Brad Hefta-Gaub
c5e22a62e8 Merge pull request from Atlante45/script-engine 
Improved ScriptEngine debug messages
 2015-10-28 11:27:30 -07:00
Howard Stearns
21afcf48ae Merge pull request from AndrewMeadows/character-controller 
Move DynamicCharacterController to MyAvatarController
 2015-10-28 11:24:03 -07:00
Brad Hefta-Gaub
457ec76d3d CR feedback 2015-10-28 11:21:53 -07:00
Andrew Meadows
afec2a9771 fix whitespace 2015-10-28 09:42:55 -07:00
Brad Hefta-Gaub
30f7c44f61 emit hardwareChanged signal to scripts 2015-10-28 09:34:18 -07:00
samcake
57aa89d14f Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-28 09:24:24 -07:00
samcake
37f967bc33 And adding the StateCOntroller class 2015-10-28 09:23:57 -07:00
samcake
92ca658aae Trying to get a state controller to work 2015-10-28 09:23:20 -07:00
Brad Davis
45ba0645d0 Merge pull request from ZappoMan/myAvatarPalmTweaks 
thread safety clean up of use of PalmData
 2015-10-27 17:20:00 -07:00
Brad Hefta-Gaub
65eae35433 a little more cleanup 2015-10-27 17:09:43 -07:00
samcake
b2a5452f87 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-27 16:57:22 -07:00
samcake
6ec87086bc Adding the state controller 2015-10-27 16:57:06 -07:00
Brad Hefta-Gaub
7f313e7f86 Merge branch 'controllers' of https://github.com/highfidelity/hifi into myAvatarPalmTweaks 2015-10-27 16:47:36 -07:00
Brad Hefta-Gaub
8461e48e83 Merge pull request from jherico/hydraFix 
Fixing hydras
 2015-10-27 16:47:14 -07:00
Brad Hefta-Gaub
d86f1b50a7 more cleanup 2015-10-27 16:37:43 -07:00
Brad Davis
b8f189dea7 Fixing hydras 2015-10-27 16:37:16 -07:00
Brad Hefta-Gaub
19743c1f39 gak, build busters and more CR feedback 2015-10-27 16:16:03 -07:00
Brad Hefta-Gaub
eb19364129 CR feedback 2015-10-27 15:56:27 -07:00
Brad Hefta-Gaub
133d48ebee CR feedback 2015-10-27 15:53:48 -07:00
Brad Davis
5cbb2562cd Move GL utilities out to their own library 2015-10-27 15:53:42 -07:00
Andrew Meadows
c9cd336400 fix for bad contacts after changing avatar models 2015-10-27 15:01:48 -07:00
Brad Hefta-Gaub
7000350317 Merge branch 'controllers' of https://github.com/highfidelity/hifi into myAvatarPalmTweaks 2015-10-27 14:57:35 -07:00
Andrew Meadows
e35596428c cleanup comment 2015-10-27 14:43:18 -07:00
Atlante45
32f88f3fb6 Fix for JSConcole 2015-10-27 14:37:39 -07:00
Brad Hefta-Gaub
5a42991e0c first pass at cleaning up MyAvatars use of PalmData 2015-10-27 13:51:42 -07:00
Andrew Meadows
8b285fd228 recover follow HMD behavior 2015-10-27 13:51:40 -07:00
Andrew Meadows
43aac813da more prep for shifting avatar during HMD motion 2015-10-27 13:15:38 -07:00
Andrew Meadows
24c2f538a4 keep MyAvatar RigidBody on shape changes 2015-10-27 13:15:38 -07:00
Andrew Meadows
355ebe923d cleanup and comments 2015-10-27 13:15:38 -07:00
Andrew Meadows
5e59e9595b fix typo in comments 2015-10-27 13:15:38 -07:00
Andrew Meadows
5f278f9024 name change 2015-10-27 13:15:38 -07:00
Andrew Meadows
a1f1e50431 split CharacterController btw phys and interface 2015-10-27 13:15:38 -07:00
Atlante45
c0138bd189 Rename check functions and make them static 2015-10-27 12:39:40 -07:00
Brad Hefta-Gaub
00d5c8f682 Merge pull request from EdgarPironti/controllers 
Fixed standard.json
 2015-10-27 12:23:21 -07:00