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

40513 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chris Collins
e577658315 Merge pull request #7333 from PhilipRosedale/testSound 
playTestSound.js - better clip for testing/showing audio
 2016-03-14 08:44:28 -07:00
Brad Hefta-Gaub
7f4cbeda00 Merge pull request #7343 from jherico/procedural_time 
Fix iDate uniform in procedurals to be continuous
 2016-03-13 22:08:54 -07:00
Brad Hefta-Gaub
9e0d9f5748 Merge pull request #7337 from sethalves/disable-oculus-legacy-on-linux 
don't build oculus-legacy plugin on Linux
 2016-03-13 12:26:37 -07:00
Brad Hefta-Gaub
27fec45e95 Merge pull request #7342 from imgntn/consoleversion2 
Add version number and make adding new menu items to Server Console easier
 2016-03-13 12:25:04 -07:00
Brad Davis
798d2a73db Merge pull request #7326 from ZappoMan/toggleOverlay 
Various Overlay, Menu, and Away Mode bug fixes
 2016-03-13 11:44:19 -07:00
Brad Hefta-Gaub
d4d113d47d Merge pull request #7346 from sethalves/fix-crash 
fix a crash
 2016-03-13 11:18:35 -07:00
Seth Alves
dbd548a8c7 fix a crash 2016-03-13 11:01:11 -07:00
Eric Levin
8d2ab50616 Merge pull request #7344 from jherico/vive_crash 
Fix vive crash on deactivate
 2016-03-12 22:03:38 -08:00
Brad Davis
27033e5bb5 Fix vive crash on deactivate 2016-03-12 21:48:36 -08:00
Brad Davis
27ecdffeb3 Fix iDate uniform in procedurals to be continuous 2016-03-12 16:46:15 -08:00
James B. Pollack
b929089af7 options 2016-03-12 15:01:34 -08:00
James B. Pollack
98d4f34d64 enable 2016-03-12 14:59:54 -08:00
James B. Pollack
03a109b60f menu 2016-03-12 14:54:10 -08:00
James Pollack
50e7bd7742 claenup 2016-03-12 13:42:18 -08:00
James B. Pollack
f409127f1d start 2016-03-12 12:18:54 -08:00
Seth Alves
29fd3e4ea6 Merge branch 'master' of github.com:highfidelity/hifi into disable-oculus-legacy-on-linux 2016-03-12 08:59:29 -08:00
Brad Hefta-Gaub
8420e67b54 Merge pull request #7338 from highfidelity/revert-7331-consoleversion 
Revert "Show Server Console Version"
 2016-03-12 08:54:14 -08:00
Brad Hefta-Gaub
90f5dd50a5 Revert "Show Server Console Version" 2016-03-12 08:38:41 -08:00
Seth Alves
d036e0618d don't build oculus-legacy plugin on linux 2016-03-12 07:54:59 -08:00
Brad Hefta-Gaub
c93ed7c6f7 Merge pull request #7321 from ctrlaltdavid/20829 
Restyle HMD menus
 2016-03-11 20:43:27 -08:00
Brad Hefta-Gaub
001cdfad38 Merge pull request #7331 from imgntn/consoleversion 
Show Server Console Version
 2016-03-11 20:34:36 -08:00
Howard Stearns
38338d7418 Merge pull request #7330 from ZappoMan/depthReticleWork 
auto-show reticle on mouse click
 2016-03-11 18:40:46 -08:00
Philip Rosedale
f87b9a963e Merge pull request #7334 from hyperlogic/tony/third-person-camera-mouse-fix 
Application: fix for mouse control in third-person camera
 2016-03-11 18:03:24 -08:00
Anthony Thibault
9fb897476e Application: fix for mouse control in third-person camera 
Process the keyboard & mouse input plugin after the userInputMapper()->update().
 2016-03-11 17:29:18 -08:00
PhilipRosedale
9823ecffa7 new test sound script 2016-03-11 17:00:44 -08:00
James B. Pollack
42e3d0bdad remove logging 2016-03-11 16:57:50 -08:00
Brad Hefta-Gaub
6083706151 CR feedback 2016-03-11 16:47:16 -08:00
Brad Hefta-Gaub
f9fca99b42 Merge pull request #7329 from howard-stearns/suppress-misleading-thread-warning 
Remove logging that implies a problem that isn't there.
 2016-03-11 16:34:46 -08:00
James B. Pollack
23fd2e93b5 add version number 2016-03-11 16:26:14 -08:00
David Rowe
8b9319b29e Merge branch 'master' into 20829 2016-03-12 13:09:59 +13:00
David Rowe
3deb30d699 Remove no longer need font type 2016-03-12 13:06:29 +13:00
David Rowe
3bf1afb80b HMD submenus not allcaps 2016-03-12 12:56:38 +13:00
David Rowe
9da64e540d Add shortcut keys to HMD menu 2016-03-12 12:53:16 +13:00
David Rowe
ecf67282d5 Add separators to HMD menus 2016-03-12 12:29:52 +13:00
Philip Rosedale
7e581cc831 Merge pull request #7325 from hyperlogic/tony/smooth-hands 
Smoother hand motion when using hand controllers
 2016-03-11 15:08:59 -08:00
James B. Pollack
973022f0e1 version attempts 2016-03-11 14:51:36 -08:00
howard-stearns
fce8369708 Remove logging that implies a problem that isn't there. 2016-03-11 14:23:47 -08:00
James B. Pollack
e82fa70bb4 Merge branch 'master' into consoleversion 2016-03-11 13:49:08 -08:00
Anthony J. Thibault
0ce004c8a7 Removed passive-aggressive comment, (it was a late night) 2016-03-11 13:36:48 -08:00
Brad Hefta-Gaub
082bb8c4b8 auto-show reticle on mouse click 2016-03-11 12:49:42 -08:00
Brad Hefta-Gaub
e341419090 enter away mode when you remove the Vive HMD 2016-03-11 11:56:39 -08:00
Brad Hefta-Gaub
820e185c9d Merge branch 'master' of https://github.com/highfidelity/hifi into toggleOverlay 2016-03-11 11:49:43 -08:00
Chris Collins
ae596d79f1 Merge pull request #7317 from jherico/hmd_worn 
Expose a property in display plugins to determine if the device is visible to the user
 2016-03-11 11:46:06 -08:00
Brad Hefta-Gaub
d32611a7f9 make away show overlays if they are hidden when you enter away 2016-03-11 11:45:52 -08:00
Brad Hefta-Gaub
18f5b14e7a make all toggle menu items work properly through Menu scripting interface 2016-03-11 11:45:29 -08:00
Brad Davis
75c3fd18c9 Expose HMD worn to scripting 2016-03-11 11:00:58 -08:00
Anthony Thibault
ab390f7d2e Merge branch 'master' into tony/smooth-hands 2016-03-11 10:06:31 -08:00
Anthony J. Thibault
5eeb4ca594 Fix one frame lag controller lag/jitter 
Move userInputMapper->update() after inputPlugin->pluginUpdate().
 2016-03-11 09:28:25 -08:00
Brad Hefta-Gaub
d1c024fb39 Merge pull request #7286 from zzmp/fix/skybox-tex 
Clean up skybox rendering
 2016-03-11 08:50:23 -08:00
Brad Hefta-Gaub
d8d500c318 Merge pull request #7291 from ericrius1/uniformBugRepro 
Rapid uniform change test
 2016-03-11 08:45:52 -08:00