Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 08:32:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29560 commits 75 branches 59 tags 1.2 GiB
Commit graph

1293 commits

Author SHA1 Message Date
Seth Alves
005bd8bda5 merge from upstream 2015-06-26 12:33:35 -07:00
Brad Hefta-Gaub
2c30711229 Merge pull request #5210 from bwent/faceCameraProp 
Added faceCamera property for text entities
 2015-06-26 12:29:25 -07:00
Seth Alves
d09588b7fa put upper bound on size of serilized action parameters so they'll fit in MTU 2015-06-26 12:11:34 -07:00
bwent
aa865680ab Added faceCamera property to Text Entities 
…and removed from base
 2015-06-25 15:38:38 -07:00
Seiji Emery
6e87f44ec7 Merge remote-tracking branch 'upstream/master' 2015-06-24 15:12:57 -07:00
bwent
0516caaa32 Added CHECK_PROPERTY_CHANGE macro 2015-06-24 14:58:33 -07:00
Seth Alves
28582ed14d Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-23 19:50:35 -07:00
bwent
99cd9bada1 Added Billboard entity property and enabled billboarding for text entities 2015-06-23 16:22:34 -07:00
Seth Alves
a46e8ed14c quiet compiler 2015-06-23 15:27:35 -07:00
Seth Alves
0af137af36 save encoded action data rather than generating it on demand 2015-06-23 15:27:25 -07:00
ericrius1
b1190bee6e deleted empty files I accidently committed. 2015-06-23 14:13:13 -07:00
David Rowe
93509f4c6e Code review 2015-06-23 11:25:02 -07:00
Seth Alves
6e34678a59 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-23 10:48:21 -07:00
Seth Alves
4bf4e9f5da Merge pull request #5164 from ericrius1/lineBounds 
Line bounds
 2015-06-23 10:47:38 -07:00
Seiji Emery
dfe58a5ed4 Disabled Model (entity) Tests, as they are waaay out of date and will not run with the current codebase. These should get reimplemented at some point. 2015-06-22 17:42:07 -07:00
Seth Alves
f75506bf1b Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-22 15:37:10 -07:00
Seth Alves
7f4e3f8216 when deserializing action, remove any existing actions that weren't part of the serialized data 2015-06-22 13:12:34 -07:00
ericrius1
362d9a2481 syncing brush sphere with line color 2015-06-22 10:35:00 -07:00
Seth Alves
c14276145d lock when reading or writing _actionsToAdd or _actionsToRemove 2015-06-22 07:19:40 -07:00
ericrius1
dbec1aad0c line entity points are now local to entity position. Changed paint script to reflect this 2015-06-19 18:54:28 -07:00
Seth Alves
5381e6e9bb entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion 2015-06-19 16:20:07 -07:00
Seth Alves
6deedd19a3 zero velocities when we clear simulatorID 2015-06-19 16:19:21 -07:00
Seth Alves
fca06d9d3d add actionData to properties that EntityItem transmits and receives 2015-06-19 09:36:06 -07:00
Seth Alves
fce551099f first stab at sending action data across wire 2015-06-18 18:32:57 -07:00
Brad Davis
48b27acc79 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-18 18:17:59 -07:00
ericrius1
830a8b6909 checking for bounds and modified paint script to start a new line entity if user paints outside of line entity's bounding box 2015-06-18 18:14:03 -07:00
Seth Alves
32cf669d8b moving toward sending actions over wire 2015-06-18 17:51:41 -07:00
Philip Rosedale
2f080a8e29 Merge pull request #5147 from sethalves/more-actions 
offset action
 2015-06-18 17:35:50 -07:00
ericrius1
8183e7393d adding check for points inside bounds' 2015-06-18 17:00:27 -07:00
ericrius1
6a5deaaef1 returning true from set line points 2015-06-18 16:54:39 -07:00
ericrius1
2b4146125f adding logic to check points of line are inside bounds 2015-06-18 16:27:06 -07:00
Seth Alves
816726efdc Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-18 15:33:46 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Seth Alves
3c90c851e9 start on code to de/serialize actions 2015-06-18 15:01:34 -07:00
Seth Alves
7d707447ca move multi-line function out of header 2015-06-18 11:07:50 -07:00
Seth Alves
97eeb20625 Merge branch 'master' of github.com:highfidelity/hifi into overloaded-virtual 2015-06-18 11:04:24 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -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
Seth Alves
fbfa73af2d Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-17 15:18:17 -07:00
Brad Davis
ae1c9603b9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:13:04 -07:00
Seth Alves
22ac61e476 work around hiding of virtual functions in PolyVox entity classses 2015-06-17 14:40:24 -07:00
ZappoMan
58ee5217e3 fix some warnings 2015-06-17 14:08:02 -07:00
Seth Alves
3e758a8f43 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-17 11:53:12 -07:00
Seth Alves
85564199c6 git rid if pull-to-point action (spring handles this). add new action which tries to maintain an entity's distance from a given point 2015-06-17 11:22:10 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Brad Davis
ba13b7820c Working on overlay refactor 2015-06-16 09:58:03 -07:00
Seth Alves
6def25de92 formatting 2015-06-15 16:22:06 -07:00
Seth Alves
445381bb6b fix DEFAULT_VOXEL_DATA, recompress voxel data when a script calls setVoxel. Use provided transform when rendering. 2015-06-15 16:07:28 -07:00
Seth Alves
4a00bd3e7f quiet compiler 2015-06-15 16:06:20 -07:00
Seth Alves
5f3b902798 remove debugging print 2015-06-15 11:24:29 -07:00
Seth Alves
c1668553fd make sure that the root node always appends an entity count (even if it's zero). This keeps the unreasonably-deep-recursion warnings from happening 2015-06-15 11:22:07 -07:00
Seth Alves
8ed9a3ca02 add handedness setting to avatar-hold action. update stick.js to allow use of hydra 2015-06-11 11:04:19 -07:00
Seth Alves
ba4fd7adf6 windows didn't like EntityActionFactoryInterface::factory not returning an error 2015-06-10 19:23:01 -07:00
Seth Alves
45c7cd4929 respond to code review, add a simple hold-a-stick script 2015-06-10 18:48:51 -07:00
Seth Alves
eccf4eb8a8 hold action works 2015-06-10 17:05:49 -07:00
Seth Alves
1c0c7f0fe3 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 15:30:28 -07:00
Niraj Venkat
182a3e918c Hyperlink properties now propagate locally and over network 2015-06-10 13:12:18 -07:00
Seth Alves
3dcc6c9b8c make action-factory interface and subclass it in Interface. this allows an action to use avatar data. the login the AvatarActionHold is still bogus. 2015-06-10 12:04:44 -07:00
Niraj Venkat
c45d409383 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-10 09:51:17 -07:00
Eric Levin
286b7bf573 changed comment to use TREE_SCALE instead of 16000 2015-06-10 08:48:26 -07:00
Eric Levin
f51b1d2ac2 clamping line points between 0 and TREE_SCALE 2015-06-09 17:30:15 -07:00
Niraj Venkat
a577d7955c Removed classes and the "hyperlink entity" 2015-06-09 11:27:57 -07:00
Seth Alves
ccb2f17b33 grab.js rotation sort-of works now 2015-06-09 11:21:13 -07:00
Niraj Venkat
2bb1bf8afe Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-09 10:33:39 -07:00
Niraj Venkat
1bf0b15bb0 Removing unnecessary files 2015-06-09 10:33:05 -07:00
Niraj Venkat
0004b1a81c Reversing previous entity work and creation of property group 2015-06-09 10:32:25 -07:00
Seth Alves
42f94307d5 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-09 09:51:29 -07:00
Atlante45
303026d86b Reduce qDebug calls 2015-06-09 15:26:41 +02:00
Seth Alves
eb85f7f818 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-08 17:37:56 -07:00
Seth Alves
b3bc9c3ef0 first attempt at getting spring-action to handle rotation 2015-06-08 17:10:13 -07:00
Niraj Venkat
dbb447c9b5 Exposing Hyperlink type to javascript 2015-06-08 16:09:06 -07:00
Niraj Venkat
63665d720a Fixed bug by adding hyperlink props to flags. Safe to merge 2015-06-08 15:32:21 -07:00
Seth Alves
1e858d8bc5 start on spring action 2015-06-08 14:16:03 -07:00
Niraj Venkat
cd93128236 [ERRORS] Starting on hyperlink entity and properties 2015-06-08 13:29:54 -07:00
ZappoMan
5d6112d9c5 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 12:29:32 -07:00
ZappoMan
7dc0e8a66c Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 12:21:29 -07:00
Seth Alves
b425cc6491 merge from upstream 2015-06-05 11:56:33 -07:00
Seth Alves
b0480af040 Merge pull request #5053 from AndrewMeadows/isothermal 
fix crash during bogus reconnect on login
 2015-06-05 11:38:23 -07:00
Seth Alves
aff582287d use const references for arguments in action-related calls 2015-06-05 11:26:54 -07:00
ZappoMan
f8a2fff5a7 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 11:06:10 -07:00
Seth Alves
28c034698f Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-05 10:41:20 -07:00
Seth Alves
c5143cdfa0 Merge pull request #5027 from AndrewMeadows/isentropic 
cleanup around sending all "terse update" data whenever some of it changes
 2015-06-05 10:41:06 -07:00
Seth Alves
51f5730e68 formatting 2015-06-05 10:05:11 -07:00
Seth Alves
eb912892dc code review 2015-06-05 09:56:34 -07:00
ZappoMan
807cc3db24 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 09:37:39 -07:00
Seth Alves
086b9d404a fix return-type in lambda 2015-06-05 08:59:08 -07:00
Andrew Meadows
9cb7cb314d update minimum version support 2015-06-05 08:43:48 -07:00
Seth Alves
3dbf28b7b4 use lambdas to remove some repeated code 2015-06-05 07:33:39 -07:00
Seth Alves
b2db5f7fee update grab.js to use pull-to-point action, various other fixes 2015-06-05 07:10:44 -07:00
Seth Alves
9a67f35b59 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-04 19:02:46 -07:00
Seth Alves
ba42b0dcc4 updateAction and deleteAction 2015-06-04 17:51:59 -07:00
Eric Levin
5e15c14539 added sanitization for invalid line points data. Fixed bug where occasionally wrong view frustum would be sent to script" 2015-06-04 16:45:32 -07:00
Seth Alves
5e5bc497d9 remove debugging prints 2015-06-04 12:44:08 -07:00
Seth Alves
66ab3d455f use shared pointers to keep track of action objects 2015-06-04 12:29:05 -07:00
Seth Alves
8f19bad97d pull argument extracting code into EntityActionInterface 2015-06-04 11:39:15 -07:00
Andrew Meadows
aff751b4e6 remove old debug assert 2015-06-04 11:26:35 -07:00
Andrew Meadows
0514736a3e remove last of *InDomainUnits code 2015-06-04 11:24:10 -07:00
Seth Alves
14026667f5 script interface for creating an action now takes an action-type name rather than having a different call for each action 2015-06-04 10:55:32 -07:00
Seth Alves
9cae11cc3c clean up actions when DeleteEntityOperator's list is processed rather than as it's made 2015-06-04 09:55:25 -07:00
Seth Alves
57d85cece0 get rid of simulation back-pointer in actions 2015-06-04 09:41:32 -07:00
Seth Alves
31bc106189 remove unneeded include 2015-06-03 20:43:11 -07:00
Seth Alves
d634663bb1 simple action is working. destructor sequense is still suspicous 2015-06-03 17:33:55 -07:00
ZappoMan
c6fb22b915 make sure all entities are rendering in pipeline part 1 2015-06-03 17:16:45 -07:00
Seth Alves
9861e8afcc adjust assert 2015-06-03 11:47:42 -07:00
Seth Alves
c8ab22c517 hook up entity-scripting-interface to actions 2015-06-03 11:19:45 -07:00
ZappoMan
7c40b666e8 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-06-03 09:52:40 -07:00
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