Commit graph

2625 commits

Author SHA1 Message Date
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
Andrew Meadows
b28a18dab0 Remove warning about null-op sprintf() in g++ 2014-02-17 09:17:34 -08:00
Andrew Meadows
4848aa1d16 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-17 09:14:06 -08:00
ZappoMan
dd0909659a Merge branch 'master' of https://github.com/worklist/hifi into overlaysupport 2014-02-16 19:20:06 -08:00
Philip Rosedale
37e1c00828 Merge pull request #2002 from ZappoMan/lowerLODnoFPSdrop
Automatically Adjust LOD
2014-02-16 18:14:24 -08:00
Andrew Meadows
2d1218d304 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-14 16:34:32 -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
2eac9c293f first working version of scriptable Overlays 2014-02-14 15:37:47 -08:00
Andrzej Kapolka
f4b47ea443 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-14 11:09:35 -08:00
ZappoMan
dbd6cb71c9 fixed crash on shutdown with multiple scripts 2014-02-13 20:55:16 -08:00
Andrzej Kapolka
91fac4eebe Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-13 17:38:23 -08:00
Andrew Meadows
ee4733d0bd Fixing a comment. 2014-02-13 12:41:23 -08:00
Andrew Meadows
439cbe3f87 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
Conflicts:
	interface/src/avatar/Hand.h
	interface/src/avatar/MyAvatar.cpp
2014-02-13 12:36:01 -08:00
ZappoMan
e9259db944 Merge branch 'master' of https://github.com/worklist/hifi into lowerLODnoFPSdrop 2014-02-13 12:20:29 -08:00
Andrzej Kapolka
23169c098e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-13 10:27:36 -08:00
Andrew Meadows
3a8aa0c47e Removing HeadData::findSpherePenetration() as unused cruft. 2014-02-13 10:02:16 -08:00
ZappoMan
20a6f4eea9 first cut at auto-LOD adjustment 2014-02-12 21:22:21 -08:00
Philip Rosedale
1412d49a2f merge fix 2014-02-11 15:08:49 -08:00
Philip Rosedale
b6edd7be7b add Vec3::subtract in JS 2014-02-11 15:07:25 -08:00
Andrzej Kapolka
3c535e6c9c These need to be FST files, too. 2014-02-11 14:38:44 -08:00
ZappoMan
1fca763b9d removed whitespace to get build to run 2014-02-11 12:43:48 -08:00
ZappoMan
4b5e633258 tweaks to hydraMove.js, added scale to MyAvatar JS 2014-02-10 19:48:51 -08:00
ZappoMan
98211a832c Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js 2014-02-10 17:41:21 -08:00
ZappoMan
8b45e0e3a8 Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js 2014-02-10 17:34:35 -08:00
ZappoMan
991c72006c moving the hydra grab behavior to JS 2014-02-10 17:25:14 -08:00
Andrew Meadows
f6be83b63c Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-10 17:02:46 -08:00
Andrzej Kapolka
b9a5b13f0a This should fix the remaining signed/unsigned warning on Windows. 2014-02-10 16:33:35 -08:00
Andrew Meadows
ab25fd03af Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-10 16:01:36 -08:00
Philip Rosedale
dabf3e34d6 Merge pull request #1964 from ZappoMan/multiple_voxel_scripts_crash
Fixes various crashes in running multiple voxel scripts simultaneously
2014-02-10 15:43:37 -08: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
ZappoMan
0c547a8160 added Quat.safeEulerAngles() for JS 2014-02-10 15:37:49 -08:00
AndrewMeadows
8844b375d3 Merge pull request #1956 from ey6es/metavoxels
Fixes for streaming, added test application for metavoxel stuff (currently, datagram transmissions), Windows crash fix, fixes for Windows warnings that Brad reported.
2014-02-10 15:36:11 -08:00
ZappoMan
c68abb3499 nodelist bug 2014-02-10 15:33:07 -08:00
ZappoMan
4bb7bb2b77 make pending packets thread safe 2014-02-10 12:48:45 -08:00
ZappoMan
f8a24a2e99 fix crash in multiple voxel edit scripts running simultaneously 2014-02-10 12:19:46 -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
Stephen Birarda
3e90bcd523 use shorter default URLs, set as placeholder text in prefs 2014-02-10 11:28:22 -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
712692f8bf add fallback default URLs for head and body models 2014-02-10 11:15:35 -08:00