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

39624 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
c05849714b bubbles etc 2016-02-29 16:21:43 -08:00
James B. Pollack
e152f74cae Merge branch 'newfishes' of github.com:imgntn/hifi into newfishes 2016-02-29 09:13:09 -08:00
James B. Pollack
96f5ff5fbd switching computers 2016-02-28 21:05:36 -08:00
James B. Pollack
ac28a1880e Merge branch 'master' into newfishes 2016-02-25 15:22:01 -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
ericrius1
98cf784c6f more smoke fading 2016-02-25 10:32:21 -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
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
ericrius1
9a108c298f smoke tweaks 2016-02-25 09:34:22 -08:00
ericrius1
728612f9a7 far trigger launches fireworks 2016-02-25 09:26:37 -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
ericrius1
8f914c6673 removed query string on entity script 2016-02-24 20:08:35 -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
ericrius1
08e7adc518 tweaks 2016-02-24 17:08:12 -08:00
ericrius1
45e8287d1d particle trail in right spot 2016-02-24 16:55:31 -08:00
ericrius1
c26ad2b9d0 relative smoke trail 2016-02-24 16:52:02 -08:00
ericrius1
fdb5d33866 MORE RANDOM YAHH 2016-02-24 16:42:24 -08:00
ericrius1
208096f2e0 fireworks but no smoke 2016-02-24 16:36:54 -08:00
ericrius1
769a5ecca9 tweaks 2016-02-24 16:33:28 -08:00
ericrius1
0a6a35ddd8 need multiple explosions at once 2016-02-24 16:30:29 -08:00
Seth Alves
cfdaf643a1 Merge pull request #7181 from sethalves/fix-grab-action 
fix avatarActionHold
 2016-02-24 16:28:17 -08:00
Brad Hefta-Gaub
ecb03562d3 fix build buster 2016-02-24 16:24:48 -08:00
Zach Pomerantz
20bfdba14b Avoid light prop copies when setting globalLight 2016-02-24 16:20:59 -08:00
Brad Hefta-Gaub
f9b55c4b87 Merge pull request #7185 from ctrlaltdavid/20809 
Fixes for new modal message dialog
 2016-02-24 16:20:40 -08:00
Brad Hefta-Gaub
ca5de8d6a9 remove some unimplemented menu items 2016-02-24 16:17:11 -08:00
ericrius1
0499334938 toadd: different colors for fireworks 2016-02-24 16:14:46 -08:00
Zach Pomerantz
1817b8ef2f Use only skyboxTexture in DeferredLightingEffect 2016-02-24 16:07:28 -08:00
Zach Pomerantz
95d98e3ed7 Wire up zone ambientURL 2016-02-24 16:07:04 -08:00
ericrius1
dea41edf9c tweaks 2016-02-24 16:01:38 -08:00
ericrius1
e245ad93d6 smoke and fire 2016-02-24 15:58:09 -08:00
Anthony J. Thibault
62ed5333e0 AvatarActionHold: compute velocities for other avatars 2016-02-24 15:14:56 -08:00
Anthony J. Thibault
b3b4c6473d Merge branch 'master' into fix-grab-action 2016-02-24 14:34:23 -08:00
David Rowe
b9a1c2051b Fix modal dialog not being opaque to mouse clicks 2016-02-25 10:52:16 +13:00