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

566 commits

Author SHA1 Message Date
Sam Gondelman
2291c7e5fb
Merge branch 'master' into NOverlays3 2018-12-06 12:37:18 -08:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays 2018-12-06 11:29:06 -08:00
Sam Gondelman
d30dd4c26c
Merge branch 'master' into NOverlays3 2018-12-06 11:23:50 -08:00
SamGondelman
3ce6f7f3d6 real image entities 2018-12-03 11:50:59 -08:00
luiscuenca
ad42f6a590 Add method to check entities joint hierarchy 2018-12-01 12:32:29 -07:00
SamGondelman
e282d51883 CR 2018-11-26 01:15:07 -05:00
SamGondelman
e8d45c46c1 shouldn't be able to write actionData 2018-11-19 23:31:20 -05:00
Seth Alves
d19cdc62d7
Merge pull request #14135 from ElderOrb/FB18573 
FB18573 - Other avatars' avatar entities may appear to be successfull…
 2018-11-16 10:05:22 -08:00
SamGondelman
8dbb2d806b local entities are always collisionless 2018-11-14 14:48:07 -08:00
SamGondelman
079d1dcbd6 convert clientOnly to entityHost and add local entities 2018-11-14 11:25:37 -08:00
Seth Alves
c5aafd4644 fix spatialKey conversion 2018-10-25 07:47:16 -07:00
Seth Alves
387a8ce933 fix QJsonArray handling 2018-10-25 07:47:15 -07:00
Seth Alves
252e504ab9 attempt to keep userData and new grab properties in sync 2018-10-25 07:47:15 -07:00
Andrew Meadows
6558d539e4 adjust simulation bid priority by props changed 2018-10-18 10:33:02 -07:00
Andrew Meadows
9bfa4a5267 remove unhelpful/wrong TODO comment 2018-10-18 10:33:02 -07:00
Andrew Meadows
1a685d2409 set script-triggerd sim ownership priority correctly 2018-10-18 10:33:02 -07:00
Andrew Meadows
ce81ab1f9d don't edit restricted properties unless sim ownership possible 2018-10-18 10:33:02 -07:00
Andrew Meadows
0b34524ba0 minimimze time holding locks on tree in editEntity() 2018-10-18 10:31:27 -07:00
Andrew Meadows
21654ba77c cleanup access to sessionID 2018-10-18 10:31:27 -07:00
Andrew Meadows
f63610af2b namechange: TerseUpdate --> TransformAndVelocities 2018-10-18 10:31:27 -07:00
Sam Gondelman
67662df760
Merge branch 'master' into scriptvec3 2018-10-08 12:59:34 -07:00
John Conklin II
afe6d97b00
Merge pull request #14100 from danteruiz/soft-entities-updates 
update soft entities and fix deadlock from qml.
 2018-10-04 13:33:34 -07:00
Alexander Ivash
9cf94c968a FB18573 - Other avatars' avatar entities may appear to be successfully deleted until edited 
note: partially revert commit 888f2f64a5 / "Merge pull request #10981 from druiz17/bug/delete-avatar-entity
 2018-10-03 03:15:36 +03:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3 2018-10-02 08:58:04 -07:00
Brad Hefta-Gaub
edd5db7768
Merge pull request #14042 from thoys/perf/create/getMultipleEntities 
Speed up Entity List properties fetching by adding Entities.getMultipleEntities API
 2018-10-01 16:16:48 -07:00
Dante Ruiz
c1c853790b update soft entities and fix deadlock 2018-09-27 14:53:28 -07:00
Thijs Wenker
80beb6c444 addressed CR feedback 2018-09-25 22:43:58 +02:00
Thijs Wenker
06491ef12f API function for retrieving multiple entity properties with better performance 2018-09-20 19:34:00 +02:00
Seth Alves
1a44054c49 attempt fix for fb-17131 2018-09-15 09:15:43 -07:00
SamGondelman
9b75c7e07f trying to separate colors and vectors 2018-09-04 17:20:05 -07:00
Sam Gondelman
6730635931
Merge branch 'master' into scriptvec3 2018-08-27 10:43:52 -07:00
SamGondelman
283c0c0311 s i m p l i f y 2018-08-23 11:47:56 -07:00
Stephen Birarda
e33f349d53 fix flagging for avatar entity update/delete 2018-08-21 10:32:05 -07:00
Sam Gondelman
f0986a7f5a Merge branch 'master' into scriptvec3 2018-08-20 10:56:45 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy 
Trying to fix dependency shutdown
 2018-08-16 13:14:58 -07:00
David Back
8db0711b5b set grabbable user data in addModelEntity, pass grabbable from asset browser 2018-08-08 16:33:47 -07:00
SamGondelman
1ba28de5b6 try to fix nodelist not getting destroyed 2018-08-01 17:52:27 -07:00
SamGondelman
2ca217eb4a merge with master 2018-07-30 17:43:15 -07:00
SamGondelman
318ef907b8 parabola/polyvox, fixing some bugs 2018-07-24 10:08:35 -07:00
SamGondelman
956c1511b6 Merge remote-tracking branch 'upstream/master' into parabolic 2018-07-19 15:23:25 -07:00
SamGondelman
9929529f30 vec3 conversion 2018-07-11 14:18:22 -07:00
SamGondelman
90091d11e4 parabola picks, started implementing math 2018-07-03 09:47:31 -07:00
Wayne Chen
9e3626cca3 returning false if there is no entity to connect to 2018-06-29 14:42:33 -07:00
Sam Gondelman
850e2d5cf5
Merge branch 'master' into particleFix 2018-06-21 17:32:24 -07:00
SamGondelman
8f411ad6c8 CR 2018-06-20 16:13:10 -07:00
Andrew Meadows
4329ea5240 Merge master' into 'workload' 2018-06-04 16:11:25 -07:00
John Conklin II
ec3f9549f1
Merge pull request #13172 from wayne-chen/getChildrenIDs-issue-1934 
Fix EntityScriptingInterface::getChildrenIDs function
 2018-05-31 14:27:25 -07:00
Andrew Meadows
d50da2babc Merge 'master' into 'workload' 2018-05-23 14:51:05 -07:00
Liv Erickson
56493346c1 fix permissions check 2018-05-22 15:41:48 -07:00
Thijs Wenker
7f4e9a0089 style 2018-05-21 06:17:08 +02:00
Thijs Wenker
f4df75d016 CR feedback 2018-05-21 06:04:05 +02:00
Livi Erickson
70bbac5c83 update with lastEditedCheck 2018-05-20 18:49:41 -07:00
Liv Erickson
29b11b9101 some fixes to server cloneables 2018-05-18 17:12:41 -07:00
Andrew Meadows
00e360aff0 reduce sim ownership priority when releasing grab 2018-05-17 17:25:07 -07:00
David Back
4e14eb37e3 update comment 2018-05-17 16:34:19 -07:00
David Back
30855f94eb set last edited to 0 to ensure server update 2018-05-17 16:02:58 -07:00
David Back
f74e219029 rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete 2018-05-15 17:24:14 -07:00
Wayne Chen
f82e597ac7 Updating documentation for getChildrenIDs + fixing issue #1934 2018-05-15 09:34:07 -07:00
Wayne Chen
bd6905b3d2 Adding possible solution to issue#1934. 2018-05-14 18:25:39 -07:00
David Back
a57c280813 convertToCloneProperties 2018-05-11 17:54:08 -07:00
David Back
dea588ae4a remove prints 2018-05-09 18:12:04 -07:00
David Back
3241c18271 first pass cloneables WIP 2018-05-09 18:10:40 -07:00
John Conklin II
cb7b03652b
Merge pull request #12796 from MiladNazeri/feature/add-findByName 
added Entities.findbyName
 2018-04-25 14:00:10 -07:00
milad
988dca437d added case-sensitive search 2018-04-16 18:30:00 -07:00
Zach Fox
071bf35683 Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018 2018-04-16 10:11:44 -07:00
John Conklin II
1834325970
Merge pull request #12788 from sethalves/fix-immediate-last-edited-by 
set lastEditedBy in local tree whenever a script adds or edits an entity
 2018-04-12 13:02:05 -07:00
John Conklin II
e47dca77ec
Merge pull request #12773 from AndrewMeadows/expire-simulation-ownership 
entity-server will expire stale simulation ownership
 2018-04-12 12:04:52 -07:00
John Conklin II
88a151481d
Merge pull request #12763 from sethalves/ess-can-edit-localX 
allow ESS to make relative-to-parent edits when entity is not in ESS's octree
 2018-04-11 12:08:35 -07:00
Andrew Meadows
a0f3e3a031 add simulation ownership expiry 2018-04-11 09:40:32 -07:00
Zach Fox
a9b9a1cb10 Commerce: Gifts 2018-04-10 15:54:19 -07:00
milad
4adc8928f0 added Entities.findbyName 2018-04-05 09:58:54 -07:00
Seth Alves
2545e67b14 set lastEditedBy in local tree whenever a script adds or edits an entity 2018-04-04 12:27:41 -07:00
Seth Alves
71d6dbf9bf allow ESS to edit local version of properties even if the entity isn't in the ESS's local octree 2018-04-02 15:52:28 -07:00
David Rowe
7027ccb6d8 Remove unused code 2018-03-30 09:35:25 +13:00
David Rowe
3b90078097 Remove Entities.currentAvatarEnergy and related from the API 2018-03-30 08:36:18 +13:00
Seth Alves
b39c7eadd2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-13 09:24:18 -07:00
David Rowe
a62b6b7150 Merge branch 'master' into 21709 2018-03-07 17:34:53 +13:00
Seth Alves
2d374583b4 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-01 11:07:50 -08:00
David Rowe
a782b6779a Merge branch 'master' into 21709 
# Conflicts:
#	interface/src/ui/overlays/Overlays.h
#	interface/src/ui/overlays/Shape3DOverlay.cpp
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/EntityScriptingInterface.h
 2018-02-28 12:42:05 +13:00
Elisa Lupin-Jimenez
17ddf21028 fixed line length 2018-02-27 15:05:51 -08:00
Dante Ruiz
be52b66874 be able to delete entities in serverless domain 2018-02-26 15:41:35 -08:00
Dante Ruiz
c83a8e9a25 minimize diff 2018-02-26 14:51:36 -08:00
Dante Ruiz
5031d94c6d small changes 2018-02-26 14:50:34 -08:00
Elisa Lupin-Jimenez
b56c78d36c image has correct orientation and is collisionless 2018-02-26 14:44:46 -08:00
Dante Ruiz
a23c425f5e actions and serverless status fixes 2018-02-26 14:24:51 -08:00
Dante Ruiz
07b0431215 fix merge conflict 2018-02-23 14:00:36 -08:00
David Rowe
26404a6ce8 Entities functions JSDoc bulk 2018-02-23 19:27:13 +13:00
Zach Fox
90f05f4db7 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-22 09:23:49 -08:00
David Rowe
9e37230aa1 Miscellaneous code tidying 2018-02-19 12:21:56 +13:00
ZappoMan
e71811bef2 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-02-14 09:03:32 -08:00
Zach Fox
ae8a8a48eb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-13 13:55:32 -08:00
Zach Fox
95e9eb8e4a Lots of progress 2018-02-12 17:06:57 -08:00
Elisa Lupin-Jimenez
9f8e2017ce can add image directly from asset server 2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
576d683d3b initial changes to incorporate snap model 2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
fc0e87d5ea more infrastructure links 2018-02-02 10:08:39 -08:00
ZappoMan
cd4b3b1a54 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-01-30 12:52:41 -08:00
ZappoMan
aa82ad8855 adjust client to only delete entities on server echo 2018-01-26 14:57:36 -08:00
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05:00
Seth Alves
897b96d092 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-22 07:36:26 -08:00
humbletim
a146b778f7 support additional .extraInfo for ray intersections 2017-12-21 12:35:13 -05:00