Seth Alves
a31a5a1554
main actions interface is in EntityItem. changes in actions are queued up and applied before simulation step
2015-06-02 19:40:20 -07:00
Andrew Meadows
acb3163f43
add comments for future work
2015-06-02 17:20:41 -07:00
Seth Alves
f84e970c48
Merge branch 'master' of github.com:highfidelity/hifi into actions
2015-06-02 16:28:07 -07:00
Seth Alves
d6549948d0
first pass at entity interface to actions
2015-06-02 16:06:27 -07:00
Andrew Meadows
0e2028b820
merge
...
Conflicts:
libraries/entities/src/EntityItem.cpp
2015-06-02 15:08:36 -07:00
Andrew Meadows
2702e07863
Merge pull request #5015 from sethalves/polyvox
...
PolyVox improvements -- depends on #5008
2015-06-02 14:34:49 -07:00
Eric Levin
55ffb7f1c0
code style changes
2015-06-02 12:51:45 -07:00
Seth Alves
20d3814c1b
code review
2015-06-02 10:00:07 -07:00
Atlante45
ad3cea9907
Disable entity debub
2015-06-02 18:23:37 +02:00
Eric Levin
83bf4241e4
resolved merge conflicts... but now lines not flying across clients
2015-06-01 15:16:08 -07:00
Andrew Meadows
cc9ae81c75
group Entity property settings together
2015-06-01 14:47:14 -07:00
ZappoMan
d4af454834
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-01 14:42:35 -07:00
Andrew Meadows
fa491a5c4f
fix theoretical crash bug in editEntity()
2015-06-01 13:59:56 -07:00
Seth Alves
d1bb6473d9
more work on edge handling and resizing
2015-06-01 13:57:28 -07:00
Seth Alves
43a1519e29
better handling of changes to the size of voxel space. limit each dimension to 32
2015-06-01 12:01:45 -07:00
Eric Levin
5cce4edec8
fix merge conflicts attemp 1
2015-06-01 11:18:33 -07:00
Eric Levin
7b08537574
code standards fixes
2015-06-01 09:51:24 -07:00
Eric Levin
8a191a661d
adding flag for points changed
2015-06-01 09:35:32 -07:00
Eric Levin
9ca5310c21
cleaned up another qDebugging line
2015-05-31 15:33:51 -07:00
Eric Levin
115bf3dd25
cleaned up logging and testing code.
2015-05-31 14:52:44 -07:00
Seth Alves
b9202ebfb6
added SURFACE_EDGED_CUBIC surface extractor which pads the outsides of the voxel-space with empty cells to change how the edges of the surface look
2015-05-31 09:14:59 -07:00
Seth Alves
a3589788df
allow edit.js to change between cubic and marching-cubes surface extractor on polyvox entity-items.
2015-05-30 18:33:35 -07:00
Seth Alves
f955cb45b2
keep track of number of non-zero voxels, use this information when deciding on shape-type
2015-05-30 18:14:54 -07:00
Seth Alves
fe59f8846f
recompute polyvox mesh when setVoxelSurfaceStyle is called. remove left-over color stuff from polyvox. don't require that a polyvox be rendered before computing its physics shape
2015-05-30 16:43:11 -07:00
Seth Alves
96a40bd673
basic collisions with cubic polyvoxes
2015-05-29 18:50:26 -07:00
Eric Levin
7d5dd278a1
adding unpacking
2015-05-29 16:54:40 -07:00
Philip Rosedale
6b9f6ff7bb
Merge pull request #4994 from AndrewMeadows/isentropic
...
compute correct deltaTime for extrapolation of moving entity and other fixes
2015-05-29 16:07:10 -07:00
Seth Alves
a96520ca74
set up EntityItemPropertiesFromScript to either ignore or honor read-only properties
2015-05-29 13:43:18 -07:00
Seth Alves
1a26421414
Merge branch 'master' of github.com:highfidelity/hifi into created-time-is-a-property
2015-05-29 13:04:45 -07:00
Andrew Meadows
8177512432
send all TerseUpdate properties when one changes
2015-05-29 11:35:50 -07:00
ZappoMan
7ec44dfc88
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-29 11:23:31 -07:00
ZappoMan
94f6e8cebd
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-29 11:23:22 -07:00
ZappoMan
dc62052a3c
more hacking on models
2015-05-29 11:07:25 -07:00
Andrew Meadows
f049dc37fc
Merge pull request #4992 from howard-stearns/preload-collision-sounds
...
Preload collision sounds
2015-05-29 09:51:41 -07:00
Seth Alves
9f4fff3588
don't need convertScriptValue(QScriptEngine* e, QDateTime v)
2015-05-29 09:33:29 -07:00
Eric Levin
f573645291
line entity width translating
2015-05-29 09:24:00 -07:00
Atlante45
ab13bc41a4
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching
2015-05-29 17:53:17 +02:00
ZappoMan
78c701a89d
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-29 08:40:46 -07:00
Atlante45
0384b74479
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-29 17:37:53 +02:00
Atlante45
f07f9ac0c5
Expand setDimensions check to negative values
2015-05-29 17:04:39 +02:00
Seth Alves
0cf9afd8ec
attempt to save _created as an iso date in utc
2015-05-28 21:21:57 -07:00
ZappoMan
eb19b93433
render models in scene checkpoint
2015-05-28 17:19:30 -07:00
Seth Alves
6b8b930839
Merge branch 'master' of github.com:highfidelity/hifi into created-time-is-a-property
2015-05-28 16:16:13 -07:00
Eric Levin
533148f26d
line being sent as array
2015-05-28 15:48:31 -07:00
Seth Alves
131827a82b
libraries/entities doesn't need polyvox, only libraries/entities-renderer
2015-05-28 14:27:49 -07:00
Andrew Meadows
7be16da1a8
compute correct time-of-flight for extrapolation
2015-05-28 14:24:39 -07:00
Eric Levin
2d66696675
line working from array of points
2015-05-28 14:18:57 -07:00
Howard Stearns
e7a48af56d
Merge branch 'master' of https://github.com/highfidelity/hifi into preload-collision-sounds
2015-05-28 14:15:51 -07:00
Brad Hefta-Gaub
1c3398f27e
Merge pull request #4991 from ZappoMan/team-teaching
...
TEAM TEACHING - merge from master
2015-05-28 13:52:18 -07:00
Howard Stearns
0f30ec2ccc
Undo the merge with the broken master checking. What could go wrong?
2015-05-28 13:48:27 -07:00
ZappoMan
f736ce714f
fix build buster
2015-05-28 13:33:57 -07:00
Howard Stearns
810c766f77
When an entity is added or changed with a collisionSoundURL, cache it so that it is ready to play on the first hit.
2015-05-28 12:50:02 -07:00
ZappoMan
1029a8af7c
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-28 12:38:16 -07:00
ZappoMan
a0e51469d3
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-28 12:36:34 -07:00
Andrew Meadows
b7e3461e1a
restore _created magic
2015-05-28 12:21:38 -07:00
ZappoMan
2fba5a0928
more work on simple renderable
2015-05-28 12:19:43 -07:00
Eric Levin
8886e93d5f
changed qVector to qVectorVec3
2015-05-28 11:26:41 -07:00
Seth Alves
92817d9302
created-time is a property so it can be persisted to and retrieved from json saves
2015-05-28 10:59:27 -07:00
Eric Levin
72af4e4e67
latest pointer
2015-05-28 10:44:44 -07:00
Seth Alves
7547ef6ea4
code review
2015-05-28 10:29:07 -07:00
ZappoMan
806ee88f1f
place burden of adding/removing to/from scene on entity
2015-05-28 09:43:36 -07:00
Atlante45
bca80addef
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into text-renderer
2015-05-28 16:13:24 +02:00
Seth Alves
a91a7942a4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-28 06:59:39 -07:00
Andrew Meadows
c32ff497e8
Merge pull request #4982 from howard-stearns/unowned-object-sounds
...
Unowned object sounds
2015-05-27 21:07:49 -07:00
ZappoMan
5ad9efbee4
allow entities to tell us if they support proper scene rendering
2015-05-27 20:42:53 -07:00
ZappoMan
63c19f7c11
fix build buster from bad merge
2015-05-27 20:19:59 -07:00
ZappoMan
763e6dd97b
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-27 19:58:11 -07:00
Seth Alves
4961c10e17
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 19:05:01 -07:00
Seth Alves
4fa6f388b9
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 18:20:59 -07:00
Howard Stearns
bbc04f3b03
Merge branch 'master' of https://github.com/highfidelity/hifi into unowned-object-sounds
2015-05-27 18:08:37 -07:00
Andrew Meadows
0a0eba8277
merge
2015-05-27 18:07:00 -07:00
Andrew Meadows
aba539928d
fix grab glitches and failure to own simulation
2015-05-27 18:05:59 -07:00
Brad Hefta-Gaub
0553f7ca4c
Merge pull request #4961 from hyperlogic/ajt/particle-net-anim-fix
...
Particle entities should avoid resetting simulation when setMaxParticles is called
2015-05-27 17:44:44 -07:00
Howard Stearns
4fffe05b63
Play still sound for still objects and those just created in a script.
2015-05-27 16:25:11 -07:00
Eric Levin
385c9be75f
using vec of points
2015-05-27 15:35:06 -07:00
Seth Alves
c3c701f807
polyvox no longer has a color
2015-05-27 15:23:01 -07:00
Seth Alves
8cb5717b86
formatting, cleanups
2015-05-27 15:16:15 -07:00
Seth Alves
5cc038e1c6
polyvox no longer has a color
2015-05-27 15:12:26 -07:00
Seth Alves
ded79609de
back out unrelated change
2015-05-27 15:10:27 -07:00
Eric Levin
8edc883e4d
adding serialization for Qvector
2015-05-27 13:47:47 -07:00
Eric Levin
62539719df
line width added as property to line entities
2015-05-27 13:31:47 -07:00
ZappoMan
1a7c6eb316
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-27 10:41:01 -07:00
Seth Alves
6fd38fabe4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 10:06:53 -07:00
Seth Alves
3af916e27e
use enum for polyvox surface style
2015-05-27 09:32:10 -07:00
Brad Hefta-Gaub
afb09e81a6
Merge pull request #4962 from howard-stearns/entity-events-in-normal-scripts
...
Entity events in normal scripts
2015-05-27 09:24:50 -07:00
Seth Alves
f310da9cd3
adapting to entitypointer merge
2015-05-27 08:59:44 -07:00
Seth Alves
b02e452b19
adapting to entitypointer merge
2015-05-27 08:58:03 -07:00
Seth Alves
c1f75506ae
adapting to entitypointer merge
2015-05-27 08:57:22 -07:00
Seth Alves
df795cf296
adapting to entitypointer merge
2015-05-27 08:54:15 -07:00
Seth Alves
c80f2970fd
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 07:37:51 -07:00
Seth Alves
0f81445cee
flag for polyvox to select minecraft vs walking-cubes. uppack to unpack
2015-05-27 07:04:44 -07:00
Seth Alves
6930008f74
remove debugging spew
2015-05-26 21:40:50 -07:00
Seth Alves
6b5020285b
set last-edited in properties when changing voxel data
2015-05-26 21:32:33 -07:00
Seth Alves
5acc018bda
debugging
2015-05-26 20:58:23 -07:00
Seth Alves
ebae87136f
debugging
2015-05-26 20:57:58 -07:00
Eric Levin
4fb5f0796c
added props for encoding and decoding
2015-05-26 18:40:15 -07:00
Eric Levin
811f5db419
fixed linker error in lineentityitem.cpp
2015-05-26 18:36:24 -07:00
Eric Levin
dc4196df30
line entities
2015-05-26 18:26:25 -07:00
Seth Alves
cd2b6473ba
debugging
2015-05-26 18:21:45 -07:00
Seth Alves
517d4372fa
debugging
2015-05-26 16:53:11 -07:00
Seth Alves
55028f6cb0
voxel data sent over wire and saved to json
2015-05-26 16:34:35 -07:00
Seth Alves
cdef502e2e
expose setVoxelSphere to js
2015-05-26 14:26:05 -07:00
Seth Alves
1ec384ab4d
allow QByteArray data to be sent with a length. Use appendRawData in places that used to append raw byte-arrays
2015-05-26 13:43:22 -07:00
Seth Alves
988ecf9d55
send PolyVox voxel dimensions and compressed data over the wire
2015-05-26 13:18:52 -07:00
Howard Stearns
bbdf9f1d9f
Remove changingEntityID.
2015-05-26 11:14:23 -07:00
ZappoMan
c4f96b09a2
sam's feedback on shared pointers in master
2015-05-26 09:55:28 -07:00
ZappoMan
c92e7bed87
andrews CR feedback
2015-05-26 09:44:02 -07:00
ZappoMan
5f6978a517
sam's CR feedback, more use of share_ptr<>
2015-05-26 09:41:51 -07:00
ZappoMan
d1520c5502
andrews CR feedback
2015-05-26 09:23:27 -07:00
Seth Alves
727f457f91
hook up RenderablePolyVoxEntityItem::findDetailedRayIntersection to polyvox library's version
2015-05-25 21:01:20 -07:00
Anthony Thibault
18d683bced
Particle entities should avoid resetting simulation when setMaxParticles is called.
...
This caused all particles to disappear when a network packet was received.
2015-05-25 12:22:38 -07:00
Howard Stearns
599886079d
Restore blank line for minimum diff.
2015-05-25 11:33:12 -07:00
Howard Stearns
4266a99d78
Put the javascript methods on Script, not Entities, and other minimum-diff cleanup.
2015-05-25 11:28:33 -07:00
Atlante45
3d7a834356
Ignore new entity dimensions if one of them is 0
2015-05-24 20:20:20 +02:00
Howard Stearns
b884d3cf90
Handle all the signals.
2015-05-24 09:57:12 -07:00
Howard Stearns
1dd2b7275e
Simpler and more uniform version that handles all the standard entity-script events.
2015-05-23 18:11:05 -07:00
Howard Stearns
277f5ef3a4
Working experimental first version.
2015-05-23 13:35:35 -07:00
ZappoMan
bcac50b362
verify that entityitem cleanup is happening correctly
2015-05-22 22:39:41 -07:00
ZappoMan
72ffd01920
more work on smart pointers
2015-05-22 22:39:37 -07:00
ZappoMan
9988f2d1cd
EnitityItem smart pointers
2015-05-22 22:38:02 -07:00
ZappoMan
76c5bd1ab7
verify that entityitem cleanup is happening correctly
2015-05-22 22:01:25 -07:00
ZappoMan
9fa9942861
more work on smart pointers
2015-05-22 21:45:57 -07:00
ZappoMan
8b78fc4190
EnitityItem smart pointers
2015-05-22 17:57:50 -07:00
Seth Alves
6c67d14fbc
experimenting with physics
2015-05-22 16:21:09 -07:00
Seth Alves
e702518041
adjust logic around timestamps used by entity-server to know if something was sent. adjust which physics variables are adjusted by a non-sim-owner packet
2015-05-22 16:11:29 -07:00
Seth Alves
ed082800f5
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-22 08:38:22 -07:00
Atlante45
f089143cf1
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-22 17:16:51 +02:00
Eric Levin
fe99941de3
fixed problem with particle entities not showing up on other clients by adding properties to decodeEditEntityPacket and encodeEntityEditPacket methods in EntityItemProperties.cpp
2015-05-21 19:35:27 -07:00
Seth Alves
f85cc89946
clean up diff
2015-05-21 18:17:07 -07:00
Seth Alves
478cb40135
draws in the right place, now
2015-05-21 16:46:27 -07:00
Seth Alves
2cb73b5430
added a volex-volume size member variable. drawing transform still isn't quite right
2015-05-21 16:31:01 -07:00
Seth Alves
fe188f9a43
something draws, now
2015-05-21 10:42:14 -07: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
Seth Alves
72e227eefe
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-21 09:55:14 -07:00
ZappoMan
ce81d9a817
fix merge issue
2015-05-20 19:30:44 -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
d7ccd23b07
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-20 18:08:29 -07:00
Seth Alves
aa1d3eb82a
respond to code review
2015-05-20 17:31:57 -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
4a59dc24c5
split entity-add and entity-edit messages
2015-05-20 14:52:03 -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
Seth Alves
a769cfdaf2
client decides on new entity-ids, keep EntityItemID class
2015-05-20 10:42:19 -07:00
Ryan Huffman
6f69ed2561
Fix calculated dimensions of spotlight
...
The spotlights region of effect is the intersection of the spotlight
with radius r, and the sphere of radius r
2015-05-20 09:11:48 -07:00
Ryan Huffman
bb38b3eb3f
Update default light cutoff to PI / 2
2015-05-20 09:11:21 -07:00
Seth Alves
f2c1c43da3
polyvox code runs, no rendering yet
2015-05-20 08:44:41 -07:00
Seth Alves
4b263cf5c8
derieve PolyVox Entity from Model Entity
2015-05-19 21:40:05 -07:00
Seth Alves
4166c3224f
link polyvox library in with entities
2015-05-19 16:24:13 -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
ede94e4248
Merge branch 'master' of https://github.com/highfidelity/hifi into remove_gl_transform
2015-05-18 11:39:17 +02:00
Andrew Meadows
180590145d
check for NULL before using pointer to EntityItem
2015-05-16 11:12:19 -07:00
Atlante45
4725d5e676
Merge branch 'primitives_batch' into remove_gl_transform
2015-05-16 05:22:12 +02:00
Seth Alves
bb3d1a6a58
rays never pick a line entity. some fixes to pointer.js
2015-05-15 13:10:16 -07:00
Atlante45
21d9ae7cf3
Transform compute + Magic numbers
2015-05-15 21:34:54 +02:00
Atlante45
c13ad83cc4
Rename getCenter by get CenterPosition
2015-05-15 18:34:28 +02:00
Atlante45
e5c3a93e54
Make sure get/set pos/rot/dim are inlined
2015-05-15 17:52:29 +02:00
Atlante45
92d4b08c38
Init _transform with correct values
2015-05-15 17:52:06 +02:00
Atlante45
d0cd18d6c0
Replace entities pos/rot/dim with transform
...
Removed _position, _rotation, _dimensions
Added Transform _transform
2015-05-15 17:35:24 +02:00
Andrew Meadows
53e241fb07
merge upstream/master into andrew/thermonuclear
2015-05-14 12:37:41 -07:00
Andrew Meadows
d28c400cea
add restitution and friction Entity properties
2015-05-14 12:36:59 -07:00
Andrew Meadows
81d06e0dc3
Merge upstream/master into andrew/nova
...
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityItemProperties.cpp
2015-05-14 10:09:55 -07:00
ZappoMan
0dcb89fce7
Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup
...
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityItemProperties.cpp
2015-05-13 20:33:10 -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
ZappoMan
045c0141e8
Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup
...
Conflicts:
libraries/entities/src/EntityItemProperties.cpp
2015-05-13 17:09:21 -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
ZappoMan
b4f15304ba
standardize COPY_PROPERTY_FROM_QSCRIPTVALUE for vec3, quat, and color
2015-05-13 13:12:47 -07:00
ZappoMan
4fecd33115
use new macros in Line entity
2015-05-13 12:38:11 -07:00
ZappoMan
095b7701d8
Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup
2015-05-13 12:12:12 -07:00
ZappoMan
f28ca90ac5
clean up COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE to be type safe
2015-05-13 09:38:49 -07:00
Brad Davis
a8d343bbf1
Working on web entities
2015-05-13 00:27:57 -07:00
Andrew Meadows
7e9e223b3e
merge upstream/master into andrew/nova
2015-05-12 21:48:55 -07:00
Andrew Meadows
4872a565c9
bid for simulation ownership
2015-05-12 21:46:52 -07:00
Andrew Meadows
45d4fa91ab
add a TODO comment
2015-05-12 21:46:04 -07:00
Andrew Meadows
2165d18c05
don't copy simulatorID from script value
2015-05-12 21:45:36 -07:00
Brad Davis
e9b83e1c02
Working on web entities
2015-05-12 21:15:54 -07:00
ZappoMan
8d731b15ee
some warning fixes
2015-05-12 17:21:59 -07:00
ZappoMan
8169d82141
consolidate COPY_PROPERTY_TO_QSCRIPTVALUE and COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE to be type safe
2015-05-12 17:13:20 -07:00
ZappoMan
67df6e3c62
make READ_ENTITY_PROPERTY_TO_PROPERTIES() type safe
2015-05-12 16:24:16 -07:00
ZappoMan
98474376de
consolidate READ_ENTITY_PROPERTY() macros into single typesafe version
2015-05-12 15:59:45 -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
ZappoMan
83d212861d
make APPEND_ENTITY_PROPERTY type safe
2015-05-12 11:41:04 -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
Andrew Meadows
289dcb0e7f
only set ACTIVATE flag on non-zero velocity
2015-05-08 15:39:45 -07:00
ZappoMan
e8f43c7f4b
set default atmosphere properties to match the default atmosphere
2015-05-08 10:03:24 -07:00