Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 06:56:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68372 commits 74 branches 59 tags 1.2 GiB
Commit graph

3918 commits

Author SHA1 Message Date
Sam Gondelman
4e649d2498
Merge pull request #13276 from SamGondelman/resource 
Protect against null resource
 2018-06-08 11:35:04 -07:00
David Back
afd4b5a8ab update default avatar to fix non-flat feet 2018-06-06 11:48:04 -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
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
Simon Walton
fe92cf0c47 Move fix up a level to bit a little more general 2018-05-17 13:34:38 -07:00
David Rowe
2669a39e0f Deprecate Agent API items that shouldn't be exposed in the API 2018-05-18 07:32:25 +12:00
Simon Walton
86a8672c5a Initialize Qt/openssl before RSA keygen to prevent collision 2018-05-17 10:17:22 -07:00
David Rowe
6db4dd8673 Merge branch 'master' into 21872-b 
# Conflicts:
#	interface/src/ui/Snapshot.h
 2018-05-17 20:11:14 +12:00
David Back
f8fc7bedd7 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-15 17:31:43 -07:00
John Conklin II
aca261af3e
Merge pull request #12939 from Cristo86/android_places_goto 
Android Search & Go To
 2018-05-15 16:43:38 -07:00
David Rowe
1ca6bd2f0b location getter/setter JSDoc 2018-05-15 17:37:45 +12:00
David Rowe
8ea3a733ca Resource API JSDoc stub 2018-05-15 10:32:36 +12:00
David Rowe
b445371ad8 Resources API JSDoc stubs 2018-05-12 16:24:34 +12:00
David Back
3031bb05be Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-11 17:54:20 -07:00
David Rowe
cf9053c873 Merge branch 'master' into 21872-b 2018-05-12 10:50:31 +12:00
Gabriel Calero
9b5da09dc7 Fix connection issue syncing two AccountManagers 2018-05-11 18:08:56 -03:00
Stephen Birarda
4f7ce7345d
Merge pull request #13045 from SimonWalton-HiFi/domain-checkins-tweak 
Reset pending domain check-in count more frequently
 2018-05-11 13:31:03 -07:00
David Back
65bda27ae3 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-11 13:03:27 -07:00
David Rowe
3891ebe703 Agent API JSDoc stubs 2018-05-11 20:20:07 +12:00
John Conklin II
bc9e403ab9
Merge pull request #13005 from SimonWalton-HiFi/hmac-auth2 
Use HMAC authentication for network packets - 2nd attempt
 2018-05-10 14:38:18 -07:00
David Back
3241c18271 first pass cloneables WIP 2018-05-09 18:10:40 -07:00
Simon Walton
9b6225db40 Bump default packet version 20 -> 21 2018-05-09 14:29:10 -07:00
Simon Walton
0349847857 Add comment re threading issues 2018-05-08 17:46:25 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Stephen Birarda
ec354620db
Merge pull request #12956 from huffman/feat/client-texture-selection-baking 
Add support for client texture selection
 2018-05-04 16:14:43 -07:00
Clément Brisset
39e2a78b1a
Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist 
Multifrustum queries punchlist
 2018-05-04 15:50:44 -07:00
Simon Walton
00d2f9494b Change HMACAuth::calculateHash to just call existing methods 2018-05-04 15:07:20 -07:00
Ryan Huffman
e1d218bb57 Bump asset packet version for texture meta 2018-05-04 11:25:11 -07:00
Stephen Birarda
8ded6c76ec
Merge pull request #13069 from ctrlaltdavid/21729-a 
Remove deprecated location.domainId from API
 2018-05-04 10:35:41 -07:00
Stephen Birarda
8c6d83ad67
Merge pull request #13023 from SimonWalton-HiFi/connection-stats-dump 
Add a utility function to dump ConnectionStats
 2018-05-04 10:19:25 -07:00
Clement
d7e9fdc6a4 Bump Avatar Query packet version 2018-05-03 18:19:29 -07:00
Clement
67c119cd2e Send Entity Query via conical frustums 2018-05-03 18:19:29 -07:00