Commit graph

40011 commits

Author SHA1 Message Date
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
ericrius1
ef85d0451a removed files that shouldn't be there 2016-02-25 14:24:06 -08:00
ericrius1
21808242ba stashin 2016-02-25 14:20:13 -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
Anthony J. Thibault
626b170207 Crash fix for RenderableBoxEntityItem::render 2016-02-25 14:10:23 -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
Andrew Meadows
b4edfe2390 no expiry for simulation ownership 2016-02-25 12:07:20 -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
samcake
287bfeddda Fixing the way the Obscurance is used with the ssao map 2016-02-24 18:31:08 -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