samcake
|
6639287418
|
Merging with master
|
2017-10-02 17:03:09 -07:00 |
|
Andrew Meadows
|
0fc6bf1e89
|
Merge pull request #11471 from Atlante45/feat/auto-bake
Asset Browser tweaks
|
2017-10-02 11:29:36 -07:00 |
|
Sam Gateau
|
68046ae4e3
|
Merge pull request #11491 from jherico/dev/disable_watchdog
Disable watchdog with environment variable
|
2017-10-02 10:19:32 -07:00 |
|
Zach Fox
|
2783293d24
|
Merge pull request #11490 from vladest/fix_walletsetup_focus
Remove mouse area for text fields. use activeFocusOnPress property in…
|
2017-10-02 08:38:04 -07:00 |
|
Seth Alves
|
0d010d0cf4
|
Merge pull request #11493 from hyperlogic/bug-fix/oculus-controller-rendering
Bug fix for offset of animated parts of oculus touch controller display
|
2017-10-01 16:54:05 -07:00 |
|
Sam Gateau
|
59225ae8ac
|
Merge pull request #11497 from SamGondelman/modelOverlays
Fix ModelOverlay visible change
|
2017-10-01 12:56:27 -07:00 |
|
vladest
|
9a00468ea9
|
semicolons, yes
|
2017-10-01 19:21:30 +02:00 |
|
vladest
|
feafd441b1
|
Make sure keyboard will be rised after lowering on another click
|
2017-10-01 18:54:07 +02:00 |
|
vladest
|
c3bc67b72d
|
Merge branch 'master' into fix_walletsetup_focus
|
2017-10-01 18:24:38 +02:00 |
|
SamGondelman
|
0bb27a7165
|
fix modeloverlay visible change
|
2017-09-29 17:48:59 -07:00 |
|
Anthony J. Thibault
|
9273e02497
|
Bug fix for offset of animated parts of oculus touch controller display
Ensure position/rotations are updated with a consistent scale and
are animated correctly as the controller values change.
|
2017-09-29 14:01:50 -07:00 |
|
Sam Gateau
|
fb5fd346ff
|
Merge pull request #11492 from SamGondelman/tPose
Fix getting stuck in T-Pose on avatar switch
|
2017-09-29 13:37:31 -07:00 |
|
Sam Gateau
|
332fb86a9f
|
Merge pull request #11141 from AndrewMeadows/prioritized-entity-streaming
entity-server uses differential Octree traversal and priority-queued EntityItems
|
2017-09-29 13:34:58 -07:00 |
|
vladest
|
7f6773b1f4
|
Added semicolons
|
2017-09-29 21:12:21 +02:00 |
|
Andrew Meadows
|
ad9a239b45
|
remove unused cruft
|
2017-09-29 11:34:36 -07:00 |
|
Andrew Meadows
|
8134e2b7f9
|
fix const violation
|
2017-09-29 11:34:36 -07:00 |
|
Andrew Meadows
|
86cbea73c8
|
less magic
|
2017-09-29 11:34:36 -07:00 |
|
Andrew Meadows
|
01304de8c2
|
indent switch statement, use const ref
|
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
|
0c934e863b
|
clarify some comments
|
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 |
|
SamGondelman
|
3ae41b9b75
|
cleanup client and stats string
|
2017-09-29 11:34:35 -07:00 |
|
SamGondelman
|
f7af581c71
|
track traversal time, rename entity server stat
|
2017-09-29 11:34:35 -07:00 |
|
Andrew Meadows
|
a56c076149
|
fix bad resolution during rebase
|
2017-09-29 11:34:35 -07:00 |
|
Andrew Meadows
|
99265a5758
|
remove extra parens
|
2017-09-29 11:34:35 -07:00 |
|
Andrew Meadows
|
25d250898b
|
remove old debug info
|
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
|
624d0c12a2
|
minor cleanup
|
2017-09-29 11:34:35 -07:00 |
|
Andrew Meadows
|
b1b7764056
|
use 20 degrees of OVERSEND
|
2017-09-29 11:34:35 -07:00 |
|
SamGondelman
|
c39ac93fc8
|
fix isVerySimilar
|
2017-09-29 11:34:35 -07:00 |
|
SamGondelman
|
cbd20f89dd
|
separate elementBag logic from EntityTreeSendThread
|
2017-09-29 11:34:35 -07:00 |
|
SamGondelman
|
bf1065b56e
|
track encode stats
|
2017-09-29 11:34:35 -07:00 |
|
Andrew Meadows
|
a0f95ca5bd
|
swap order of evaluation for minor theoretical speedup
|
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 |
|
Andrew Meadows
|
d55d45f6aa
|
check radius in ViewFrustum::isVerySimilar()
|
2017-09-29 11:34:35 -07:00 |
|
Andrew Meadows
|
a55661e1ff
|
remove ViewFrustum::calculateProjection()
|
2017-09-29 11:34:35 -07:00 |
|
Andrew Meadows
|
3433c5c414
|
remove redundant boolean logic
|
2017-09-29 11:34:35 -07:00 |
|
Andrew Meadows
|
fb3e74398f
|
don't invalidate viewFrustum sent to server
|
2017-09-29 11:34:35 -07:00 |
|
Andrew Meadows
|
a22e577100
|
zero out OVERSEND hack
|
2017-09-29 11:34:35 -07:00 |
|
Andrew Meadows
|
d061627a1d
|
reasonable values for iitial OctreeQueryNode view
make sure newViewFrustum is fully initialized before using it
|
2017-09-29 11:34:34 -07:00 |
|
Andrew Meadows
|
0597970bb4
|
faster, more correct ViewFrustum::isVerySimilar()
remove OVERSEND hack
add ViewFrustum::calculateProjection() method used by OctreeQueryNode
|
2017-09-29 11:34:34 -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 |
|
SamGondelman
|
247764b679
|
add total entity packets in stat (kbps)
|
2017-09-29 11:34:34 -07:00 |
|