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

34190 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
03a338dfe6 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-03 11:13:56 -08:00
Stephen Birarda
57a68edaa3 resolve conflicts merging with huffman/baseball 2015-11-03 11:13:54 -08:00
Stephen Birarda
8cd41b9383 resolve conflicts on merge with huffman/baseball 2015-11-03 11:13:15 -08:00
Ryan Huffman
55789fed99 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-03 11:11:26 -08:00
Ryan Huffman
67b43cafc1 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-03 11:10:47 -08:00
Ryan Huffman
ccb25f4b63 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-03 11:10:45 -08:00
Ryan Huffman
afffe7f5c6 Merge branch 'master' of github.com:Atlante45/hifi into baseball 2015-11-03 11:10:14 -08:00
Atlante45
01bbd3665e Remove accidentally commited file 2015-11-03 11:06:21 -08:00
Atlante45
f2ff0b40f7 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-03 11:06:19 -08:00
Atlante45
b37fa6f403 Merge branch 'master' of github.com:Atlante45/hifi 2015-11-03 11:00:46 -08:00
Clément Brisset
31d92fd90a Baseball test code 2015-11-03 11:00:35 -08:00
Brad Hefta-Gaub
5a93516330 Merge pull request #6276 from sethalves/lazy-smi-init 
don't initialize SMI sdk unless we need it
 2015-11-02 14:05:38 -08:00
Seth Alves
310a5c9bfb don't initialize SMI sdk unless we need it 2015-11-02 13:42:12 -08:00
Howard Stearns
cdd150f24e Merge pull request #6158 from hyperlogic/tony/anim-sync-blend 
Synced blending for avatar movement animations
 2015-11-02 12:59:38 -08:00
Brad Hefta-Gaub
354157ccec Merge pull request #6272 from jherico/externals 
Try using the VS2010 build of the latest SDK.
 2015-11-02 12:26:35 -08:00
Anthony J. Thibault
2236573a9d Merge branch 'master' into tony/anim-sync-blend 2015-11-02 12:18:11 -08:00
Anthony Thibault
f896a84391 Merge pull request #6269 from AndrewMeadows/avatar-velocity 
proper avatar velocity for HMD motion
 2015-11-02 12:16:48 -08:00
Ryan Huffman
b8d90ab28e Replace pitching.js include with relative path 2015-11-02 12:12:54 -08:00
Ryan Huffman
3820adf3f6 Add bat.js 2015-11-02 12:12:21 -08:00
Ryan Huffman
72775a7af8 Clean up pitching.js so the pitching machine code is separate 2015-11-02 12:12:05 -08:00
Stephen Birarda
017cee6961 make shouldRenderLocally do the right thing 2015-11-02 11:59:09 -08:00
U-GAPOS\andrew
a77f888f15 more correct HMD offset correction velocity 2015-11-02 11:29:17 -08:00
Brad Davis
edf3e5b17a Try using the VS2010 builds from the new Sixense SDKs 2015-11-02 11:15:51 -08:00
Eric Levin
7838683909 Merge pull request #6189 from imgntn/fjs 
Add functional.js library
 2015-11-02 11:10:19 -08:00
U-GAPOS\andrew
a545d770d8 fix bug preventing avatar motion in 2D mode 2015-11-02 11:07:43 -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
Andrew Meadows
9b1b009b8b Merge pull request #6271 from sethalves/fix-seths-build 
get interface building on seth's linux box
 2015-11-02 11:02:08 -08:00
Seth Alves
c381da24a7 get interface building on my linux box 2015-11-02 10:42:06 -08:00
Brad Hefta-Gaub
8431ef9b98 Merge pull request #6267 from jherico/externals 
Update external version of Sixense.
 2015-11-02 09:49:29 -08:00
Brad Davis
a79933b7f8 Merge pull request #6268 from ZappoMan/rightClickMenu 
add mouseClicked inputs vs mouseButton inputs
 2015-11-02 09:48:07 -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
Brad Davis
017e42bbc2 Update sixense SDK 2015-11-02 09:15:54 -08:00
Anthony J. Thibault
e3e759248f Merge branch 'master' into tony/anim-sync-blend 2015-11-02 08:37:10 -08:00
Brad Hefta-Gaub
0f78a0b301 Merge pull request #6266 from ZappoMan/rightClickMenu 
remove right click context menu until we can make it work with camera move better
 2015-11-02 07:43:22 -08:00
Brad Hefta-Gaub
70b9aa5ff1 remove right click context menu until we can make it work with camera move better 2015-11-02 07:42:52 -08:00
Brad Davis
71a6e783e3 Merge pull request #6265 from ZappoMan/fixWarnings 
warnings fixes
 2015-11-01 16:16:17 -08:00
Brad Hefta-Gaub
92bcd9ca9e make oculus plugin use static glew 2015-11-01 15:48:01 -08:00
Brad Hefta-Gaub
b9d60e803b fix mac warning 2015-11-01 15:13:28 -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 Davis
1e47a53603 Fixing mac oculus crash 2015-11-01 14:34:03 -08:00
Brad Hefta-Gaub
13e805ac15 replace copy_resolved_item_into_bundle with a version that doesn't report warnings for a status case 2015-11-01 13:18:53 -08:00
Brad Hefta-Gaub
886c4526c0 Merge pull request #6263 from jherico/externals 
Move ZLib to automatically downloaded externals on Win32
 2015-11-01 12:33:05 -08:00
Brad Davis
e0ac48fe27 PR comments 2015-11-01 12:19:19 -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
f751d5bf85 Merge pull request #6264 from ZappoMan/fixControllers 
tweaks to how VrMenu is shown
 2015-11-01 11:29:25 -08:00