Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-18 01:06:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
19699 commits 69 branches 56 tags 1.2 GiB
Commit graph

10073 commits

Author SHA1 Message Date
Brad Hefta-Gaub
31cbd6e88c Merge pull request #3954 from ctrlaltdavid/20226 
CR for Job #20226 - Change Overlays.getTextWidth into Overlays.getTextSize
 2014-12-11 14:33:24 -08:00
AndrewMeadows
84e82cd03b Merge pull request #3947 from ZappoMan/HMDMode 
Make the Chat, Running Scripts, and Address bar "avoid" HMD Screen
 2014-12-11 10:48:32 -08:00
AndrewMeadows
bb6f976699 Merge pull request #3945 from ZappoMan/someCleanup 
AudioRefector-ectomy
 2014-12-11 10:39:41 -08:00
ZappoMan
ec54b609df dry up code and make chat window avoid the hmd screen 2014-12-10 17:23:39 -08:00
ZappoMan
06d348c399 get have addressbar avoid the hmd screen 2014-12-10 17:13:34 -08:00
ZappoMan
d058b5554e make sure the running scripts widget doesn't start on the HMD screen 2014-12-10 16:58:36 -08:00
ZappoMan
7f887ba75f more spatial audio removal 2014-12-10 15:46:10 -08:00
ZappoMan
eda7432868 remove audio reflector 2014-12-10 15:37:48 -08:00
Andrzej Kapolka
d402f767c1 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-10 15:23:27 -08:00
Andrzej Kapolka
c57fd15bc9 Rather than loading the entire FBX file into a byte array, read it straight 
from the QNetworkReply.
 2014-12-10 15:22:48 -08:00
ZappoMan
74a6fd5ca7 fix joystick pick 2014-12-09 20:03:00 -08:00
Atlante45
88a576f846 fix action events for gamepad; 2014-12-09 19:35:38 -08:00
David Rowe
ff6db7a9fa Merge branch 'master' into 20226 2014-12-09 19:20:30 -08:00
David Rowe
8cf50b71ea Update some comments to reflect changes 2014-12-09 19:18:37 -08:00
Brad Hefta-Gaub
69f7a89003 Merge pull request #3937 from Atlante45/mouse_pick_in_oculus 
Mouse pick improvments
 2014-12-09 18:33:25 -08:00
David Rowe
136c3a2cce Replace 2D and 3D text overlay textWidth() method with textSize() 2014-12-09 18:32:53 -08:00
Atlante45
dc4c9cd545 Correctly Hide/Show cursor 2014-12-09 18:00:14 -08:00
Sam Gateau
01c13cd6f1 Fix the broken shadows by simply calling the needed setViewTransform which is used for rendering the ENitites and avatars 2014-12-09 17:58:17 -08:00
Atlante45
43dc35d549 Use correct mouse coordinate 2014-12-09 17:53:23 -08:00
Atlante45
b197558b87 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-09 16:46:13 -08:00
Atlante45
8765d9a9b3 Mouse cursor modifications 2014-12-09 16:30:37 -08:00
Stephen Birarda
ada325da2b Merge pull request #3931 from Atlante45/mouse_pick_in_oculus 
Misc fixes
 2014-12-09 12:13:24 -08:00
Atlante45
649940de24 wrong pickray function 2014-12-09 11:53:32 -08:00
Atlante45
a6f7a1ce15 guard against NULL _models 2014-12-09 11:52:20 -08:00
ZappoMan
1eaa2caa6c fix to crash on rapidly switching domains 2014-12-09 11:40:47 -08:00
Atlante45
ba81030aa1 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-08 16:53:56 -08:00
Atlante45
fa73730359 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-08 16:46:34 -08:00
ZappoMan
cdeaaf2ca9 fix deadlock in enter/leave events 2014-12-08 15:06:34 -08:00
ZappoMan
efbe8ce757 Merge branch 'master' of https://github.com/highfidelity/hifi into entityCollisions 2014-12-08 14:15:20 -08:00
ZappoMan
0592b74a06 make collision callbacks work 2014-12-08 14:15:03 -08:00
Brad Hefta-Gaub
a9079b64e4 Merge pull request #3922 from AndrewMeadows/thermonuclear 
overhaul EntitySimulation API (and relay relevant EntityItem properties to simulation when they change)
 2014-12-08 13:56:06 -08:00
Clément Brisset
681a1a3297 Merge pull request #3917 from ctrlaltdavid/20202 
CR for Job #20202 - Add "backgroundVisible" property to text overlays
 2014-12-08 11:43:52 -08:00
Andrew Meadows
9e9929da91 merge upstream/master into andrew/thermonuclear 2014-12-08 11:22:39 -08:00
ZappoMan
27bc394bed repair collision info mismatch 2014-12-08 10:52:53 -08:00
Atlante45
299389ccef Fixed typo 2014-12-08 09:59:33 -08:00
Philip Rosedale
60c2a89292 Merge pull request #3915 from ZappoMan/modelRayPick 
Proper Model Ray Picking
 2014-12-07 14:19:26 -08:00
ZappoMan
d698594899 use common findRayTriangleIntersection 2014-12-06 19:39:02 -08:00
ZappoMan
91fd574eb5 Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick 2014-12-06 15:28:54 -08:00
ZappoMan
1a1fb18ba1 removed dead code 2014-12-06 15:03:26 -08:00
ZappoMan
c8e648c4d7 removed unused menu item 2014-12-06 15:00:29 -08:00
ZappoMan
a03984a561 removed some debug code 2014-12-06 14:59:50 -08:00
ZappoMan
3bb16ce831 properly wire up precision picking in JS api 2014-12-06 12:03:46 -08:00
ZappoMan
7ea85073f4 introduce precision picking in API form 2014-12-06 11:45:49 -08:00
David Rowe
dbb547507d Merge branch 'master' into 20202 2014-12-06 11:14:45 -08:00
ZappoMan
303274a554 tweaks and debug cleanup 2014-12-06 10:59:48 -08:00
ZappoMan
1fec69698e get the triangle picking for submeshes working, remove some debug 2014-12-05 23:23:21 -08:00
ZappoMan
f1c6e2d1a2 more debugging 2014-12-05 19:52:48 -08:00
Andrew Meadows
7d96ad5836 cleanup of EntitySimulation API 
* remove EntityItem::_simulationState (only useful to EntitySimulation)
* move code from SimpleEntitySimuation to EntitySimulation
* EntitySimulation now maintans many QSets of entities
* cleanup and clarify use of EnityTree::updateEntity()
* reduced cost of polling for entity expiries
* changed "UpdateFlags" to "DirtyFlags" and clarified what they're for
 2014-12-05 18:08:53 -08:00
Atlante45
d89d10d263 Hide cusor in VR mode 2014-12-05 17:36:46 -08:00
Atlante45
1bb08ef30f Centered reticule 2014-12-05 17:10:58 -08:00