Commit graph

3948 commits

Author SHA1 Message Date
Clément Brisset
f2a3907e3d
Merge pull request #13357 from SimonWalton-HiFi/memcheck-fixes
Entity Script Server memory leak when taking down EntityTree
2018-07-05 15:30:45 -07:00
John Conklin II
3f975cfa84
Merge pull request #13506 from sabrina-shanman/fix-osx-crash-on-exit
Fix Mac Crashes On Shutdown
2018-07-02 15:27:26 -07:00
Stephen Birarda
dce9cb0404 fix case where TCP Vegas would not re-send lost ACK 2018-06-29 15:42:59 -07:00
sabrina-shanman
e4377a6c95 Prevent type conversion in ~ResourceManager constant 2018-06-29 10:55:01 -07:00
Stephen Birarda
b5254f1ea5 cleanup race on deleteLater after callback processed 2018-06-27 11:41:37 -07:00
Stephen Birarda
70cab27c1a add a safeguard deleteLater for QNetworkReply 2018-06-27 11:41:37 -07:00
Stephen Birarda
24f92502b5 add warning output of error from AccountManager 2018-06-27 11:41:37 -07:00
Stephen Birarda
e90ea82ef5 move AddressManager to NodeList thread, fix AccountManager invokes 2018-06-27 11:41:37 -07:00
Seth Alves
dcebbada28 fix various crashes-upon-exits 2018-06-26 10:08:44 -07:00
Sam Gondelman
850e2d5cf5
Merge branch 'master' into particleFix 2018-06-21 17:32:24 -07:00
Sam Gondelman
afc64a18a1
Merge pull request #13362 from SamGondelman/modelTextures
Fix transparent textures rendering wrong sometimes
2018-06-21 14:23:49 -07:00
Andrew Meadows
6d422e4678 Merge 'master' into 'workload' 2018-06-18 10:30:13 -07:00
SamGondelman
9ea65950d5 particles: threadsafe, cleanup, rework initialized logic 2018-06-15 15:45:06 -07:00
Sam Gondelman
225a98129a
Merge branch 'master' into modelTextures 2018-06-15 15:09:32 -07:00
Andrew Meadows
be0899c41d remove unnecessary writes to appease Xcode's static analyzer 2018-06-15 11:44:22 -07:00
John Conklin II
d66ed07061
Merge pull request #12901 from kitely/fix-banning-users
Fixed banning users
2018-06-14 09:33:28 -07:00
SamGondelman
5ac7ced306 cleanup renderable model entity item, fix crash on reload, fix different transparent bug 2018-06-13 17:14:52 -07:00
John Conklin II
0ba97fa83b
Merge pull request #13338 from amantley/scriptedBlendshapesFaceFlags
Scripted Blendshapes and Procedural Face Movement Flags
2018-06-13 10:32:59 -07:00
Anthony J. Thibault
042f902d2e Merge branch 'master' into scriptedBlendshapesFaceFlags 2018-06-11 17:13:30 -07:00
Stephen Birarda
b41c80f31e
Merge pull request #13221 from huffman/feat/oven-cli-texture-options
Add more texture options to Oven CLI
2018-06-11 12:01:56 -07:00
John Conklin II
6794fedf5b
Merge pull request #13337 from ctrlaltdavid/21887
Don't save user location if not connected to domain
2018-06-11 11:09:57 -07:00
Simon Walton
740ccd3495 Merge branch 'master' into memcheck-fixes 2018-06-08 14:21:57 -07:00
Sam Gondelman
4e649d2498
Merge pull request #13276 from SamGondelman/resource
Protect against null resource
2018-06-08 11:35:04 -07:00
Simon Walton
131a57248b NLPacket local ID could be used uninitialized (according to valgrind) 2018-06-08 10:27:03 -07:00
David Rowe
8e1e93abb0 Don't save user location if not connected to domain 2018-06-08 15:04:01 +12:00
amantley
3f58202667 updated the AvatarMixerPacketVersion to ProceduralFaceMovementFlagsAndBlendshapes in PacketHeaders.cpp 2018-06-07 17:41:12 -07:00
David Back
afd4b5a8ab update default avatar to fix non-flat feet 2018-06-06 11:48:04 -07:00
Andrew Meadows
4329ea5240 Merge master' into 'workload' 2018-06-04 16:11:25 -07:00
Andrew Meadows
8eedf83f70 increment packet version for workload logic 2018-06-04 15:23:31 -07:00
John Conklin II
611159f65f
Merge pull request #13188 from SimonWalton-HiFi/placename-crash
Initialize Qt's use of openssl lib before calling RSA code
2018-05-31 14:34:24 -07:00
SamGondelman
1470170296 lock weak resource 2018-05-31 11:54:37 -07:00
John Conklin II
6095a3b319
Merge pull request #13082 from jherico/feature/shader_cache
Shader load time performance optimiziations
2018-05-30 13:55:34 -07:00
Simon Walton
a3324c5616 Remove empty destructor 2018-05-30 13:52:26 -07:00
Simon Walton
8fb5d1b92d Make RSA key-pair class a Runnable that's owned by a threadpool 2018-05-30 13:41:08 -07:00
Simon Walton
66d39667e1 AccountManager destructor waits for any RSA key thread 2018-05-29 17:04:37 -07:00
Anthony Thibault
eae5215d94
Merge pull request #13206 from ctrlaltdavid/21872-c
JSDoc fixes
2018-05-24 16:44:55 -07:00
Bradley Austin Davis
3beb77694f Cached shader binaries and uniform data for shaders 2018-05-24 12:42:33 -07:00
Andrew Meadows
885c7bc97d bump protocol for extra byte in collisionMask 2018-05-24 11:28:52 -07:00
John Conklin II
3e665fb616
Merge pull request #13179 from dback2/cloneables
Server-Managed Cloneables + Cloneable Properties
2018-05-23 12:40:27 -07:00
Ryan Huffman
59ca2f9977 Fix ResourceManager not properly shutting down thread 2018-05-23 10:51:12 -07:00
Liv Erickson
56493346c1 fix permissions check 2018-05-22 15:41:48 -07:00
Liv Erickson
0ebd13b3e6 cannot edit origin from client / fix ICE issue 2018-05-22 13:17:23 -07:00
David Rowe
fa54461788 Update some recent JSDoc additions 2018-05-22 08:52:39 +12:00
John Conklin II
168edb1cde
Merge pull request #13192 from druiz17/fix-spaming-set-host
fix case sensitive comparison in AddressManager::setHost
2018-05-21 11:16:18 -07:00
David Rowe
e44e7ca35f Fix up Resource and resource cache APIs' JSDoc 2018-05-21 11:57:16 +12:00
David Rowe
6d4f704279 Regularize some JSDoc usage 2018-05-21 09:32:10 +12:00
Dante Ruiz
027d1ed50b making requested changes 2018-05-18 11:07:11 -07:00
Liv Erickson
de05388ebf Merge branch 'master' of github.com:highfidelity/hifi into clone-server 2018-05-18 10:42:26 -07:00
Simon Walton
545ada0abb Connect signal to keyGen thread for it to quit when owner destructed 2018-05-18 10:28:52 -07:00
Dante Ruiz
48404d811c fix case sensitive comparison 2018-05-17 16:34:52 -07:00