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

2669 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
f8dc01a890 removed the - key killing all the planets 2013-05-16 12:56:13 -07: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
ed3a94d3fc Merge pull request #322 from ey6es/master 
Fix for glut reinitialization warning, Linux build fix, migrated to Qt shader classes.
 2013-05-15 23:22:07 -07:00
=
0016038fe3 fixing locale issue with decimal delimiter for floats 2013-05-16 02:39:10 -03:00
Andrzej Kapolka
2885c14480 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 17:31:11 -07:00
birarda
df2bde9fd6 Merge pull request #326 from birarda/master 
return avatar object by pointer instead of by reference
 2013-05-15 17:29:05 -07:00
Stephen Birarda
d78daf53e9 fix copy of Avatar object for use in Audio class 2013-05-15 17:28:27 -07:00
birarda
22cb5bf470 Merge pull request #325 from birarda/master 
remove eve's unused temp audio injector socket
 2013-05-15 16:41:05 -07:00
Stephen Birarda
ddff60f236 remove the unused temporary UDP Socket 2013-05-15 16:40:39 -07:00
Andrzej Kapolka
fc20ba58db Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 16:38:16 -07:00
birarda
c28a0412b7 Merge pull request #324 from birarda/master 
fix missing bytes on audio injector read
 2013-05-15 16:32:06 -07:00
Stephen Birarda
9b72762eb8 fix missing bytes on read for audio injector 2013-05-15 16:31:43 -07:00
Andrzej Kapolka
8a03e75906 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 16:26:26 -07:00
birarda
811a3dd934 Merge pull request #323 from birarda/master 
add missing header for broken eve unix build
 2013-05-15 16:25:56 -07:00
Stephen Birarda
e6cba99c0e include cstring for memcpy in eve main 2013-05-15 16:25:27 -07:00
Andrzej Kapolka
a571caac8f Build fix. 2013-05-15 16:24:22 -07:00
Andrzej Kapolka
cb2acb58e7 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 16:22:47 -07:00
ZappoMan
ac19f0b078 Merge pull request #321 from birarda/injector 
add threaded injection of audio via AudioInjector class
 2013-05-15 16:21:27 -07:00
Stephen Birarda
af934e2104 type squishes in UDPSocket implementation 2013-05-15 16:19:45 -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
13c10c95e8 type squishes in UDPSocket header 2013-05-15 16:17:38 -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
47766d6c6b add methods to AudioInjector to prepare for procedural injection 2013-05-15 15:20:11 -07:00
birarda
d4b75670a9 Merge pull request #320 from birarda/master 
new interface icon
 2013-05-15 14:44:05 -07:00
Stephen Birarda
67b9b5382d update to newer interface icon 2013-05-15 14:43:35 -07:00
ZappoMan
b1e4c039ce Merge pull request #319 from birarda/master 
refactor the Agent class
 2013-05-15 14:34:25 -07:00
Stephen Birarda
db0c1bdba1 another type squish in Agent header 2013-05-15 14:28:43 -07:00
Stephen Birarda
9b8fd55bb7 type squishes in Agent header 2013-05-15 14:28:20 -07:00
Stephen Birarda
80284470ed type squishes in Agent class 2013-05-15 14:20:15 -07:00
Stephen Birarda
12b4b485f0 refactor the Agent copy constructor 2013-05-15 14:19:14 -07:00
Stephen Birarda
f333aaf809 refactor Agent constructor to call member variable constructors 2013-05-15 14:16:15 -07:00
Stephen Birarda
48b57c92bd refactor Agent member variables 2013-05-15 14:12:21 -07:00
birarda
f71b342b8e Merge pull request #318 from birarda/master 
add audio injector the getTypeName switch case
 2013-05-15 14:02:52 -07:00
Stephen Birarda
2c242a7704 add AGENT_TYPE_AUDIO_INJECTOR to getTypeName, refactor 2013-05-15 14:02:09 -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
ZappoMan
652832c207 Merge pull request #316 from ey6es/master 
Voxel editing improvements: apply color on add, menu items, free placement, dragging.
 2013-05-15 13:01:43 -07:00
Andrzej Kapolka
3e57aa08c9 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 12:48:51 -07:00
ZappoMan
ab3ee22dc9 Merge pull request #317 from birarda/audio-refactor 
refactoring Audio in interface and audio-mixer
 2013-05-15 12:40:05 -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
Stephen Birarda
182b0b4fa1 data sent to client from mixer must include packet header 2013-05-15 12:13:39 -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
e4a734fc78 refactor constructor in AudioInjector 2013-05-15 12:01:32 -07:00