Commit graph

34009 commits

Author SHA1 Message Date
Howard Stearns
502cc7f580 Don't copy while converting. 2015-10-29 16:44:01 -07:00
Atlante45
8b46ed7dff Check keyLight is defined 2015-10-29 16:42:48 -07:00
Howard Stearns
6613a0e0a6 Merge pull request #6234 from hyperlogic/tony/new-grab-anim
New left and right grab animations.
2015-10-29 16:42:36 -07:00
ericrius1
b6b71e7e76 increased range and intensity of light 2015-10-29 16:40:50 -07:00
Howard Stearns
303491817b assert to get hard error in dev, warning and no-op in release. 2015-10-29 16:35:59 -07:00
Anthony J. Thibault
047614b2eb New left and right grab animations. 2015-10-29 16:18:39 -07:00
samcake
2bf6ce09c7 Merge pull request #6233 from ZappoMan/comfortTweaks
tweak comfort mode filters
2015-10-29 16:08:59 -07:00
Howard Stearns
6b4b4440e8 Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars 2015-10-29 16:06:24 -07:00
Brad Hefta-Gaub
b070306c2c tweak comfort mode filters 2015-10-29 15:53:17 -07:00
Clément Brisset
bf7911e517 Merge pull request #6232 from Atlante45/master
edit.js fix
2015-10-29 15:39:20 -07:00
Atlante45
c237072195 edit.js fix 2015-10-29 15:29:12 -07:00
Brad Hefta-Gaub
c962697b18 Merge pull request #6230 from samcake/controllers
Controllers : Comfort mode is working through the stanadrd mapping
2015-10-29 14:59:42 -07:00
samcake
c1e00ca08c FIxing the mac build again ? 2015-10-29 14:30:51 -07:00
samcake
f72146c35d FIxing the mac build 2015-10-29 14:17:52 -07:00
Brad Hefta-Gaub
ffa805affb Merge pull request #6223 from AlessandroSigna/controllers
Vive Controller
2015-10-29 14:16:34 -07:00
ericrius1
020566b76a no deleting 2015-10-29 14:14:15 -07:00
samcake
1b6a2ff56f Merge pull request #6231 from Atlante45/master
edit.js fix
2015-10-29 14:13:29 -07:00
Atlante45
904326cd1c edit.js fix 2015-10-29 14:11:27 -07:00
samcake
f7aa77253b Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-29 14:09:04 -07:00
samcake
9c860346df Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-10-29 14:05:34 -07:00
Brad Davis
036ae62dd3 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-29 14:00:52 -07:00
samcake
d73eafddd1 COmfort mode working with the COntroller system observing the menu state 2015-10-29 13:48:16 -07:00
Andrew Meadows
9bc44d678b Merge pull request #6228 from ZappoMan/scriptCleanup
removed old metavoxel example, since the api is no longer available
2015-10-29 13:26:11 -07:00
Brad Hefta-Gaub
3c11cf2926 Merge pull request #6226 from kencooke/master
Workaround for audio having channels swapped under Qt 5.5.1
2015-10-29 13:25:41 -07:00
Andrew Meadows
fa96349155 Merge pull request #6229 from birarda/sleep-dt-loop
guard timeElapsed for simulateKinematicMotion to max 1s
2015-10-29 13:23:57 -07:00
AlessandroSigna
ffd2b39874 Fix vive controller - update to new input plugin register 2015-10-29 13:18:37 -07:00
samcake
b09a159090 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-29 13:06:52 -07:00
samcake
77759fa8af t reset --:wq
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-10-29 13:06:16 -07:00
samcake
e902e5e97a Introduce the concept of loading the default Mapping 2015-10-29 13:05:29 -07:00
Ken Cooke
1eabb924f1 Fixed the logic to be correct 2015-10-29 12:53:47 -07:00
Stephen Birarda
fb55f0becb guard timeElapsed for simulateKinematicMotion to max 1s 2015-10-29 12:50:34 -07:00
Brad Hefta-Gaub
dd8295b908 Merge pull request #6225 from ZappoMan/controllers
Controllers merged from master
2015-10-29 12:39:35 -07:00
Andrew Meadows
0c5b4115ed Merge pull request #6221 from huffman/physics-substep-fix
Physics substep fix
2015-10-29 12:39:15 -07:00
Brad Hefta-Gaub
1c2973f17d removed old metavoxel example, since the api is no longer available 2015-10-29 12:34:24 -07:00
Brad Hefta-Gaub
1f53e425eb Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-10-29 12:28:28 -07:00
Brad Davis
f21633e368 Merge pull request #6222 from ZappoMan/hardwareChanged
Handle input plugin register/remove when activated/deactivated by menus
2015-10-29 12:24:17 -07:00
Ken Cooke
4d576d7aaf Fix typo 2015-10-29 12:23:36 -07:00
Ken Cooke
143b9c663f Quick fix for audio having channels swapped under Qt 5.5.1. 2015-10-29 12:21:28 -07:00
samcake
8f908f9877 Adding the stepYaw to the Standard mapping 2015-10-29 12:08:11 -07:00
Brad Hefta-Gaub
851460b2bd fix build buster for SDL2 missing builds 2015-10-29 11:26:11 -07:00
Brad Hefta-Gaub
3d37a1d249 fix Controller.Hardware when input plugins are deactived 2015-10-29 11:06:20 -07:00
Howard Stearns
3c6d4f9c22 Thread safety per #6154. 2015-10-29 11:02:24 -07:00
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
3bbba99e2b Merge pull request #6178 from samcake/color
Refactor the KeyLIght properties in their own group
2015-10-29 10:44:44 -07:00
samcake
517387621a Fixing the keyLIght Direction ui for edit.js and fix the case for D to d 2015-10-29 10:40:28 -07:00
Howard Stearns
6e4d0043c9 Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars 2015-10-29 10:32:12 -07:00
Howard Stearns
4083c5c71b Handle wrapping of very long-lived sessions. 2015-10-29 10:31:36 -07:00
Brad Davis
ccbae81dad Merge branch 'master' into HEAD
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
2015-10-29 10:24:38 -07:00
Eric Levin
42fb683085 Merge pull request #6184 from imgntn/toybox_sounds
Add Arcade Game Sound To Toybox
2015-10-29 10:24:23 -07:00