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

81 commits

Author SHA1 Message Date
Elisa Lupin-Jimenez
49e72346a4 fixed typo in macro name 2018-01-17 18:08:05 -08:00
Seth Alves
9b7086b1fb added EntityItemProperties.merge function. when sending edits for avatar-entities, don't call setProperties on the entity. Fix currentFrame bug in AnimationPropertyGroup::copyToScriptValue 2016-10-17 16:11:37 -07:00
Andrew Meadows
db77f22a61 use "collidesWith" instead of "collisionMask" 
but make "collisionMask" work for those who want it
 2016-01-19 11:41:22 -08:00
Andrew Meadows
952f5b23f6 namechange collisionsWillMove --> dynamic 2016-01-15 15:21:25 -08:00
Andrew Meadows
e1ba4ff0a8 add CollisionMask entity property 2016-01-12 15:08:52 -08:00
Seth Alves
942e77166e merge from upstream 2016-01-05 11:11:19 -08:00
Seth Alves
83f60d6e97 make entity properties for model-entity joint-states 2015-12-23 15:43:50 -08:00
Seth Alves
0ac06bad5c more AACube plumbing 2015-12-15 15:31:02 -08:00
Seth Alves
24fb43e8cd first steps toward a puffed-out query-box for child entities 2015-12-12 12:33:14 -08:00
Brad Hefta-Gaub
d9a1563396 Merge pull request #6152 from sethalves/parents 
Parents
 2015-12-04 10:26:57 -08:00
Ryan Huffman
667d2b728e Fix uninitialized xColor value when converting script value 2015-12-03 09:52:56 -08:00
Seth Alves
778dc8dc15 add parentID and parentJointIndex EntityItemProperties 2015-10-22 11:52:56 -07:00
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