Stephen Birarda
|
ed9c805539
|
attempt to set send buffer size to 1MB
|
2014-03-25 17:29:35 -07:00 |
|
Stephen Birarda
|
46077a7fb0
|
output old size when notifying for send buffer size change
|
2014-03-25 17:24:17 -07:00 |
|
Stephen Birarda
|
db757e9e7b
|
increase NodeList send buffer size by default to 128KB
|
2014-03-25 17:18:45 -07:00 |
|
Atlante45
|
9f95ca8e7c
|
Display warning popup when something went wrong with the fst upload
|
2014-03-25 17:18:18 -07:00 |
|
Stephen Birarda
|
34634af975
|
add mutex header to NodeData
|
2014-03-25 16:05:51 -07:00 |
|
Andrew Meadows
|
fff7a36b54
|
merge upstream/master into physics project
Conflicts:
interface/src/avatar/Hand.cpp
interface/src/avatar/Hand.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/renderer/Model.h
|
2014-03-25 15:55:26 -07:00 |
|
Stephen Birarda
|
c8b3ae0c40
|
add a mutex to NodeData and leverage in AvatarMixer threads
|
2014-03-25 15:49:47 -07:00 |
|
Andrew Meadows
|
06fbd49ffa
|
Adding StreamUtils for common debug output
|
2014-03-25 15:29:22 -07:00 |
|
Andrew Meadows
|
5934a17475
|
fix sphere-capsule collisions at the capsule caps
|
2014-03-25 15:27:28 -07:00 |
|
Stephen Birarda
|
d5be3f1c9f
|
output socket errors if they occur
|
2014-03-25 15:01:24 -07:00 |
|
Stephen Birarda
|
56869a769d
|
remove some extraneous domain-server check in debugging
|
2014-03-25 14:53:32 -07:00 |
|
Stephen Birarda
|
38ad75fc9e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-debug
|
2014-03-25 14:52:28 -07:00 |
|
Stephen Birarda
|
7190ce9a88
|
remove loadRandomIdentifier for STUN requests, use UUID
|
2014-03-25 14:33:53 -07:00 |
|
Stephen Birarda
|
41e2ce2b19
|
remove DS check in debug
|
2014-03-25 14:29:59 -07:00 |
|
Stephen Birarda
|
4e77afb4b2
|
block and wait for bytes to be written during broadcastAvatarData loop
|
2014-03-25 13:38:02 -07:00 |
|
Stephen Birarda
|
68d55152b9
|
flush after each call to writeDatagram
|
2014-03-25 13:28:53 -07:00 |
|
Stephen Birarda
|
08bfc15b70
|
output more descriptive socket error
|
2014-03-25 13:20:45 -07:00 |
|
Stephen Birarda
|
6a8637230f
|
add socket error debugging
|
2014-03-25 13:17:37 -07:00 |
|
Stephen Birarda
|
ce169dd87d
|
add code return debug to DS check in packet
|
2014-03-25 13:06:44 -07:00 |
|
Stephen Birarda
|
08ed708ee6
|
add domain IP and packet size debugging
|
2014-03-25 13:05:58 -07:00 |
|
Stephen Birarda
|
f0b87bebc2
|
cleanup debug and inactive node pinging
|
2014-03-25 13:02:09 -07:00 |
|
Stephen Birarda
|
bc1b7045cb
|
output count of unreplied domain-server check ins
|
2014-03-25 12:30:06 -07:00 |
|
Stephen Birarda
|
a90cd7ed31
|
cast numerator to float before divide
|
2014-03-24 16:54:14 -07:00 |
|
Stephen Birarda
|
b01b2a3311
|
use explicit float casts where appropriate
|
2014-03-24 16:35:36 -07:00 |
|
Stephen Birarda
|
ba338cb7bc
|
at minimum send packet rate stats for ThreadedAssignment subclasses
|
2014-03-24 16:06:25 -07:00 |
|
Stephen Birarda
|
8dbe4dfdde
|
collect packet rate stats in NodeList
|
2014-03-24 15:06:53 -07:00 |
|
Stephen Birarda
|
5f93e44ff7
|
abstract stats packet sending to NodeList
|
2014-03-24 12:33:00 -07:00 |
|
Stephen Birarda
|
8f403609e7
|
hook JSON stats sending from domain-server
|
2014-03-24 11:56:16 -07:00 |
|
Stephen Birarda
|
949f7b2fc1
|
add a json stats packet type
|
2014-03-24 11:21:39 -07:00 |
|
ZappoMan
|
bde2146b1b
|
whitespace cleanup
|
2014-03-23 18:14:36 -07:00 |
|
ZappoMan
|
9c7ffffbae
|
fix some windows issues
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
|
2014-03-23 18:10:22 -07:00 |
|
ZappoMan
|
2c8c43094f
|
CR feedback
|
2014-03-21 14:46:46 -07:00 |
|
ZappoMan
|
3cb3cb81c4
|
fixes to voxel server crashes on client shutdown
|
2014-03-21 14:15:02 -07:00 |
|
Stephen Birarda
|
acedc555d5
|
Merge pull request #2424 from birarda/audio-scaling
move and remove some debugging for audio mixer
|
2014-03-21 10:26:41 -07:00 |
|
Stephen Birarda
|
c1cbc79807
|
move debug for no reply domain checkins to ThreadedAssignment
|
2014-03-21 10:26:09 -07:00 |
|
Philip Rosedale
|
b49058ea77
|
Merge pull request #2402 from Atlante45/inspect_js
Inspect js
|
2014-03-20 17:21:21 -07:00 |
|
Atlante45
|
746d109025
|
Merge branch 'master' of https://github.com/highfidelity/hifi into inspect_js
|
2014-03-20 16:10:33 -07:00 |
|
Atlante45
|
65603b0631
|
Fixed typo
|
2014-03-20 15:30:28 -07:00 |
|
Atlante45
|
bf85f8d5e5
|
Changed model_type to model_categorie in FstReader
|
2014-03-20 14:00:27 -07:00 |
|
Atlante45
|
a908c23f61
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_models_upload
|
2014-03-20 13:58:44 -07:00 |
|
Atlante45
|
947dde3715
|
Modified models uploader to diferrenciate heads and skeletons
|
2014-03-20 12:44:37 -07:00 |
|
Atlante45
|
4604f5333d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into inspect_js
|
2014-03-20 12:15:55 -07:00 |
|
Andrzej Kapolka
|
20ae5c15f7
|
Added a "flat" mode for environments that makes them follow you around on the
X/Z axes. The default environment is flat. Closes #2378.
|
2014-03-20 12:09:20 -07:00 |
|
Andrzej Kapolka
|
a761a4862b
|
Merge pull request #2398 from AndrewMeadows/emergency-fixes
explicitly send neck angles in avatar data
|
2014-03-20 11:19:13 -07:00 |
|
AndrewMeadows
|
144f86b540
|
Merge pull request #2370 from Atlante45/model_browsing
Model browsing
|
2014-03-20 11:15:35 -07:00 |
|
Andrew Meadows
|
6440dd1b5f
|
explicitly send neck angles in avatar data
|
2014-03-20 11:05:14 -07:00 |
|
Philip Rosedale
|
e14069c9e3
|
Merge pull request #2376 from ZappoMan/experimental_scaling
Voxel Server Performance Improvements
|
2014-03-19 16:24:47 -07:00 |
|
Tony Hagale
|
7f2a92d759
|
#2386 trying a new static lookup table for numberOfOnes()
|
2014-03-19 16:28:12 -05:00 |
|
Tony Hagale
|
5f94e44cde
|
#2386 trying a new static lookup table for numberOfOnes()
|
2014-03-19 16:26:45 -05:00 |
|
Atlante45
|
d239aecbfb
|
Added names to signals argument
|
2014-03-19 10:17:28 -07:00 |
|
ZappoMan
|
584adfda08
|
cleanup headers
|
2014-03-19 00:32:38 -07:00 |
|
ZappoMan
|
499c4bd500
|
fix octree server crashes on various shutdown corner cases
|
2014-03-18 17:44:53 -07:00 |
|
Atlante45
|
93f66b074a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing
|
2014-03-18 17:37:07 -07:00 |
|
Stephen Birarda
|
f86b793c96
|
only output version mismatch once per sender per packet
|
2014-03-18 17:14:57 -07:00 |
|
Stephen Birarda
|
281f2c6614
|
return false in packetVersionAndHashMatch on version mismatch
|
2014-03-18 17:04:27 -07:00 |
|
Atlante45
|
a10a3f6f29
|
Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing
|
2014-03-18 14:49:00 -07:00 |
|
Andrzej Kapolka
|
500f9d1485
|
Merge pull request #2338 from AndrewMeadows/cleanup
Don't send redundant avatar hand/head data, and cleanup.
|
2014-03-18 13:57:30 -07:00 |
|
Atlante45
|
6f50ea0faa
|
Improved FileDownloader
|
2014-03-18 13:55:14 -07:00 |
|
Andrew Meadows
|
4a1a7898ea
|
Merge branch 'cleanup' into 'shapes'
|
2014-03-18 12:53:45 -07:00 |
|
Andrew Meadows
|
a2fea49f58
|
bump version of PacketTypeAvatarData from 1 to 2
|
2014-03-18 12:36:48 -07:00 |
|
Stephen Birarda
|
b6a41eeaaa
|
resolve conflicts on merge with upstream master
|
2014-03-18 10:37:04 -07:00 |
|
Andrzej Kapolka
|
6aa1f286bb
|
Alpha is the new default.
|
2014-03-18 10:13:23 -07:00 |
|
Stephen Birarda
|
7ba595338e
|
guard around update to last heard for a NULL matching node
|
2014-03-17 17:39:08 -07:00 |
|
ZappoMan
|
9411519dc9
|
fix SimpleMovingAverage::reset()
|
2014-03-17 16:37:07 -07:00 |
|
Stephen Birarda
|
61594b9a1e
|
fixes to silent audio frame sending
|
2014-03-17 16:27:49 -07:00 |
|
Stephen Birarda
|
9f24bd9c47
|
have the AudioMixer handle silent audio, send silence from Interface when gate closed
|
2014-03-17 15:12:02 -07:00 |
|
ZappoMan
|
aab2ca826f
|
Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling
|
2014-03-17 11:01:25 -07:00 |
|
ZappoMan
|
96572d3752
|
fix some Q_OBJECT macros in class headers
|
2014-03-17 10:57:53 -07:00 |
|
ZappoMan
|
cbdd159213
|
fix constness
|
2014-03-17 10:55:43 -07:00 |
|
Brad Hefta-Gaub
|
c6f8d34ded
|
fix unix warning
|
2014-03-14 18:16:38 -07:00 |
|
Brad Hefta-Gaub
|
c0ee3fa1f0
|
fix unix warning
|
2014-03-14 18:14:54 -07:00 |
|
Brad Hefta-Gaub
|
0e7e337807
|
fixed uninitialized variable warning
|
2014-03-14 18:05:40 -07:00 |
|
Atlante45
|
f07725d017
|
Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing
|
2014-03-14 17:47:39 -07:00 |
|
Atlante45
|
a88872a21f
|
Simple class to download files (sync/async)
|
2014-03-14 17:41:22 -07:00 |
|
Andrew Meadows
|
d4c7e25f8e
|
Merge branch upstream/master into "hands" project
|
2014-03-14 14:28:50 -07:00 |
|
Andrew Meadows
|
a045a87cca
|
Remove arm stretching, add sixense calibration
|
2014-03-14 11:11:00 -07:00 |
|
Atlante45
|
423f26f669
|
Review comments
|
2014-03-13 15:26:02 -07:00 |
|
Atlante45
|
e5b5778caf
|
Upload FST
|
2014-03-13 15:04:22 -07:00 |
|
Atlante45
|
51585acd25
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader
|
2014-03-13 10:53:24 -07:00 |
|
Andrzej Kapolka
|
e249b29b45
|
Merge pull request #2268 from AndrewMeadows/radians
prefer radians over degrees
|
2014-03-12 12:10:29 -07:00 |
|
AndrewMeadows
|
b1f4edb3a5
|
Merge pull request #2271 from ZappoMan/QWaitCondition
Fix runaway JurisdictionListener thread and other improvements
|
2014-03-12 11:54:48 -07:00 |
|
Atlante45
|
3aa534d47c
|
Added the send method
|
2014-03-12 11:48:41 -07:00 |
|
ZappoMan
|
e72d3127bf
|
fix comment and remove dead code
|
2014-03-11 21:25:30 -07:00 |
|
ZappoMan
|
025da315c6
|
removed dontSleep from JurisdictionListener
|
2014-03-11 21:11:47 -07:00 |
|
ZappoMan
|
8befefb054
|
first cut at making PacketSender use QWaitCondition
|
2014-03-11 20:45:46 -07:00 |
|
ZappoMan
|
f5cdb98efb
|
switch ReceivedPacketProcessor to using QWaitCondition
|
2014-03-11 20:32:02 -07:00 |
|
Andrzej Kapolka
|
6c4223bcdf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-03-11 18:12:12 -07:00 |
|
Andrew Meadows
|
793a760272
|
merge upstream master into "radians" project
|
2014-03-11 17:28:36 -07:00 |
|
Andrew Meadows
|
aa8c2fc8cb
|
use radians instead of degrees (almost) everywhere
|
2014-03-11 17:26:58 -07:00 |
|
Dimitar Dobrev
|
60bf473be7
|
Improved the adherence to code conventions after a code review.
|
2014-03-12 01:24:30 +02:00 |
|
Dimitar Dobrev
|
86643803cf
|
Moved the connection and configuration of XMPP to the log-in process.
|
2014-03-12 01:24:30 +02:00 |
|
Dimitar Dobrev
|
9eb217794c
|
Added time stamps to the chat. Enabled translations.
|
2014-03-12 01:24:30 +02:00 |
|
Dimitar Dobrev
|
437cadf360
|
Added a basic version of the chat window.
|
2014-03-12 01:24:30 +02:00 |
|
Dimitar Dobrev
|
07d3eb886a
|
Added reading and storing of the XMPP password of the current user.
|
2014-03-12 01:16:10 +02:00 |
|
Andrzej Kapolka
|
7d1a44fbea
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-03-11 12:52:13 -07:00 |
|
Andrzej Kapolka
|
ae6a59ef78
|
Ray intersections for models, don't load resources if there's no network
manager installed.
|
2014-03-10 17:53:20 -07:00 |
|
Andrzej Kapolka
|
34ddddae1b
|
Basic LRU cache. Closes #2234.
|
2014-03-10 12:06:07 -07:00 |
|
Andrzej Kapolka
|
9731159b82
|
Merge branch 'master' of https://github.com/highfidelity/hifi into joints
|
2014-03-10 10:57:48 -07:00 |
|
Andrzej Kapolka
|
d2f947aee1
|
Working on LRU cache for resources.
|
2014-03-10 10:49:38 -07:00 |
|
ZappoMan
|
e2415642f0
|
temporary fix to OSX 10.8 problem by delaying creation of _networkAccessManager
|
2014-03-09 00:10:31 -08:00 |
|
Atlante45
|
8faaa28bc1
|
FST ploader base
|
2014-03-07 11:55:02 -08:00 |
|
Andrew Meadows
|
9d2758ee14
|
fix warning about malformed case statement
|
2014-03-07 09:32:12 -08:00 |
|
Andrzej Kapolka
|
c5ab32235f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into joints
|
2014-03-06 17:09:24 -08:00 |
|
Andrzej Kapolka
|
3adea84b81
|
Basic joint data sending. Closes #2166.
|
2014-03-06 17:07:29 -08:00 |
|
ZappoMan
|
c81bac2ac4
|
Merge pull request #2224 from birarda/resources
cleanup switchToResourcesParentIfRequired hack
|
2014-03-06 16:51:31 -08:00 |
|
Stephen Birarda
|
0f22168e42
|
Merge pull request #2230 from ey6es/master
Add a five second download timeout timer: if that much time passes witho...
|
2014-03-06 16:22:54 -08:00 |
|
Stephen Birarda
|
8cbdf5d94a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into resources
|
2014-03-06 15:49:45 -08:00 |
|
Stephen Birarda
|
ac66f09157
|
Merge pull request #2194 from AndrewMeadows/cleanup
g++ warnings
|
2014-03-06 15:49:22 -08:00 |
|
Andrzej Kapolka
|
8ec7a5e600
|
When we time out, report the last received/total counts.
|
2014-03-06 15:08:34 -08:00 |
|
Andrew Meadows
|
0b2c399713
|
memcmp() returns a signed int!
|
2014-03-06 14:33:59 -08:00 |
|
Andrzej Kapolka
|
1468bd1b49
|
Add a five second download timeout timer: if that much time passes without
any progress, consider it an error.
|
2014-03-06 14:31:13 -08:00 |
|
Stephen Birarda
|
403f91c988
|
update resource references to use Qt resource system
|
2014-03-06 10:41:11 -08:00 |
|
Andrew Meadows
|
57e217c7fb
|
Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes
|
2014-03-04 12:10:12 -08:00 |
|
Andrew Meadows
|
427cf02d03
|
Merge branch 'cleanup' to 'cleanup2'
|
2014-03-04 11:20:42 -08:00 |
|
Andrew Meadows
|
1b2db1f7ab
|
fix for warnings about signed/unsigned comparison
|
2014-03-04 11:07:15 -08:00 |
|
Stephen Birarda
|
f5aaad1f33
|
remove if checks in cases where delete handles null
|
2014-03-04 10:05:43 -08:00 |
|
Andrew Meadows
|
e22e022252
|
Fixing warnings and out-of-range index.
|
2014-03-04 09:55:32 -08:00 |
|
Andrew Meadows
|
343998a4a8
|
Adding virtual destructor to Shape class
|
2014-03-04 09:55:08 -08:00 |
|
Andrew Meadows
|
7ba5bc71ea
|
Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes
Conflicts:
interface/src/renderer/FBXReader.cpp
interface/src/renderer/Model.cpp
interface/src/renderer/Model.h
|
2014-03-04 09:01:24 -08:00 |
|
Andrew Meadows
|
f23dda7317
|
Less math for the same effect.
|
2014-03-03 17:34:16 -08:00 |
|
Andrzej Kapolka
|
7ecfeeaba3
|
Do the actual reading of the reply on the worker thread. Otherwise, when we
read from the cache, we're reading synchronously from a file. Closes #2171.
|
2014-03-03 15:16:13 -08:00 |
|
Andrzej Kapolka
|
9759cd70c0
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-03-03 14:20:21 -08:00 |
|
Andrzej Kapolka
|
85083d74bc
|
Fix for annoying "QThreadStorage" warning.
|
2014-03-03 13:39:01 -08:00 |
|
Stephen Birarda
|
1b7d24a79c
|
keep known nodes alive when we receive a packet from them
|
2014-03-03 12:49:46 -08:00 |
|
Stephen Birarda
|
60eb588e96
|
remove some unecessary null pointer checks
|
2014-03-03 11:36:01 -08:00 |
|
ZappoMan
|
ef87fbffac
|
Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling
Conflicts:
libraries/shared/src/ResourceCache.cpp
|
2014-02-28 16:58:43 -08:00 |
|
ZappoMan
|
c1c41ea2ca
|
handle some shutdown cases and reduce time of locking in octree server
|
2014-02-28 16:18:02 -08:00 |
|
ZappoMan
|
d2faca9767
|
fixed some warnings
|
2014-02-28 16:17:30 -08:00 |
|
Andrzej Kapolka
|
2f27d8ecd3
|
Process geometry/textures in worker threads (via QThreadPool). Closes #2137.
|
2014-02-28 16:14:02 -08:00 |
|
Andrzej Kapolka
|
21a149348b
|
When switching models, retain old one until new one is loaded. Closes #2146.
|
2014-02-28 13:57:25 -08:00 |
|
Andrzej Kapolka
|
73ec568b4b
|
Further work on request limiting.
|
2014-02-27 19:28:45 -08:00 |
|
Andrzej Kapolka
|
29f7954d20
|
Factored out bits common to resource caches, added global limit on number of
resources being requested at any one time.
|
2014-02-27 18:13:40 -08:00 |
|
Andrew Meadows
|
b8c1bab4ae
|
Using pre-computed Model shapes for collisions
...instead of generating collision shapes on the fly
|
2014-02-27 17:52:35 -08:00 |
|
Andrew Meadows
|
25bdfd7677
|
Update to comment.
|
2014-02-26 15:38:33 -08:00 |
|
Andrew Meadows
|
5954bb91d4
|
ListShape now handled by ShapeCollider
|
2014-02-26 15:36:19 -08:00 |
|
Andrew Meadows
|
07eb366138
|
stubbed out collision handlers for ListShape
|
2014-02-26 14:32:46 -08:00 |
|
Philip Rosedale
|
0a1e840d10
|
Bot.js NPCs wander around and make sounds
|
2014-02-26 13:50:04 -08:00 |
|
Andrew Meadows
|
da0276ac7e
|
ShapeCollider takes CollisionList argument
Also, adding first pass at ListShape
|
2014-02-26 12:10:16 -08:00 |
|
ZappoMan
|
d765e250d5
|
removed AbstractMenuInterface.h
|
2014-02-25 20:42:59 -08:00 |
|
ZappoMan
|
42ddc82ac4
|
possible fix to windows assert
|
2014-02-25 20:23:38 -08:00 |
|
ZappoMan
|
4b3911c5c1
|
Merge pull request #2101 from birarda/authentication
fixes to login/logout flow when jumping domains
|
2014-02-25 18:25:17 -08:00 |
|
Stephen Birarda
|
bf3b5c07d5
|
Merge pull request #2093 from ZappoMan/menu_js
Adds support for editing application Menus to JS
|
2014-02-25 17:40:39 -08:00 |
|
Stephen Birarda
|
d5fc1caaaf
|
fix wording for access token change signal
|
2014-02-25 16:12:25 -08:00 |
|
Stephen Birarda
|
2496c6252f
|
fix login/logout flow when jumping domains
|
2014-02-25 16:10:08 -08:00 |
|
Stephen Birarda
|
6d847f29fb
|
currently support system wide auth only via hifi data-web
|
2014-02-25 16:05:05 -08:00 |
|
Stephen Birarda
|
d0269761b6
|
remove unecessary qDebug include
|
2014-02-25 14:39:33 -08:00 |
|
Stephen Birarda
|
27be157d70
|
fix oauth early token expiry
|
2014-02-25 14:38:19 -08:00 |
|
Stephen Birarda
|
ce3d6d2fca
|
reset nodelist if domain-server stops talking to you, closes #2092
|
2014-02-25 13:07:39 -08:00 |
|
ZappoMan
|
263d682fb9
|
Merge branch 'master' of https://github.com/worklist/hifi into menu_js
|
2014-02-25 12:20:15 -08:00 |
|
Andrew Meadows
|
362708be60
|
fix another missing semicolon
|
2014-02-25 11:19:07 -08:00 |
|
Andrew Meadows
|
28d9fb9747
|
fix missing semicolon
|
2014-02-25 11:17:48 -08:00 |
|
Andrew Meadows
|
9a70a50bdb
|
capsuleCapsule() collision with preliminary tests
|
2014-02-25 10:59:12 -08:00 |
|
Stephen Birarda
|
1163cfd07e
|
if the domain-server provides no auth, assume default
|
2014-02-25 10:58:32 -08:00 |
|
Stephen Birarda
|
b09ed1dff1
|
present a login window on app start
|
2014-02-25 10:53:13 -08:00 |
|
ZappoMan
|
74d48ab239
|
added support for MenuItemProperties for addMenuItem, removed some cruft, beginning support for menu item placement
|
2014-02-25 10:23:59 -08:00 |
|
Stephen Birarda
|
45429fa1e1
|
fix default node auth URL
|
2014-02-25 09:38:22 -08:00 |
|
Stephen Birarda
|
6d56ab3a30
|
use toDouble instead of toInt for Qt 5.1 compatibility
|
2014-02-24 15:27:12 -08:00 |
|
Stephen Birarda
|
672c6a9ed1
|
fix complaint for incomplete type QStringList
|
2014-02-24 15:23:47 -08:00 |
|
Stephen Birarda
|
c1b45d7eaa
|
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
|
2014-02-24 15:18:21 -08:00 |
|
Stephen Birarda
|
f20808b47f
|
remove option to drive from transmitter
|
2014-02-24 15:11:02 -08:00 |
|
Stephen Birarda
|
050d223b3a
|
add domain connection reset to NodeList reset
|
2014-02-24 13:33:52 -08:00 |
|
Stephen Birarda
|
27c779666b
|
add auth to assignment-client, fix refresh of static assignments
|
2014-02-24 13:29:32 -08:00 |
|
Stephen Birarda
|
9771e1bb12
|
resolve conflicts on merge with upstream master
|
2014-02-24 12:06:10 -08:00 |
|
Stephen Birarda
|
9dc460bab4
|
make multiple instances of scripted assignment use diff UUID
|
2014-02-24 11:56:14 -08:00 |
|
Andrew Meadows
|
8a3640f016
|
Adding CapsuleSphere collisions with tests.
|
2014-02-24 11:38:27 -08:00 |
|
Stephen Birarda
|
a8493ecaa2
|
cleanup login/logout in menu, logout only when in
|
2014-02-24 11:11:36 -08:00 |
|
Andrew Meadows
|
0e28e0947c
|
Adding ShapeColliderTests.*
|
2014-02-22 13:20:47 -08:00 |
|
Stephen Birarda
|
6165ca658a
|
add a logout option to the menu
|
2014-02-21 17:13:22 -08:00 |
|
Stephen Birarda
|
0686539734
|
default to quieter HTTP request debugging
|
2014-02-21 17:07:14 -08:00 |
|
Stephen Birarda
|
52a21d4dfd
|
hook to request user's location from data-server
|
2014-02-21 16:55:20 -08:00 |
|
Andrew Meadows
|
8c1dc40d39
|
Adding basic physics shapes (unfinished)
|
2014-02-21 16:29:07 -08:00 |
|
Andrew Meadows
|
ef6d2a624b
|
helper methods to rotate/translate CollisionInfo
|
2014-02-21 16:24:40 -08:00 |
|
Stephen Birarda
|
6df317e8e6
|
update user's domain in data-server after connection to new one
|
2014-02-21 16:22:17 -08:00 |
|
Stephen Birarda
|
340248ac43
|
resolve conflicts on merge with upstream master
|
2014-02-21 15:16:15 -08:00 |
|
Stephen Birarda
|
a49893689e
|
store username in local settings so it doesn't need to be reloaded
|
2014-02-21 15:05:57 -08:00 |
|
Stephen Birarda
|
76e6c9342f
|
parse username returned from data-server
|
2014-02-21 14:41:43 -08:00 |
|
Stephen Birarda
|
9d2d9c5071
|
fix cross-thread calls to AccountManager, domain switch flow
|
2014-02-21 13:45:39 -08:00 |
|
Stephen Birarda
|
d56bafc9a5
|
default to no auth for domain-server, fix no auth flow
|
2014-02-21 13:16:24 -08:00 |
|
Andrzej Kapolka
|
8d01527d93
|
Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo
|
2014-02-21 12:16:33 -08:00 |
|
ZappoMan
|
a12e1ef18f
|
Merge pull request #2043 from birarda/metavoxel-fix
fixes for extra characters in logging target names
|
2014-02-21 10:24:29 -08:00 |
|
Andrzej Kapolka
|
495447fc0d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo
|
2014-02-21 10:19:52 -08:00 |
|
Andrzej Kapolka
|
18ea1d6a85
|
More work on billboards.
|
2014-02-21 10:16:06 -08:00 |
|
Andrzej Kapolka
|
d8321bd419
|
Merge pull request #2034 from birarda/master
fixes for scripted avatars
|
2014-02-21 10:14:41 -08:00 |
|
Stephen Birarda
|
c728463410
|
use connection secret to verify domain-server packets
|
2014-02-20 17:57:58 -08:00 |
|
Stephen Birarda
|
9cb8cbff2c
|
fix noAuth flow for domain-server
|
2014-02-20 16:47:00 -08:00 |
|
Stephen Birarda
|
a6c1e3e87f
|
tweaks to domain-server authentication flow
|
2014-02-20 16:31:50 -08:00 |
|
Stephen Birarda
|
ee90c25a41
|
add helpers for json responses from AccountManager
|
2014-02-20 14:22:08 -08:00 |
|
Stephen Birarda
|
3bace43aae
|
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
|
2014-02-20 12:08:47 -08:00 |
|
Stephen Birarda
|
cfec1e583e
|
fix logging target-name extra characters
|
2014-02-20 12:02:23 -08:00 |
|
Stephen Birarda
|
4022d9f4c4
|
fix metavoxel interest list, keep node alive with ping
|
2014-02-20 11:36:16 -08:00 |
|
Andrew Meadows
|
caba4f9b9b
|
Fix for crash when CollisionList gets full.
|
2014-02-20 07:58:30 -08:00 |
|
Stephen Birarda
|
cb165902fd
|
use existing constants for HTTP operations
|
2014-02-19 18:12:10 -08:00 |
|
Stephen Birarda
|
d3dd49a2e8
|
force DomainServer to wait for session UUID before setup with auth
|
2014-02-19 18:06:21 -08:00 |
|
Stephen Birarda
|
ee9f8937e3
|
fix a silly typo
|
2014-02-19 18:03:34 -08:00 |
|
Stephen Birarda
|
32ceccfeb6
|
have domain-server bail if username/password not provided for auth
|
2014-02-19 17:26:21 -08:00 |
|
Stephen Birarda
|
57538af8fd
|
give a separate QNetworkAccessManager to the AccountManager
|
2014-02-19 14:19:00 -08:00 |
|
Stephen Birarda
|
a4cabe91f8
|
use UUID setter to fire signal and debug on UUID change
|
2014-02-19 14:17:14 -08:00 |
|
Stephen Birarda
|
c5b8ff181e
|
indicate that both username or email can be passed for login
|
2014-02-19 14:14:17 -08:00 |
|
Stephen Birarda
|
5f130872af
|
repair usage of INI file for QSettings
|
2014-02-19 14:09:18 -08:00 |
|
Stephen Birarda
|
ff7a49d8c2
|
resolve conflicts on merge with upstream master
|
2014-02-19 13:07:26 -08:00 |
|
Stephen Birarda
|
c302042e83
|
store access tokens in QSettings
|
2014-02-18 18:12:27 -08:00 |
|
Stephen Birarda
|
3199f1a3e4
|
store access tokens in settings so re-log not required
|
2014-02-18 17:42:12 -08:00 |
|
Stephen Birarda
|
ca6dfa58a6
|
client ID need not be passed for password grant type
|
2014-02-18 17:16:25 -08:00 |
|
Stephen Birarda
|
b0895ea83a
|
store registration token in more compact form, begin parse on domain-server
|
2014-02-18 15:58:54 -08:00 |
|
Stephen Birarda
|
949f79e945
|
hook up request for domain registration information for Interface
|
2014-02-18 15:38:43 -08:00 |
|
Stephen Birarda
|
f4b0375b35
|
stub a method to ask for domain-server auth from NodeList
|
2014-02-18 14:48:17 -08:00 |
|
Stephen Birarda
|
582681738a
|
correctly set token expiration from json response
|
2014-02-18 14:37:46 -08:00 |
|
Stephen Birarda
|
72a877ca49
|
remove an extra space
|
2014-02-18 14:34:47 -08:00 |
|
Stephen Birarda
|
ce3cc7e5c9
|
require that client ID for authentication server be known to AccountManager
|
2014-02-18 14:34:32 -08:00 |
|
Stephen Birarda
|
b57a5cea6a
|
complete access token request flow after login window presentation
|
2014-02-18 14:27:52 -08:00 |
|
Stephen Birarda
|
b87d65df30
|
re-set domain auth info if hostname changes
|
2014-02-18 13:23:53 -08:00 |
|
Stephen Birarda
|
8a0136efe1
|
more work on authentication, show login window when domain asks
|
2014-02-18 13:21:32 -08:00 |
|
Stephen Birarda
|
c762b92e5a
|
replace DataServerClient and Profile with AccountManager
|
2014-02-18 11:27:37 -08:00 |
|
Stephen Birarda
|
7c69028dc5
|
hook up domain request for node to authenticate
|
2014-02-18 10:54:45 -08:00 |
|
Stephen Birarda
|
4c135dd3a7
|
more tweaks to domain check-ins to prepare for auth
|
2014-02-18 10:28:28 -08:00 |
|
Stephen Birarda
|
37f1f7ba4f
|
add a DomainInfo class to hold domain information
|
2014-02-18 09:59:22 -08:00 |
|
Stephen Birarda
|
c9ade0585b
|
add a node authentication hostname to the domain-server
|
2014-02-18 09:03:35 -08:00 |
|
stojce
|
c57cae6437
|
Merge branch 'master' of https://github.com/worklist/hifi into 19497
|
2014-02-17 21:20:42 +01:00 |
|
stojce
|
13485065a5
|
Merge branch 'master' of https://github.com/worklist/hifi into 19497
|
2014-02-17 18:59:44 +01:00 |
|
Andrew Meadows
|
4848aa1d16
|
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
|
2014-02-17 09:14:06 -08:00 |
|
Andrew Meadows
|
335141049c
|
Cleaning up collision check API's and re-enabling collisions with particles.
|
2014-02-14 16:33:19 -08:00 |
|
ZappoMan
|
20a6f4eea9
|
first cut at auto-LOD adjustment
|
2014-02-12 21:22:21 -08:00 |
|
stojce
|
68584c654b
|
Allow drag-and-drop of snapshots into Interface
|
2014-02-12 02:12:52 +01:00 |
|
Andrew Meadows
|
4edc6cd88b
|
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
|
2014-02-10 15:42:56 -08:00 |
|
Philip Rosedale
|
ac9e2732b9
|
Merge pull request #1963 from birarda/authentication
default avatar head and body URLS
|
2014-02-10 15:42:53 -08:00 |
|
Philip Rosedale
|
64736fe290
|
Merge pull request #1961 from ZappoMan/silence_bad_edit_packet_warning
clean up bad edit packet warnings to help reduce log clutter
|
2014-02-10 15:42:23 -08:00 |
|
Stephen Birarda
|
37d7872677
|
fix a bug in version mismatched packets
|
2014-02-10 12:06:08 -08:00 |
|
Stephen Birarda
|
988c98d4d7
|
remove an antequated comment
|
2014-02-10 12:04:52 -08:00 |
|
ZappoMan
|
a0789d3a29
|
clean up bad edit packet warnings to help reduce log clutter
|
2014-02-10 11:21:27 -08:00 |
|
Stephen Birarda
|
27305c7a43
|
change default domain to root, don't double load domains on startup
|
2014-02-10 10:23:06 -08:00 |
|
Andrew Meadows
|
be1aaee359
|
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
|
2014-02-10 09:05:08 -08:00 |
|
Andrew Meadows
|
10296577f4
|
More info when colliding with meshes + stubbery for poking avatar.
|
2014-02-10 09:02:29 -08:00 |
|
ZappoMan
|
235673b7fe
|
Merge branch 'master' of https://github.com/worklist/hifi into ray_cast_scripting
|
2014-02-07 16:27:52 -08:00 |
|
Stephen Birarda
|
cf05600d73
|
fix miss of pingType in timePingReply, closes #1934
|
2014-02-07 15:27:44 -08:00 |
|
Stephen Birarda
|
3e13608e19
|
switch back to proper data-server
|
2014-02-07 15:06:57 -08:00 |
|
ZappoMan
|
e162aa4a40
|
Merge branch 'master' of https://github.com/worklist/hifi into ray_cast_scripting
|
2014-02-07 14:47:25 -08:00 |
|
Stephen Birarda
|
f945aac5cd
|
bump version on unverified packets whose header format has changed
|
2014-02-07 14:32:09 -08:00 |
|
Stephen Birarda
|
a1a4a3db8a
|
HifiSockAddr to SharedNodePointer changes in MetavoxelServer
|
2014-02-07 14:27:10 -08:00 |
|
Stephen Birarda
|
3bf0ed719c
|
remove a comment in HifiSockAddr
|
2014-02-07 14:08:42 -08:00 |
|
Stephen Birarda
|
dd4d944dea
|
ping inactive nodes in conjunction with domain server check in
|
2014-02-07 14:06:42 -08:00 |
|
Stephen Birarda
|
94c449e10c
|
Merge branch 'mesh-through-mixer' into authentication
|
2014-02-07 13:50:39 -08:00 |
|
Stephen Birarda
|
72a3e6f22c
|
fix long column in NodeList
|
2014-02-07 13:49:59 -08:00 |
|
Stephen Birarda
|
05f086ae74
|
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
|
2014-02-07 13:48:28 -08:00 |
|
Stephen Birarda
|
7c6d3cd01f
|
fix broken build from NetworkPacket
|
2014-02-07 13:46:59 -08:00 |
|
Stephen Birarda
|
455442088c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into mesh-through-mixer
|
2014-02-07 13:45:14 -08:00 |
|
Stephen Birarda
|
3ad8e7260e
|
fix an accidental DOS and remove getNodeActiveSocketOrPing API
|
2014-02-07 13:42:52 -08:00 |
|
Stephen Birarda
|
a5636d2dc0
|
make ThreadedAssignment subclasses handle QUdpSocket readyRead, closes #1895
|
2014-02-07 12:25:43 -08:00 |
|
ZappoMan
|
c64b934d33
|
first cut at ray cast scripting
|
2014-02-07 11:23:04 -08:00 |
|
Philip Rosedale
|
72de486671
|
Merge pull request #1920 from ZappoMan/scriptable_camera
Scriptable camera
|
2014-02-07 11:21:12 -08:00 |
|
Stephen Birarda
|
66d4eeb805
|
enforce both a version and hash match for packets
|
2014-02-07 11:10:38 -08:00 |
|
Andrew Meadows
|
2e65592048
|
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
|
2014-02-07 10:50:36 -08:00 |
|
Stephen Birarda
|
d39cccde77
|
add a method to find a node and upate based on packet
|
2014-02-07 10:32:16 -08:00 |
|
Stephen Birarda
|
7ceacd2751
|
remove blank if and fix ping reply construction
|
2014-02-07 10:24:01 -08:00 |
|
Stephen Birarda
|
fa1825fa32
|
repairs to ping-reply, removal of deconstructPacketHeader to simply return UUID
|
2014-02-07 10:20:50 -08:00 |
|
Andrzej Kapolka
|
d3b005112e
|
Changes from Philip's code review.
|
2014-02-07 10:03:23 -08:00 |
|
Stephen Birarda
|
b988308a8d
|
leverage writeDatagram helper in NodeList, ping if no active socket
|
2014-02-07 09:49:54 -08:00 |
|
ZappoMan
|
2157349804
|
added Camera.computePickRay()
|
2014-02-07 09:40:52 -08:00 |
|
Stephen Birarda
|
97a7369c76
|
remove senderWithAddress from NodeList
|
2014-02-06 14:43:46 -08:00 |
|
Andrew Meadows
|
082b7cf1a9
|
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
Conflicts:
interface/src/avatar/Avatar.cpp
interface/src/avatar/Avatar.h
interface/src/avatar/MyAvatar.cpp
|
2014-02-06 14:37:19 -08:00 |
|
Stephen Birarda
|
a823722d27
|
add writeDatagram helper to NodeList to insert md5 hash
|
2014-02-06 14:28:58 -08:00 |
|
Andrew Meadows
|
b230f046a7
|
Minor formating fixes.
|
2014-02-06 14:11:11 -08:00 |
|
Stephen Birarda
|
e72f6d16cc
|
rename NodeList ownerUUID to sessionUUID
|
2014-02-06 11:43:23 -08:00 |
|
Stephen Birarda
|
3dca04aacb
|
have the domain-server generate connection secrets, closes #1837
|
2014-02-06 11:30:53 -08:00 |
|
Stephen Birarda
|
6f638fa62c
|
have domain-server create a UUID for unidentified nodes, closes #1840
|
2014-02-06 10:34:34 -08:00 |
|
Stephen Birarda
|
f92f9ec0c2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
|
2014-02-06 09:28:03 -08:00 |
|
Brad Hefta-Gaub
|
a05e07460f
|
fix windows build errors and warnings
|
2014-02-05 13:54:17 -08:00 |
|
AndrewMeadows
|
42528be7ca
|
Merge pull request #1846 from ZappoMan/fixdebugoutput
fix debug to properly work with outputBufferBits()
|
2014-02-05 10:03:09 -08:00 |
|
ZappoMan
|
13d9b710f1
|
bump packet version
|
2014-02-04 20:23:12 -08:00 |
|
Stephen Birarda
|
8bf3b7586b
|
initial movement of mesh/skeleton URLs out of data-server through avatar-mixer
|
2014-02-04 13:02:33 -08:00 |
|
ZappoMan
|
2cf2e693b9
|
fix debug to properly work with outputBufferBits()
|
2014-02-04 12:29:55 -08:00 |
|
Andrew Meadows
|
466a43c77f
|
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
|
2014-02-03 10:47:00 -08:00 |
|
AndrewMeadows
|
bed63513a9
|
Merge pull request #1745 from ZappoMan/scripting_work
support for global collision callbacks in JS
|
2014-01-31 10:42:44 -08:00 |
|
Stephen Birarda
|
a07511ed2c
|
remove an unecessary line
|
2014-01-31 10:05:46 -08:00 |
|
Stephen Birarda
|
ddbcfbd02f
|
remove an extra debug for ping packets
|
2014-01-31 09:56:18 -08:00 |
|
Stephen Birarda
|
c989a64e90
|
repair ping packet parsing in creation of reply
|
2014-01-31 09:54:52 -08:00 |
|
Stephen Birarda
|
984fb1a5df
|
fix config parsing from command line and json
|
2014-01-30 15:22:03 -08:00 |
|
Stephen Birarda
|
356222ba15
|
removal of persistence in DS for static assignments
|
2014-01-30 14:33:36 -08:00 |
|
ZappoMan
|
ed0a2a5a18
|
Merge branch 'master' of https://github.com/worklist/hifi into scripting_work
Conflicts:
libraries/shared/src/SharedUtil.cpp
libraries/shared/src/SharedUtil.h
libraries/voxels/src/VoxelEditPacketSender.cpp
|
2014-01-29 19:49:36 -08:00 |
|
ZappoMan
|
08b06cc59c
|
support for global collision callbacks in JS
|
2014-01-29 17:52:17 -08:00 |
|
Stephen Birarda
|
740d11027c
|
add QDataStream >> operator to Assignment
|
2014-01-29 17:20:32 -08:00 |
|
Stephen Birarda
|
e700a39c3c
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-01-29 14:23:49 -08:00 |
|
Stephen Birarda
|
7d27830064
|
domain-server patches while looking for payload/pool errors
|
2014-01-29 14:23:39 -08:00 |
|
Andrew Meadows
|
f093a571c5
|
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
Conflicts:
interface/src/avatar/Avatar.cpp
libraries/particles/src/ParticleCollisionSystem.cpp
libraries/shared/src/CollisionInfo.h
|
2014-01-29 14:12:22 -08:00 |
|
Andrzej Kapolka
|
1e9e298a75
|
Missing includes.
|
2014-01-29 13:47:13 -08:00 |
|
Stephen Birarda
|
33edcea5fb
|
resolve conflicts on merge with upstream master
|
2014-01-29 12:23:06 -08:00 |
|
ZappoMan
|
98cdc656c4
|
more scripting support, including adding a Quat helper class that makes JS quat math easier
|
2014-01-29 00:56:08 -08:00 |
|
ZappoMan
|
9d87d58723
|
Merge branch 'master' of https://github.com/worklist/hifi into more_scripting
Conflicts:
libraries/particles/src/ParticlesScriptingInterface.cpp
|
2014-01-28 20:36:35 -08:00 |
|
Stephen Birarda
|
4bb72b9f3f
|
remove MAX_HOSTNAME_BYTES
|
2014-01-28 13:44:47 -08:00 |
|
Stephen Birarda
|
423e1598f0
|
use NodeSet in place of QSet<NodeType_t> where possible
|
2014-01-28 13:41:39 -08:00 |
|
Stephen Birarda
|
4de270b832
|
cleanup Node types, closes #1726
|
2014-01-28 13:38:33 -08:00 |
|
Stephen Birarda
|
fe410ae3e9
|
fix packet header size constraints
|
2014-01-28 12:56:05 -08:00 |
|
Stephen Birarda
|
8384ff79df
|
remove one Qt type replacement
|
2014-01-28 12:36:43 -08:00 |
|
Stephen Birarda
|
cda06d1cb3
|
replace uint64_t with quint64 for Qt friendlyness
|
2014-01-28 12:35:42 -08:00 |
|
Stephen Birarda
|
7b4921e761
|
use quint64 in place of uint64_t for QDataStream
|
2014-01-28 12:34:08 -08:00 |
|
Stephen Birarda
|
2aaa9ce3f6
|
resolve conflicts on merge with upstream master
|
2014-01-28 12:30:43 -08:00 |
|
Stephen Birarda
|
b009cd8e67
|
repair more node communication problems after refactor
|
2014-01-28 12:25:44 -08:00 |
|
Stephen Birarda
|
ffefc529f3
|
ensure UUID pulled from packet header is exactly 16 bytes
|
2014-01-28 11:53:09 -08:00 |
|
Stephen Birarda
|
75e2fa491a
|
some type fixes for marshalling/un-marshalling of data
|
2014-01-28 11:26:36 -08:00 |
|
ZappoMan
|
427abd4509
|
add model properties to particles
|
2014-01-28 11:18:37 -08:00 |
|
Stephen Birarda
|
85ebad979f
|
repair assignment flow errors from packet changes
|
2014-01-28 11:15:38 -08:00 |
|