Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 16:33:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
39763 commits 71 branches 56 tags 1.2 GiB
Commit graph

39763 commits

This branch
This branch
All branches
Author SHA1 Message Date
PhilipRosedale
4728eeb862 less of them 2016-03-08 20:22:29 -08:00
PhilipRosedale
5487c4cdab Firefly script 2016-03-08 19:42:11 -08:00
PhilipRosedale
87e7dd9ce3 add vive button mapping 2016-03-04 16:16:05 -08:00
PhilipRosedale
e01524abbe fix for clicking 2016-03-04 11:24:35 -08:00
PhilipRosedale
efe53c1a85 actually don't add to default yet 2016-02-29 17:12:43 -08:00
PhilipRosedale
b89b6be210 look for hydra first 2016-02-29 16:45:00 -08:00
PhilipRosedale
86249cc9db add hand controller mouse to default scripts 2016-02-29 16:23:03 -08:00
PhilipRosedale
0e17506137 hand controller doesn't take mouse if set down, renamed file. 2016-02-29 16:21:06 -08:00
PhilipRosedale
42f6ede43c azimuth = elevation, duh 2016-02-29 10:22:24 -08:00
PhilipRosedale
d1bc31afb6 azimuth function is really just a ratio 2016-02-29 10:16:34 -08:00
PhilipRosedale
08eacc436f Fixed rayPlane test again 2016-02-29 10:13:01 -08:00
PhilipRosedale
cee79c8274 Fixed bug in rayPlane test 2016-02-28 15:44:23 -08:00
PhilipRosedale
e9aed83920 suppress debug messages 2016-02-28 12:41:40 -08:00
PhilipRosedale
1d681a2461 Add angular size and azimuth limits to object XZ translation 2016-02-28 12:00:13 -08:00
PhilipRosedale
47504a068e remove unused code 2016-02-26 16:58:38 -08:00
PhilipRosedale
7fd88793dc drag relative to plane where pointer collided selection box 2016-02-26 16:58:17 -08:00
Chris Collins
a275d95c59 Merge pull request #7208 from ZappoMan/showOverlayOnMenuPopup 
Show overlay on menu popup
 2016-02-26 11:00:04 -08:00
Brad Hefta-Gaub
44f45a3f29 Merge branch 'master' of https://github.com/highfidelity/hifi into showOverlayOnMenuPopup 2016-02-26 10:27:37 -08:00
Andrew Meadows
c4798870d5 Merge pull request #7200 from hyperlogic/tony/box-render-crash-fix 
Crash fix for RenderableBoxEntityItem::render
 2016-02-26 10:25:50 -08:00
Zach Pomerantz
3c53078178 Merge pull request #7194 from ZappoMan/toggleOverlay 
add toggleOverlays menu item and action
 2016-02-26 10:17:24 -08:00
Brad Hefta-Gaub
6b427e59ae show the overlays when the context menu is shown 2016-02-26 10:12:23 -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
Brad Hefta-Gaub
bf0fb7258a CR feedback 2016-02-25 22:01:10 -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
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
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