Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-31 15:33:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
40906 commits 71 branches 59 tags 1.2 GiB
Commit graph

40906 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Anthony Thibault
ea95295e66 ApplicationOveraly: Fix for gray line at top of HMD UI overlay 2016-03-12 14:52:26 -08:00
Seth Alves
cca4a93b2b don't full up userData with default grabbable data 2016-03-12 14:09:52 -08:00
James Pollack
50e7bd7742 claenup 2016-03-12 13:42:18 -08:00
Seth Alves
be51040420 grabbable controlls are working 2016-03-12 13:20:04 -08:00
Seth Alves
f1992af38e started to add grabbable psuedo properties to edit.js 2016-03-12 13:20:00 -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
David Rowe
f7c6725f63 Improve text3d rendering 2016-03-12 23:24:52 +13:00
James B. Pollack
b0109133c0 add git handle 2016-03-11 22:02:49 -08:00
James B. Pollack
cecebc9ae4 add example 2016-03-11 22:01:01 -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
samcake
84070052af Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-11 18:52:40 -08:00
samcake
3cf32b17be Trying to fix the jittering issue, foound an extra matrix inversion that could be the source 2016-03-11 18:52:02 -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
Stephen Birarda
76e547498d support compound shape URLs in ATPAssetMigrator 2016-03-11 18:02:06 -08:00
Stephen Birarda
8375de4517 make the ATPAssetMigrator hmd friendly and a little less brittle 2016-03-11 17:32: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
Ryan Huffman
f92793b748 Merge pull request #107 from birarda/atp-mappings 
styling fixes and upload focus fix
 2016-03-11 16:49:19 -08:00
Brad Hefta-Gaub
6083706151 CR feedback 2016-03-11 16:47:16 -08:00
James B. Pollack
68cc87298f cleanup 2016-03-11 16:39:58 -08:00
James B. Pollack
801f2b3f9f add animated urchin 2016-03-11 16:38:39 -08:00
howard-stearns
8799bf2d55 Alternative implementation, which only selects visible bestZone. 2016-03-11 16:36:13 -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
Seth Alves
01659cf93b try, try again 2016-03-11 16:21:20 -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
Seth Alves
5f05d576cc move checkAndAdjustQueryAACube into SpatiallyNestable 2016-03-11 15:55:42 -08:00
David Rowe
9da64e540d Add shortcut keys to HMD menu 2016-03-12 12:53:16 +13:00
Stephen Birarda
890266e0bd shrink message dialog to contentWidth 2016-03-11 15:45:57 -08:00
Stephen Birarda
188712a55b select a right-clicked item in asset browser 2016-03-11 15:45:57 -08:00
Stephen Birarda
31f0e4a919 disable the rename and delete buttons if nothing selected 2016-03-11 15:45:57 -08:00
Stephen Birarda
6d6a53a69a use timer for upload click handle to avoid focus issue 2016-03-11 15:45:57 -08:00
David Rowe
ecf67282d5 Add separators to HMD menus 2016-03-12 12:29:52 +13:00
Ryan Huffman
df6eb8a081 Merge pull request #108 from birarda/atp-upload-crash 
short circuit upload when file cannot be opened
 2016-03-11 15:21:28 -08:00
Stephen Birarda
895920a211 short circuit upload when file cannot be opened 2016-03-11 15:19:41 -08:00
Zach Pomerantz
9dcdf26567 Only consider model transparent if all texs are 2016-03-11 15:15:30 -08: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
Seth Alves
1e8706b1da remove debug print 2016-03-11 14:47:53 -08:00