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

10062 commits

This branch
This branch
All branches
Author SHA1 Message Date
stojce
ae78cac78b removed some magic numbers 2014-02-28 00:05:46 +01:00
stojce
7d67b8e60d fixed vertical thumb placement on window resize 2014-02-27 23:28:23 +01:00
stojce
5c22376312 editVoxels new layout / assets 2014-02-27 23:20:40 +01:00
Philip Rosedale
89cf2f9a7a Merge pull request #2125 from birarda/simple-audio 
increase size of audio output buffer to match ring buffer
 2014-02-26 16:31:40 -08:00
Stephen Birarda
cb45a3242d increase size of audio output buffer to match size of ring buffer 2014-02-26 16:29:07 -08:00
Stephen Birarda
1f1369367f Merge pull request #2124 from birarda/master 
bot.js repair for wrong body when bot # < 20
 2014-02-26 16:18:13 -08:00
Stephen Birarda
88b46acdeb repair for wrong body on bots < 20 2014-02-26 16:17:51 -08:00
ZappoMan
98d9e443eb Merge pull request #2119 from PhilipRosedale/master 
NPC bots wander and look around, and play sounds
 2014-02-26 14:40:58 -08:00
Philip Rosedale
af550b8ae0 Merge pull request #2117 from ey6es/master 
Preserve joint states when switching between LODs.  Closes #2077.
 2014-02-26 14:17:50 -08:00
Philip Rosedale
b27e9b03d4 removed bad include 2014-02-26 14:15:00 -08:00
Andrzej Kapolka
d3ba0ca03d Merge pull request #2116 from birarda/authentication 
fix address go-to and update for new API
 2014-02-26 13:51:37 -08:00
Philip Rosedale
0a1e840d10 Bot.js NPCs wander around and make sounds 2014-02-26 13:50:04 -08:00
Stephen Birarda
7067cf2ab3 fix go to user and address update for new API 2014-02-26 13:40:49 -08:00
Andrzej Kapolka
f335bb8171 Preserve joint states when switching between LODs. Closes #2077. 2014-02-26 13:40:09 -08:00
Andrzej Kapolka
959c225843 Merge pull request #2112 from ey6es/master 
Fix for billboards' rendering incorrectly when rear view mirror is disabled.
 2014-02-26 12:13:45 -08:00
Andrzej Kapolka
1265f83f68 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-26 12:12:18 -08:00
Andrzej Kapolka
8644280eb5 Make sure our mode is fully established before we use the mirror camera to 
render the billboard.  Closes #2103.
 2014-02-26 12:11:03 -08:00
Philip Rosedale
220f9fda76 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-25 22:09:08 -08:00
Philip Rosedale
4da6af96bb Bots will move 2014-02-25 22:08:56 -08:00
Philip Rosedale
46469612c7 Merge pull request #2108 from ZappoMan/remove_cpp_voxel_editing 
Remove cpp voxel editing
 2014-02-25 22:07:54 -08:00
Philip Rosedale
2d2965d53a Merge pull request #2106 from ZappoMan/fixwindowsbuild 
some windows fixes and simplify script menus
 2014-02-25 22:03:52 -08:00
ZappoMan
f2b95e0a00 added a comment 2014-02-25 21:54:52 -08:00
ZappoMan
5fdf114ff0 removed more cruft 2014-02-25 21:53:20 -08:00
ZappoMan
d61ba02a38 removed more cruft 2014-02-25 21:44:38 -08:00
ZappoMan
869b35a7aa remove old c++ implementation of voxel tools 2014-02-25 21:38:10 -08:00
ZappoMan
d3594808d9 some cruft cleanup 2014-02-25 20:45:49 -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
9a052a901e Merge pull request #2104 from ZappoMan/fixwindowsbuild 
fix windows warning
 2014-02-25 18:50:23 -08:00
ZappoMan
d4c36acd7d fix windows warning 2014-02-25 18:43:31 -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
ZappoMan
3943c49dcc rename MenuType and other CR feedback 2014-02-25 17:32:16 -08:00
Philip Rosedale
e7ce7288de Merge pull request #2102 from ey6es/master 
More flexible Visage blendshape mapping, hysteresis for billboard switching, no hover text on billboards, eye convergence fix.
 2014-02-25 17:04:11 -08:00
Andrzej Kapolka
8554c1dfbf Force a minimum convergence distance on the eyes. Closes #2100. 2014-02-25 16:50:59 -08:00
Andrzej Kapolka
5d99b06a48 Use hysteresis to prevent rapid enabling and disabling of billboard. Closes 2014-02-25 16:12:58 -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
Andrzej Kapolka
038f1acf01 Don't render the hover text in mirror/billboard mode. Closes #2098. 2014-02-25 15:34:16 -08:00
Andrzej Kapolka
c588a33b01 Slight mapping improvement. 2014-02-25 15:07:19 -08:00
ZappoMan
81bff60645 change singleton approach to not require delete 2014-02-25 14:53:57 -08:00
Andrzej Kapolka
55f4f65bc0 Parse error fix. 2014-02-25 14:49:41 -08:00
Andrzej Kapolka
a5b821ab25 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-25 14:49:31 -08:00
Andrzej Kapolka
3e2a659178 Experimenting with more action unit mappings. 2014-02-25 14:47:56 -08:00
Stephen Birarda
6c27b99aba Merge pull request #2099 from birarda/authentication 
fix oauth early token expiry
 2014-02-25 14:45:02 -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
ZappoMan
e03c7be5ef moved MenuScriptingInterface to own files 2014-02-25 14:33:37 -08:00
Andrzej Kapolka
d7f55f4c30 Compile fixes. 2014-02-25 14:29:58 -08:00