Ryan Huffman
94069c964d
Remove unused variable and log message in OctreePersistThread
2018-06-11 08:37:19 -07:00
David Rowe
11178d80f7
Fix avatar attachment spinbox min/max values
2018-06-11 16:24:45 +12:00
David Rowe
0161015746
Fix setting avatar attachment joint
2018-06-11 15:31:42 +12:00
Brad Davis
380137a660
Fix particle entity shader
2018-06-10 12:15:00 -07:00
Ken Cooke
16eefe7f14
Ensure self-sufficient headers
2018-06-09 19:44:12 -07:00
howard-stearns
020d622302
don't depend on matching handlers with overlapping requests
2018-06-09 17:34:49 -07:00
howard-stearns
421edbfa1e
PSFListModel isa ListModel instead of hasa
2018-06-09 16:03:45 -07:00
howard-stearns
d2cf042a88
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
2018-06-09 14:09:42 -07:00
David Rowe
9338c217cd
Fix memory leak when reloading scripts
2018-06-09 16:58:49 +12:00
Simon Walton
e3c8895c89
Take down DependencyManager<AssignmentParentFinder> upon restart
2018-06-08 18:17:03 -07:00
SamGondelman
2dae613612
remove conserveResources
2018-06-08 17:58:06 -07:00
Anthony Thibault
044d142635
Merge pull request #13133 from amantley/nativeCGCode
...
Center of Gravity Leaning
2018-06-08 17:53:55 -07:00
Stephen Birarda
7a9d77d0d9
force git abbreviated SHA to have length of 7
2018-06-08 17:21:09 -07:00
Stephen Birarda
8dd268addb
handle semantic version updates in sandbox
2018-06-08 17:21:06 -07:00
Stephen Birarda
9506e7edbe
check for update for dev-builds, handle semantic version
2018-06-08 17:20:57 -07:00
Cristian Luis Duarte
26a9364efd
Android - Clean up enterBackground logs
2018-06-08 20:59:38 -03:00
howard-stearns
d68415c47c
code feedback
2018-06-08 16:47:06 -07:00
David Rowe
54b96cd602
Fix incomplete transition from far-grabbing entity to grabbing tablet
2018-06-09 11:32:10 +12:00
Ryan Huffman
9afc9d19c5
Cleanup comments and process structure in OctreePersistThread
2018-06-08 16:22:11 -07:00
Ryan Huffman
d0af06939f
Update persistInterval to use std::chrono in OctreePersistThread
2018-06-08 16:22:11 -07:00
Ryan Huffman
8f4f3db9ce
Add octree backup file cleanup
2018-06-08 16:22:11 -07:00
Ryan Huffman
d476146a56
Move OctreePersistThread off GenericThread and add octree negotiation
2018-06-08 16:22:11 -07:00
Anthony J. Thibault
c3da4e74de
Code review feedback
2018-06-08 16:22:00 -07:00
Ryan Huffman
2143bae100
Remove unused entity server backups
...
The domain server now handles entity backups so this code is no longer
used.
This also fixes a bug where, if the entity server went down while
writing the persist file, it would leave a lock file behind. When
starting up the next time it would try to recover from the last backup.
Because the entity server no longer gets any backup rules, and the way
it searches for backups, it would end up finding the lock file and
treating it as the most recent backup. This meant that the
models.json.gz file was replaced with an empty file.
2018-06-08 16:17:30 -07:00
Seth Alves
a2399ea1f6
keep small masses from introducing NaN into bullet's calculations
2018-06-08 16:07:01 -07:00
David Rowe
dc46c2077d
Fix function name
2018-06-09 11:01:18 +12:00
howard-stearns
f0d486a6a5
remove the unused client-side stuff from model
2018-06-08 15:48:39 -07:00
howard-stearns
d9daa3495a
remove comments / dead code
2018-06-08 15:36:10 -07:00
howard-stearns
ce322a4794
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
2018-06-08 15:33:07 -07:00
John Conklin II
bc3edbc7fc
Merge pull request #13333 from zfox23/MS15681_securityImageProviderCrash
...
Fix MS15673: Ensure offscreenUI exists before updating SecurityImageProvider
2018-06-08 15:14:32 -07:00
howard-stearns
210cb23de6
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
2018-06-08 14:54:15 -07:00
Stephen Birarda
112abc9d7e
Merge pull request #13148 from birarda/feat/new-version-numbers
...
add SHA to PR/master version, add build_type (stable/master/pr/dev)
2018-06-08 14:44:22 -07:00
Gabriel
1ec03475dd
Trying to fix android build
...
Trying a new breakpad.zip version
2018-06-08 18:31:10 -03:00
howard-stearns
36a0adf553
strip snapshot stacking code - we'll do it on server or not at all
2018-06-08 14:24:24 -07:00
Simon Walton
740ccd3495
Merge branch 'master' into memcheck-fixes
2018-06-08 14:21:57 -07:00
Zach Fox
95faad23e2
Merge pull request #13329 from zfox23/MS15664_15663_fixWalletAuthStep
...
Fix MS15663/15664: Don't set Wallet Status to 'ready' too early
2018-06-08 14:20:21 -07:00
Zach Fox
812c28ef48
Fix MS13761: Change the move conditions under which overlays hide
2018-06-08 14:15:42 -07:00
SamGondelman
310e2ee063
attempt to fix first time model overlay loading
2018-06-08 13:56:21 -07:00
Dante Ruiz
5843c24309
adding perfectly straight model and adjusting ovelray
2018-06-08 13:56:00 -07:00
Sam Gondelman
c7f05d96b4
Merge pull request #13309 from Cristo86/android_crashes_domains
...
Android - Double Click crash and dev-mobile crash with Pixel XL
2018-06-08 13:36:53 -07:00
Ryan Huffman
3e65e0b0cd
Update processImage to not compress by default
2018-06-08 13:21:47 -07:00
howard-stearns
3ade31bdf6
always show edition
2018-06-08 12:57:40 -07:00
Ryan Huffman
24182d3451
Remove compression variables & functions in image.cpp
2018-06-08 12:14:52 -07:00
howard-stearns
dd0f3c64ec
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
2018-06-08 12:12:21 -07:00
Stephen Birarda
e82edb8b66
add domain packet dissector, improve entity dissector
2018-06-08 11:58:09 -07:00
Dante Ruiz
dfea4a0f7c
fixing rotation
2018-06-08 11:50:52 -07:00
Ryan Huffman
faafd26d2a
Add uncompressed KTX files to baked texture output
2018-06-08 11:39:47 -07:00
Zach Fox
9f0864944c
Fix Friending in Connections tab - READ FIXME
2018-06-08 11:37:02 -07:00
Sam Gondelman
4e649d2498
Merge pull request #13276 from SamGondelman/resource
...
Protect against null resource
2018-06-08 11:35:04 -07:00
SamGondelman
a7d75b121f
fix avatarHash crash
2018-06-08 11:20:41 -07:00
