Dante Ruiz
dca34c7cbe
remove warning for GCC
2018-09-13 08:32:47 -07:00
Dante Ruiz
d76a2c1add
disable interstitial by default and fix crash
2018-09-12 15:31:03 -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
30e9d57026
adding pattern for during timeout to put into error state
2018-09-11 18:52:28 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged
2018-09-11 17:17:33 -07:00
Dante Ruiz
c97d646083
making requested changes and fixing compile issue for jenkins
2018-09-11 15:57:44 -07:00
Dante Ruiz
cc2c208b12
fix small issue
2018-09-11 12:12:31 -07:00
Dante Ruiz
735ff04fad
fixing merge conflicts
2018-09-11 12:10:19 -07:00
Dante Ruiz
5c9a88868d
first round of requested changes
2018-09-11 12:01:55 -07:00
Wayne Chen
84cf40f8aa
changing calculation of load percentage
2018-09-11 10:07:57 -07:00
Wayne Chen
28c3afca9d
adding back inlines
2018-09-10 17:40:35 -07:00
Wayne Chen
fa3097225b
removing inlines - not allowed for unique_ptr
2018-09-10 17:33:32 -07:00
Wayne Chen
c194c236f1
adding inlines
2018-09-10 17:10:13 -07:00
Simon Walton
fff6a10bcd
Remove some debug logging from safe landing additions
2018-09-04 10:58:40 -07:00
Dante Ruiz
03ede9371e
cleaning code
2018-08-30 14:26:39 -07:00
danteruiz
e2cd695dfb
PR code clean up
2018-08-27 11:01:29 -07:00
danteruiz
e4293d9ad5
fixing some entity visual problems
2018-08-26 21:50:01 -07:00
Dante Ruiz
92acaade2b
trying to fix problems
2018-08-24 17:13:57 -07:00
Dante Ruiz
3796675123
script update and visuallyReady entities
2018-08-24 15:46:39 -07:00
Dante Ruiz
11ab6dd0b5
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-23 13:20:09 -07:00
Dante Ruiz
78458d62de
revert some changes and fix toolbar issue
2018-08-22 15:20:56 -07:00
Simon Walton
dd098f05c2
Change EntityQueryInitialResultsComplete protocol to use exclusive sequence number
2018-08-22 14:54:07 -07:00
Dante Ruiz
535fdf32cf
saving changes
2018-08-22 13:13:00 -07:00
Dante Ruiz
54236e5c59
fixing loading bar
2018-08-22 10:58:55 -07:00
Dante Ruiz
26a30edec9
trying to fix loading bar
2018-08-21 18:27:21 -07:00
Simon Walton
8d6aaf3fb5
Tidy some method names per reviewer comment
2018-08-20 17:50:29 -07:00
Simon Walton
a891b74fac
Reset SafeLanding in all cases
...
Also remove unused data member, elevate load priority only
for entities with collisions, handle case of no nearby entities.
2018-08-20 12:31:21 -07:00
Simon Walton
829b83c61d
Use elevated model priority during initial load
2018-08-10 18:16:08 -07:00
Simon Walton
0ae86d5aa8
Remove useless statement
2018-08-10 16:16:58 -07:00
Simon Walton
05fa7fdf0e
Clean-up
2018-08-10 15:43:51 -07:00
Simon Walton
3c665b7de8
Don't delete sequence numbers outside of range as range may change
2018-08-10 14:40:08 -07:00
Simon Walton
a8b9568c92
Add some locking
2018-08-10 10:11:46 -07:00
Simon Walton
875407b3fe
New approach to physics readiness - now (mostly) working
2018-08-09 16:24:04 -07:00
Simon Walton
4395e1fa26
Safe Landing checkpoint
2018-08-09 11:11:58 -07:00
Simon Walton
88bd4e3d9a
WIP - safe landing infrastructure
2018-08-08 12:32:45 -07:00
Simon Walton
790fb43b42
Start of safe landing client work
2018-08-07 11:34:05 -07:00
Simon Walton
b18c1f0e1e
Use defined value for invalid sequence number
2018-08-01 10:10:45 -07:00
Simon Walton
ed75fe673e
Replace int+bool with single atomic int
2018-07-31 18:28:14 -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
Simon Walton
5315b020ec
Use locking for the OctreePacketProcessor additions
2018-07-27 14:51:24 -07:00
Simon Walton
3d390203e2
More fixes for clang & gcc
...
C++14 issues, I think.
2018-07-27 11:34:08 -07:00
Simon Walton
0cec9a72d6
Implement client-side enable physics once indicated EntityData has arrived
...
Also now use Entity Server Protocol sequence numbers.
2018-07-26 18:10:38 -07:00
Clement
da9fb9c751
Fix non self-sufficient headers
2018-05-04 16:26:41 -07:00
Simon Walton
bed4033554
Local node IDs now working correctly
...
Move typedef to single location; fixes for replicated packets
(probably still not correct); reserve zero as local ID;
pass domain server's local ID in domain server list;
other tweaks.
2018-03-27 18:18:14 -07:00
SamGondelman
4b1217f1f6
move all entity items to main thread
2018-02-21 15:54:07 -08:00
Seth Alves
f47aeae2a7
stop passing bare pointers to EntityTreeRenderer all around
2016-10-27 10:10:22 -07:00
Stephen Birarda
6b28523cb5
don't release the OPP processed packet
2016-03-21 16:29:18 -07:00
Ryan Huffman
dd6c8cbe33
Remove verbose piggyback logging
2015-12-07 09:42:04 -08:00
Ryan Huffman
ce882a9c11
Replace QSharedPointer ctor with ::create
2015-12-03 09:43:36 -08:00
Ryan Huffman
9ddcfdf94d
Cleanup PacketReceier and ReceivedMessage
2015-10-16 09:21:10 -07:00