Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:33:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
9615 commits 71 branches 56 tags 1.2 GiB
Commit graph

9615 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ZappoMan
26d076f166 Merge pull request #2003 from AndrewMeadows/avatar-interaction 
Particle vs Avatar collisions work again
 2014-02-17 12:15:53 -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
Andrew Meadows
e4ef09e06d Helper method for adding avatar collision submenu 2014-02-17 09:12:38 -08:00
Philip Rosedale
fc3cc52665 Merge pull request #2006 from ZappoMan/overlaysupport 
Scriptable Overlay Support
 2014-02-16 22:17:11 -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
Philip Rosedale
d4c99b6320 Merge pull request #1982 from ey6es/master 
Load FST file before FBX, use its filename and texdir properties like Faceshift does.  Fixed a bug with the fallback model and added basic LOD switching based on distance.
 2014-02-16 18:11:27 -08:00
ZappoMan
d101f19e40 removed bounds properties from Overlay so it only lives in Overlay2D 2014-02-16 13:39:01 -08:00
ZappoMan
78f4df912d added 3D line overlay support 2014-02-16 13:25:49 -08:00
ZappoMan
6b410253d4 update comments in example 2014-02-16 12:42:26 -08:00
ZappoMan
7c350b3acb add 3D sphere overlay support 2014-02-16 12:30:15 -08:00
ZappoMan
5abf908874 added 3D cube overlay support 2014-02-16 11:36:06 -08:00
ZappoMan
cb1c659e2e fix windows 2014-02-15 21:25:20 -08:00
ZappoMan
ef11865d24 implement text overlay support 2014-02-15 21:13:44 -08:00
ZappoMan
0a9f9a7c7a fix windows build 2014-02-15 19:20:08 -08:00
ZappoMan
37bb85fca6 tweaks to overlays 2014-02-15 19:15:30 -08:00
ZappoMan
f7f695d145 add support for detecting clicked on overlays 2014-02-15 17:45:42 -08:00
ZappoMan
1ddd856ca8 removed getProperties() which was not implemented 2014-02-15 16:31:09 -08:00
ZappoMan
f6adce255d more work on image overlays 2014-02-15 16:26:34 -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
Andrew Meadows
b7352335f2 Adding collisions options to menu at a second location. 
And adding CollideWithParticle option which will be working soon...
 2014-02-14 16:31:53 -08:00
ZappoMan
2eac9c293f first working version of scriptable Overlays 2014-02-14 15:37:47 -08:00
Andrzej Kapolka
855bc19c5a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-14 15:36:13 -08:00
ZappoMan
8310ce1e25 Merge pull request #1980 from stojce/19494 
Code Review for Job #19494
 2014-02-14 14:29:06 -08:00
Andrzej Kapolka
af0d395751 Added sanity check for zero vertices. 2014-02-14 13:11:16 -08:00
Andrzej Kapolka
76142c92f2 Adjust offset when skipping parts that don't match the translucency setting. 
Closes #2001.
 2014-02-14 13:04:17 -08:00
Andrzej Kapolka
f4b47ea443 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-14 11:09:35 -08:00
ZappoMan
8e284a55b1 Merge branch 'master' of https://github.com/worklist/hifi into overlaysupport 2014-02-14 10:50:35 -08:00
stojce
d5b87fbe8a Merge branch 'master' of https://github.com/worklist/hifi into 19494 2014-02-14 18:28:34 +01:00
Philip Rosedale
04cda4c2b6 Merge pull request #1995 from ZappoMan/scriptfixes 
Fix crash on shutdown with multiple scripts and other scripting improvements
 2014-02-13 21:28:05 -08:00
ZappoMan
cd137b2b12 tweak to reload scripts 2014-02-13 21:00:20 -08:00
ZappoMan
dbd6cb71c9 fixed crash on shutdown with multiple scripts 2014-02-13 20:55:16 -08:00
ZappoMan
9d841ce918 add Stop All Scripts and Reload All Scripts 2014-02-13 18:19:20 -08:00
Andrzej Kapolka
91fac4eebe Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-13 17:38:23 -08:00
Andrzej Kapolka
87ec2dc25a Merge pull request #1994 from AndrewMeadows/avatar-interaction 
Avatar interaction
 2014-02-13 17:38:08 -08:00
Andrzej Kapolka
1afd3ab712 Fixes for OS X warnings. 2014-02-13 17:07:57 -08:00
Andrzej Kapolka
b08d452749 Fix for head appearing at wrong position for a single frame. 2014-02-13 16:49:42 -08:00
Andrzej Kapolka
5f38c328d5 Removed debugging code. 2014-02-13 16:25:04 -08:00
Andrzej Kapolka
078b15c02d Add some hysteresis on the LOD switching to prevent rapid switching back 
and forth.
 2014-02-13 16:20:43 -08:00
ZappoMan
601c155303 correctly lock arrays on init 2014-02-13 14:46:59 -08:00
ZappoMan
ed7fa6e311 added back setupNewVoxelsForDrawing() on changeTree() 2014-02-13 14:39:10 -08:00
ZappoMan
4fb5e68425 removed some debug 2014-02-13 14:33:23 -08:00