Simon Walton
be279f08dc
Restore the addMarketplaceIDToDocumentEntities() hack
...
Fixes for Linux compiles; other improvements
2018-10-17 15:43:38 -07:00
Simon Walton
ad9f7f3a1d
Include the skipDefaults option in case we ever need it
...
Also print errors from parsing entities file; other tweaks
2018-10-12 11:18:38 -07:00
Simon Walton
0eec0e376c
Convert EntityTree direct to JSON, not via QJsonDocument
2018-10-11 18:13:26 -07:00
SamGondelman
aae06e8f49
faster aabox ray intersection and pre-computed inverse direction
2018-08-27 15:40:33 -07:00
SamGondelman
5c0b12abf6
ordered ray/parabola intersection code
2018-08-22 16:29:17 -07:00
SamGondelman
1ba28de5b6
try to fix nodelist not getting destroyed
2018-08-01 17:52:27 -07:00
SamGondelman
956c1511b6
Merge remote-tracking branch 'upstream/master' into parabolic
2018-07-19 15:23:25 -07:00
SamGondelman
90091d11e4
parabola picks, started implementing math
2018-07-03 09:47:31 -07:00
David Back
a8e231c5af
floats .0f
2018-06-28 11:33:38 -07:00
David Back
4f5a1bc340
zero out spread values for previous versions
2018-06-27 19:02:55 -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
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
f4df75d016
CR feedback
2018-05-21 06:04:05 +02: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
926014b43f
entity-server always promotes VOLUNTEER to RECRUIT
2018-05-17 17:24:24 -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
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
Andrew Meadows
99a75c5a87
Merge 'master' into 'workload'
2018-05-02 17:28:36 -07:00
Oren Hurvitz
26ffb3213c
Changed "[[gnu::fallthrough]]" to "// FALLTHRU"
2018-05-02 07:06:47 +01:00
Andrew Meadows
26db9ec09e
yield ownership outside workload R1
2018-05-01 13:15:37 -07:00
samcake
b3408ae4c0
Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload
2018-05-01 11:39:54 -07:00
Oren Hurvitz
a226790295
Eliminated warnings in gcc
...
Note that the call to encodeNode() in FBXWriter.cpp can never be reached, so it's safe to remove it.
2018-04-30 15:05:27 +03:00
Zach Fox
0f36fb113d
Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
2018-04-27 10:20:55 -07:00
Sam Gateau
99a0e42b5d
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-22 20:26:49 -07:00
Seth Alves
9e1bd69af3
Merge pull request #12918 from kitely/fix-addentity-failure
...
Fixed null pointer exception if importing an entity from JSON fails
2018-04-21 18:12:48 -07:00
samcake
a6bd589f4f
Merging upstream
2018-04-19 12:20:10 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp
...
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
2018-04-18 17:28:48 -07:00
John Conklin II
db99d12736
Merge pull request #12919 from kitely/fix-import-entities-distance
...
Fixed crash when importing entities from JSON multiple times
2018-04-18 11:52:46 -07:00
samcake
d6b6645630
exposing feedback of timing
2018-04-17 18:03:45 -07:00
Stephen Birarda
95c172f418
Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66
2018-04-17 15:34:46 -07:00
Oren Hurvitz
3ae65bba15
Fixed crash when importing entities from JSON multiple times
...
This happened because the Clipboard wasn't being completely cleared between uses.
This bug can also manifest in another way (if Interface doesn't crash): the imported entities appear very far away, instead of right in front of the user. This happens for the same reason as the crash: the Clipboard still contains some previously-imported entities. That causes us to calculate the wrong dimensions for the newly-imported entities which is why they are added to the domain far away.
2018-04-17 15:51:41 +03:00
Oren Hurvitz
91e27db9b0
When importing entities from JSON: fixed a null pointer exception if addEntity() failed on any of the entities
2018-04-17 12:32:28 +03:00
samcake
5d34329873
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-16 09:21:26 -07:00
Seth Alves
7f285c5f90
Merge pull request #12571 from Atlante45/fix/es-concurrent-traversal
...
Fix unprotected tree traversals
2018-04-14 14:33:25 -07:00
Seth Alves
0e081a3944
code review
2018-04-13 10:42:22 -07:00
Sam Gateau
79e92a52ea
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-12 23:51:23 -07:00
John Conklin II
98f6899c3d
Merge pull request #12839 from SamGondelman/matMigrate
...
Migrate materials from userData to materialData
2018-04-12 18:24:33 -07:00
samcake
e2f9eef5e2
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-12 12:27:27 -07:00
Andrew Meadows
a0f3e3a031
add simulation ownership expiry
2018-04-11 09:40:32 -07:00
Seth Alves
f81836c830
support specification of named landing-points in serverless-domain json files
2018-04-10 14:25:59 -07:00
SamGondelman
9b07880aab
migrate materials from userData to materialData
2018-04-09 12:49:03 -07:00
Andrew Meadows
299f2a92e0
merge 'master' into 'workload'
2018-04-05 12:01:19 -07:00
