Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 16:30:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18474 commits 76 branches 59 tags 1.2 GiB
Commit graph

9530 commits

Author SHA1 Message Date
Sam Gateau
27aadd24b3 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-04 16:43:26 -08:00
Sam Gateau
441d09a460 debugiing the mysterious glError coming from glFrustum 2014-11-04 16:42:58 -08:00
Sam Gateau
4afa0b4188 more GL error checking 2014-11-04 15:52:25 -08:00
Brad Hefta-Gaub
24c324fd1d Merge pull request #3735 from ctrlaltdavid/20126 
CR for Job #20126 - Rift HUD shouldn't move with head
 2014-11-04 15:52:10 -08:00
Brad Hefta-Gaub
583b7b1267 Merge pull request #3732 from thoys/20166 
CR for Job #20166 - Extend AudioDeviceScriptingInterface to have muted property and mute event
 2014-11-04 15:51:05 -08:00
Sam Gateau
66d732fc33 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-04 14:52:22 -08:00
Sam Gateau
c842060dc5 fix names for stream and Batch interface 2014-11-04 14:51:57 -08:00
Stephen Birarda
fab3a61f1b Merge pull request #3737 from birarda/lobby 
fix for Camera.getPosition() calls
 2014-11-04 12:40:08 -08:00
Stephen Birarda
72f80d4a0f make camera getPosition() callable from js 2014-11-04 12:39:50 -08:00
Philip Rosedale
6b8476a87f Merge pull request #3734 from birarda/lobby 
bubble up a PickRay with action event, camera cleanup
 2014-11-04 12:03:29 -08:00
Andrzej Kapolka
f00c54c23c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-04 11:45:23 -08:00
Andrzej Kapolka
03ce8081a4 Oh, when will I learn not to use "near" and "far" as variable names? 2014-11-04 11:44:47 -08:00
Stephen Birarda
f53455ee55 use a ray from the near clip for action ray 2014-11-04 11:40:47 -08:00
Stephen Birarda
fe0d593ac4 expose camera mode as property and leverage in scripts 2014-11-04 10:41:13 -08:00
Stephen Birarda
790aa848ae leverage Camera object for scripting, remove sep interface 2014-11-04 10:33:55 -08:00
Stephen Birarda
957705998f fix an uninitialized action ray when hitting spacebar 2014-11-04 10:19:56 -08:00
Stephen Birarda
8d6b041758 send a pick ray with HFActionEvent, not x,y 2014-11-04 10:01:25 -08:00
ZappoMan
af1b69d8a1 removed some dead code 2014-11-04 09:01:45 -08:00
Sam Gateau
e290347a05 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-03 23:48:03 -08:00
Sam Gateau
f413f93c62 fix the bug for blend shape when more than one and clean the model rendering with the new stream and buffer gpu api 2014-11-03 23:26:39 -08:00
Andrzej Kapolka
3ba3299e35 Use glFrustum rather than Oculus's projection utility method, which seems to 
be returning weird results.
 2014-11-03 21:13:01 -08:00
Andrzej Kapolka
e76a8c2234 Fix for ambient occlusion in 3DTV mode. 2014-11-03 17:36:10 -08:00
Andrzej Kapolka
38a04b53d2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-03 17:00:42 -08:00
Stephen Birarda
a86ccfd603 Merge pull request #3725 from ZappoMan/entityScriptsAndEvents 
add support for enter/leave entity events for when the avatar enters or leaves the bounds of an entity
 2014-11-03 15:51:33 -08:00
ZappoMan
60182a78cb CR feedback 2014-11-03 15:42:40 -08:00
ZappoMan
2dae78b82c CR feedback 2014-11-03 15:40:09 -08:00
ZappoMan
bc329a6394 remove blank line 2014-11-03 15:34:30 -08:00
ZappoMan
e12e3b05e1 add support for enter/leave entity events for when the avatar enters or leaves the bounds of an entity 2014-11-03 15:33:01 -08:00
Stephen Birarda
d3372537c5 Merge pull request #3715 from ZappoMan/entityScriptsAndEvents 
Entity Scripts
 2014-11-03 15:02:52 -08:00
Sam Gateau
4d1fbc1cf9 Fix end of line in Application.cpp 2014-11-03 14:39:34 -08:00
Sam Gateau
a4bd0acc91 Fix the syntax issue with if blocks 2014-11-03 14:36:03 -08:00
Sam Gateau
ed067791f2 Fixing format for skin attributes float need to be NFloat 2014-11-03 14:29:11 -08:00
Andrzej Kapolka
ce3133b8d4 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-03 14:01:08 -08:00
Sam Gateau
eae604d77e Merged with upstream master 2014-11-03 13:37:17 -08:00
Sam Gateau
48769928c5 Trying to fix the skinning issue 2014-11-03 13:20:12 -08:00
Andrzej Kapolka
4475bb89d5 Fix for 3DTV mode with non-unity render scale. 2014-11-03 12:13:08 -08:00
Andrew Meadows
92a6609ac0 simpler tuning system for walk velocities 2014-11-03 11:31:04 -08:00
Sam Gateau
cecf79e580 Fix the problem of actual framerate target not beeing true to the value displayed in the menu, same for resolution scale. Removed the value in Application and relies exclusively on the menu state 2014-11-03 11:22:23 -08:00
Brad Hefta-Gaub
9fb4f91f2a Merge pull request #3716 from ctrlaltdavid/20152 
CR for Job #20152 - Interface cache goes away when you close Interface.
 2014-11-03 11:07:36 -08:00
AndrewMeadows
43a33730ea Merge pull request #3713 from ey6es/metavoxels 
Allow heightfield color/material layers to be of different resolutions than the height layer.
 2014-11-03 11:00:58 -08:00
ZappoMan
49a389618e Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents 2014-11-03 10:54:19 -08:00
Sam Gateau
ac02746587 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-03 09:56:54 -08:00
Sam Gateau
fba1526389 Migrating the model rendering code to use the new gpu api for input buffers and stream format 2014-11-03 09:56:14 -08:00
AndrewMeadows
b246af7511 Merge pull request #3712 from ctrlaltdavid/fix-log-file-eols 
Fix log file missing end of lines
 2014-11-03 08:44:23 -08:00
ZappoMan
4db5986625 support for url or text based scripts 2014-11-01 11:40:06 -07:00
ZappoMan
87a5423b35 support changing scripts on the fly and reloading them accordningly 2014-11-01 10:57:12 -07:00
Thijs Wenker
af74fc09b9 Adds AudioDevice mute functionality to ScriptEngine 2014-11-01 02:42:22 +01:00
ZappoMan
e8c694f02e args for more methods 2014-10-31 16:38:51 -07:00
ZappoMan
e7722dc692 pass args to object scripts for mouse events 2014-10-31 15:20:16 -07:00
David Rowe
a9040c1a53 Minor adjustment to Oculus pick ray calc 2014-10-31 15:15:44 -07:00