Andrzej Kapolka
|
a23ed58a53
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-16 16:25:05 -07:00 |
|
ZappoMan
|
068e863fb4
|
Merge pull request #334 from PhilipRosedale/master
Mouse moves pitch, yaw when near screen edge, gravity bouncing fixed!
|
2013-05-16 16:24:42 -07:00 |
|
Andrzej Kapolka
|
00171eccbb
|
Slight fix for shadows; we were drawing an unnecessary layer of text.
|
2013-05-16 16:23:11 -07: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 |
|
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 |
|