Brad Hefta-Gaub
bf0fb7258a
CR feedback
2016-02-25 22:01:10 -08:00
Brad Hefta-Gaub
e58081ca9c
remove extra debug code
2016-02-25 16:23:12 -08:00
Brad Hefta-Gaub
b0c286bc3b
Merge branch 'master' of https://github.com/highfidelity/hifi into toggleOverlay
...
Conflicts:
interface/src/Application.cpp
2016-02-25 16:21:38 -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
Brad Hefta-Gaub
519a90f2bd
fix the overlays visible on startup case
2016-02-25 16:02:05 -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
366aa39be8
handle startup overlay visibility correctly
2016-02-25 14:46:08 -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
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
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
ericrius1
98cf784c6f
more smoke fading
2016-02-25 10:32:21 -08:00
Stephen Birarda
c1776e7f55
move button text changes out of onInit
2016-02-25 10:22:42 -08:00
Stephen Birarda
2d0d73116a
call handling of post install options once install complete
2016-02-25 10:20:07 -08:00
Stephen Birarda
30b1341dbb
change the close button text to finish
2016-02-25 10:15:59 -08:00
Stephen Birarda
c01ba7714c
title changes for setup options
2016-02-25 10:11:47 -08:00
Zach Pomerantz
c20bd6cbbc
Update Scene on ZoneEntity update
...
ZoneEntity is unique in that it is not updated
every frame that it is rendered, but only
when the avatar moves.
This introduces custom code so that the
RenderableZoneEntity initiates an update
in the EntityTreeRenderer on update,
to improve usability of zone editing.
2016-02-25 10:06:19 -08:00
Zach Pomerantz
9000c3479b
Avoid double-update of zone
2016-02-25 10:06:19 -08:00
Anthony J. Thibault
b5b3a40233
LogHandler: add option to display milliseconds in timestamp
2016-02-25 10:03:12 -08:00
Zach Pomerantz
32ce7c6eab
Rename light surfaceRadius->falloffRadius
2016-02-25 10:02:33 -08:00
Stephen Birarda
a44c34dd0b
change buttons in post install options for new placement
2016-02-25 10:02:12 -08:00
ericrius1
54ee3d347c
more velocity
2016-02-25 09:53:17 -08:00
ericrius1
f12acfb7f3
simplfied
2016-02-25 09:49:44 -08:00
ericrius1
d4d5aed518
smoke tweaks
2016-02-25 09:44:48 -08:00
Stephen Birarda
2a2760b708
put the post install options before the actual install
2016-02-25 09:43:02 -08:00
ericrius1
9a108c298f
smoke tweaks
2016-02-25 09:34:22 -08:00
Howard Stearns
077d331004
whitespace
2016-02-25 09:34:07 -08:00
ericrius1
728612f9a7
far trigger launches fireworks
2016-02-25 09:26:37 -08:00
Andrew Meadows
9c927ea36b
ViewFrustum method renames and whitespace cleanup
...
fooInFrustum() --> computeFooViewLocation()
except pointInFrustum() --> computeFrustumLocation()
2016-02-25 09:11:28 -08:00
Brad Hefta-Gaub
91f6b7e80d
Merge pull request #7186 from zzmp/feat/scene-ambient-tex
...
Wire up zone ambientURL
2016-02-25 09:05:25 -08:00
Brad Hefta-Gaub
526f9dc248
check/uncheck the overlays menu when you toggle the overlays via some other mechanism
2016-02-25 08:41:38 -08:00
Brad Hefta-Gaub
5828c32041
add toggleOverlays menu item and action
2016-02-25 08:31:11 -08:00
ericrius1
8f914c6673
removed query string on entity script
2016-02-24 20:08:35 -08:00
Brad Davis
ef33d297e2
Fix framebuffer behavior when changing attachments
2016-02-24 19:57:00 -08:00
ericrius1
ad49bcda72
lowered num fireworks
2016-02-24 18:29:44 -08:00
ericrius1
7cb57aa067
alpha tweaks
2016-02-24 18:15:34 -08:00
ericrius1
a1eab365ce
added name to launch pad
2016-02-24 18:11:08 -08:00
ericrius1
29c4ac83c0
can set launch position in userdata
2016-02-24 18:00:57 -08:00
ericrius1
857ccc7409
move sound with thing
2016-02-24 17:53:46 -08:00
Chris Collins
f6a6560b86
Merge pull request #7175 from sethalves/grab-clean-up-abandoned
...
grab script cleans up abandoned grabs
2016-02-24 17:20:46 -08:00
Thijs Wenker
a716d971d9
Merge branch 'master' of https://github.com/highfidelity/hifi into 20774_fix
2016-02-25 02:18:40 +01:00
