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
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
Oren Hurvitz
26ffb3213c
Changed "[[gnu::fallthrough]]" to "// FALLTHRU"
2018-05-02 07:06:47 +01: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
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
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
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
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
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
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
John Conklin II
9e21bab67e
Merge pull request #12748 from AndrewMeadows/untangle-003
...
cleanup around simulation-ownership
2018-04-05 10:58:45 -07:00
Atlante45
895023ca4b
Fix unprotected tree traversals
2018-04-04 14:54:21 -07:00
Simon Walton
692ccfc09b
Create HIFI_FCDEBUG(_ID) variants that require a category
...
Original macros use default settings.
2018-04-04 09:49:15 -07:00
Andrew Meadows
d57cb0b5d7
use list.empty() instead of comparing list.size()
2018-04-03 22:15:57 -07:00
Simon Walton
7d16ca9c1c
Remove uses of addRepeatedMessageRegex() and its implementation
...
Change to new log-message ID scheme.
2018-04-03 17:54:01 -07:00
Andrew Meadows
6746e08206
faster EntitySimulation::takeDeadEntities()
2018-03-30 13:18:32 -07:00
Andrew Meadows
e1d2a5e5f3
more cleanup for deleting entities
2018-03-30 13:18:32 -07:00
Andrew Meadows
5854a36ff7
more correct handling of simulated entity
2018-03-30 13:18:32 -07:00
Andrew Meadows
a05c753e03
only process changed entities when simulated
2018-03-30 13:18:32 -07:00
SamGondelman
afe39aba46
fix octal code char issue
2018-03-29 10:05:08 -07:00
Dante Ruiz
8382d842e1
changing to resources path
2018-03-07 12:51:26 -08:00
Seth Alves
bdd926f89e
cleanups
2018-03-02 10:38:35 -08:00
Seth Alves
45157a16f2
merge from upstream
2018-03-02 09:57:27 -08:00
Seth Alves
33065fb51c
more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port
2018-03-01 11:07:37 -08:00
Seth Alves
31115b3cb6
make sure rezzer doesn't ignore adjustment
2018-02-27 20:14:00 -08:00
Seth Alves
9d131a6547
if a node can't change locks, don't allow them to create an already-locked entity
2018-02-27 19:53:54 -08:00
Seth Alves
a44ddbbc26
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-27 14:09:05 -08:00
Atlante45
c106fee659
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration
2018-02-22 19:45:43 -08:00
Seth Alves
c5d6f0e10f
don't queue up edit packets while connected to a serverless domain
2018-02-20 17:48:14 -08:00
ZappoMan
76d611d563
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-02-19 19:15:33 -08:00
SamGondelman
2d754edf74
CR
2018-02-15 15:48:41 -08:00
Ryan Huffman
2a667fcd60
Cleanup entity -> ds persist
2018-02-15 10:09:21 -08:00
