SamGondelman
c6b636901a
fewer undesirable couplings
2017-10-16 13:46:23 -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
SamGondelman
d274d99411
merge from master
2017-10-16 12:17:37 -07:00
Andrew Meadows
23bb8608b1
minor optimizations in updateModelBounds()
2017-10-16 11:52:30 -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
SamGondelman
5bfb0baf09
const references
2017-10-13 14:38:46 -07:00
Nissim Hadar
afb8b2d8e7
Merge branch 'master' into hazeZone
2017-10-13 13:40:06 -07:00
Nissim Hadar
9c9dfc7211
Replace light blend with glare.
2017-10-13 13:36:46 -07:00
Nissim Hadar
c76229934c
Changed blend-in colour and blend-out colour to colour and glare colour
2017-10-13 12:21:00 -07:00
Nissim Hadar
5bfbaf4860
Renamed HazeMode to ComponentMode.
2017-10-13 11:24:56 -07:00
Bradley Austin Davis
4dcce6ef45
Merge pull request #11578 from hyperlogic/bug-fix/delete-on-wrong-thread
...
Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
2017-10-12 17:37:05 -07:00
SamGondelman
cc8ecdc596
put back entity signals for scripts
2017-10-12 17:28:00 -07:00
Nissim Hadar
b1174ce40c
Merge branch 'master' into hazeZone
2017-10-12 17:04:42 -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
SamGondelman
1a047613bf
fix pointerevents on entities from scripts
2017-10-12 12:31:36 -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
SamGondelman
53fde83922
cleaning up pointerevents, wip
2017-10-12 11:21:50 -07:00
Nissim Hadar
dc45c7af75
Implemented radio-buttons.
2017-10-12 11:18:18 -07:00
Zach Fox
5efa920712
Getting closer
2017-10-12 11:13:23 -07:00
Nissim Hadar
a21995db24
Added checkbox for altitude effect.
2017-10-11 22:10:58 -07:00
Nissim Hadar
96fd3123e8
Changed haze altitude to ceiling.
2017-10-11 20:36:24 -07:00
Nissim Hadar
832f9fb6e3
Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED.
2017-10-11 19:10:51 -07:00
Nissim Hadar
ea6b9ed28e
Removed ...ALTITUDE_MODE from combo.
2017-10-11 18:58:59 -07:00
Anthony J. Thibault
0a943fbe7b
Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
...
When script calls Entities.getChildrenIDs*() it is possible to deadlock the main thread, and also invoke
the destructor of Entities and Overlays, which is very NOT thread safe.
The fix is to use a pattern already in use in several places in our codebase.
Use the custom deleter parameter of std::shared_ptr to call deleteLater() instead of destroying the object in place.
This allows any thread to use shared_ptrs of SpatiallyNestables without fear.
2017-10-11 17:32:34 -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
Daniela
a46ef56af9
Merge with hifi:master. Packet Headers version were increased.
2017-10-10 17:26:33 +01:00
Nissim Hadar
c9be5ea100
Merge branch 'master' of https://github.com/highfidelity/hifi into hazeZone
2017-10-09 18:01:48 -07:00
Nissim Hadar
7d5a887f43
Refactoring.
2017-10-09 17:25:19 -07:00
Seth Alves
23f41457be
Revert "Revert "fix importing of avatar entities""
...
This reverts commit 28a8b18060
2017-10-09 11:52:43 -07:00
Zach Fox
a7d43c63b6
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-09 11:38:13 -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
Brad Hefta-Gaub
62fc193bff
Merge pull request #11532 from sethalves/import-av-entities
...
fix importing of avatar entities
2017-10-06 17:59:54 -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
Nissim Hadar
e34fb1c874
Merge branch 'master' into hazeZone
2017-10-06 13:20:12 -07:00
Zach Fox
1fa9bd8fc6
Better implementation of location change and bugfixes
2017-10-06 12:22:29 -07:00
Seth Alves
9064114ce5
fix mistaken logic-flip in recent PR
2017-10-06 11:03:48 -07:00
Seth Alves
f4dedf05bb
move variables into block that needs them
2017-10-06 11:02:26 -07:00
Nissim Hadar
320c888ce4
Added checkbox to allow separate control of keylight attenuation.
2017-10-05 20:31:45 -07:00
Nissim Hadar
cbaae2c79b
WIP - haze colour.
2017-10-05 12:59:56 -07:00
Seth Alves
b96fac2f00
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-05 11:43:25 -07:00
Seth Alves
53a49272dc
fix importing of avatar-entities
2017-10-05 11:43:19 -07:00
Nissim Hadar
1e2bd23c0b
Fixed typo in variable name.
2017-10-05 11:31:08 -07:00
Nissim Hadar
794cb961d5
Merge branch 'master' into hazeZone
2017-10-04 23:03:59 -07:00
Nissim Hadar
ad03301df8
WIP - implementing range+altitude mode.
2017-10-04 23:03:21 -07:00
Nissim Hadar
8b72e3044a
WIP - implementing range+altitude mode.
2017-10-04 22:26:53 -07:00
Nissim Hadar
6dcd8b7b57
Haze Range works.
2017-10-04 21:47:20 -07:00
Zach Fox
27d6cc2657
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-04 15:49:33 -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
Nissim Hadar
eef778a463
Replaced uint8_t with uint32_t in server packet.
2017-10-04 13:47:13 -07:00
Zach Fox
cf7c1934f8
Progress?
2017-10-04 13:16:33 -07:00
Nissim Hadar
62cfaaaf38
Sam's corrections.
2017-10-04 12:56:14 -07:00
Zach Fox
ab08dc6bd6
Progress?
2017-10-04 12:33:58 -07:00
Nissim Hadar
2ce86ebfae
WIP - working on byte order in server messages.
2017-10-04 11:56:35 -07:00
Nissim Hadar
3f677ec7c9
WIP - working on byte order in server messages.
2017-10-04 10:23:59 -07:00
Zach Fox
2cdd5c29f3
Uncertified rez rights
2017-10-04 09:58:29 -07:00
Nissim Hadar
8c430d36fa
WIP - working on byte order in server messages.
2017-10-03 21:59:40 -07:00
Nissim Hadar
76f843c741
WIP - working on byte order in server messages.
2017-10-03 21:46:50 -07:00
Nissim Hadar
75509b9ecb
WIP - working on byte order in server messages.
2017-10-03 21:39:41 -07:00
Nissim Hadar
4019c3bc10
WIP - working on byte order in server messages.
2017-10-03 21:36:20 -07:00
Nissim Hadar
3505fedc00
WIP - working on byte order in server messages.
2017-10-03 21:34:21 -07:00
Nissim Hadar
16a10a8a0c
WIP - working on byte order in server messages.
2017-10-03 20:57:56 -07:00
Nissim Hadar
89381e7c8e
Moved _hazeProperties.getProperties(properties); into the ReadLock
2017-10-03 19:43:35 -07:00
Nissim Hadar
c1f4735468
Replaced HazeMode with uint8_t in transport protocol.
2017-10-03 19:39:34 -07:00
Brad Hefta-Gaub
a1979a2600
Merge branch 'master' into RC-56
2017-10-03 18:16:21 -07:00
Nissim Hadar
d4acb00aa5
Merge branch 'master' into hazeZone
2017-10-03 17:44:31 -07:00
Zach Fox
ed40e41b94
Potential progress? Not totally sure
2017-10-03 16:18:29 -07:00
SamGondelman
fc6e5df2cb
fix text/web registration point usage
2017-10-03 15:02:21 -07:00
SamGondelman
c9d2d40e1e
possibly fix registration offset issue
2017-10-03 14:44:11 -07:00
Zach Fox
9c4b02c659
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-03 14:37:07 -07:00
Zach Fox
b7e50c5b73
First steps
2017-10-03 14:36:22 -07:00
Seth Alves
6040c4a3e8
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-03 14:06:01 -07:00
Seth Alves
05e173a1d0
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-03 13:11:03 -07:00
Anthony J. Thibault
1389c2e31d
Bug fix for deadlock in ModelEntityItem::setCompundShapeURL()
...
The fix was to prevent ModelEntityItem::hasCompoundShapeURL() from taking
a readlock on the entity, instead a finer grained lock (ThreadSafeValueCache)
is made around the _compoundShapeURL QString.
2017-10-03 12:15:23 -07:00
Nissim Hadar
86c497a12f
Merge branch 'master' into hazeZone
...
# Conflicts:
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
2017-10-03 10:34:33 -07:00
Daniela
2b18296cfd
Merge remote-tracking branch 'upstream/master'
...
# the commit.
2017-10-03 15:26:22 +01:00
Daniela
1d6985a9eb
Fix Animation hue bug.
2017-10-03 15:25:54 +01:00
Nissim Hadar
93a2776cb5
Changes for debug
2017-10-02 18:13:23 -07:00
Seth Alves
e7fa8131ea
make json importer understand AVATAR_SELF_ID
2017-10-02 16:44:03 -07:00
Howard Stearns
9b0ebf0e07
doh! string not boolean
2017-10-02 16:18:28 -07:00
Seth Alves
ca11d19b3e
allow importing of avatar entities from json
2017-10-02 16:06:44 -07:00
Howard Stearns
0b7af66016
more linux warnings
2017-10-02 15:38:59 -07:00
Howard Stearns
136381adb9
fatal compiler warning on mac/linux
2017-10-02 13:56:15 -07:00
Howard Stearns
7b0321c1e1
guess for mac/linux openssl
2017-10-02 12:30:25 -07:00
Howard Stearns
5c5f052bc2
explicit free, and remove header that isn't available on mac/linux
2017-10-02 10:28:47 -07:00
Howard Stearns
0f6884dd80
fix mac/linux compiler error
2017-10-02 09:44:10 -07:00
Nissim Hadar
bdd469cec4
Integrated haze shader into this branch.
2017-10-01 21:52:34 -07:00
Nissim Hadar
951ce247a2
Working on adding zone to haze.
2017-09-29 17:36:14 -07:00
Howard Stearns
73c8da99dc
Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties
2017-09-29 16:46:43 -07:00
Howard Stearns
58255abe12
animation url and computing certificateID
2017-09-29 16:32:25 -07:00
Nissim Hadar
2e1919eba5
Merge branch 'master' into hazeZone
2017-09-29 15:16:46 -07:00
Nissim Hadar
f26345a3f0
Working on adding zone to haze.
2017-09-29 15:15:49 -07:00
Zach Fox
96b6a2f013
Fix entity add after incomplete rezCertified implementation
...
(cherry picked from commit 0f66fb41fd
2017-09-29 13:27:21 -07:00
Andrew Meadows
8134e2b7f9
fix const violation
2017-09-29 11:34:36 -07:00
Andrew Meadows
32910e6f40
use [this] for lambda capture list
2017-09-29 11:34:35 -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
5dcd6bc496
namechange: apparentAngle --> angularDiameter
2017-09-29 11:34:35 -07:00
Andrew Meadows
1c30f7424e
remove cruft and add comments
2017-09-29 11:34:35 -07:00
Andrew Meadows
49e11d2173
fix Differential scan logic for LOD culling
2017-09-29 11:34:35 -07:00
SamGondelman
f2de03bc38
small fixes and LOD cull children instead of parent
2017-09-29 11:34:35 -07:00
Andrew Meadows
355a59edb1
fix missing entities in differential traversal
2017-09-29 11:34:35 -07:00
SamGondelman
defed80be7
edited entities are not repeatedly sent if out of view, handles cases where usesViewFrustum changes
2017-09-29 11:34:34 -07:00
SamGondelman
7938e301e7
full scene traversal and json filters
2017-09-29 11:34:34 -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
b6818c4369
first-pass sending entities from _sendQueue
2017-09-29 11:34:34 -07:00
Andrew Meadows
cf2e500ec4
remove unnecessary const qualifiers
2017-09-29 11:34:33 -07:00
SamGondelman
bb5368eb55
use correct rootSizeScale
2017-09-29 11:34:33 -07:00
Andrew Meadows
7597088c7c
simpler logic flow
2017-09-29 11:34:33 -07:00
Andrew Meadows
3e50d01734
more correct handling of LOD
2017-09-29 11:34:33 -07:00
Andrew Meadows
8b7c43f3b1
add LOD culling in DiffTraversal
2017-09-29 11:34:33 -07:00
Andrew Meadows
0758b60afc
abstract DiffTraversal out of EntityTreeSendThread
2017-09-29 11:34:33 -07:00
Andrew Meadows
8d535f9c5a
remove bump to changeFromRemote for server case (revert)
2017-09-29 11:34:33 -07:00
Andrew Meadows
3665a3fbee
libraries/entities/src/EntityTreeElement.cpp
2017-09-29 11:34:33 -07:00
Andrew Meadows
dd1febba2f
add missing bump to element changed content
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
2b31a746e3
add content timestamp for EntityTreeElement
2017-09-29 11:34:32 -07:00
Andrew Meadows
ca470d67b4
fix indentation
2017-09-29 11:34:32 -07:00
Andrew Meadows
7edd99ca0b
add basics for send queue and tree traversal
2017-09-29 11:34:32 -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
Andrew Meadows
55e9ced5c3
cleanup MovingEntitiesOperator
2017-09-29 11:34:32 -07:00
Andrew Meadows
4fa60f5108
cleanup AddEntityOperator
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
Howard Stearns
d1350a03c2
working checkpoint, but with a lot of debug/development stuff
2017-09-28 17:06:07 -07:00
Zach Fox
0f66fb41fd
Fix entity add after incomplete rezCertified implementation
2017-09-28 16:07:15 -07:00
Nissim Hadar
9d0cf16c20
Fixed Ubuntu warnings.
2017-09-27 19:33:04 -07:00
Nissim Hadar
4d8a1db895
Merge branch 'master' into hazeZone
...
# Conflicts:
# libraries/entities-renderer/src/RenderableModelEntityItem.cpp
2017-09-27 17:50:51 -07:00
Nissim Hadar
55fafeacb1
Implemented HazePropertyGroup and added the haze shader. Shader does not work yet!
2017-09-27 17:43:09 -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
