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
|
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 |
|
Philip Rosedale
|
0a1e840d10
|
Bot.js NPCs wander around and make sounds
|
2014-02-26 13:50:04 -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 |
|
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 |
|
Stephen Birarda
|
a8493ecaa2
|
cleanup login/logout in menu, logout only when in
|
2014-02-24 11:11:36 -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 |
|
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 |
|