Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 23:46:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
2814 commits 75 branches 59 tags 1.2 GiB
Commit graph

1447 commits

Author SHA1 Message Date
Philip Rosedale
aad5f3bfff Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 17:21:24 -06:00
Philip Rosedale
d8578ebb42 Merge pull request #335 from ey6es/master 
Added gray background for chat entry, shadow/outline effects for text rendering.  Enabled shadows for text contrast.
 2013-05-16 16:21:10 -07:00
Andrzej Kapolka
700d3de4aa Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 16:11:48 -07:00
Andrzej Kapolka
26badc56e0 Added shadow and outline effects to TextRenderer, use the shadow effect in 
our text to separate it from the background.
 2013-05-16 16:10:38 -07:00
Philip Rosedale
9011484590 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 17:06:40 -06:00
Philip Rosedale
9f57787ece Fixed jerking on gravity, added mouse pitch, yaw behavior. 2013-05-16 17:05:45 -06:00
Andrzej Kapolka
191c533ad2 Provide a gray background for the chat entry, so that we can see what we're 
typing.
 2013-05-16 14:24:18 -07:00
ZappoMan
d58a811844 Merge pull request #332 from birarda/audio-injection-manager 
add an AudioInjectionManager to handle memory management for multiple injectors
 2013-05-16 14:12:24 -07:00
Philip Rosedale
7866c803fb Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 14:44:15 -06:00
Philip Rosedale
b2709652b4 Tweaks to improve mouse Yaw behavior. 2013-05-16 14:43:46 -06:00
Andrzej Kapolka
d241dba573 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 13:09:31 -07:00
Andrzej Kapolka
86ddcea87f Better names for the shaders. 2013-05-16 13:08:21 -07:00
Stephen Birarda
a2f8d8ae25 break audio out of shared into its own library 2013-05-16 13:00:40 -07:00
Philip Rosedale
31967e8afb Merge pull request #331 from ZappoMan/master 
get rid of the "kill the solar system" feature... protecting us from ourselves!
 2013-05-16 12:59:55 -07:00
ZappoMan
f8dc01a890 removed the - key killing all the planets 2013-05-16 12:56:13 -07:00
Philip Rosedale
a36d32e101 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 13:34:54 -06:00
Philip Rosedale
78bd5ab40f Fixes per review 2013-05-16 13:34:48 -06:00
Jeffrey Ventrella
cd248188d9 thingy 2013-05-16 12:19:20 -07:00
Jeffrey Ventrella
aafb557b02 turned off look at behavior - until it is finished and working correctly 2013-05-16 12:14:36 -07:00
Jeffrey Ventrella
04828c8224 cleaned up copyright header notifications in several files 2013-05-16 12:06:36 -07:00
Jeffrey Ventrella
be7be4ad99 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-16 11:18:32 -07:00
tosh
489a0cb844 adds comments and blank lines to clarify the code 2013-05-16 18:56:32 +02:00
tosh
539e69cef0 puts private members to the bottom of the class definition 2013-05-16 18:56:20 +02:00
Philip Rosedale
c8c4b8fda5 Merge pull request #328 from kordero/master 
fixing sscanf issue with floats for certain locales
 2013-05-15 23:36:04 -07:00
Philip Rosedale
1b039c3755 Transmitter V2 drives the hand, and rendering levels with 'l' shows the hand transmitter data. Physics will need to be tuned. 2013-05-16 00:10:10 -06:00
=
0016038fe3 fixing locale issue with decimal delimiter for floats 2013-05-16 02:39:10 -03:00
Andrzej Kapolka
0a6b4702c6 Experimenting with simple Perlin noise shader for voxels. 2013-05-15 22:18:56 -07:00
Philip Rosedale
29889725ef Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 21:17:34 -06:00
Philip Rosedale
1a283c3ac0 Improvements to scope display, added framework for echo analysis over multiple frames 2013-05-15 21:15:55 -06:00
Andrzej Kapolka
2885c14480 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 17:31:11 -07:00
Stephen Birarda
d78daf53e9 fix copy of Avatar object for use in Audio class 2013-05-15 17:28:27 -07:00
Andrzej Kapolka
cb2acb58e7 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 16:22:47 -07:00
Andrzej Kapolka
f0055bd419 Fixes for OS X: GLSL version must be first line in source, don't init glut 
(Qt apparently uses it?)
 2013-05-15 16:19:42 -07:00
Stephen Birarda
fc5e42cf8b add threaded injection of audio via audio injector class 2013-05-15 16:10:59 -07:00
Andrzej Kapolka
f15c670c4e Let's try initializing glut before Qt, since we're getting a warning on OS X. 2013-05-15 16:07:09 -07:00
Stephen Birarda
67b9b5382d update to newer interface icon 2013-05-15 14:43:35 -07:00
Philip Rosedale
2820323567 Fixes from merge 2013-05-15 13:48:55 -07:00
Andrzej Kapolka
7211fd7027 Now that we have a Qt context, we can use their shader classes. However, we 
extend the program object class with glm-enabled functions.
 2013-05-15 13:27:37 -07:00
Philip Rosedale
f6389cac38 First commit, audio echo detection, also changed scope to show last buffer played rather than next buffer to play. 2013-05-15 13:03:22 -07:00
Andrzej Kapolka
3e57aa08c9 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 12:48:51 -07:00
Stephen Birarda
e0ee50fa9c spacing changes in Audio render 2013-05-15 12:38:11 -07:00
Stephen Birarda
351412f6e8 constantize SOUND_PITCH in addProceduralSounds 2013-05-15 12:36:53 -07:00
Stephen Birarda
63a2b203d9 constantize VOLUME_BASELINE in addProceduralSounds 2013-05-15 12:36:19 -07:00
Stephen Birarda
274c810dec constantize the number of packets to discard for stats 2013-05-15 12:35:41 -07:00
Stephen Birarda
b186dd0f65 comment cleanup for audioCallback 2013-05-15 12:24:58 -07:00
Stephen Birarda
c5fdfd64e7 remove extra space 2013-05-15 12:22:11 -07:00
Stephen Birarda
44b12cb593 spacing changes 2013-05-15 12:21:43 -07:00
Stephen Birarda
fb42e8df04 correct some global references in Audio.cpp 2013-05-15 12:19:40 -07:00
Andrzej Kapolka
4292cd9ab3 Moved voxel options into their own menu, switched destructive flag to check 
Qt action.
 2013-05-15 12:05:32 -07:00
Stephen Birarda
e83710e45e prepend audio packets from the mixer with a packet header 2013-05-15 12:00:04 -07:00
Andrzej Kapolka
0ce9e42085 Support dragging when in coloring mode. I tried it in add/delete mode, too, 
but it felt messy.
 2013-05-15 11:48:23 -07:00
Stephen Birarda
ce34a8f3e0 add packet headers and agent types for audio clarity 2013-05-15 11:43:49 -07:00
Stephen Birarda
26c34bb86c sensible initialization for Audio member variables 2013-05-15 11:29:52 -07:00
Andrzej Kapolka
6317404249 When in add mode and there's no voxel under the cursor, place the mouse voxel 
a fixed distance away.
 2013-05-15 11:21:34 -07:00
Stephen Birarda
4693082db0 refactor Audio to remove requirement of AudioData 2013-05-15 10:54:36 -07:00
Andrzej Kapolka
b05140ee51 Turned the voxel edit commands into menu options for better visibility. 2013-05-15 10:40:41 -07:00
Philip Rosedale
72d657b51d Preventing render bug with mis-scaled mouth (part of screen all black) 2013-05-15 10:00:30 -07:00
Andrzej Kapolka
1f7b77eb95 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 09:55:56 -07:00
Philip Rosedale
124f04820e Removed renderPitch(), and renderYaw() from code/classes - we will use bodyPitch(), headPitch() only. 2013-05-15 09:52:12 -07:00
Philip Rosedale
73c793c0a1 Added optional millisecond onscreen frame timer for easier latency timing with high-speed camera 2013-05-15 09:37:36 -07:00
Philip Rosedale
daaf86a634 restrict avatar body yaw to be between 0-360 2013-05-15 08:06:53 -07:00
Jeffrey Ventrella
a0e8c0da74 more work on avatar lookat 2013-05-14 18:15:54 -07:00
Jeffrey Ventrella
a5e696b696 Merge remote-tracking branch 'upstream/master' 2013-05-14 17:31:03 -07:00
Jeffrey Ventrella
f53b49c496 working on lookat (eye contact) 2013-05-14 17:30:41 -07:00
Philip Rosedale
5fec8bc8fe Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 17:11:27 -07:00
Philip Rosedale
6cfdf96dea Added mouse panning in the Yaw direction - at edges of screen. 2013-05-14 17:11:16 -07:00
birarda
6f7d2a6922 Merge pull request #314 from birarda/transmitter 
add new packet header for V2 transmitter data
 2013-05-14 16:30:55 -07:00
Stephen Birarda
aca2ce47b6 add a V2 transmitter data packet for new iOS transmitter 2013-05-14 16:29:39 -07:00
Andrzej Kapolka
45e1d341fa When we add voxels, add them with the selected color. 2013-05-14 16:02:50 -07:00
Philip Rosedale
62a97f23bf Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 15:11:04 -07:00
Philip Rosedale
b30f7b02bd Removed mouse shift prototype. 2013-05-14 15:10:44 -07:00
Andrzej Kapolka
775fd5bd2e Use the sun location in the environment to set the light position. 2013-05-14 14:53:29 -07:00
Andrzej Kapolka
8e04c17cc2 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
 2013-05-14 14:44:22 -07:00
Andrzej Kapolka
e1016ad902 What matters is the active state, not the focus. 2013-05-14 14:40:18 -07:00
Andrzej Kapolka
b4ca7ca5e3 Just manually request focus. 2013-05-14 14:36:43 -07:00
Andrzej Kapolka
053c0d1ca5 Focus tweak; focus isn't returning to the GL widget after closing the color 
dialog on OS X.
 2013-05-14 14:34:36 -07:00
Andrzej Kapolka
ebc612f87a Start out with gray, fix coloring smaller portions by (similar to deleting) 
breaking up leaf nodes into their components.
 2013-05-14 14:23:08 -07:00
ZappoMan
8dc61d89fc Added support for "destructive" vs "non-destructive" voxel create 
- changed VoxelTree to support destructive and non-destructive mode
- added protocol packet headers to differentiate
- added new UI to switch modes
- default mode now, non-destructive.
 2013-05-14 14:19:31 -07:00
Andrzej Kapolka
4eced82cf4 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2013-05-14 13:51:27 -07:00
Andrzej Kapolka
9033152401 Color selection for painting. 2013-05-14 13:49:24 -07:00
Philip Rosedale
a0179073ae Merge pull request #306 from ZappoMan/render_voxels_optimization 
Added "Delta" mode
 2013-05-14 12:37:23 -07:00
ZappoMan
43e190fe3c switched Want Delta menu to use new Qt menus 2013-05-14 12:19:23 -07:00
birarda
ff6ce63a31 Merge pull request #311 from birarda/master 
fix casing of PORTAUDIO_ROOT_DIR
 2013-05-14 12:13:23 -07:00
Stephen Birarda
306d2a4b98 casing is important for UNIX 2013-05-14 12:12:36 -07:00
Andrzej Kapolka
c9b688b876 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 11:56:36 -07:00
birarda
6073ad3245 Merge pull request #308 from birarda/master 
fix broken reference to LODEPNG_LIBRARY
 2013-05-14 11:55:04 -07:00
Stephen Birarda
c117d62532 fix old reference to LODEPNG_LIBRARY 2013-05-14 11:54:35 -07:00
Andrzej Kapolka
c6ce992332 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 11:49:27 -07:00
birarda
1c2de455a0 Merge pull request #307 from birarda/master 
refactor modules so they actually bail when things are missing
 2013-05-14 11:47:28 -07:00
Stephen Birarda
241c170345 refactor find modules so they complain when things are missing 2013-05-14 11:46:19 -07:00
Jeffrey Ventrella
7117e4a76c Merge remote-tracking branch 'upstream/master' 2013-05-14 11:44:34 -07:00
Jeffrey Ventrella
acda87502e more work on camera shifting between modes 2013-05-14 11:43:51 -07:00
Andrzej Kapolka
174fdb8109 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-14 11:32:43 -07:00
Andrzej Kapolka
60e8971eb9 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-14 11:29:08 -07:00
ZappoMan
3f503e1e4d Merge pull request #305 from birarda/master 
link PortAudio as static lib instead of compiling as dependency
 2013-05-14 11:28:23 -07:00
ZappoMan
63510aa30b Merge pull request #301 from PhilipRosedale/master 
Improved stability of invensense for drift
 2013-05-14 11:27:01 -07:00
Stephen Birarda
4c9d1c19ff link PortAudio as a static library instead of compiling as dependency 2013-05-14 11:22:34 -07:00
Andrzej Kapolka
537686d541 Allow changing the edit voxel size using the mouse wheel. 2013-05-14 11:06:03 -07:00
Philip Rosedale
d386221620 Merge pull request #297 from Ventrella/master 
added code to allow mouse hover over avatar to be used for touch effects
 2013-05-14 11:04:59 -07:00
Andrzej Kapolka
a5e7fdeacd Accidentally left a debug line in. 2013-05-14 10:47:21 -07:00