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

40530 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
16f2ef48fe adjust 2016-03-17 09:36:10 -07:00
James B. Pollack
c35e4bc78a working reset and ping pong 2016-03-17 09:18:12 -07:00
James B. Pollack
ed1913e58d add ping pong gun and enable some items 2016-03-17 01:03:21 -07:00
James B. Pollack
4dd3f2a097 moar 2016-03-16 18:37:21 -07:00
James B. Pollack
0193889690 line endings 2016-03-16 17:49:20 -07:00
James B. Pollack
8477b721a4 add kinetic objects 2016-03-16 15:48:17 -07:00
James B. Pollack
b6955ec77f refs 2016-03-14 18:59:15 -07:00
James B. Pollack
432810704e tidy 2016-03-14 18:53:29 -07:00
James B. Pollack
8877a6c570 tidyyy guy! 2016-03-14 17:58:12 -07:00
James B. Pollack
2c8f13b538 entity script reset 2016-03-14 16:47:18 -07:00
James B. Pollack
169cd70a8c Merge branch 'homeswitches' into homereset 2016-03-14 16:00:19 -07:00
Brad Hefta-Gaub
830f53cc46 Merge pull request #7345 from sethalves/delete-parentless-entities-redux 
Delete parentless entities redux
 2016-03-14 10:04:22 -07:00
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
Seth Alves
7641b1e99d remove debug print 2016-03-13 08:45:23 -07:00
Seth Alves
415f21c189 be more aggressive about putting entities into the missing-its-parent list 2016-03-13 08:35:21 -07:00
Seth Alves
0a2fb77698 delete child entities when parent is deleted 2016-03-13 07:04:50 -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
James B. Pollack
8050bdd742 range 2016-03-11 20:00:49 -08:00
James B. Pollack
cb83bec341 switches 2016-03-11 19:49:23 -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