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

18461 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
688bd0f34f first pass audio mixer automatic muting of noisy streams, tour guide improvements, new lightExample.js, hair hangs over cone 'body' 2014-11-05 16:58:58 -08:00
Philip Rosedale
a6c8fb7449 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-04 14:12:24 -08:00
Philip Rosedale
803686c2ce Merge pull request #3739 from birarda/lobby 
fix for ice server lookup from DomainHandler
 2014-11-04 14:12:18 -08:00
Stephen Birarda
beb350d1e7 fix for HifiSockAddr lookup for ice server from DomainHandler 2014-11-04 13:53:56 -08:00
Philip Rosedale
b971089ba8 Merge pull request #3738 from birarda/lobby 
fix for ice server sock addr in domain-server
 2014-11-04 13:26:56 -08:00
Stephen Birarda
d46f775f20 async and sync nomenclature flip 2014-11-04 13:23:53 -08:00
Stephen Birarda
d671dec61b fix for ice server sock addr in domain-server 2014-11-04 13:21:48 -08:00
Philip Rosedale
cdad40faec Merge pull request #3736 from ZappoMan/entityBugs 
reset the QElapsedTimer in usecTimestampNow() periodically to prevent error
 2014-11-04 12:59:13 -08:00
Philip Rosedale
c4eeebe03e Merge branch 'master' of https://github.com/worklist/hifi 2014-11-04 12:44:31 -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
558aa52d30 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-04 12:14:08 -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
Philip Rosedale
2a84149d15 Merge pull request #3728 from ey6es/master 
Fix for lights/shadows on Oculus, as well as a couple fixes for 3DTV mode.
 2014-11-04 12:01:03 -08:00
Stephen Birarda
b968f05123 use a new cursor for selection in lobby 2014-11-04 11:54:14 -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
AndrewMeadows
61d5bfc751 Merge pull request #3730 from ZappoMan/deadcode 
removed some dead code
 2014-11-04 11:09:24 -08:00
AndrewMeadows
d7234d5995 Merge pull request #3731 from ctrlaltdavid/20138 
CR for Job #20138 - Repopulate example default models for "Upload URL" to better sized models
 2014-11-04 11:08:47 -08:00
ZappoMan
a89287e404 reset the QElapsedTimer in usecTimestampNow() periodically to prevent error 2014-11-04 11:01:37 -08:00
Stephen Birarda
8452182b45 replace position and orientation calls in lobby 2014-11-04 10:43:09 -08:00
Stephen Birarda
303e8f6da9 more js changes for changes to camera interface 2014-11-04 10:41:36 -08:00
Stephen Birarda
fe0d593ac4 expose camera mode as property and leverage in scripts 2014-11-04 10:41:13 -08:00
Stephen Birarda
81ef722ef8 update camera calls in JS to use new mode methods 2014-11-04 10:35:41 -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
99219a1758 use actionRay in lobby script 2014-11-04 10:17:00 -08:00
Brad Hefta-Gaub
37d95b7f82 Merge pull request #3733 from huffman/inspect-tool-fixes 
Inspect tool fixes
 2014-11-04 10:13:59 -08:00
Ryan Huffman
2e8e31fce9 Update inspect tool behavior to pan correctly 2014-11-04 10:06:45 -08:00
Ryan Huffman
573e6f119f Add entity camera options to settings 2014-11-04 10:06:17 -08:00
Stephen Birarda
8d6b041758 send a pick ray with HFActionEvent, not x,y 2014-11-04 10:01:25 -08:00
David Rowe
4fdc00948f Repopulate example models in newEditEnties.js too 2014-11-04 09:39:37 -08:00
David Rowe
fd8fb32190 Repopulate example models for "Upload URL" to better sized models 2014-11-04 09:33:39 -08:00
Ryan Huffman
fc977e21e6 Remove print statements 2014-11-04 09:14:14 -08:00
ZappoMan
af1b69d8a1 removed some dead code 2014-11-04 09:01:45 -08:00
Brad Hefta-Gaub
1707025bd0 Merge pull request #3729 from huffman/inspect-tool 
Add inspect tool functionality to newEditModels.js
 2014-11-04 08:54:31 -08:00
AndrewMeadows
2083a4dd89 Merge pull request #3727 from birarda/domain-tunnel 
report restricted access state from domain-server in heartbeat
 2014-11-04 08:42:39 -08:00
Ryan Huffman
a3fa1e4ce8 Merge branch 'master' of github.com:highfidelity/hifi into inspect-tool 2014-11-04 08:32:58 -08:00
Ryan Huffman
185b9ac545 Add Inspect tool to newEditEntities 2014-11-04 08:32:21 -08:00
Ryan Huffman
640c2c5fbf Add optional orientation easing to entity camera 2014-11-04 08:30:10 -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
96dd1eaf76 report restricted access state from domain-server in heartbeat 2014-11-03 16:57:10 -08:00
Brad Hefta-Gaub
bc51d13c9a Merge pull request #3726 from birarda/domain-tunnel 
allow for case insensitivity in domain-server allowed users
 2014-11-03 15:52:55 -08:00
Brad Hefta-Gaub
a78407cac8 Merge pull request #3724 from birarda/network-timeout 
fix for reverted HifiSockAddr IP lookup in assignment clients
 2014-11-03 15:52:44 -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