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
dc2e923583
Ordering for packets.
2015-05-13 15:51:11 -07:00
Howard Stearns
1a87ca04da
Entity sound.
2015-05-13 13:18:02 -07:00
Brad Davis
a8d343bbf1
Working on web entities
2015-05-13 00:27:57 -07:00
Brad Davis
e9b83e1c02
Working on web entities
2015-05-12 21:15:54 -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
f647db3bf0
Merge branch 'master' of github.com:highfidelity/hifi into line-entity
2015-05-12 11:36:56 -07:00
ZappoMan
c81f6dc69c
fix particle properties
2015-05-12 11:03:16 -07:00
Seth Alves
38caed00ca
Attempt to draw line entity item
2015-05-12 10:25:50 -07:00
Brad Hefta-Gaub
cbaa503934
Merge pull request #4838 from Atlante45/quiet_compiler
...
Quiet compiler
2015-05-12 08:57:57 -07:00
Brad Hefta-Gaub
4d9e413b3f
Merge pull request #4820 from hyperlogic/ajt/particle-system-improvements
...
Improvements to particle entity.
2015-05-12 08:40:11 -07:00
Atlante45
00864afe53
Quiet compiler
2015-05-12 17:06:40 +02:00
Seth Alves
4881b0c53c
copy box to make a new type of line entity item
2015-05-11 19:25:14 -07:00
Anthony Thibault
e1cbfcd901
Merge branch 'master' into ajt/particle-system-improvements
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-05-11 19:24:13 -07:00
Anthony Thibault
b3af515224
Particle entity improvements based on code review.
...
* Updated variable naming to match coding standards.
* Changed particle raw float arrays to vectors.
* Bug fix: changing maxParticles will no longer lead to memory corruption.
* Made particle ring buffer more explicit, added _particleTailIndex.
* Added getLivingParticleCount() private method.
* Moved integration and bounds code into private methods.
* Bug fix: high emit rates now properly integrate particles forward for the
remaing frame time, not the entire frame.
* Bug fix: new particles were not initiaized to origin.
* Added more particles to ajt-test.js.
* Bug fix: ajt-test.js script was not shutting down properly.
* Removed random seed, unless we have a psudo random number generator per
particle system instance, it's unlikely that this will preserve sync.
* Bumped packet version number.
2015-05-11 19:21:33 -07:00
ZappoMan
73428ec12d
add support to not displace very large clipboards on import
2015-05-11 14:21:58 -07:00
Clément Brisset
5160eb5b94
Merge pull request #4819 from ZappoMan/moreZoneProperties
...
More Zone Atmosphere Work: add automatic day/hour calculation
2015-05-11 19:38:27 +02:00
Clément Brisset
421ebeb3d7
Merge pull request #4795 from birarda/sequence-numbers
...
add sequence number support to NL, don't double send data from AvatarMixer
2015-05-11 19:23:33 +02:00
Anthony J. Thibault
ede42285b1
Improvements to particle entity.
...
* Changed particle geometry to billboarded quads
* Added texture support
* Added ajt-test.js particle test script.
* GeometryCache support for batched quads with texCoords.
* Bug fix for infinite loop if _lifetime was very large.
* Don't reset the simulation on animation loop.
* stop emitting particles on animation stop, but keep simulating until there are no more living particles.
* Removed some trailing whitespace
2015-05-10 17:13:46 -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
e8f43c7f4b
set default atmosphere properties to match the default atmosphere
2015-05-08 10:03:24 -07:00
Stephen Birarda
305835ea79
Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers
2015-05-07 15:38:35 -07:00
Andrew Meadows
1879a67804
cleanup
2015-05-07 14:42:09 -07:00
Philip Rosedale
b7b62c8d42
Merge pull request #4772 from AndrewMeadows/nova
...
PhysicsEngine cleanup in preparation for collidable avatars
2015-05-07 14:33:35 -07:00
ZappoMan
20fe43c852
wire up new zone properties, fix bug in group proprties decode
2015-05-07 13:05:00 -07:00
Seth Alves
f52747d8c1
re-enable code that ignores old packets
2015-05-07 11:53:57 -07:00
Seth Alves
d52a45b57e
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-07 11:30:46 -07:00
Andrew Meadows
f0618501dd
fix non-physical kinematic motion
...
also can set objects collisionless again
2015-05-07 11:29:42 -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
Andrew Meadows
00c6944125
merge
2015-05-06 17:49:18 -07:00
Andrew Meadows
411bf1a35c
fix for entity-server kinematic simulation
2015-05-06 17:48:10 -07:00
Seth Alves
5ac8558168
flash yellow box when transmitting an edit packet
2015-05-06 17:03:27 -07:00
Seth Alves
c63b8a93ec
oops fix endless loop
2015-05-06 15:48:45 -07:00
Seth Alves
4c3cbea261
don't auto-remove simulation owner unless the Node is gone. put back code that causes interfaces to give up ownership
2015-05-06 15:32:02 -07:00
Seth Alves
86ec12b22c
don't increase moving-without-simulator counter unless the thing is moving enough
2015-05-06 14:30:45 -07:00
Andrew Meadows
6e6fec158d
split ignore/activation thresholds for updates
2015-05-06 11:47:33 -07:00
ZappoMan
f2ebb6e821
fix output of group names to be lowercase
2015-05-06 11:30:41 -07:00
Andrew Meadows
e61470517c
track all entities added to simulation
2015-05-06 11:01:16 -07:00
Stephen Birarda
5b1514a390
Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers
2015-05-06 10:12:17 -07:00
Atlante45
8de5e636bb
Bit of cleanup
2015-05-06 17:39:18 +02:00
Seth Alves
4a7fe50084
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-05 16:43:43 -07:00
Seth Alves
c35edd8eb4
some debugging on Andrew's refactor
2015-05-05 16:40:10 -07:00
ZappoMan
0cb14650b6
added skybox group properties to zones
2015-05-05 14:12:02 -07:00
Seth Alves
1cd93b9ec8
pull andrew's branch, add back in visual indicator of an entity being active in bullet
2015-05-05 13:14:22 -07:00
Seth Alves
8aafce6382
Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1
2015-05-05 12:53:28 -07:00
ZappoMan
5fc5df7c55
change skyboxMode to backgroundMode
2015-05-05 12:38:44 -07:00
Stephen Birarda
6b3cf1ba4a
remove dependency of PacketHeaders on NodeList
2015-05-05 12:19:42 -07:00
