Commit graph

32492 commits

Author SHA1 Message Date
Seiji Emery
c704fb7b12 Fixed to follow signal naming conventions, and added null check 2015-08-28 11:01:30 -07:00
Ryan Huffman
c6d98f3c67 Update ResourceCache to retry an asset request when the node is unavailable 2015-08-28 10:59:38 -07:00
Seth Alves
1ac5c19f44 if someone else changes a polyvox, we need to localy recompute the collision shape 2015-08-28 10:39:23 -07:00
Stephen Birarda
9575b47e4e don't unlock double lock outside conditional 2015-08-28 10:38:15 -07:00
Stephen Birarda
54cd430be9 unlock if double lock succeeds but queues not empty 2015-08-28 10:35:29 -07:00
Seiji Emery
9353eaf35a Added signal to detect + close address bar when user clicks outside of it 2015-08-28 10:33:30 -07:00
Seth Alves
92b5fe3457 fix thinko -- if the changes didn't happen, put them back on the list and don't clear their dirty flags 2015-08-28 10:31:28 -07:00
Seth Alves
0bcd6b8ec5 remove no-longer-used #define 2015-08-28 10:30:56 -07:00
Stephen Birarda
ac3a1d54b1 don't lock in while for maybeResendPacket 2015-08-28 10:07:01 -07:00
Stephen Birarda
d66375bb09 fix queue timeout for empty queue 2015-08-28 09:54:51 -07:00
Stephen Birarda
577b6bf62f correct the check for flow window size 2015-08-28 09:52:33 -07:00
Sam Gateau
e2fce12713 Splitting the FBXREader.cpp file into sub files 2015-08-28 09:51:03 -07:00
Stephen Birarda
e662209754 use a QMutex instead of QReadWriteMutex 2015-08-28 09:48:55 -07:00
Stephen Birarda
dcd5a4aec2 address comments in code review 2015-08-28 09:47:25 -07:00
Stephen Birarda
21c80e45c2 guard connection addition by a mutex in Socket 2015-08-28 09:42:52 -07:00
Stephen Birarda
539108dd45 repairs for new timeout code 2015-08-28 09:26:32 -07:00
Stephen Birarda
0b712eef55 Merge branch 'protocol' of github.com:birarda/hifi into atp 2015-08-28 09:10:12 -07:00
Stephen Birarda
77aeae7dc0 change to timeout behaviour to re-send unACKed packets 2015-08-28 09:10:06 -07:00
Ryan Huffman
2ccf983669 Merge pull request #35 from Atlante45/protocol
Forward AssetResourceRequest loading errors
2015-08-28 08:46:41 -07:00
Sam Gateau
8ea8eea08d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-08-28 08:13:10 -07:00
Sam Gateau
85f230bf17 Getting rid of the NetworkMEshPart and simplifying the thinking around the MOdel regarding its RenderItems 2015-08-28 08:12:50 -07:00
Stephen Birarda
cf98d4a8f7 add a control packet type for LightACK 2015-08-28 07:31:44 -07:00
Stephen Birarda
28d9610bd4 add a listen port option to ACs 2015-08-28 07:31:17 -07:00
Atlante45
12fdec232b CR 2015-08-28 16:31:02 +02:00
Atlante45
ea05fcea0c Forward AssetResourceRequest loading errors 2015-08-28 16:03:31 +02:00
Stephen Birarda
d908cd4a53 use NotStarted instead of Unsent, return NotFound for Files 2015-08-28 06:35:02 -07:00
Stephen Birarda
0ef459f7a9 Merge pull request #33 from huffman/resource-req-naming
Resource req naming
2015-08-28 06:30:02 -07:00
Brad Davis
b7dd47efcb Merge pull request #5674 from birarda/master
cleanup of some warnings
2015-08-27 23:34:43 -07:00
Ryan Huffman
a7294eb0e5 Add AccessDenied error for failure to open File in FileResourceRequest 2015-08-27 22:48:15 -07:00
Ryan Huffman
2a4b25dd76 Update names of ResourceRequest enums 2015-08-27 22:23:06 -07:00
Ryan Huffman
8f8e0f9624 Merge pull request #32 from birarda/atp
unlock mutexes before calling notify
2015-08-27 22:04:37 -07:00
Stephen Birarda
341e27fecc unlock mutexes before calling notify 2015-08-27 22:02:08 -07:00
Ryan Huffman
4dadfb8ea6 Merge pull request #5668 from ctrlaltdavid/20648
Auto refresh entities list upon display of Entities tab
2015-08-27 21:50:11 -07:00
Seiji Emery
c12f192c3a bugfix...
Apparently I didn't test that -_-
2015-08-27 21:44:55 -07:00
Ryan Huffman
61c31dbe52 Merge pull request #31 from birarda/atp
use const ref where appropriate for asset classes
2015-08-27 21:36:07 -07:00
Stephen Birarda
98888a36a3 use const ref where appropriate for asset classes 2015-08-27 21:33:37 -07:00
Anthony J. Thibault
21c6ba9bdf updated avatar.json to match current gist. 2015-08-27 21:27:37 -07:00
Anthony J. Thibault
19e91bb392 Added basic interpolation support to AnimStateMachine 2015-08-27 21:26:31 -07:00
Stephen Birarda
111abac0f1 Merge pull request #30 from huffman/cache-limit
Update ResourceCache to only emit failure when not retrying
2015-08-27 21:17:16 -07:00
Ryan Huffman
147fbd4b54 Update ResourceCache to only emit failure when not retrying 2015-08-27 21:11:12 -07:00
Anthony J. Thibault
3286a32afc Initial version of AnimStateMachine.
No interpolation support, but basic avatar.json is working
with two states and two transitions between them.
2015-08-27 20:41:53 -07:00
Andrew Meadows
614fad0811 remove warnings from linux build 2015-08-27 19:12:25 -07:00
Seiji Emery
2bea436e12 Added timeouts
if USE_ENTITY_TIMEOUTS is enabled, entities will now clean up after
themselves if not touched within X seconds (ie. if the script and/or
client crashes and scriptEnding isn't called then the entities will
timeout; otherwise, they get cleaned up normally when the script ends).
2015-08-27 18:34:31 -07:00
Nex Pro
b2e5cc7c4e Fixed list problems when list contains more than 200 entries. And some style fixes. 2015-08-28 02:29:01 +01:00
Stephen Birarda
c5c73b7809 remove _ipd variable from OculusLegacyDisplayPlugin 2015-08-27 18:26:55 -07:00
Stephen Birarda
8ea20b5e5e fix warning on string literal call to qFatal 2015-08-27 18:26:55 -07:00
Stephen Birarda
f7d32add0c wrap OVR variables in ifdef for MAJOR_VERSION >= 6 2015-08-27 18:26:55 -07:00
Stephen Birarda
1d6f43e0d0 cleaned up some warnings 2015-08-27 18:26:55 -07:00
Andrew Meadows
d3f06af892 remove PhysicsEntity class 2015-08-27 18:22:12 -07:00
Stephen Birarda
598b9b2819 Merge pull request #29 from birarda/atp
add an assert that enqueue packet is truly from message
2015-08-27 17:26:36 -07:00