Atlante45
bcd148cb87
Construct entity properties at definition
2015-10-09 12:23:19 -07:00
David Rowe
131b4ed004
Merge branch 'master' into 20699
...
Conflicts:
libraries/entities/src/EntityItemProperties.cpp
libraries/entities/src/ParticleEffectEntityItem.cpp
2015-10-07 15:08:07 -07:00
Brad Hefta-Gaub
b09ae1755e
fix formatting of macros
2015-10-07 13:59:00 -07:00
Brad Hefta-Gaub
57cc7adbfe
standardize somethingChanged - CR feedback
2015-10-07 12:27:12 -07:00
David Rowe
4624649b1b
Sanitize particle properties, fix crashes
2015-10-07 08:57:55 -07:00
Brad Hefta-Gaub
cf2693e712
working fistFrame lastFrame
2015-10-02 08:31:22 -07:00
Brad Hefta-Gaub
aca25bd76e
connect up AnimationPropertyGroup to AnimationLoop
2015-10-01 11:05:16 -07:00
David Rowe
812ab9b7c6
Merge branch 'master' into 20681
...
Conflicts:
libraries/entities/src/EntityItemProperties.cpp
2015-09-18 16:44:04 -07:00
Brad Hefta-Gaub
6de424237f
add support for property groups in the desired properties logic
2015-09-17 20:24:15 -07:00
Brad Hefta-Gaub
08babecb75
add support for mapping EntityPropertyFlags to QScriptValues and wire in desiredProps
2015-09-17 19:51:21 -07:00
Brad Hefta-Gaub
4e2cb00ec3
first cut at only returning type specific properties in getEntityProperties
2015-09-17 17:33:53 -07:00
David Rowe
d51cab3e3d
Replace particle velocity with speed and orientation
2015-09-16 14:51:08 -07:00
Seth Alves
64d0ce47f3
attempting to stitch polyvox entites together
2015-08-30 09:59:33 -07:00
ericrius1
ff77c3e0d8
added stroke width entity
2015-06-30 18:38:40 -07:00
David Rowe
6623d0c552
Add "Reload" button associated with entity editor's script URL field
...
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
2015-06-17 16:11:32 -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
Eric Levin
5cce4edec8
fix merge conflicts attemp 1
2015-06-01 11:18:33 -07:00
Seth Alves
9f4fff3588
don't need convertScriptValue(QScriptEngine* e, QDateTime v)
2015-05-29 09:33:29 -07:00
Seth Alves
0cf9afd8ec
attempt to save _created as an iso date in utc
2015-05-28 21:21:57 -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
8cb5717b86
formatting, cleanups
2015-05-27 15:16:15 -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
55028f6cb0
voxel data sent over wire and saved to json
2015-05-26 16:34:35 -07:00
ZappoMan
b4f15304ba
standardize COPY_PROPERTY_FROM_QSCRIPTVALUE for vec3, quat, and color
2015-05-13 13:12:47 -07:00
ZappoMan
f28ca90ac5
clean up COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE to be type safe
2015-05-13 09:38:49 -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
ZappoMan
83d212861d
make APPEND_ENTITY_PROPERTY type safe
2015-05-12 11:41:04 -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
20fe43c852
wire up new zone properties, fix bug in group proprties decode
2015-05-07 13:05:00 -07:00
ZappoMan
496da6fcd5
wire up the skybox color property to the new skybox renderer
2015-05-06 20:36:06 -07:00
ZappoMan
f2ebb6e821
fix output of group names to be lowercase
2015-05-06 11:30:41 -07:00
ZappoMan
0cb14650b6
added skybox group properties to zones
2015-05-05 14:12:02 -07:00
ZappoMan
4b9c6728e7
fix issue with skyboxMode getting randomly set
2015-05-04 18:58:35 -07:00
ZappoMan
741323e6c1
wire up atmosphere.hasStars property
2015-05-04 14:19:13 -07:00
ZappoMan
78f7870cbb
more tweaks to atmosphere properties
2015-05-04 11:13:05 -07:00
ZappoMan
7ae5ed1aaf
next pass at atmosphere properties
2015-05-01 17:48:09 -07:00
Seth Alves
f75b599288
don't save default values in json file
2015-04-30 11:28:27 -07:00
ZappoMan
19386d5a5d
Merge branch 'master' of https://github.com/highfidelity/hifi into ZoneEntity2
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-04-22 09:35:08 -07:00
ZappoMan
e436c95212
first cut at reworking zones
2015-04-21 14:36:13 -07:00
Seth Alves
deec577db6
if nodes are fighting over phyics variables, squash physics-related properties in the updates from the loser of the race
2015-04-17 10:21:52 -07:00
Seth Alves
c69aaa806b
if a uuid is null, don't send a uuid of all zeros
2015-04-17 09:55:49 -07:00
Seth Alves
f48f9caea4
cut back on debuging prints
2015-04-16 16:18:13 -07:00
Seth Alves
1484d6e37f
fix READ_ENTITY_PROPERTY_UUID_TO_PROPERTIES to use binary version
2015-04-16 16:10:01 -07:00
Seth Alves
3b2a15f76a
more debugging
2015-04-16 15:52:48 -07:00
Seth Alves
ea8dcfa5b5
read UUIDs as UUIDs rather than as strings. more debugging prints
2015-04-16 15:33:43 -07:00
Seth Alves
d7059d8f2d
add code for uuids in wire protocol. some debugging prints
2015-04-16 14:46:38 -07:00
Atlante45
298a81cea9
Trim entity properties set from JS that are strings
2015-04-09 14:42:26 +02:00
ZappoMan
e99ffb8307
fix bug in export
2015-03-04 16:29:34 -08:00
Andrew Meadows
2e1c122915
moved ShapeType boilerplate stuff macos
2015-02-23 11:38:56 -08:00
Andrew Meadows
27e6f99deb
use strings for shapeType for JS Entity properties
2015-02-20 16:54:58 -08:00
ZappoMan
bc5a1477e6
added logging of edit commands in the server
2015-02-13 14:59:57 -08:00
Andrew Meadows
ff27ab74ae
expose _shapeType to script and server
2015-02-11 08:46:41 -08:00
Andrew Meadows
28381a3b70
cleanup of EntityItem::_created timestamp logic
...
EntityItem::_created initializes to 0 in ctor
and must be set either by EntityItemProperties (via server update)
or manually whenever a script creates a fresh entity
2014-12-18 11:39:02 -08:00
Andrew Meadows
97d1dc4200
use updateFoo() where entity properties need relay
...
clear EntityItem updateFlags when processed
2014-11-19 15:12:22 -08:00
ZappoMan
66f519d613
dry up EntityItemProperties with macros
2014-11-14 22:15:19 -08:00
ZappoMan
62c64479c2
first cut at text entity
2014-11-14 15:58:12 -08:00
ZappoMan
245f019836
first cut at migrating entity animation frame calculations to use AnimationLoop
2014-11-12 16:10:35 -08:00
ZappoMan
5e497c2d97
added new macro for getter access to a color
2014-10-23 09:18:11 -04:00
ZappoMan
ffe1e2db00
fix crash in butterflies.js
2014-09-16 09:07:22 -07:00
ZappoMan
cbdaf76b88
dry up the EntityItemProperties::copyFromScriptValue() with macros for repeated blocks
2014-09-10 15:39:00 -07:00
ZappoMan
8023735eb3
changed rotational to angular and added angular damping
2014-09-10 14:46:27 -07:00
ZappoMan
7283e7818f
moved macros to sep file
2014-09-10 09:19:24 -07:00