Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-18 17:00:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
39813 commits 25 branches 0 tags 1.1 GiB
Commit graph

39813 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericrius1
0d9a8b22c8 water flowing in ray direction 2016-02-29 15:48:56 -08:00
ericrius1
b301b71c7d cast ray from spout in its direction 2016-02-29 15:06:28 -08:00
ericrius1
03ae48d465 going to find water spout from water can 2016-02-29 11:53:26 -08:00
ericrius1
00dcddd838 changed to water spout entity script 2016-02-29 11:44:33 -08:00
ericrius1
2cd8e088f5 water pouring out of can linked to angle can is held 2016-02-29 10:36:32 -08:00
ericrius1
b7e80b03ae Merge branch 'master' into growingPlant 2016-02-29 10:10:25 -08:00
Clément Brisset
2ffaa1f2e7 Merge pull request #7196 from AndrewMeadows/simulation-ownership 
no expiry for simulation ownership
 2016-02-29 08:26:53 -08:00
Andrew Meadows
a933935e2d lock mutex in clearEntitiesInernal() 2016-02-28 15:13:49 -08:00
Brad Davis
d932cb7578 Merge pull request #7212 from ZappoMan/depthReticleWork 
add fade between depths in depth reticle
 2016-02-28 12:49:47 -08:00
Brad Hefta-Gaub
188cf3694b fix rotation of depth reticle 2016-02-27 17:31:35 -08:00
Brad Hefta-Gaub
e403c990d9 make fade non-linear 2016-02-27 17:13:09 -08:00
Brad Hefta-Gaub
70614aba90 Merge pull request #7184 from imgntn/cellscience 
Cellscience Updates
 2016-02-26 16:53:00 -08:00
Brad Hefta-Gaub
581bd69d14 Merge pull request #7216 from hyperlogic/tony/attachment-render-fix 
Avatar: fix for rendering avatar attachments
 2016-02-26 15:43:13 -08:00
Anthony J. Thibault
9a01c93322 Avatar: fix for rendering avatar attachments 2016-02-26 14:28:27 -08:00
ericrius1
a544ffc942 not emitting right now 2016-02-26 14:20:40 -08:00
ericrius1
0015e28b95 particle tweaks 2016-02-26 14:14:39 -08:00
Brad Hefta-Gaub
6d9c585604 add fade between depths in depth reticle 2016-02-26 12:01:59 -08:00
Chris Collins
7457b73e74 Merge pull request #7211 from zzmp/fix/default-ambience 
Differentiate global sun and skyStage sun
 2016-02-26 11:33:28 -08:00
Zach Pomerantz
712cf911b1 Differentiate global sun and skyStage sun 2016-02-26 11:06:02 -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
James B. Pollack
6c6ea3f0a7 code cleanup 2016-02-26 10:42:45 -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
James B. Pollack
b0cb4b7199 disable boundaries 2016-02-26 10:26:02 -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
ericrius1
d65479be77 Merge branch 'master' into growingPlant 2016-02-26 08:55:21 -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