Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:13:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
34418 commits 71 branches 56 tags 1.2 GiB
Commit graph

34418 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Seth Alves
a85358085d Merge pull request #6299 from Atlante45/master 
handControllerGrab.js fix
 2015-11-03 16:11:18 -08:00
Atlante45
d8797ef9d7 Initialize relativePosition/Rotation 2015-11-03 16:07:37 -08:00
Anthony J. Thibault
31f361d49c Moved fps timing to beginning of paintGL 
This should improve accuracy.

However the fps displayed can still sometimes be slightly greater then the
vsync, this is either due to timer accuracy problems or QTimer delay within
OpenGLDisplayPlugin.
 2015-11-03 15:51:18 -08:00
ericrius1
a722ad46f6 Merge branch 'master' into particleSorting 2015-11-03 15:47:44 -08:00
ericrius1
60f35ce8c7 discarding pixel if alpha is below threshold 2015-11-03 15:46:58 -08:00
Brad Hefta-Gaub
d21415b00d Merge pull request #6295 from imgntn/cleanup_tests 
Remove timers test file
 2015-11-03 15:43:02 -08:00
samcake
57bc2f3093 Removing dead js files 2015-11-03 15:37:36 -08:00
ericrius1
0c8a712935 removed comment 2015-11-03 15:36:11 -08:00
howard-stearns
4bf9861350 Forgot license header. 2015-11-03 15:36:02 -08:00
samcake
4d62c532f5 Removing dead config files 2015-11-03 15:35:13 -08:00
ericrius1
0650280fb6 tweaks 2015-11-03 15:14:56 -08:00
ericrius1
ed2bd07585 rotating blade 2015-11-03 14:54:05 -08:00
Howard Stearns
022a83528b Merge pull request #6296 from AndrewMeadows/fix-walk-with-hmd 
fix bug preventing avatar from walking when HMD is at rest
 2015-11-03 14:45:39 -08:00
Seth Alves
e5da29e08a Merge pull request #6297 from birarda/grab-locked 
allow non-colliding grab of locked entities
 2015-11-03 14:31:19 -08:00
Stephen Birarda
8346ce27b3 allow a non-colliding grab of locked entities 2015-11-03 14:22:41 -08:00
ericrius1
0846c3bef4 moving 2015-11-03 14:12:56 -08:00