howard-stearns
a6b437a79f
get rid of "error" warning because the key wasn't broken into 64 char
...
lines
2017-11-22 16:55:57 -08:00
howard-stearns
abf41300dd
refactor
2017-11-22 16:29:56 -08:00
howard-stearns
899999a4c6
fix up dynamic ownership challenge
2017-11-22 15:58:30 -08:00
howard-stearns
ca80c9b764
Merge branch 'ECWallet' of https://github.com/MandatoryMania/hifi into MandatoryMania-ECWallet
2017-11-21 16:28:08 -08:00
ZappoMan
3a967ca895
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-21 10:53:29 -08:00
Thijs Wenker
627fee80ec
added support for exporting parentJointName
2017-11-21 01:49:56 +01:00
Thijs Wenker
84ec9890ca
reverted special property case, parentJointName is now only parsed from the JSON import
2017-11-20 18:29:33 +01:00
ZappoMan
04ee1adabd
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-19 14:40:31 -08:00
H Q
21a28827c9
Remaining coding style changes, other small fixes
2017-11-17 07:59:52 -08:00
H Q
27350ddbfc
Coding style corrections
2017-11-16 12:35:00 -08:00
H Q
44f2c92d30
Final ECSDA and nonce modifications for this dev cycle
2017-11-14 15:40:29 -08:00
ZappoMan
afaad5fcd7
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-02 13:39:51 -07:00
Zach Fox
b335ba9a75
Timeout timer
2017-11-01 11:34:29 -07:00
Zach Fox
8a6a744099
It's working
2017-11-01 10:46:13 -07:00
Zach Fox
93308dfcd3
Why did I think this would work before?
2017-10-31 16:21:10 -07:00
Zach Fox
e9c144892a
Fixes
2017-10-31 13:11:32 -07:00
Zach Fox
f5ada4fe62
Will it compile?
2017-10-31 12:33:28 -07:00
Zach Fox
6f96e0c7bd
More progress
2017-10-31 12:14:12 -07:00
Zach Fox
90e9251176
It's a start
2017-10-31 11:28:19 -07:00
Zach Fox
19420a0ff2
Move static cert verify to properties
2017-10-30 17:01:55 -07:00
ZappoMan
a7a0f03ede
rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()
2017-10-27 18:39:17 -07:00
Zach Fox
91333cdf7b
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-25 10:26:50 -07:00
Zach Fox
1f6d989044
Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023
2017-10-23 17:37:43 -07:00
Zach Fox
3e139283ba
Remove unnecessary newlines
2017-10-23 17:31:21 -07:00
Zach Fox
97d44e62c8
Fix bugs
2017-10-23 16:52:32 -07:00
Zach Fox
53081b51a6
Clean up as much as possible
2017-10-23 16:00:39 -07:00
Zach Fox
cda43ec1ea
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-23 11:52:59 -07:00
Zach Fox
74180bc4cd
Implement static cert verification correctly
2017-10-19 16:39:13 -07:00
Seth Alves
c1e8d5144c
remove code which is no longer needed because of custom physics setters
2017-10-19 13:19:25 -07:00
Seth Alves
f2cb5d4aff
clean-up concept of puffed queryAACube
2017-10-19 13:19:13 -07:00
Zach Fox
e1b0e5a2dd
Move some include files around
2017-10-16 16:00:32 -07:00
Zach Fox
a4b8bf0be6
Bugfixes and CR
2017-10-16 15:33:10 -07:00
Zach Fox
3c572b0f7a
Fix deadlock
2017-10-16 13:41:39 -07:00
Zach Fox
960f1fbfe4
Still broken, but safer
2017-10-16 13:28:14 -07:00
Andrew Meadows
e109101acc
update profiling timers
2017-10-16 11:52:30 -07:00
Zach Fox
febc725520
Merge branch 'RC-57' of https://github.com/highfidelity/hifi into pop_dynamicTests57
2017-10-16 09:53:15 -07:00
Zach Fox
1400c66506
Be a bit more thorough
2017-10-12 16:58:48 -07:00
Zach Fox
b56a38ca15
Re-add references to recentlyDeletedEntityItemIDs
2017-10-12 16:32:09 -07:00
Zach Fox
d75c0a00bb
Closer than ever
2017-10-12 16:29:05 -07:00
Zach Fox
6a47884fcf
Cleanup and fix
2017-10-12 13:41:19 -07:00
Brad Hefta-Gaub
1bba5ff812
Merge pull request #11554 from sethalves/import-av-entities
...
Import av entities
2017-10-12 13:30:53 -07:00
Zach Fox
50446619f5
Remove unnecessary (?) references to _recentlyDeletedEntityItemIDs
2017-10-12 11:59:46 -07:00
Zach Fox
abe1cd1b51
Minor cleanup
2017-10-12 11:53:47 -07:00
Zach Fox
0e96fc5cab
It's working!
2017-10-12 11:37:26 -07:00
Zach Fox
5efa920712
Getting closer
2017-10-12 11:13:23 -07:00
Zach Fox
c3e66c9581
Fixes
2017-10-11 16:56:47 -07:00
Zach Fox
5a3a3c4937
What is going on
2017-10-11 15:05:45 -07:00
Zach Fox
fa1bfe0d19
Maybe fixes?
2017-10-11 14:10:33 -07:00
Zach Fox
d8b84e6875
Minor cleanup
2017-10-11 13:26:32 -07:00
Zach Fox
9e570fdba3
First pass at encryption/decryption. Exciting!
2017-10-11 13:08:04 -07:00
Zach Fox
f05c709693
Remove static certificate verification for now
2017-10-11 12:06:11 -07:00
Zach Fox
1f8b68c952
Updates now that endpoint exists; add pending timer
2017-10-11 11:46:35 -07:00
Zach Fox
0ae69b6ad9
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-10 12:38:14 -07:00
Seth Alves
23f41457be
Revert "Revert "fix importing of avatar entities""
...
This reverts commit 28a8b18060
2017-10-09 11:52:43 -07:00
Andrew Meadows
0bcecdbe66
be picky when finding nearby entities at login
2017-10-09 10:27:46 -07:00
Seth Alves
28a8b18060
Revert "fix importing of avatar entities"
2017-10-07 16:54:05 -07:00
Zach Fox
c70ee6055f
Don't clear cert ID if static properties change; updates to DDV
2017-10-06 17:12:40 -07:00
Zach Fox
59a6726af6
Checkpoint; lotsa changes...
2017-10-06 16:55:05 -07:00
Zach Fox
1fa9bd8fc6
Better implementation of location change and bugfixes
2017-10-06 12:22:29 -07:00
Seth Alves
f4dedf05bb
move variables into block that needs them
2017-10-06 11:02:26 -07:00
Seth Alves
53a49272dc
fix importing of avatar-entities
2017-10-05 11:43:19 -07:00
Zach Fox
4cfb860e23
Wow, this actually seems to be working
2017-10-04 15:45:12 -07:00
Zach Fox
f974672e7b
Working way better than I expected
2017-10-04 15:19:06 -07:00
Zach Fox
b35eaf2cc8
Throw a bunch of code at the wall and hope some sticks
2017-10-04 15:06:55 -07:00
Zach Fox
f7ea50ef3b
Free memory
2017-10-04 14:02:28 -07:00
Zach Fox
cf7c1934f8
Progress?
2017-10-04 13:16:33 -07:00
Zach Fox
ab08dc6bd6
Progress?
2017-10-04 12:33:58 -07:00
Zach Fox
2cdd5c29f3
Uncertified rez rights
2017-10-04 09:58:29 -07:00
Zach Fox
ed40e41b94
Potential progress? Not totally sure
2017-10-03 16:18:29 -07:00
Zach Fox
b7e50c5b73
First steps
2017-10-03 14:36:22 -07:00
Seth Alves
e7fa8131ea
make json importer understand AVATAR_SELF_ID
2017-10-02 16:44:03 -07:00
Seth Alves
ca11d19b3e
allow importing of avatar entities from json
2017-10-02 16:06:44 -07:00
Andrew Meadows
8134e2b7f9
fix const violation
2017-09-29 11:34:36 -07:00
Andrew Meadows
f5f1a64c92
use const ref on pointer, and use dynamic_cast
2017-09-29 11:34:35 -07:00
Andrew Meadows
b16d666026
remove dupe addToNeedsParentFixupList() call
2017-09-29 11:34:35 -07:00
Andrew Meadows
1c30f7424e
remove cruft and add comments
2017-09-29 11:34:35 -07:00
SamGondelman
0ad5f47bfd
trying to fix entity editing bugs, needs testing
2017-09-29 11:34:34 -07:00
SamGondelman
6c066605cd
add state to entity tree send thread
2017-09-29 11:34:34 -07:00
Andrew Meadows
8d535f9c5a
remove bump to changeFromRemote for server case (revert)
2017-09-29 11:34:33 -07:00
Andrew Meadows
481df49386
on server: note time of entity edit by remote
2017-09-29 11:34:33 -07:00
Andrew Meadows
82ed19386f
make Octree::readBitstreamToTree() virtual
2017-09-29 11:34:32 -07:00
Andrew Meadows
56bc48b31a
don't use octcode data in entity update packets
2017-09-29 11:34:32 -07:00
Seth Alves
72cacc4cef
server only deletes and entity if it's still the child of an avatar, not if it has ever been
2017-09-28 19:56:15 -07:00
Zach Fox
0f66fb41fd
Fix entity add after incomplete rezCertified implementation
2017-09-28 16:07:15 -07:00
Zach Fox
7ad3a5a1e3
Commerce: Tons of Interface changes ( #11463 )
...
* canRez(Tmp)Certified()
* CertifiedItem beginnings
* Skeleton of verifyOwnerChallenge()
* Controlled failure; updateLocation() skeletion
* Controlled failure on checkout page with ctrl+f
* Skeleton Purchases first-use tutorial
* Initial progress on new setup
* Security pic tip
* Skeleton Certificate page
* Updates to Certificate
* General progress; setup is nearly complete
* Better buttons; last step almost done
* Initial progress on wallet home
* Completed recent transactions
* Security page
* Scrollbar
* Fix auth error text
* PassphraseSelection
* Change security pic
* Minor layout changes; beginnings of emulated header
* Various layout changes; wallet nav bar
* Help screen
* Quick onaccepted change
* First pass at new purchases
* Small style updates
* Some error progress
* Lightbox in purchases
* Collapse other help answers when clicking on another
* REZZED notif
* Commerce Lightbox
* Lots of new interactions in Purchases
* Hook up 'view certificate'
* Fix errors, fix close button on cert
* Purchases timer; much faster filter
* Add debugCheckout
* Purchase updates
* GlyphButton; separator; Checkout Success; Ledger fix; debug modes
* Lock glyph below security pic should be white
* Various fixes, round 1
* Circular mask
* Passphrase change button fix; TextField error edge highlighting
* Recent Activity fixes
* Various changes
* Standard Security Pic location
* Color changes
* Filter bar changes
* Styling for multiple owned items
* Minor language change
* Header dropdown (harder than expected)
* Small fixes
* View backup instructions
* marketplaces.js onCommerceScreen
* Beginnign of new injection
* Marketplace injection changes
* Purchase button style changes
* More button styling
* MY PURCHASES button
* marketplace onUsernameChanged
* New help QA
* Help text changes etc
* Downscale security image, reducing filesize
* Lots of bugfixes
* Cleanup before PR
* Only open cert during inspection if commerce switch is on
* Help text changes
* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey
* Quick glyph change
* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00
Bradley Austin Davis
b93e91b9f3
New android toolchain
2017-09-19 13:45:12 -07:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
Andrew Meadows
a8dac0cb79
don't send constant updates for grabbed objects
2017-07-20 15:45:50 -07:00
Andrew Meadows
8fc4d1f43e
make UNEXPECTED logs warnings
2017-07-13 13:30:57 -07:00
Andrew Meadows
02bc9b9610
minimize the lock context
2017-07-13 13:30:57 -07:00
Andrew Meadows
f71ef554b7
use copy of _entityMap for debug logging
2017-07-13 13:30:57 -07:00
Andrew Meadows
fe79514b08
lock when changing EntityTree elements
2017-07-13 13:30:57 -07:00
Andrew Meadows
a0c6c49360
bump some "debug" messages to "warning" status
2017-07-13 13:30:57 -07:00
Andrew Meadows
7ea1e7285f
map EntityItemID to EntityItemPointer
2017-07-13 13:30:57 -07:00
Brad Davis
8130a91b8c
Cleanup entity dependencies
2017-06-27 19:15:49 -07:00
Brad Davis
fece438602
Cleanup and refactoring
2017-06-15 18:58:56 -07:00
Brad Hefta-Gaub
5af95c8fdf
Merge pull request #10476 from sethalves/fix-imported-children-querybox
...
fix up queryAACubes before sending imported entities to server
2017-05-25 08:29:23 -07:00
Stephen Birarda
cecbf43129
make server entity scripts respect script whitelist
2017-05-22 16:17:01 -07:00
Seth Alves
5c94147f40
children collision hulls appear to be in the right place, now
2017-05-19 17:09:42 -07:00
Seth Alves
67f222cb3f
be more careful about fixing up entities which arrived before their parents
2017-05-19 15:19:16 -07:00
Seth Alves
54dafa0f83
be more careful about fixing up entities which arrived before their parents
2017-05-19 14:14:00 -07:00
Seth Alves
5c93dbd20d
be more careful about fixing up entities which arrived before their parents
2017-05-19 13:48:29 -07:00
Seth Alves
936d0e2d50
be more careful about fixing up entities which arrived before their parents
2017-05-19 12:13:43 -07:00
Seth Alves
735e4b7d05
trying to get child collision hulls to be in the right place after import
2017-05-19 10:59:59 -07:00
Seth Alves
7220fe0ad8
set more physics flags dirty when an entity parent is found
2017-05-19 10:40:24 -07:00
Seth Alves
0c12baa258
call entityChanged after settings flags
2017-05-19 09:57:42 -07:00
Seth Alves
4007133423
collision hulls are still not always in the right place
2017-05-18 14:59:26 -07:00
Seth Alves
ef556fae9b
when an entity's parent wasn't known and then becomes known, patch up the rigid-body and the render-item bounds
2017-05-18 14:13:33 -07:00
Seth Alves
ec02887ae6
attempt to get imported entities into the correct octree-element
2017-05-18 13:20:44 -07:00
Seth Alves
10f1143278
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-16 20:49:53 -07:00
Seth Alves
d90843428d
when importing entities, make a queryAACube that takes children into account
2017-05-16 16:54:16 -07:00
Seth Alves
1e4e2cc1b4
when a parent entity is deleted, delete its children in the local tree, rather than waiting for the server to tell us about it
2017-05-16 16:22:40 -07:00
Seth Alves
b9005a9e76
fix up queryAACubes before sending imported entities to server
2017-05-16 14:32:55 -07:00
Seth Alves
630d95a812
fix constraint import some more
2017-05-12 13:03:51 -07:00
Seth Alves
80e6edda0c
code review
2017-05-11 10:13:15 -07:00
Seth Alves
4f24a7618a
cleanups
2017-05-09 10:23:04 -07:00
Seth Alves
4816e4f826
what does VS mean when it uses words?
2017-05-08 21:39:41 -07:00
Seth Alves
1346ce22b9
don't crash if imported entities make a reference to an unknown entity
2017-05-08 15:51:25 -07:00
Seth Alves
94dfbc81f3
entity export/import involving constraints now works
2017-05-08 15:44:31 -07:00
Seth Alves
fd238f5438
working on fixing action/constraint export/import
2017-05-08 11:02:35 -07:00
Seth Alves
d25db099b9
be more effecient about ignoring edits to unknown entities
2017-05-04 18:49:46 -07:00
Seth Alves
74c0a70cb0
rename base action classes to dynamics, start on constraints
2017-04-11 20:39:13 -07:00
Ryan Huffman
b9fffc10f8
Fix entity "unlock" edits not being propagated to clients
...
The lastEditedBy property was not being updated when changing the locked
property of entities from true to false.
2017-04-03 15:51:19 -07:00
David Kelly
5184cbe615
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2
2017-02-15 12:08:55 -07:00
David Kelly
e6969321ca
fix for not properly filtering entity adds
2017-02-15 09:15:35 -07:00
David Kelly
17acd8fa4f
I should just build on linux exclusively
2017-02-14 13:30:43 -07:00
David Kelly
342584b2a8
Filter failure mode updated
...
The decision here is that all failed filters (syntax errors, 404s,
bad urls etc...) lock out all edits for those without lock rights.
If it is the domain-wide one, then that applies to entire domain.
If a zone filter, then that applies to all edits in that zone.
Also - zone filters don't apply to the zone itself. Other zone filters
whose zones lie within that zone _do_ apply, in addition to the global
one.
2017-02-14 13:05:12 -07:00
howard-stearns
487adc7f18
whitespace
2017-02-13 16:35:03 -08:00
howard-stearns
6241889e38
lastEditedBy is set by add/edit, but not by physics packets
2017-02-13 13:47:20 -08:00
David Kelly
8a7a3926c5
rest of issues w/linux and mac
2017-02-10 15:57:27 -07:00
David Kelly
cf780b3b73
fixed persist issue, working much better
2017-02-10 11:42:56 -07:00
David Kelly
8d666854c7
working it seems
...
But, AABox for zones isn't very helpful (box is _small). Time to use
the shape of the zone.
2017-02-09 15:39:38 -07:00
David Kelly
ff7c9d3546
Working like before
...
Single entity script running properly. Now, need to add the zone
filters and execute them.
2017-02-08 15:36:16 -07:00
howard-stearns
12720cac32
Pass filter type as an int, with constants to compare against.
2017-02-06 13:36:45 -08:00
howard-stearns
dacaa3df1d
Send new entity physics packet from physics simulation, accept in server,
...
and make it go through filter (when supplied) regardless of lock rights.
2017-02-06 11:12:18 -08:00
howard-stearns
4499a92a82
filter gets isAdd argument
2017-02-02 13:07:08 -08:00
David Kelly
f25bbc9649
Merge pull request #9574 from howard-stearns/delete-failed-entity-adds
...
cleanly log failed entity adds, and tell the client to delete his copy
2017-02-01 10:12:17 -07:00
howard-stearns
e42853a96c
cleanly log failed entity adds, and tell the client to delete his copy
2017-01-31 16:05:38 -08:00
Stephen Birarda
d4a161041e
drop empty parts when splitting script whitelist
2017-01-31 15:32:47 -08:00
Brad Hefta-Gaub
619bcdeed8
Merge pull request #9553 from huffman/fix/polyvox-import
...
Fix importing of PolyVox entities
2017-01-31 08:42:28 -08:00
Ryan Huffman
f553656e36
Fix importing of PolyVox entities
...
PolyVox entities reference neighboring PolyVox entities in their entity
properties so that they can be stitched together. When importing, a new ID is
generated for each entity. When importing PolyVox entities, the
neighboring entity IDs were not updated to reflect the newly generated
IDs. This commit fixes that.
2017-01-30 13:33:42 -08:00
howard-stearns
93414d802d
fetch entity filter script asynchronously (but reject edits while waiting)
2017-01-30 11:06:36 -08:00
Howard Stearns
f36b968860
Merge branch 'edit-entity-filter' into entity-filter-resource
2017-01-25 19:39:12 -08:00
Howard Stearns
a1afbe7d5e
Merge branch 'master' of https://github.com/highfidelity/hifi into edit-entity-filter
2017-01-25 19:16:29 -08:00
howard-stearns
4437063a3a
remove logging, now that we have error logging
2017-01-25 17:04:09 -08:00
howard-stearns
9cbc4fd1b9
Merge branch 'master' of https://github.com/highfidelity/hifi into entity-filter-resource
2017-01-25 16:23:52 -08:00
howard-stearns
b62f3e550a
error check/log on execution, too
2017-01-25 16:23:07 -08:00
Atlante45
f540c94113
Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr
2017-01-25 13:06:49 -08:00
howard-stearns
8eff3b1e83
restructure initialization so that server can do server-like things to get
...
the filter program from file
2017-01-24 16:14:41 -08:00
howard-stearns
da914f0a4f
bypass entity-server edit filter if you have lock/unlock rights
2017-01-24 11:59:31 -08:00
