zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-23 19:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
8533 commits 86 branches 139 tags 124 MiB
Commit graph

8533 commits

This branch
This branch
All branches
Author SHA1 Message Date
Randy Heit
3d61365879 Merge branch 'maint' 2013-07-02 14:51:49 -05:00
Randy Heit
e845b292c2 - Always clear bEvilGrin after checking it in FMugShot::UpdateState(). If 
it's not an appropriate time to show the grin when the flag is set, it
  shouldn't be saved until later.
 2013-07-02 14:48:03 -05:00
Randy Heit
5af1e6f734 - Added a compatibility option to fix Super Sonic Doom's first bonus 
stage leaving you frozen when you finished it.
 2013-07-02 14:15:08 -05:00
Christoph Oelckers
b6cd38cded Merge branch 'maint_1.8' 2013-07-02 11:44:41 +02:00
Christoph Oelckers
05a95f0ed0 Merge branch 'maint' into maint_1.8 
Conflicts:
	wadsrc/CMakeLists.txt
 2013-07-02 10:04:35 +02:00
Christoph Oelckers
97bccb5239 - adjusted CMakeLists.txt for brightmaps.pk3 and lights.pk3 to same style as for gzdoom.pk3 2013-07-02 10:02:38 +02:00
Christoph Oelckers
503dc1d9a1 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	wadsrc/CMakeLists.txt
 2013-07-02 09:59:59 +02:00
Randy Heit
d9848a8e26 Merge branch 'maint' 2013-07-01 22:21:37 -05:00
Randy Heit
23e21cc85e - Fixed: S_IsChannelUsed() is declared as static, so it should be defined 
as such, too.
 2013-07-01 22:02:46 -05:00
Randy Heit
001ed91fd4 - Fixed: ACS's PlaySound should mask off the flag bits from the channel 
before passing it to S_IsActorPlayingSomething().
 2013-07-01 22:01:26 -05:00
Randy Heit
2717ed703d Shuffle FActionMap for better 64-bit alignment. 2013-07-01 21:51:12 -05:00
Randy Heit
e9425b356b - Fixed: Verbose user info strings were written with an extra backslash 
character between the key and value.
 2013-07-01 21:40:09 -05:00
Braden Obrzut
cc616a417d Merge branch 'maint' 2013-07-01 16:58:14 -04:00
Braden Obrzut
02ff428d54 - Allow generator expressions to be turned off during pk3 building with CMake. 
- On Mac OS X, ensure assembly code is disabled by default (since it won't work).
 2013-07-01 16:57:46 -04:00
Christoph Oelckers
db4f6bb8a1 Merge branch 'master' of https://github.com/rheit/zdoom 2013-07-01 18:21:12 +02:00
Christoph Oelckers
7e6a5c1448 - added damage type specific extreme death and extreme crash states. Order of labels is 'Death.extreme.damagetype' ('XDeath.damagetype') and 'Crash.extreme.damagetype'. 
- fixed: Damage of type 'extreme' did not get recorded as an extreme death for the mugshot code.
- changed: extreme deaths now only get recorded when an extreme death state was actually used, to ensure that the crash state being used is the correct one associated with the death state.
 2013-07-01 11:02:35 +02:00
Chris Robinson
665d685a44 Implement GetStats for OpenAL streams 2013-06-30 20:31:41 -07:00
Christoph Oelckers
f501983d1b Merge branch 'maint' 2013-06-30 18:16:38 +02:00
Christoph Oelckers
310979e9e6 - fixed clang compile error "friend declaration specifying a default argument must be the only declaration". 2013-06-30 18:16:02 +02:00
Chris Robinson
68988ab93c Handle S8 and U16 samples from SDL_sound 2013-06-30 08:16:49 -07:00
Chris Robinson
c4492f88ee Make sure streams are "pumped" 2013-06-30 08:04:41 -07:00
Chris Robinson
ba3cc38d09 Support float stream callbacks with AL_EXT_FLOAT32 2013-06-30 08:04:08 -07:00
Chris Robinson
69af01d629 Use SDL_sound when available to decode files 2013-06-30 07:45:57 -07:00
Chris Robinson
99209c4a2a Remove an unnecessary function 2013-06-30 04:47:10 -07:00
Chris Robinson
5d1cd7b7fe Small fixups 
find -> std::find
AL_EXT_loop_points -> AL_SOFT_loop_points
 2013-06-30 01:32:48 -07:00
Chris Robinson
4f2e367ec6 Remove GStreamer support 2013-06-30 01:07:09 -07:00
Chris Robinson
b31a729ab8 Fix compilation with OpenAL 2013-06-29 22:44:46 -07:00
Chris Robinson
18597a93a7 Merge remote-tracking branch 'origin' into openal 
Conflicts:
	src/sound/fmodsound.cpp
 2013-06-29 19:02:04 -07:00
coelckers
5e96b11f42 Merge pull request #1 from alexey-lysiuk/osx-fix 
* fix build on OS X via CMake
 2013-06-28 01:17:13 -07:00
alexey.lysiuk
28fd035b22 * fix build on OS X via CMake 2013-06-28 11:02:55 +03:00
Christoph Oelckers
b35422376e - add brightmaps.pk3 and lights.pk3 to VC++ 64bit confguration. 2013-06-27 20:03:05 +02:00
Braden Obrzut
57324f6fd8 Merge branch 'maint_1.8' 2013-06-26 19:05:03 -04:00
Braden Obrzut
276ca5b75b - Fixed compilation on non-Windows systems by removing dependency on src/Linux/platform.h 2013-06-26 19:01:00 -04:00
Christoph Oelckers
98637e2559 Merge branch 'maint_1.8' 2013-06-26 20:23:57 +02:00
Christoph Oelckers
119bcd7686 Merge branch 'maint' into maint_1.8 2013-06-26 20:23:15 +02:00
Christoph Oelckers
d65af4b5bb - fixed updaterevision calls in VC project. 
- put back a clean version file into the maintenance branch.
 2013-06-26 20:22:52 +02:00
Christoph Oelckers
ddae9757a8 Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-26 09:32:43 +02:00
Randy Heit
78196063da - Add generated zcc-parse files to .gitignore 2013-06-25 19:29:49 -05:00
Randy Heit
4deeb8d8ae Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/g_doom/a_doomweaps.cpp
	src/p_local.h
	src/p_map.cpp
	src/sdl/i_main.cpp
	src/thingdef/thingdef_codeptr.cpp
 2013-06-25 19:28:25 -05:00
Christoph Oelckers
f0feee3b4e Merge branch 'maint' 2013-06-26 01:03:19 +02:00
Christoph Oelckers
fb1734ba50 - fix previous commit and add compat option for Cheogh's blue key. 2013-06-26 00:57:26 +02:00
Christoph Oelckers
72e91786e2 - added SetThingZ compatibility option for fixing problems resulting from the changes to spawn position handling. 2013-06-26 00:57:10 +02:00
Christoph Oelckers
4622ab865b - merged the two blocks for void.wad in compatibility.txt. 2013-06-25 11:55:49 +02:00
Christoph Oelckers
93e040b322 Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-25 09:23:11 +02:00
Randy Heit
fb965c50a1 Merge branch 'maint' 2013-06-24 20:59:12 -05:00
Randy Heit
a5f5d8adcb - Remove the first parameter from updaterevision, since it isn't needed with git. 2013-06-24 20:58:14 -05:00
Randy Heit
1032170ccd - Add .aps files to .gitignore 2013-06-24 20:53:49 -05:00
Randy Heit
b9d5949825 - Add popen/pclose macros for updaterevision on Windows. 2013-06-24 20:52:52 -05:00
Randy Heit
e989e11f5c - update revision via popen() (via GZDoom OS X) 2013-06-24 20:52:01 -05:00
Christoph Oelckers
4189092db8 - spycancel improvement by Edward-san. 2013-06-24 22:50:24 +02:00