samcake
|
d64b9bb6d9
|
Drafting the support for gloss map
|
2016-02-26 09:18:40 -08:00 |
|
samcake
|
3ee6f9d6f2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-02-25 23:48:53 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Brad Hefta-Gaub
|
8422d4f36a
|
Merge pull request #7198 from howard-stearns/snapTurnDefault
snap turn default
|
2016-02-25 14:25:00 -08:00 |
|
samcake
|
610189ded3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-02-25 14:14:04 -08:00 |
|
samcake
|
96fb9c4466
|
cleaning up macos warnings, separating Metallic maps from the default, gamma corrected gray textures
|
2016-02-25 14:13:35 -08:00 |
|
Seth Alves
|
6eeff34eb8
|
Merge pull request #7187 from thoys/20774
CR for Job #20774 - Allowance for negative zone area space within the Domain-Server web portal.
|
2016-02-25 14:07:03 -08:00 |
|
Seth Alves
|
09e4c54831
|
Merge pull request #7192 from zzmp/fix/zone-edit-update
Update Scene on ZoneEntity update
|
2016-02-25 14:05:29 -08:00 |
|
Seth Alves
|
b253cd53b9
|
Merge pull request #7190 from ericrius1/playaFireworks
Playa fireworks
|
2016-02-25 14:02:25 -08:00 |
|
Seth Alves
|
489fad4141
|
Merge pull request #7188 from ZappoMan/menuGroups
remove some unimplemented menu items
|
2016-02-25 14:00:38 -08:00 |
|
Seth Alves
|
fb44bf8941
|
Merge pull request #7195 from hyperlogic/tony/milliseconds-log
LogHandler: add option to display milliseconds in timestamp
|
2016-02-25 13:50:47 -08:00 |
|
Eric Levin
|
4d27d5c9f2
|
Update fireworksLaunchButtonEntityScript.js
|
2016-02-25 13:45:08 -08:00 |
|
Seth Alves
|
6dafc654eb
|
only update heartbeat in userData of grabbed entity every 5 seconds
|
2016-02-25 13:19:56 -08:00 |
|
James B. Pollack
|
16bebc437b
|
...spaces?
|
2016-02-25 13:09:45 -08:00 |
|
James B. Pollack
|
8d5834475a
|
spaces!
|
2016-02-25 13:07:09 -08:00 |
|
howard-stearns
|
d8fe55ddc5
|
Proper default for snapTurn preference (and new name so as to update old
users).
|
2016-02-25 13:06:34 -08:00 |
|
Stephen Birarda
|
9f377a5ad5
|
separate reading of post install options from handling
|
2016-02-25 12:53:28 -08:00 |
|
James B. Pollack
|
751b991522
|
semicolons
|
2016-02-25 12:36:35 -08:00 |
|
James B. Pollack
|
9b6889e237
|
no tabs
|
2016-02-25 12:32:59 -08:00 |
|
James B. Pollack
|
f62777af96
|
cleanup
|
2016-02-25 12:32:06 -08:00 |
|