Braden Obrzut
9dd3c4b2d5
- When erroring due to the lack of iwads, print instructions more relevent to the user's platform.
2013-07-05 00:45:45 -04:00
Braden Obrzut
8afece1b8a
Merge branch 'maint'
2013-07-03 01:58:51 -04:00
Braden Obrzut
80a3e4f902
- Fixed: Cocoa IWAD picker needed to be updated to handle git version strings.
2013-07-03 01:58:13 -04:00
Randy Heit
ff49de164a
Merge branch 'maint'
...
Conflicts:
src/version.h
2013-07-02 15:49:10 -05:00
Randy Heit
5b17c0779b
Version 2.7.1
2013-07-02 15:46:31 -05:00
Christoph Oelckers
44dd79953b
Merge branch 'master' of https://github.com/rheit/zdoom
2013-07-02 22:02:20 +02:00
Christoph Oelckers
f1dff6c9d3
- fixed: The new XDeath code forgot to move the assignment of the flags4 variable. Also renamed the variable to avoid conflicts.
2013-07-02 22:01:54 +02:00
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
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
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
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
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
Christoph Oelckers
94a3d92f93
Merge branch 'maint'
2013-06-24 16:49:51 +02:00
Christoph Oelckers
394f21f71e
- fixed: Draining health from a victim must check for damage reduction before awarding the health to the player. This affected Heretic's gauntlets, A_Saw and A_CustomPunch.
...
- added a DONTDRAIN flag that prevents the above attacks from draining any health at all.
2013-06-24 16:42:43 +02:00
Christoph Oelckers
c4ad09fe90
- added new MAPINFO/gameinfo keys for adding entries to some string arrays, most notably the player classes and the F1 info pages.
2013-06-24 15:50:30 +02:00
Christoph Oelckers
9f253ccae3
- fixed: Application of inflictor's death damage type was done too late and missed a few spots where it needed.
...
- fixed: DamageTypeReceived was not serialized.
- fixed: The check for unhandled damage type was rendered ineffective by the old code handling the DeathType.
2013-06-24 15:40:17 +02:00
Christoph Oelckers
1976f28df9
- merge cheat fix from maint.
2013-06-24 14:32:55 +02:00
Christoph Oelckers
baa82c396c
- disabled Heretic's 'joke' cheats and Chex's 'idmus' in 'allcheats' mode because their multiple occurence interfered with how the cheat parser works.
2013-06-24 14:25:48 +02:00
Christoph Oelckers
e4f78f225c
Merge fix.
2013-06-24 02:26:23 +02:00
Christoph Oelckers
631fd69719
- fixed: GoldWandPuff2 requires the PUFFONACTORS flag.
2013-06-24 02:25:16 +02:00
Randy Heit
7531191ffe
Get fixed SAVESIG from maint.
2013-06-23 18:14:39 -05:00
Randy Heit
03d2b79bfd
- Fixed: SAVEVERSTRINGIFY macros were wrong.
2013-06-23 18:14:29 -05:00