Wayne Chen
a7321f950a
pushing requested changes - adding timeout refusal
2018-09-11 18:32:17 -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
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
Wayne Chen
9e0fa08cf1
adding property to location, updating domain
2018-09-04 17:46:23 -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
Zach Fox
b8cd5dd8b9
Fixup PR13870: Make the feature work in Master
2018-08-29 16:58:19 -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
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
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
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
Simon Walton
dd098f05c2
Change EntityQueryInitialResultsComplete protocol to use exclusive sequence number
2018-08-22 14:54:07 -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
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
Seth Alves
527b27da96
pseudo-joints for far-grab positions
2018-08-14 08:55:20 -07: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
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
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
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
