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

34320 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
234271a40d Merge branch 'baseball' of github.com:huffman/hifi into baseball 2015-11-04 11:26:38 -08:00
Atlante45
d9cd986db2 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-04 11:26: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
samcake
ce5e89ce66 removing the pulsing mechanism in MyAvatar and making a new stadnard.json mapping file 2015-11-04 10:53:53 -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
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
Ryan Huffman
cb2a698488 Update urls in baseball scripts to be absolute 2015-11-04 09:22:05 -08:00
Ryan Huffman
f5c89dedb5 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-04 08:56:01 -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
Brad Davis
439bdbc0e4 Merge pull request #6298 from samcake/controllers 
Controllers : Removing dead files
 2015-11-03 19:57:37 -08:00
Atlante45
3a545399e3 Remove our idle() from paintGL now that it's in master 2015-11-03 17:56:40 -08:00
Atlante45
55894f2eee Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-03 17:46:24 -08:00
Atlante45
04f4e49158 Merge branch 'baseball' of github.com:huffman/hifi into baseball 2015-11-03 17:45:43 -08:00
Atlante45
78d39bc6bc Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-03 17:45:33 -08:00
Atlante45
eb990c9c1c More basebal test code 2015-11-03 17:45:01 -08:00
Stephen Birarda
9ae3c8b593 change bat relative rotation yaw to 90 2015-11-03 16:58:30 -08:00
Stephen Birarda
e7bc2e349a use real userData in createBatButton script 2015-11-03 16:55:11 -08:00
Stephen Birarda
9488a8ed24 use HTTP URL for bat script URL 2015-11-03 16:42:31 -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
Stephen Birarda
5b3809b543 update the bat script URL 2015-11-03 16:13:14 -08:00
Seth Alves
a85358085d Merge pull request #6299 from Atlante45/master 
handControllerGrab.js fix
 2015-11-03 16:11:18 -08:00
Stephen Birarda
804db537bf volume changes for crowd, bat avatar suppression fix 2015-11-03 16:11:13 -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
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
samcake
4d62c532f5 Removing dead config files 2015-11-03 15:35:13 -08:00
Stephen Birarda
8c0592caba add semicolons to createBatButton script 2015-11-03 14:52:40 -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
Ryan Huffman
5211824e0e Fix script include paths in firework.js and pitching.js 2015-11-03 14:43:43 -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
501b905e7a change script URL for bat to HTTP 2015-11-03 14:25:38 -08:00
Stephen Birarda
8346ce27b3 allow a non-colliding grab of locked entities 2015-11-03 14:22:41 -08:00
Stephen Birarda
06dbe2693a fix for created bat properties 2015-11-03 14:21:52 -08:00
U-GAPOS\andrew
d544b7a645 fix bug: avatar can't walking when HMD at rest 2015-11-03 13:59:15 -08:00
James B. Pollack
b83b24b096 remove strange test file 2015-11-03 13:42:18 -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
Andrew Meadows
498cec3abd Merge pull request #6294 from AndrewMeadows/fix-hydra-sans-hmd 
fix hydra sensor matrix when no HMD is attached
 2015-11-03 13:37:03 -08:00
Ryan Huffman
644e1008bd Fix bat.js not setting pitchingMachine variable 2015-11-03 13:32:28 -08:00
Ryan Huffman
2b8c6ebaf1 Add firework show when distance hit > 200 2015-11-03 12:14:55 -08:00
Ryan Huffman
3056432b0c Add fireworks 2015-11-03 12:14:04 -08:00
Brad Hefta-Gaub
b366011d22 Merge pull request #6293 from jherico/lisa 
Disabling billboard rendering, source of the evil black rectangles
 2015-11-03 12:13:51 -08:00
Atlante45
9be8d1edf9 Remove now unecessary vive hack 2015-11-03 11:44:33 -08:00
Atlante45
570777e6f3 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-03 11:42:00 -08:00