Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-06-22 13:49:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
79173 commits 23 branches 28 tags 1.2 GiB
Commit graph

280 commits

Author SHA1 Message Date
Brad Hefta-Gaub
0d37511071 add support for scripts to call methods on entity scripts 2015-09-18 14:06:38 -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
Brad Hefta-Gaub
e1cb041576 first cut at adding desiredProperties to getProperties 2015-09-16 15:00:42 -07:00
Stephen Birarda
5df7ce7424 fix for missing jurisdiction listener in Agent 2015-09-16 11:43:54 -07:00
Seth Alves
9c4fdfd653 merge from upstream 2015-09-08 18:01:07 -07:00
Seth Alves
31fcd55d47 octree uses shared pointers 2015-09-08 11:59:48 -07:00
Stephen Birarda
ed19987b7d resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
Seth Alves
7369ca19e9 allow setting cuboid voxel spaces. clean up some locking 2015-08-31 18:01:15 -07:00
Atlante45
179ee73e26 Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol 2015-08-26 16:50:33 +02:00
Stephen Birarda
0f77ab8611 resolve conflicts on merge with upstream/master 2015-08-18 11:45:55 -07:00
Seth Alves
b129c2a933 in edged mode, make sure border voxels are zeroed out. expose some more voxel matrix math to javascript 2015-08-16 09:36:54 -07:00
Seth Alves
5ecdbaa19d have functions that change polyvox voxes return true if they changed anything, else false. added voxelCoordsToWorldCoords and worldCoordsToVoxelCoords 2015-08-15 15:18:25 -07:00
ericrius1
0f7c21ddd7 rearranged entity props and added check in setNormals to avoid uninitialized binormal values 2015-08-10 11:55:47 -07:00
ericrius1
3910cb0d69 Merge branch 'master' into polyLineInProgress 2015-08-07 10:12:02 -07:00
Zander Otavka
be4e827281 Merge: master -> panel-attachable-improvements. 2015-08-06 16:29:38 -07:00
Zander Otavka
4a1fcbf160 Fix error in an unused method declaration. 2015-08-05 16:11:09 -07:00
Stephen Birarda
052978898e resolve conflicts on merge with upstream master 2015-08-05 11:16:20 -07:00
ericrius1
9125b3a2a9 attempting to fix windows and linux builds again 2015-08-03 14:53:02 -07:00
ericrius1
47bc8f50ab cleaning 2015-08-03 08:45:14 -07:00
Andrew Meadows
0a5ada3c09 remove legacy shapes 2015-07-29 09:02:24 -07:00
Stephen Birarda
9e7fb9ae16 shuffle Packet headers, use static enum for PacketType 2015-07-23 13:56:47 -07:00
ericrius1
0ce6737b34 merged and normals flipping 2015-07-13 09:43:15 -07:00
Stephen Birarda
ffa6edc904 fix spaces created by xcode find/replace 2015-07-07 15:01:19 -07:00
Stephen Birarda
b3c3e5a6c8 more PacketType to PacketType::Value replacements 2015-07-02 16:49:19 -07:00
ericrius1
ad54b4c0b0 changed quad entity to PolyLine 2015-07-01 17:18:36 -07:00
Seth Alves
0970f010a4 provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are 2015-06-27 13:31:00 -07:00
ericrius1
9dc6846eba rendering wad entity 2015-06-22 15:12:35 -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
ericrius1
2b4146125f adding logic to check points of line are inside bounds 2015-06-18 16:27:06 -07:00
Seth Alves
aff582287d use const references for arguments in action-related calls 2015-06-05 11:26:54 -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
eb912892dc code review 2015-06-05 09:56:34 -07:00
Seth Alves
3dbf28b7b4 use lambdas to remove some repeated code 2015-06-05 07:33:39 -07:00
Seth Alves
ba42b0dcc4 updateAction and deleteAction 2015-06-04 17:51:59 -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
d634663bb1 simple action is working. destructor sequense is still suspicous 2015-06-03 17:33:55 -07:00
Seth Alves
c8ab22c517 hook up entity-scripting-interface to actions 2015-06-03 11:19:45 -07:00
Andrew Meadows
0e2028b820 merge 
Conflicts:
	libraries/entities/src/EntityItem.cpp
 2015-06-02 15:08:36 -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
96a40bd673 basic collisions with cubic polyvoxes 2015-05-29 18:50:26 -07:00
Seth Alves
6fd38fabe4 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 10:06:53 -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
c80f2970fd Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 07:37:51 -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
Howard Stearns
bbdf9f1d9f Remove changingEntityID. 2015-05-26 11:14:23 -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
Howard Stearns
b884d3cf90 Handle all the signals. 2015-05-24 09:57:12 -07:00
Howard Stearns
277f5ef3a4 Working experimental first version. 2015-05-23 13:35:35 -07:00
ZappoMan
8b78fc4190 EnitityItem smart pointers 2015-05-22 17:57:50 -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
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
Ryan Huffman
8ed5284dfa Add drawZoneBoundaries get/set to EntitiesScriptingInterface 2015-05-01 12:52:59 -07:00
Ryan Huffman
e0d4a0b1e1 Add functionality to turn zone picking off 2015-04-23 09:36:41 -07:00
Seth Alves
4e83301c65 add a bool value to Node which indicates if it is allowed to rez new entities 2015-03-31 18:27:46 -07:00
Atlante45
ad16f49d01 Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection 2015-03-16 14:28:24 +01:00
Atlante45
29300e0ae0 Added findEntitiesInBox to JS API 2015-03-13 13:55:26 +01:00
Ryan Huffman
5c9ec6bdcc Add add/delete/rename/clear events to EntitiesScriptingInterface 2015-03-12 11:17:07 -07:00
Ryan Huffman
b370e025c9 Move EntityScriptingInterface instance to DependencyManager 2015-03-02 15:05:31 -08:00
Ryan Huffman
9a302eebed Add Entities.canAdjustLocksChanged 2015-03-02 10:40:29 -08:00
Seth Alves
60a4f48985 rather than a list of allowed editors, a list of allowed lockers/unlockers 2015-02-06 09:14:40 -08:00
Seth Alves
bad44c540a also guard deleteEntity and getEntityProperties with canEdit. make canEdit available to javascript 2015-02-05 16:22:52 -08:00
Seth Alves
485785be7f Allowed Editors setting in DomainServer; domain-list wire protocol includes "you can edit" boolean after uuid; entity server checks canEdit flag of node who sends edit requests; interface does not attempt to do edits if DomainServer sent false for "you can edit" 2015-02-05 15:37:14 -08:00
ZappoMan
a1ec44b8e0 add developer menu item to disable sending physics updates 2015-01-26 12:05:57 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
ZappoMan
27bc394bed repair collision info mismatch 2014-12-08 10:52:53 -08:00
ZappoMan
7ea85073f4 introduce precision picking in API form 2014-12-06 11:45:49 -08:00
ZappoMan
63d1ac8375 implement support for entity subclasses to implement their own detailed ray intersection, make likes light pickability toggle 2014-12-02 14:56:12 -08:00
Ryan Huffman
6a68281308 Remove EntityScriptingInterface::getEntityItemID 2014-11-20 09:39:41 -08:00
Ryan Huffman
3ff44964b5 Add entity list window 2014-11-19 13:25:38 -08:00
ZappoMan
e12e3b05e1 add support for enter/leave entity events for when the avatar enters or leaves the bounds of an entity 2014-11-03 15:33:01 -08:00
ZappoMan
a5088eece6 first cut at running scripts from entities 2014-10-31 14:03:30 -07:00
ZappoMan
277da5a24f first cut at wiring up new entity specific UI/UX events 2014-10-31 10:23:45 -07:00
ZappoMan
c7d544cd58 wire up collision signals 2014-10-13 14:36:06 -07:00
ZappoMan
1125cb183e splitting up a bunch of Entity classes into different files 2014-07-16 09:25:54 -07:00
ZappoMan
3c4f5f88d0 checkpoint on virtual entities 2014-07-09 18:24:31 -07:00
ZappoMan
c4fe36b13d more Models->Entities renaming 2014-06-26 17:01:07 -07:00
Renamed from libraries/models/src/EntityScriptingInterface.h (Browse further)