Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 03:57:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
10237 commits 76 branches 59 tags 1.2 GiB
Commit graph

5547 commits

Author SHA1 Message Date
Andrzej Kapolka
5d4ed4c85e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-27 18:14:18 -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
7ce380a333 relocate mute button, audio scope 2014-02-27 18:02:53 -08:00
ZappoMan
19b7189269 switch AUTO LOD to use moving avarage of FPS, and also tweak the min and max behavior 2014-02-27 18:00:58 -08:00
Philip Rosedale
f06b30e024 remove audio barograph latency display 2014-02-27 17:45:47 -08:00
Philip Rosedale
fb97abf128 reset audio connection on prefs changes 2014-02-27 17:35:23 -08:00
Philip Rosedale
ae6d156feb remove travelling noises 2014-02-27 17:27:41 -08:00
Philip Rosedale
7b55ee31a3 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-27 16:01:04 -08:00
Philip Rosedale
348295bbb1 Merge pull request #2133 from ey6es/master 
Delay loading models until we know that we need them (i.e., that we're not going to use the billboard).
 2014-02-27 16:00:04 -08:00
Philip Rosedale
e87ae8ac8f audio debugging 2014-02-27 15:52:19 -08:00
ZappoMan
1cc6288899 add back in entry point for import voxels 2014-02-27 15:41:36 -08:00
ZappoMan
b7f62eabf0 clean up more menu items 2014-02-27 15:25:39 -08:00
Andrzej Kapolka
e91d47174b Removed unused function. 2014-02-27 12:37:17 -08:00
Andrzej Kapolka
cd2bd32210 Delay loading models until we know that we need them (i.e., that we're not 
beyond billboard distance).  Closes #2121.
 2014-02-27 12:30:46 -08:00
ZappoMan
8d53fc9671 Merge branch 'master' of https://github.com/worklist/hifi into seeing_voxels 2014-02-27 01:05:20 -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
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
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
ZappoMan
1e404404c3 next pass at seeing voxels 2014-02-26 13:35:59 -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
ZappoMan
7a2419a5bd removed old menu items for voxel protocol options 2014-02-26 01:54:32 -08:00
ZappoMan
5b1037cc63 switching to OctreeQuery instead of VoxelQuery 2014-02-26 01:22:53 -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
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
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
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
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
3e2a659178 Experimenting with more action unit mappings. 2014-02-25 14:47:56 -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
Andrzej Kapolka
c0a33fe8fe Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-25 14:26:50 -08:00
Andrzej Kapolka
16796b50a7 Working on Visage improvements. 2014-02-25 14:26:31 -08:00
Philip Rosedale
6b128466a9 Merge pull request #2094 from birarda/authentication 
reset nodelist if domain-server stops talking to you, closes #2092
 2014-02-25 14:10:24 -08:00
ZappoMan
23b2d7d124 Merge pull request #2073 from josecpujol/19489 
19489
 2014-02-25 13:34:39 -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
e12d791097 remove dead code 2014-02-25 12:37:49 -08:00
Philip Rosedale
11e9b18a98 Don’t render avatar ‘sphere’ unless there is voice intensity 2014-02-25 12:35:14 -08:00
ZappoMan
263d682fb9 Merge branch 'master' of https://github.com/worklist/hifi into menu_js 2014-02-25 12:20:15 -08:00
ZappoMan
0048099ff5 implement support for menu item positioning 2014-02-25 12:19:30 -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
0b6e81b8a6 remove more cruft 2014-02-25 10:31:29 -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
Philip Rosedale
e637e48598 Merge pull request #2076 from birarda/authentication 
groundwork for secure node communication via data-server
 2014-02-25 10:07:55 -08:00
ZappoMan
cb01c1ee10 add separator support 2014-02-24 23:53:26 -08:00
ZappoMan
374b12980b added checkable menus and sub menus 2014-02-24 23:42:05 -08:00
ZappoMan
a3d0c20516 better support for shortcuts 2014-02-24 20:49:06 -08:00
ZappoMan
76355dc1a8 add support for hiding local rendering of avatar 2014-02-24 19:24:45 -08:00
ZappoMan
03f8885cad first cut at menus JS 2014-02-24 19:09:22 -08:00
Andrzej Kapolka
c71b10f639 Added toggles for rendering bucky balls, particles. 2014-02-24 17:43:47 -08:00
Philip Rosedale
fa3b109e1d Merge branch 'master' of https://github.com/worklist/hifi 2014-02-24 16:43:39 -08:00
Jose Carlos
64e75bb4ab fixed typo 2014-02-25 00:19:52 +01: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
4a4001a049 remove pairing logic from interface 2014-02-24 15:03:10 -08:00
Jose Carlos
976732120e fixed typo 2014-02-24 23:33:25 +01:00
Jose Carlos
ae87ab3b79 Undone a change to try to prevent the decay effect in the text rendering 2014-02-24 23:26:42 +01:00
Jose Carlos
438131f3e9 Reverted myAvatar::render call to test if the decay effect is gone 2014-02-24 22:38:50 +01:00
Andrzej Kapolka
2cea83a599 Proper header on ribbon.js, show display name for own avatar. 2014-02-24 13:36:43 -08:00
Jose Carlos
2bf3d2547a Merge remote-tracking branch 'upstream/master' into 19489 2014-02-24 22:03:03 +01:00
Jose Carlos
c8c371b6f4 Changed the displayname background rect: instead of having squared 
corners, they are bevel
Added some test code to prevent the decay effect in the text rendering
 2014-02-24 22:02:06 +01:00
Stephen Birarda
9771e1bb12 resolve conflicts on merge with upstream master 2014-02-24 12:06:10 -08:00
Andrzej Kapolka
e40fe85c36 Updating the camera mode every frame screws with the scripts, so revert to 
updating it when the menu changes.
 2014-02-24 11:42:47 -08:00
Andrzej Kapolka
8efc4d52ba Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-24 11:34:12 -08:00
Andrzej Kapolka
d80b52dc9f Fixes for camera mode transitions, seeing inside head. 2014-02-24 11:33:52 -08:00
Stephen Birarda
a8493ecaa2 cleanup login/logout in menu, logout only when in 2014-02-24 11:11:36 -08:00
ZappoMan
6ea2c81e68 fix reload of scripts 2014-02-24 10:10:00 -08:00
Philip Rosedale
246bb1fd2d Physics test ‘buckyballs’ moved to application.cpp 2014-02-24 00:06:50 -08:00
Philip Rosedale
26541e12b6 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-23 21:08:54 -08:00
Philip Rosedale
197b039a42 remove buckyballs physics testing code from hand code 2014-02-23 21:08:38 -08:00
Andrzej Kapolka
8745ca3139 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-23 20:13:23 -08:00
Andrzej Kapolka
f5fece5eb5 Fix for Xcode warnings. 2014-02-23 20:11:46 -08:00
Philip Rosedale
8c3b18f797 Finished audio input DC offset correction 2014-02-23 19:56:25 -08:00
Philip Rosedale
9b463dd8cf Merge branch 'master' of https://github.com/worklist/hifi 2014-02-23 17:26:23 -08:00
Philip Rosedale
b0f3ab3ccd Merge pull request #2057 from ey6es/master 
I believe this is what was intended for the voxel edit orbit behavior.  Yaw the body, pitch the head.
 2014-02-23 17:22:07 -08:00
Andrzej Kapolka
7bb3ea66ac And another one. 2014-02-21 18:32:29 -08:00
Andrzej Kapolka
68fea8de1e More merge fixes. 2014-02-21 18:32:05 -08:00
Andrzej Kapolka
e470b1c41d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	assignment-client/src/metavoxels/MetavoxelServer.cpp
	interface/src/MetavoxelSystem.cpp
 2014-02-21 18:26:40 -08:00
Andrzej Kapolka
6cbf0f407a Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo 2014-02-21 18:24:56 -08:00
Andrzej Kapolka
6f8f15018c Allow setting the combined head orientation, which changes the body yaw and 
applies the rest to the head.  Closes #2050.
 2014-02-21 17:52:20 -08:00
Stephen Birarda
6165ca658a add a logout option to the menu 2014-02-21 17:13:22 -08:00