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

13769 commits

Author SHA1 Message Date
Brad Davis
69d29bbbbb Creating recording library 2015-11-04 16:18:55 -08:00
samcake
f4cc8c4c2e Merge pull request #6306 from jherico/barney 
Fix ability to enable mappings parsed from JSON in JS
 2015-11-04 11:47:04 -08:00
Brad Davis
18d2b184dc Fix ability to enable mappings parsed from JSON in JS 2015-11-04 11:39:34 -08:00
U-GAPOS\andrew
f260c6b12b fix bad time measurment in AtRestDetector 2015-11-04 10:47:39 -08:00
Andrew Meadows
4215ce5d25 Merge pull request #6212 from howard-stearns/dont-use-other-avatar-sounds 
Don't play other avatar's collision sounds.
 2015-11-03 13:40:27 -08:00
Thijs Wenker
73d7fd4648 Fix: Vec3.UP was pointed to Vectors::UNIT_X 
This fixes the scripting property Vec3.UP to point to Vectors::UP which is equal to {X: 0, Y: 1, Z: 0}.
 2015-11-03 19:19:12 +01:00
Brad Hefta-Gaub
79f7284c32 Merge pull request #6285 from jherico/lisa 
Adding diagnostics to track down the 'black rectangles of death'
 2015-11-02 22:18:16 -08:00
Brad Davis
764ecba2a8 Adding diagnostics to track down the 'black rectangles of death' 2015-11-02 21:55:35 -08:00
James B. Pollack
192e4c8185 Merge pull request #6274 from ZappoMan/rightClickMenu 
add example of overriding default rightClick behavior
 2015-11-02 18:58:12 -08:00
Brad Davis
699a13b2a7 Merge pull request #6275 from ZappoMan/mappingTweaks 
Mapping tweaks to match Controllers spec
 2015-11-02 16:06:08 -08:00
Brad Hefta-Gaub
02288e84e8 CR feedback 2015-11-02 15:35:30 -08:00
samcake
3d2739c7b4 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-02 15:34:57 -08:00
Brad Hefta-Gaub
f532607cca add touch and other gestures to standard 2015-11-02 15:06:38 -08:00
samcake
0211e00c86 Cleaning the feature not conditional do the true design 2015-11-02 15:01:59 -08:00
samcake
c2687b4998 Cleaning the feature not conditional do the true design 2015-11-02 14:17:07 -08:00
Anthony J. Thibault
2236573a9d Merge branch 'master' into tony/anim-sync-blend 2015-11-02 12:18:11 -08:00
Brad Hefta-Gaub
b94258f953 add example of overriding default rightClick behavior 2015-11-02 11:55:50 -08:00
Andrew Meadows
9799693135 remove extra whitespace 2015-11-02 11:07:41 -08:00
Andrew Meadows
fd557c4e52 route HMD-following through the physics simulation 2015-11-02 11:07:40 -08:00
Seth Alves
c381da24a7 get interface building on my linux box 2015-11-02 10:42:06 -08:00
samcake
543f322ffe Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-02 09:48:32 -08:00
Brad Hefta-Gaub
d9dd045886 better parameter name 2015-11-02 09:29:09 -08:00
Brad Hefta-Gaub
c3a78ed151 cleanup 2015-11-02 09:27:35 -08:00
Brad Hefta-Gaub
b00f572e1a add mouseClicked inputs vs mouseButton inputs, make right-click work without right button drag 2015-11-02 09:21:15 -08:00
Anthony J. Thibault
e3e759248f Merge branch 'master' into tony/anim-sync-blend 2015-11-02 08:37:10 -08:00
Howard Stearns
ea2971a24f Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds 2015-11-01 17:02:59 -08:00
Brad Hefta-Gaub
fe4a6fa2bf Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarnings 2015-11-01 15:01:30 -08:00
Brad Hefta-Gaub
9c23f2551d Merge pull request #6207 from jherico/pluginSupport 
Support for runtime plugins (DLLs)
 2015-11-01 14:57:13 -08:00
Brad Hefta-Gaub
4a08329d22 fix unix warnings for comparing enums to enums 2015-11-01 12:10:42 -08:00
Brad Hefta-Gaub
43df5b55fe fix linker warnings 2015-11-01 11:55:55 -08:00
Brad Davis
cfb2fd1523 Support for runtime plugins (DLLs) 2015-11-01 11:12:12 -08:00
Brad Davis
99d8554cc8 Make zlib a true external on windows (linux and OSX should rely on system libraries) 2015-11-01 01:36:59 -07:00
Brad Davis
7fdb8e28e7 Merge pull request #6262 from ZappoMan/fixControllers 
Tweaks to standard hand controller mappings
 2015-10-31 23:42:13 -07:00
Brad Hefta-Gaub
05dea847be add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu 2015-10-31 15:47:40 -07:00
Howard Stearns
fb26e85faf Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds 2015-10-31 14:33:17 -07:00
Brad Davis
0e13348b5a PR feedback 2015-10-31 14:26:14 -07:00
Brad Davis
abbfe15395 Adding peek support for endpoints 2015-10-31 14:26:14 -07:00
Brad Hefta-Gaub
b877f832a9 fix SDL joysticks 2015-10-31 13:02:17 -07:00
Howard Stearns
79f05c63e5 Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds 2015-10-31 11:23:18 -07:00
Seth Alves
5916875345 one more 2015-10-31 08:20:24 -07:00
Seth Alves
224aeea044 quiet compiler 2015-10-31 08:11:43 -07:00
Andrew Meadows
9809fcfa54 Merge pull request #6244 from sethalves/grab 
kinematic grab fixes
 2015-10-31 04:36:13 -07:00
Bradley Austin Davis
0355a37fb1 Fixing SDL2 active/inactive value 2015-10-30 22:19:44 -07:00
Bradley Austin Davis
9b9e35d396 Limit sixense to mavericks and below 2015-10-30 22:02:20 -07:00
Seth Alves
896ed3927c merge from upstream 2015-10-30 19:17:43 -07:00
Bradley Austin Davis
46d87dda5a Fixing paths for SDL2 and Sixense libs 2015-10-30 19:00:26 -07:00
Brad Hefta-Gaub
88fda01ce2 Merge pull request #6254 from hyperlogic/tony/log-handler-crash-fix 
Fix for rare crash in LogHandler::flushRepeatedMessages()
 2015-10-30 18:47:37 -07:00
Anthony J. Thibault
2eb62f2fd8 LogHandler: fix for linux build 2015-10-30 17:44:06 -07:00
samcake
78e6fe5563 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-10-30 17:33:38 -07:00
samcake
00be6b3e3a Add support for NOT conditional in the route json 2015-10-30 17:32:26 -07:00