Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-15 08:32:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
75218 commits 75 branches 59 tags 1.2 GiB
Commit graph

4263 commits

Author SHA1 Message Date
Sam Gondelman
67662df760
Merge branch 'master' into scriptvec3 2018-10-08 12:59:34 -07:00
Simon Walton
12db6a4d10 Limit number of domain-checkin duplicates 2018-10-08 10:58:46 -07:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged 
Merged interstitial page/redirect domain improvements
 2018-10-08 10:32:29 -07:00
Stephen Birarda
88f76ac760 suppress traits larger than INT16_MAX bytes 2018-10-05 09:46:55 -07:00
Dante Ruiz
651f37aceb Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged 2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d fix loading progress 2018-10-04 15:01:16 -07:00
SamGondelman
4024f2a180 fix various resourcecache bugs 2018-10-04 11:29:22 -07:00
Wayne Chen
0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-04 08:59:26 -07:00
Wayne Chen
d6af09ca62 ignoring entities in interstitial/saving address on 404 error 2018-10-03 17:40:42 -07:00
Sam Gondelman
4e96c3297b
Merge branch 'master' into scriptvec3 2018-10-03 17:14:15 -07:00
John Conklin II
4d7b2bb429
Merge pull request #14113 from Atlante45/feat/audio-mixer-throttle-equation 
Audio Mixer Scaling
 2018-10-03 13:17:28 -07:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3 2018-10-02 08:58:04 -07:00
Seth Alves
834699fa12 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
John Conklin II
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f 
Mini tablet in palm
 2018-10-01 16:56:36 -07:00
Wayne Chen
5f05be554f check for hard refusal to 404 2018-10-01 10:06:13 -07:00
Wayne Chen
eab57633a5 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-01 09:21:26 -07:00
Stephen Birarda
371de312cc enumerate a vector of mixable streams for each listener 2018-09-28 14:54:50 -07:00
Stephen Birarda
aed79b3b17 use a vector for ignored node IDs 2018-09-28 14:54:49 -07:00
David Rowe
2456fd0e99 Merge branch 'master' into M17428-f 2018-09-28 08:41:57 +12:00
Roxanne Skelly
af6db93b70 Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-27 12:05:21 -07:00
Wayne Chen
9079c8a6b7 adding log for redirect cases 2018-09-27 10:42:21 -07:00
Wayne Chen
db41a1c16b error state signal for 404/interstitial 2018-09-26 13:48:15 -07:00
Wayne Chen
de5614500a Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialImprovements 2018-09-25 21:52:01 -07:00
Wayne Chen
26b6967ba6 adding overlays to redirect domain 2018-09-25 18:16:18 -07:00
Wayne Chen
69d5299362 patching fix for previous commits 2018-09-24 15:22:46 -07:00
Wayne Chen
ac5814a1f8 Merge branch 'master' of https://github.com/highfidelity/hifi into toggle404Redirect 2018-09-24 13:57:23 -07:00
Roxanne Skelly
61cbee72af Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-21 12:31:36 -07:00
Wayne Chen
7e796f7e7f committing requested changes 2018-09-19 14:26:30 -07:00
Roxanne Skelly
d5f756c79d Tray Notifier Checkpoint 
* Add app launch
* Add authentication for auth-related calls
* Refactor notifications code
 2018-09-19 12:40:15 -07:00
Wayne Chen
01594d7a52 fixing settings check in domain handler 2018-09-19 10:17:14 -07:00
Wayne Chen
795580f4e1 adding 404 redirect toggle with interstitial 2018-09-19 09:55:15 -07:00
Wayne Chen
be5f498c2f reversion 2018-09-18 15:47:54 -07:00
Wayne Chen
48e4b38312 reversion 2018-09-18 15:28:15 -07:00
Wayne Chen
8274f4cb4c reverting domain handler change 2018-09-18 15:26:12 -07:00
Wayne Chen
f82063ed46 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-09-18 09:17:28 -07:00
Wayne Chen
0afea6fbd1 removing double login fail signal 2018-09-14 11:08:53 -07:00
SamGondelman
c522d1bc93 merge with master 2018-09-14 00:57:13 -07:00
Wayne Chen
fd1e64e4e6
Revert "Fix login fail twice call" 2018-09-13 17:01:59 -07:00
John Conklin II
aef3ed3e01
Merge pull request #13989 from wayne-chen/fixLoginFailTwiceCall 
Fix login fail twice call
 2018-09-13 16:59:00 -07:00
Wayne Chen
0fc1cc9af8 Revert "adding fix for getting DomainHandler into error state" 
This reverts commit 49f26d968a.
 2018-09-13 15:39:18 -07:00
David Rowe
bbfb2b1374 Merge branch 'master' into M17428-f 2018-09-14 10:36:49 +12:00
John Conklin II
0bf064c451
Merge pull request #13984 from wayne-chen/fixLoopingConnectionMonitor 
Fixing Error State for Timeout/localhost Redirection
 2018-09-13 15:19:55 -07:00
Wayne Chen
647c4e1694 adding true fix for localhost timeouts 2018-09-13 13:51:42 -07:00
John Conklin II
b675e6cc6b
Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling 
Performance improvements for Avatar Mixer
 2018-09-13 13:43:18 -07:00
Wayne Chen
873859455a Revert "adding fix for getting DomainHandler into error state" 
This reverts commit 3fe3f674d0.
 2018-09-13 11:53:56 -07:00
Wayne Chen
380f24b37f adding fix, changing window title 2018-09-13 11:53:21 -07:00
Wayne Chen
96ab7d417e removing connection for on login failed 2018-09-13 10:35:43 -07:00
Wayne Chen
ad233677b8 adding changes for overriding host change for error state 2018-09-12 18:31:01 -07:00
Wayne Chen
3fe3f674d0 adding fix for getting DomainHandler into error state 2018-09-12 15:45:06 -07:00
Wayne Chen
49f26d968a adding fix for getting DomainHandler into error state 2018-09-12 15:42:55 -07:00
John Conklin II
f67deb9f65
Merge pull request #13938 from wayne-chen/interstitalMerged 
Interstitial Page with 404 Redirect
 2018-09-12 08:39:52 -07:00
Wayne Chen
20cab87a17 Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-11 18:53:06 -07:00
Wayne Chen
a7321f950a pushing requested changes - adding timeout refusal 2018-09-11 18:32:17 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged 2018-09-11 17:17:33 -07:00
Wayne Chen
8bca1bc5fe
reverting, oversight 2018-09-11 17:09:21 -07:00
Wayne Chen
a85a7a6119
adding back goToLastAddress back 2018-09-11 17:07:49 -07:00
Wayne Chen
490cdc901e
Merge pull request #3 from danteruiz/interstitalMerged 
making requested changes and fixing compile issue for jenkins
 2018-09-11 16:30:13 -07:00
Wayne Chen
0f25756908 expose domain connection error to Window 2018-09-11 16:29:39 -07:00
Dante Ruiz
c97d646083 making requested changes and fixing compile issue for jenkins 2018-09-11 15:57:44 -07:00
Wayne Chen
c194c236f1 adding inlines 2018-09-10 17:10:13 -07:00
Wayne Chen
e5a87aa58c removing unused variables 2018-09-10 16:56:13 -07:00
Wayne Chen
ff86e480ba adding debug statement to check for window close 2018-09-10 11:36:45 -07:00
Simon Walton
d12376187c
Merge branch 'master' into avatar-mixer-scaling 2018-09-10 10:15:49 -07:00
David Rowe
7dba2e6a2e Merge branch 'master' into M17428-f 2018-09-08 12:45:11 +12:00
Wayne Chen
77bb6fa4d5 adding position to try again zone; updating whitespace 2018-09-05 11:53:49 -07:00
Wayne Chen
0be7a5ffaa
fixing typo in domain handler 2018-09-04 19:58:56 -07:00
SamGondelman
589e88af4a Merge remote-tracking branch 'upstream/master' into scriptvec3 2018-09-04 17:54:45 -07:00
Wayne Chen
9e0fa08cf1 adding property to location, updating domain 2018-09-04 17:46:23 -07:00
Simon Walton
7af69b5450 Check that a requested listened port is used in NodeList 2018-09-04 13:53:25 -07:00
Simon Walton
c2ea05b026 Merge remote-tracking branch 'upstream/master' into avatar-mixer-scaling 2018-09-04 09:31:05 -07:00
Wayne Chen
c95cb97b9b adding working version with networking signals 2018-08-31 19:29:48 -07:00
Wayne Chen
e3f5f4c55a Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into 404DomainRedirect 2018-08-30 19:55:51 -07:00
Wayne Chen
82c7495615 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-30 19:41:06 -07:00
Wayne Chen
5f43f5b276 adding different method for handling redirect 2018-08-30 17:40:13 -07:00
Simon Walton
b45b0f54e4 Move unfilteredHandlers processing back into main loop 2018-08-30 11:59:53 -07:00
Zach Fox
b8cd5dd8b9 Fixup PR13870: Make the feature work in Master 2018-08-29 16:58:19 -07:00
Simon Walton
9711076dae Use a queued signal for pending datagrams 2018-08-29 10:49:29 -07:00
Wayne Chen
6689c15564 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-28 19:22:34 -07:00
Wayne Chen
223f86108f adding debugging stuff 2018-08-28 17:34:48 -07:00
Wayne Chen
8a9ad421e7 adding serverless file + redirection if conn fail 2018-08-28 15:50:14 -07:00
David Rowe
e5c733e7f2 Merge branch 'master' into M17428-c 2018-08-29 08:20:00 +12:00
Stephen Birarda
7ddd70a84a
Merge pull request #13871 from birarda/bug/double-domain-connect 
force NodeList reset if DS changes session or local ID
 2018-08-27 11:59:24 -07:00
Sam Gondelman
6730635931
Merge branch 'master' into scriptvec3 2018-08-27 10:43:52 -07:00
Simon Walton
861d1e26a9 Remove unused variable 2018-08-24 18:02:28 -07:00
Simon Walton
bf839ca291 Handle _unfilteredHandlers first upon processing datagrams 2018-08-24 16:53:38 -07:00
Simon Walton
4392b3c2a8 Merge remote-tracking branch 'upstream/master' into avatar-mixer-scaling 2018-08-24 16:07:00 -07:00
John Conklin II
fcdbc6c6d2
Merge pull request #13778 from SamGondelman/bloom 
Enable bloom in zone properties
 2018-08-24 14:46:31 -07:00
Stephen Birarda
cb4ce4fedb make sure settings are re-requested on new connection 2018-08-24 13:05:04 -07:00
Stephen Birarda
1263db5688 force NL reset if the domain changes session ID or local ID 2018-08-23 16:48:46 -07:00
Simon Walton
9dac399c20 Merge branch 'master' into avatar-mixer-scaling 2018-08-23 13:58:38 -07:00
John Conklin II
5dd64645eb
Merge pull request #13861 from SimonWalton-HiFi/safe-landing-fixes 
Fix safe-landing protocol for sparse domains
 2018-08-23 10:17:08 -07:00
Simon Walton
c0966d738e Use EntityVersion for the EntityQueryInitialResultsComplete packet 2018-08-22 16:40:49 -07:00
Simon Walton
c4b916af62 Just bump packet version for EntityQueryInitialResultsComplete 2018-08-22 16:22:30 -07:00
David Rowe
883479d654 Merge branch 'master' into M17428-c 2018-08-23 10:43:44 +12:00
Simon Walton
dd098f05c2 Change EntityQueryInitialResultsComplete protocol to use exclusive sequence number 2018-08-22 14:54:07 -07:00
Simon Walton
d8d940b06a Cap datagrams-at-once processed; debugging output 2018-08-22 10:28:32 -07:00
Simon Walton
4084973cca Changes for linux compilation 2018-08-21 16:04:08 -07:00
Simon Walton
e867ae86f4 Split readPendingDatagrams() into two slots 2018-08-21 14:44:55 -07:00
Stephen Birarda
7d8db482a3 put back ExtendedIODevice ctor for ubuntu warning 2018-08-21 13:21:21 -07:00
Stephen Birarda
3e2d4dc696 fixes and improvments addressing CR comments 2018-08-21 10:53:52 -07:00
Stephen Birarda
e6b419d283 add instanced traits and migrate avatar entities 2018-08-21 10:31:15 -07:00
Stephen Birarda
be7eb57205 handle whitelist avatar URL override via traits 2018-08-21 10:31:14 -07:00
Stephen Birarda
a80d19a44a remove skeleton from identity, handle in clients 2018-08-21 10:31:14 -07:00
Stephen Birarda
26a1f03314 send traits in bulk to avatar mixer client 2018-08-21 10:31:14 -07:00
Stephen Birarda
f23a036f4a add node local ID retreivable from NodeData 2018-08-21 10:31:14 -07:00
Stephen Birarda
486557e28a initial trait packet sending on skeleton URL change 2018-08-21 10:31:14 -07:00
Sam Gondelman
f0986a7f5a Merge branch 'master' into scriptvec3 2018-08-20 10:56:45 -07:00
David Rowe
846f38584f Merge branch 'master' into M17428 2018-08-17 15:01:35 +12:00
John Conklin II
bbf6162361
Merge pull request #13632 from Atlante45/fix/udt-rtt 
Fix potential reliable connection lockup.
 2018-08-16 13:15:23 -07:00
David Rowe
a86fdeafc0 Merge branch 'master' into M17248-a 2018-08-16 10:38:30 +12:00
Seth Alves
527b27da96 pseudo-joints for far-grab positions 2018-08-14 08:55:20 -07:00
David Rowe
2a177e04e1 Misc. tweaks 2018-08-11 10:11:56 +12:00
David Rowe
38d8a9a2da Send messages locally if not connected to a domain 2018-08-11 07:00:50 +12:00
SamGondelman
fb75b42059 working on enabling bloom 2018-08-07 22:26:30 -07:00
John Conklin II
3a6a72a079
Merge pull request #13643 from SimonWalton-HiFi/user-setting-hmac 
Add DS option to disable HMAC packet authentication
 2018-08-03 17:45:32 -07:00
Sam Gondelman
7772e8adf2
Merge branch 'master' into scriptvec3 2018-08-03 14:57:49 -07:00
John Conklin II
243bd5ea69
Merge pull request #13536 from SimonWalton-HiFi/script-engine-thread-agent 
ScriptsModel instances should be created & destroyed on the same thread (for Agent)
 2018-08-03 13:32:11 -07:00
Simon Walton
88fafc7a1f
Merge pull request #13704 from SimonWalton-HiFi/delay-physics 
Enable physics after ES indicates all nearby entities received
 2018-08-01 18:15:00 -07:00
John Conklin II
fd1a431729
Merge pull request #13689 from ctrlaltdavid/M15244 
Move scriptable caches' APIs into scripting interfaces
 2018-08-01 11:50:13 -07:00
Simon Walton
ecfba312ef Merge remote-tracking branch 'upstream/master' into script-engine-thread-agent 2018-07-31 15:54:54 -07:00
Simon Walton
33a46a6a82 Make ThreadedAssignment::setFinished() protected 2018-07-31 15:46:43 -07:00
Simon Walton
64fc3e1091 ThreadedAssignment calls virtual stop() upon domain disconnect 2018-07-31 15:30:33 -07:00
SamGondelman
7c8d080050 Merge remote-tracking branch 'upstream/master' into scriptvec3 2018-07-31 14:04:23 -07:00
Simon Walton
a320308eaf Fix sequence number encoding issue 
Don't mix QDataStream and readPrimitive. Also fix logic
issues in completion check; move new packet type; don't
reset known sent entities upon initial completion;
other reviewer recommendations.
 2018-07-31 13:54:22 -07:00
Seth Alves
4ff9252b47
Merge pull request #13718 from jherico/fix/fb15963 
Support rendering of 'about' URLs in web entities
 2018-07-31 09:44:31 -07:00
SamGondelman
2ca217eb4a merge with master 2018-07-30 17:43:15 -07:00
John Conklin II
6d7116fad7
Merge pull request #13676 from thoys/fix/api/agent 
MS15184: Remove deprecated functions in Agent API
 2018-07-30 14:48:10 -07:00
Brad Davis
c991053c93 Support rendering of 'about' URLs in web entities 2018-07-30 11:56:31 -07:00
John Conklin II
fc88165e23
Merge pull request #13696 from SamGondelman/particleRot 
Particles don't spin with head roll, new spin + rotateWithEntity properties
 2018-07-27 14:54:48 -07:00
David Rowe
baf88ab508 Revise scriptable resource caches' interfaces 2018-07-26 16:12:16 +12:00
David Rowe
16e06de9cd Move scriptable caches into scripting interfaces 
Removed non-working getResource() API functions.
 2018-07-25 22:10:14 +12:00
SamGondelman
4750611af9 particles don't spin with head roll, add particle spin properties, negative emitSpeed 2018-07-24 23:47:58 -07:00
Simon Walton
47e99cdeac Initial code for AC side of Enabling Physics plan 
When interface sets query flag send only entities
close to main frustrum origin, until no more available,
then send unreliabe sequence # reliably.
 2018-07-24 16:50:37 -07:00
Stephen Birarda
0cd5a24233
Merge pull request #13677 from birarda/bug/no-socket-error-string 
remove thread-unsafe socket errorString call
 2018-07-24 16:16:25 -07:00
Stephen Birarda
8224492d72 avoid thread-unsafe socket errorString call 2018-07-24 12:24:01 -07:00
Thijs Wenker
e2d7431456 move agent scripting interface to its own class to get rid of deprecated API 2018-07-24 16:54:24 +02:00
Howard Stearns
49d9d61425
Merge pull request #13305 from howard-stearns/personal-space-bubble-off-for-new-users 
Personal space bubble is defaulted off for now for new users
 2018-07-23 12:29:00 -07:00
Clement
87daa55f0b Remove deprecated control packet types 2018-07-20 18:12:24 -07:00
Clement
9a1c4afbd8 More cleanup 2018-07-20 18:12:24 -07:00
Clement
0bfe2671dd Cleanup udt dead code 2018-07-20 18:12:24 -07:00
Simon Walton
d147d17b70 Update PacketType version for domain list 2018-07-19 10:04:29 -07:00
Simon Walton
5d13f6c030 Bump DomainListVersion for new protocol 2018-07-19 09:55:28 -07:00
Simon Walton
3002abeddc Add DS option to turn off packet authentication 2018-07-18 18:22:36 -07:00
Simon Walton
c1e6221391 Merge branch 'master' into script-engine-thread-agent 2018-07-13 10:06:49 -07:00
Sam Gondelman
b53772f9ca
Merge pull request #13431 from Cristo86/android_stop_downloads_bg 
Android - Prevent pending downloads to happen when going back to home
 2018-07-12 15:22:56 -07:00
SamGondelman
5bbd5b9e52 vec2 conversion 2018-07-10 16:32:49 -07:00
Simon Walton
1c23fc75a4 Emit finished signal from AC derived classes 
To avoid Agent destruction-in-use move emit finished from
setFinished to Agent methods. For other ACs emit from
aboutToFinish().
 2018-07-09 16:56:54 -07:00
Simon Walton
000423673e Don't explicitly destroy script engine; emit finished when actually finished 2018-07-09 13:30:44 -07:00
John Conklin II
e6801c303a
Merge pull request #13432 from SimonWalton-HiFi/avatar-identity-request 
Implement AvatarRequestIdentity and use if interface gets unknown avatar data
 2018-07-09 10:07:19 -07:00
Cristian Luis Duarte
be8351dc0d Android - Rollback pause/resume mechanism. Stop server checkIns, reset nodeList before entering background 2018-07-06 20:43:52 -03:00
John Conklin II
01610a1520
Merge pull request #13559 from wayne-chen/fixCopyAddress-case-16444 
Fix AddressManager copyAddress/copyPath functionality
 2018-07-06 14:11:08 -07:00
Wayne Chen
0facbedbbc adding Q_INVOKABLE method for copying to Application clipboard 2018-07-06 11:03:58 -07:00
John Conklin II
f2d0f1ffbc
Merge pull request #13458 from SimonWalton-HiFi/aggressive-domain-checkins 
Send repeated check-in requests for greater resilience
 2018-07-06 10:58:46 -07:00
Simon Walton
33ae04f9ea Change sense of DomainHandler::checkInPacketTimeout() return value 2018-07-05 16:39:13 -07:00
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
Cristian Luis Duarte
a878ad5a33 Android - remove logs from pause/resume and pending requests 2018-07-05 14:58:55 -03:00
Cristian Luis Duarte
736fc41bb9 Android - Remove resume code that tries the next pending download as entering domains asks for resources anyway 2018-07-04 19:37:12 -03:00
Simon Walton
ec67b8ad56 Address reviewer comments 2018-07-03 15:31:34 -07:00
Cristian Duarte
6b5e5702dd Android - implement pause-resume of requests chain in ResourceCache 2018-07-02 20:05:59 -03: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
Cristian Duarte
6b3a9def7a Merge branch 'hifi_master' into android_stop_downloads_bg 2018-07-02 17:37:40 -03: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
Simon Walton
b63515f42a Send multiple copies of domain check-in for greater resilience 
Also move domain-limit check to start of NodeList::sendDomainServerCheckIn().
 2018-06-25 14:36:50 -07:00
Simon Walton
dafd97b6f4 Duplicate domain check-ins after timeouts 2018-06-22 18:21:32 -07:00
Simon Walton
3775bdc335 Move PacketType::AvatarIdentityRequest so as to not break ICE 2018-06-22 17:20:43 -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
Cristian Luis Duarte
3837952418 Android - Add a clear method on pending downloads and use it when going background 2018-06-20 18:29:04 -03:00
Simon Walton
5bf075457c Add avatar identity request packet 2018-06-19 10:21:30 -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
howard-stearns
65e3652b9f Personal space bubble is defaulted off for now. 2018-06-05 11:47:44 -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