Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 09:40:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
34434 commits 25 branches 0 tags 1.1 GiB
Commit graph

34434 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
dba6031703 Merge pull request #6311 from jherico/marge 
Fix crash in Oculus simulator
 2015-11-05 00:57:05 -08:00
samcake
00797b4dea Merge pull request #6314 from jherico/homer 
Fixing step yaw to move by consistent amounts, be 'tappable'
 2015-11-04 23:33:45 -08:00
Brad Davis
86b852231e Merge pull request #6286 from EdgarPironti/master 
Spacemouse migration
 2015-11-04 19:15:35 -08:00
samcake
f4c610a0f4 Tuning the standard mapping for tbringin vertical axis 2015-11-04 18:21:04 -08:00
AlessandroSigna
eac73671e0 Added some documentation and examples for the new mapping system 2015-11-04 17:40:35 -08:00
Philip Rosedale
8dc3d62d17 Merge pull request #6316 from sethalves/grab-release-velocity-experiment 
don't set release velocity
 2015-11-04 16:37:04 -08:00
Seth Alves
05a977e31b get rid of code that computes release velocity 2015-11-04 16:26:30 -08:00
samcake
8dd8793fc0 Merge pull request #6315 from jherico/rec1 
Creating recording library
 2015-11-04 16:24:23 -08:00
Seth Alves
adb9118dc1 don't set release velocity 2015-11-04 16:21:02 -08:00
Brad Davis
69d29bbbbb Creating recording library 2015-11-04 16:18:55 -08:00
ericrius1
4e5b806934 particle effect entities no longer intersect with rays 2015-11-04 16:05:29 -08:00
Brad Davis
067a058799 Merge pull request #6312 from sethalves/dont-grab-zones 
don't attempt to grab particles or zones
 2015-11-04 16:03:05 -08:00
Brad Davis
20d1035821 Fixing step yaw to move by consistent amounts, be 'tappable' 2015-11-04 15:54:50 -08:00
Anthony J. Thibault
d46d521d81 Added #else branch to #if 0 2015-11-04 15:10:23 -08:00
ericrius1
b7840fdd6b explosion 2015-11-04 15:01:55 -08:00
Alan Z
8b20a3c903 Created playaSpawner and fixed cleanup issue 2015-11-04 14:41:11 -08:00
Seth Alves
1cbe6c4463 don't attempt to grab particles or zones 2015-11-04 13:59:37 -08:00
Brad Davis
4dec31d524 Fix crash in Oculus simulator 2015-11-04 13:20:47 -08:00
James B. Pollack
6cfc0b9487 update openssl binaries link 2015-11-04 13:07:38 -08:00
Anthony J. Thibault
69f1cfbcb9 Fixes for Mac build and crash on startup 
For some reason the qt code gen is getting confused by the #if 0
in 3DConnextionClient.h, so I added a stub implementation.

In Application.cpp the change of moving idle into paintGL had a sideeffect
of calling OffscreenGlCanvas before it was initialized.  To work around this
I added a guard to prevent calling idle before all the gl windows/widgets have
been initialized.
 2015-11-04 12:04:34 -08:00
Brad Davis
017cb2cb6c Getting rid of HTTPS external dependencies 2015-11-04 11:53:42 -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
Howard Stearns
4fd2027fb4 change name 2015-11-04 11:42:21 -08:00
Brad Davis
18d2b184dc Fix ability to enable mappings parsed from JSON in JS 2015-11-04 11:39:34 -08:00
ericrius1
3c227db08d explode heli 2015-11-04 11:27:16 -08:00
Philip Rosedale
8954d21ed1 Merge pull request #6303 from sethalves/fix-grab-again 
rework grab search logic
 2015-11-04 11:26:13 -08:00
Anthony Thibault
275b248547 Merge pull request #6302 from AndrewMeadows/fix-avatar-drift 
fix slow drift of avatar when wearing HMD
 2015-11-04 11:19:45 -08:00
Seth Alves
c2f9a49598 don't grab light 2015-11-04 11:15:57 -08:00
Brad Davis
a0d26fed70 Merge pull request #6304 from samcake/controllers 
Controllers: Fixing the step pulse behavior and changes to standard mapping
 2015-11-04 11:14:35 -08:00
samcake
d4259931b2 Setting the step yaw to 22.5 degrees 2015-11-04 10:57:39 -08:00
Howard Stearns
3fdd7ca470 obscure the code and increase the likelihood of future whitespace-only diffs 2015-11-04 10:57:03 -08:00
samcake
ce5e89ce66 removing the pulsing mechanism in MyAvatar and making a new stadnard.json mapping file 2015-11-04 10:53:53 -08:00
Howard Stearns
883f9c09bf add gratuitous whitespace 2015-11-04 10:49:12 -08:00
Howard Stearns
fe12891f61 whitespace only 2015-11-04 10:48:02 -08:00
U-GAPOS\andrew
f260c6b12b fix bad time measurment in AtRestDetector 2015-11-04 10:47:39 -08:00
Seth Alves
1e498a41f0 rework search logic 2015-11-04 10:46:20 -08:00
Howard Stearns
7b9245022c Merge branch 'away' of https://github.com/howard-stearns/hifi into away 2015-11-04 10:46:16 -08:00
U-GAPOS\andrew
9de5721a48 set _hmdFollowVelocity to zero when done following 2015-11-04 10:23:55 -08:00
Philip Rosedale
bbe74f2e55 Merge pull request #6301 from sethalves/fix-grab-velocity 
make held objects move tightly with hand (again)
 2015-11-04 09:28:20 -08:00
Seth Alves
270b4b97fc remove a left-over kludge that was causing the appearence of frame-lag in held objects 2015-11-04 02:26:02 -08:00
EdgarPironti
ade0862948 Spacemouse fixes 2015-11-04 00:49:40 -08:00
EdgarPironti
1ab683643c Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-04 00:36:38 -08:00
Brad Davis
439bdbc0e4 Merge pull request #6298 from samcake/controllers 
Controllers : Removing dead files
 2015-11-03 19:57:37 -08:00
EdgarPironti
7adf38f781 Spacemouse migration 2015-11-03 18:22:55 -08:00
EdgarPironti
2a84cadd5d Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-03 18:22:29 -08:00
Howard Stearns
4a54f2052e Merge branch 'master' of https://github.com/highfidelity/hifi into away 2015-11-03 17:42:38 -08:00
ericrius1
af0c0e6a1b spacing fix 2015-11-03 17:32:22 -08:00
ericrius1
31fe5fa953 Bump version num, use different shader for additive blending effect 2015-11-03 17:15:10 -08:00
ericrius1
470f814776 Fixed glitches with large particles being sorted along wrong axis 2015-11-03 16:39:16 -08:00
Brad Hefta-Gaub
71e4092276 Merge pull request #6283 from hyperlogic/tony/one-update-for-every-render 
Remove idleTimer and call idle directly from paintGL.
 2015-11-03 16:38:43 -08:00