ZappoMan
160898ce96
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-22 14:55:29 -07:00
David Rowe
a01830f8f8
Fix some double to float conversion warnings in Windows builds
2015-05-22 12:32:02 -07:00
Atlante45
20ff43e29a
Don't sync by default
2015-05-22 20:29:25 +02:00
ZappoMan
c7fb8fab85
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-21 10:36:22 -07:00
ZappoMan
e1c5c5b12e
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-20 18:42:54 -07:00
Seth Alves
782402b4c8
Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux
2015-05-20 14:53:05 -07:00
Seth Alves
124ff68cee
make EntityItemID a subclass of QUuid
2015-05-20 14:22:08 -07:00
Seth Alves
f522334c99
sort out script interface changes
2015-05-20 12:30:06 -07:00
Howard Stearns
c5b8dd51d8
Fix https://app.asana.com/0/32622044445063/34195351184789
...
Handle collision events when we do other updates (and their entity scripts) rather than when we do the physic updates while the tree is locked.
Given that, remove the check that kept sound from playing (or scripts from running) when we would have deadlocked, because now we don't.
2015-05-20 11:07:03 -07:00
Seth Alves
a769cfdaf2
client decides on new entity-ids, keep EntityItemID class
2015-05-20 10:42:19 -07:00
Seth Alves
f9d46b0cb5
interface decides on entityIDs rather than bouncing a temporary id through the entity server
2015-05-19 14:25:23 -07:00
Atlante45
72bf160845
Proxies render in Batch
2015-05-18 16:36:16 +02:00
Atlante45
ede94e4248
Merge branch 'master' of https://github.com/highfidelity/hifi into remove_gl_transform
2015-05-18 11:39:17 +02:00
Atlante45
3436658e45
Add batch to RenderAgrs
2015-05-16 05:42:26 +02:00
Atlante45
4725d5e676
Merge branch 'primitives_batch' into remove_gl_transform
2015-05-16 05:22:12 +02:00
Atlante45
7ff973b94c
Merge branch 'master' of https://github.com/highfidelity/hifi into primitives_batch
2015-05-16 04:36:05 +02:00
Atlante45
feefcbf40f
Merge branch 'master' of https://github.com/highfidelity/hifi into remove_gl_transform
2015-05-15 20:30:45 +02:00
Sam Cake
97b18fcd52
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-05-15 11:29:43 -07:00
Sam Cake
765145b898
Moving the load of the texture and the generation of the cube map irradiance in the same thread
2015-05-15 11:28:59 -07:00
Howard Stearns
9f7a56e3e5
Ask audio injector to delete itself.
...
Put in null guards.
Tune parameters (including higher threshold).
2015-05-15 11:00:28 -07:00
Atlante45
c13ad83cc4
Rename getCenter by get CenterPosition
2015-05-15 18:34:28 +02:00
Atlante45
e0ae8597bc
Factor zone code in Model::render
2015-05-15 15:45:31 +02:00
Howard Stearns
5accb4d0d2
Remove debug logging.
2015-05-14 15:12:31 -07:00
Howard Stearns
b5a28730ea
Filter out low-penetration continuous contact from all entity collision activity including scripts:
...
We don't want sound for these.
This appears to avoid the Entities.getEntityProperties() deadlock within entity scripts.
Variable names:
energyPercentOfFull => energyFactorOfFull, because the range is 0-1, not 0-100.
COLLISION_SOUND_COMPRESSION => COLLISION_SOUND_COMPRESSION_RANGE (portion of full dynamic range)
Tune constants:
COLLISION_ENERGY_AT_FULL_VOLUME 10 => 1
COLLISION_MINIMUM_VOLUME 0.01 => 0.001
COLLISION_SOUND_COMPRESSION_RANGE 0.5 => 0.95
Refer to SoundCache later, after filtering for collision threshold.
2015-05-14 14:41:32 -07:00
Brad Davis
a77816617d
Make web entities interactive (via the mouse) if they're not locked.
2015-05-14 01:15:20 -07:00
Brad Hefta-Gaub
5da0a8d7a3
Merge pull request #4860 from howard-stearns/entity-sound
...
Entity sound.
2015-05-13 20:07:44 -07:00
Howard Stearns
6ebeb7a22e
Another constexpr.
2015-05-13 15:47:47 -07:00
Howard Stearns
76e39fc95b
constexpr => const for Windows compiler.
2015-05-13 13:56:10 -07:00
Howard Stearns
1a87ca04da
Entity sound.
2015-05-13 13:18:02 -07:00
Brad Davis
8c4f802dbf
Merge remote-tracking branch 'upstream/master' into web-entity
...
Conflicts:
libraries/entities/src/EntityItemProperties.h
libraries/entities/src/EntityTypes.h
2015-05-12 15:56:02 -07:00
Brad Davis
745182a963
Working on web entities
2015-05-12 14:39:54 -07:00
Seth Alves
4881b0c53c
copy box to make a new type of line entity item
2015-05-11 19:25:14 -07:00
Howard Stearns
51a29bdba6
Put back the script-fix that belongs in this branch.
2015-05-11 11:53:48 -07:00
ZappoMan
17c3c1a18d
add support for automatic hour/day calculations and backward compatibility on stage properties
2015-05-10 15:22:02 -07:00
ZappoMan
0b6a815a20
moved zone stage properties into a group
2015-05-08 20:17:01 -07:00
ZappoMan
1936f4c114
fix zone:nothing bug
2015-05-08 14:03:58 -07:00
Sam Gateau
deb303838d
Cleaning code
2015-05-07 17:15:45 -07:00
Sam Gateau
ce5295a55f
THese is not final but we have a basic working framework so let's try to share
2015-05-07 17:06:15 -07:00
Atlante45
faabf29e84
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-07 19:58:26 +02:00
ZappoMan
496da6fcd5
wire up the skybox color property to the new skybox renderer
2015-05-06 20:36:06 -07:00
Atlante45
6d2fe945af
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-06 09:53:57 +02:00
ZappoMan
5fc5df7c55
change skyboxMode to backgroundMode
2015-05-05 12:38:44 -07:00
Atlante45
429c1e1231
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-05 21:33:55 +02:00
Atlante45
46cd1f458b
Actually call render on zone entities from tree
2015-05-05 17:20:27 +02:00
ZappoMan
4b9c6728e7
fix issue with skyboxMode getting randomly set
2015-05-04 18:58:35 -07:00
ZappoMan
2c02bfdda5
fix build buster
2015-05-04 16:01:50 -07:00
ZappoMan
3827e961a7
hook sunBrightness to keyLightIntensity
2015-05-04 15:31:50 -07:00
ZappoMan
403ed6d77b
wire up sunlocation from keylight direction
2015-05-04 15:20:16 -07:00
ZappoMan
cfe717fe08
only override environment when skyboxMode is atmosphere
2015-05-04 13:53:29 -07:00
ZappoMan
4561c59203
wire up zone to environment atmosphere rendering
2015-05-04 13:49:43 -07:00
