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

39784 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericrius1
25a2d1eb93 fixed rotation 2016-02-26 10:14:27 -08:00
ericrius1
b70d96ea96 Merge branch 'master' into whiteboardV2 2016-02-26 09:17:43 -08:00
Philip Rosedale
783892ac2e Merge pull request #7206 from hyperlogic/tony/simrate-fix 
Application: don't simulate until we are ready to render
 2016-02-26 07:27:35 -08:00
Brad Hefta-Gaub
a2140f7048 Merge pull request #7207 from AndrewMeadows/fix-setKeyholeRadius 
legacy support for EntityViewer.setKeyholeRadius()
 2016-02-25 22:48:33 -08:00
Andrew Meadows
ef433c0e01 legacy support for EntityViewer.setKeyholeRadius() 2016-02-25 22:24:37 -08:00
Andrew Meadows
2f490a0684 Merge pull request #7205 from AndrewMeadows/cleanup2 
cleanup ViewFrustum method names (correct branch)
 2016-02-25 21:28:22 -08:00
ericrius1
0ce4385554 no offset increment 2016-02-25 18:22:54 -08:00
Anthony J. Thibault
e5c81f66a5 Application: removed threadID and milliseconds from logging. 2016-02-25 18:20:43 -08:00
Anthony J. Thibault
08c16beff2 Application: re-worded presentCount comments 2016-02-25 18:17:42 -08:00
Andrew Meadows
c3dfc13f88 namechange ViewFrustum::location to ::intersection 2016-02-25 18:09:35 -08:00
Andrew Meadows
acef6642c9 fix logic typo 2016-02-25 18:09:35 -08:00
Andrew Meadows
f964df6c97 final names for ViewFrustum intersection tests 2016-02-25 18:09:35 -08:00
Andrew Meadows
5d1e283508 namechange TouchesKeyhole to IntersectsKeyhole 2016-02-25 18:09:35 -08:00
Andrew Meadows
918880b058 use correct ViewFrustum overlap tests 2016-02-25 18:09:35 -08:00
Andrew Meadows
2591c5ee3e cleanup names that use "keyhole" 2016-02-25 18:09:35 -08:00
Andrew Meadows
9558258f64 use cubeInKeyhole() where appropriate 2016-02-25 18:09:35 -08:00
Andrew Meadows
9409339230 add ViewFrustum::cubeInKeyhole() 2016-02-25 18:09:35 -08:00
Andrew Meadows
706cf66240 restor name: viewTest() --> frustumTest() 2016-02-25 18:09:35 -08:00
Andrew Meadows
669cc75596 adding ViewFrustumTests 2016-02-25 18:09:35 -08:00
Andrew Meadows
92581587b1 cleaned up AACubeTests, added AABoxTests 2016-02-25 18:09:35 -08:00
Andrew Meadows
5c11963de2 add unit tests for AACube 2016-02-25 18:09:35 -08:00
Andrew Meadows
dfdf375853 use shapeInFrustum() names again 
but at the same time make the code more redable
also: add some more efficient shape-touches-view methods
and cleanup some whitespace
 2016-02-25 18:09:35 -08:00
Andrew Meadows
8200babf78 fix warning about unused variable 2016-02-25 18:09:35 -08:00
ericrius1
4d2a65926c test 2016-02-25 18:06:13 -08:00
Anthony J. Thibault
11cd8e03b9 Merge branch 'master' into tony/simrate-fix 2016-02-25 17:50:23 -08:00
Brad Hefta-Gaub
25634ea0ca Merge pull request #7204 from PhilipRosedale/betterLeap 
Leap Motion can near grab entities
 2016-02-25 17:48:56 -08:00
Anthony J. Thibault
1fdae13de1 Application: don't simulate until we are ready to render. 2016-02-25 17:48:55 -08:00
PhilipRosedale
4845de68dd fixed typo 2016-02-25 17:29:53 -08:00
Clément Brisset
a8a7d0f61c Merge pull request #7203 from highfidelity/revert-7179-domain-security 
Revert "verified domain ownership for full automatic networking"
 2016-02-25 17:17:21 -08:00
PhilipRosedale
0cc1c930c5 mapped finger curl to trigger value 2016-02-25 17:04:46 -08:00
Stephen Birarda
34408c8144 Revert "verified domain ownership for full automatic networking" 2016-02-25 17:02:08 -08:00
Brad Hefta-Gaub
661e714c0b Merge pull request #7170 from imgntn/tiltmaze 
Tilt Maze
 2016-02-25 16:49:17 -08:00
Zach Pomerantz
113596636d Merge pull request #7189 from ZappoMan/depthReticleWork 
fix desktop detection when not pointing at overlay area
 2016-02-25 16:24:06 -08:00
ericrius1
0602bf7f1a logging 2016-02-25 16:20:35 -08:00
Philip Rosedale
86d6d255fa Merge pull request #7199 from sethalves/fix-grab-heartbeat 
only update heartbeat in userData of grabbed entity every 5 seconds
 2016-02-25 16:17:11 -08:00
ericrius1
a79d334bed no query string 2016-02-25 16:12:34 -08:00
Brad Hefta-Gaub
202a456e1a Merge pull request #7126 from AndrewMeadows/cleanup 
cleanup ViewFrustum method names
 2016-02-25 16:12:25 -08:00
Brad Hefta-Gaub
e7e6455d5d Merge pull request #7197 from birarda/installer-order 
tweak installer flow to ask everything up front
 2016-02-25 16:10:15 -08:00
Brad Hefta-Gaub
82cbf19bca Merge pull request #7078 from zzmp/fix/light-intensity 
Reimplement light attenuation for spot and point lights
 2016-02-25 16:08:28 -08:00
ericrius1
668894b3e0 should work multiuser now 2016-02-25 16:05:03 -08:00
samcake
e55ace9b19 Merge pull request #7193 from jherico/framebuffer_fix 
Fix framebuffer behavior when changing attachments
 2016-02-25 15:58:17 -08:00
Clément Brisset
2e7c7eace5 Merge pull request #7179 from birarda/domain-security 
verified domain ownership for full automatic networking
 2016-02-25 15:24:09 -08:00
ericrius1
24bf4f851f can erase any stroke at any time 2016-02-25 15:23:02 -08:00
Brad Hefta-Gaub
9e2d326b30 Merge pull request #7177 from howard-stearns/ac-sound-searcher-update 
Update sound searcher and spawner for load handling.
 2016-02-25 15:10:42 -08:00
ericrius1
ddae2d4f74 only erase stroke map on release and preload 2016-02-25 15:00:54 -08:00
ericrius1
4de951242c eraser positioned correctly 2016-02-25 14:54:34 -08:00
ericrius1
22a5f3dcc0 wait even longer 2016-02-25 14:28:48 -08:00
ericrius1
338427ed3e wait longer before sending message 2016-02-25 14:28:35 -08:00
ericrius1
e9ad06fca7 removed query string 2016-02-25 14:25:12 -08:00
Brad Hefta-Gaub
8422d4f36a Merge pull request #7198 from howard-stearns/snapTurnDefault 
snap turn default
 2016-02-25 14:25:00 -08:00