Commit graph

3495 commits

Author SHA1 Message Date
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
Liv Erickson
0ebd13b3e6 cannot edit origin from client / fix ICE issue 2018-05-22 13:17:23 -07:00
Liv Erickson
7efcc135e4 reorder flags 2018-05-22 11:03:41 -07:00
Liv Erickson
e273a0c1a6 fix define properties 2018-05-22 09:10:50 -07:00
Liv Erickson
27c2bb9046 add properties group where missing 2018-05-21 17:39:08 -07:00
Liv Erickson
a1e7f648bc add debug properties 2018-05-21 17:14:36 -07:00
Liv Erickson
e76829bb1d change to DEFINE_PROPERTY_REF 2018-05-21 16:51:23 -07:00
Liv Erickson
604b3cac1c check for null entities in grab, add conversion for old userdata cloneable 2018-05-21 16:19:43 -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
Livi Erickson
9f7b383757 address CR feedback 2018-05-20 18:22:17 -07:00
Livi Erickson
9c0084209b fix style error, start lifetime properly for cloned entities 2018-05-20 16:41:14 -07:00
Liv Erickson
6c8d68afc6 add extra cleanup in delete messages and simulation, as a fall back 2018-05-18 18:18:42 -07:00
Liv Erickson
29b11b9101 some fixes to server cloneables 2018-05-18 17:12:41 -07:00
Andrew Meadows
c8b8d0f1c4 remove commented out cruft 2018-05-18 10:31:08 -07:00
Andrew Meadows
063c2564d1 only clear bid state when ownership actually changed 2018-05-18 10:28:45 -07:00
Andrew Meadows
a9c193b672 merge 'workload-014' into 'workload' 2018-05-18 10:12:04 -07:00
Andrew Meadows
00e360aff0 reduce sim ownership priority when releasing grab 2018-05-17 17:25:07 -07:00
Andrew Meadows
926014b43f entity-server always promotes VOLUNTEER to RECRUIT 2018-05-17 17:24:24 -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
26b6b851f5 Merge branch 'cloneables' of github.com:dback2/hifi into cloneables 2018-05-17 14:50:39 -07:00
David Back
b8ce07744d initialize prop defaults, no bool returns 2018-05-17 14:50:14 -07:00
Liv Erickson
ec8aa71dc4 Add JSDoc header to new clone function in Entity API 2018-05-17 11:25:20 -07:00
David Back
42d8492427 no clock skew 2018-05-17 11:17:04 -07:00
David Back
3730cbe36c reconstruct cloneIDs lists on start, read/write locks on clone ID functions, fix removing last cloneable 2018-05-17 10:28:48 -07:00
David Back
1e2d2819d5 tweaks 2018-05-15 17:36:39 -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
Andrew Meadows
c7c4324b3c Merge 'master' into 'workload' 2018-05-15 10:22:50 -07:00
David Back
3031bb05be Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-11 17:54:20 -07:00
David Back
a57c280813 convertToCloneProperties 2018-05-11 17:54:08 -07:00
MiladNazeri
ea26512793
Merge pull request #13147 from ctrlaltdavid/21872-a
Fix JSDoc function definitions specifying properties instead of params
2018-05-11 16:20:06 -07:00
David Back
65bda27ae3 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-11 13:03:27 -07:00
John Conklin II
4129664368
Merge pull request #13145 from highfidelity/stable
Merge RC67 stable into master
2018-05-10 17:07:20 -07:00
David Rowe
fab85c3f6d Fix JSDoc function definitions specifying properties instead of params 2018-05-11 09:52:48 +12:00
David Back
7738a2bcdd Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-09 18:12:46 -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
Seth Alves
7466d08f1f more suppression of logging 2018-05-09 13:01:49 -07:00
Seth Alves
db03265a6b when in serverless mode, short-circuit simulation ownership bids 2018-05-09 10:53:46 -07:00
Clement
5a3773ba72 Fix compile error on linux/windows 2018-05-04 18:18:46 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Clement
b04c5bd0db CR 2018-05-04 14:43:16 -07:00
Clement
d774dc2060 WIP Only use conical frustums on the server 2018-05-03 18:19:29 -07:00
Stephen Birarda
21396287a4
Merge pull request #12990 from Atlante45/fix/spec-cam-av
Add support for multifrustum avatar queries
2018-05-03 18:18:51 -07:00
Stephen Birarda
31d5633b4a
Merge pull request #12930 from Atlante45/fix/spec-cam
Add support for multifrustum entity queries
2018-05-03 18:13:51 -07:00
Andrew Meadows
3d16c9014f remove unowned 'dynamic' objects from kinematic integration 2018-05-03 16:22:36 -07:00
MiladNazeri
8e214d8ee8
Merge pull request #13049 from ctrlaltdavid/21856-d
List which contexts each namespace and class is available in
2018-05-03 01:29:14 -07:00