Commit graph

4135 commits

Author SHA1 Message Date
Christoph Oelckers
4a23b97963 Merge branch 'master' of https://github.com/rheit/zdoom 2014-03-01 14:41:00 +01:00
Edward Richardson
8c6b4c12b6 Merge remote-tracking branch 'upstream/master' 2014-03-01 01:51:59 +13:00
Randy Heit
e7f427aa60 Merge branch 'maint' 2014-02-24 19:26:50 -06:00
Randy Heit
1d4f4b25d7 Don't free replaced textures that are used as patches.
- Fixed: If a part of a multipatch texture is replaced by a HIRESTEX
  version, the original patch must not be deleted, since the multipatch
  texture still needs it for compositing.
2014-02-24 19:01:36 -06:00
Randy Heit
5a5fb9b3d1 Clamp xy angle range in P_SetSlope()
- This function just assumed that every xy angle passed to it was within
  the range [0,360). This is obviously bad, since anything outside that
  range can result in accessing data outside the range of the finecosine
  and finesine tables.
2014-02-24 18:16:18 -06:00
Randy Heit
a60918f601 Add NoPushWindowCheck compatibility flag
- For maps like xtheateriii that expect non-blocking push lines to
  activate when you are standing on them and run into a completely different
  line, there is now this compatiblity.txt-only flag.
2014-02-24 17:43:28 -06:00
Randy Heit
db4763b14a Delay skin setting on save load until player class is known.
- Fixed: Loading players from savegames set the skin before their current
  class was retrieved, so they could not validate their skins with the
  correct class.
2014-02-24 16:27:57 -06:00
Christoph Oelckers
8644a9443a Merge branch 'master' of https://github.com/rheit/zdoom 2014-02-24 23:25:29 +01:00
Randy Heit
7052d4e14e Fixed: userinfo_t::SkinChanged() was unaware of player classes 2014-02-24 16:18:10 -06:00
Randy Heit
0f7ad00d9a Ignore the minor version number when checking for DRO v1 files
- There exist files where the first word of the version number for DRO v1
  files is not 0 but something else completely. (Maybe it's not actually a
  version number?) Assume they are valid v1 files as long as the second
  word is a 1.
2014-02-24 15:48:41 -06:00
Randy Heit
a72c4bc642 Merge branch 'maint' 2014-02-24 15:38:16 -06:00
Gaerzi
d430c18574 The wrong value was used here.
This caused crashes on some files (notably MBELLS from Cosmo and NUBC
from Body Count) in my port of this code to SLADE 3.
2014-02-24 15:37:59 -06:00
Gaerzi
c7301a0fbb Some DOSBox Raw OPL v2 indices were off by one.
This caused access violation errors on perfectly fine DRO files. For
reference, scoredata[20] is the hardware type (OPL2, dual OPL2, or
OPL3).
2014-02-24 15:37:42 -06:00
Randy Heit
eda6632fa5 Merge branch 'maint' 2014-02-24 15:35:41 -06:00
rheit
3437b08c1a Merge pull request #27 from Gaerzi/master
Some DOSBox Raw OPL v2 indices were off by one.
2014-02-24 15:22:20 -06:00
rheit
d0782d779d Merge pull request #22 from edward-san/cmake_uninitialized_fix
- Fixed some cmake --warn-uninitialized messages
2014-02-24 15:20:56 -06:00
rheit
78f85340d8 Merge pull request #20 from edward-san/cmake_clang_flags_fix
- Remove clang check from GCC-related workaround
2014-02-24 15:19:35 -06:00
rheit
3111f8f93d Merge pull request #19 from edward-san/unix_no_gtk_iwadpicker_fix
- Fixed scanf in IWAD picker without GTK
2014-02-24 15:18:24 -06:00
Gaerzi
9dacc9cc8d The wrong value was used here.
This caused crashes on some files (notably MBELLS from Cosmo and NUBC
from Body Count) in my port of this code to SLADE 3.
2014-02-24 05:07:37 +01:00
Christoph Oelckers
bd2334a2d3 Merge branch 'master' of https://github.com/Gaerzi/zdoom 2014-02-24 00:43:55 +01:00
Gaerzi
732ee11da1 Some DOSBox Raw OPL v2 indices were off by one.
This caused access violation errors on perfectly fine DRO files. For
reference, scoredata[20] is the hardware type (OPL2, dual OPL2, or
OPL3).
2014-02-23 23:07:10 +01:00
Gaerzi
5c2620986e New Freedoom names
- Added freedoom2.wad as valid alias name (freedoom1.wad already
existed).
- Renamed titles to Freedoom: Phase 1 and Freedoom: Phase 2.
- Reordered to put Phase 1 above Phase 2 in the IWAD picker.
2014-02-22 04:09:53 +13:00
Gaerzi
18f2644162 A_Log formatted text
Make DECORATE version of Log consistent with ACS version.
2014-02-22 04:09:52 +13:00
Alex Qyoun-ae
5c23ffb7bc Added possibly missing brackets 2014-02-22 04:09:51 +13:00
Christoph Oelckers
2490324652 Merge branch 'master' of https://github.com/Gaerzi/zdoom 2014-02-18 09:59:07 +01:00
Gaerzi
d7478bcd68 New Freedoom names
- Added freedoom2.wad as valid alias name (freedoom1.wad already
existed).
- Renamed titles to Freedoom: Phase 1 and Freedoom: Phase 2.
- Reordered to put Phase 1 above Phase 2 in the IWAD picker.
2014-02-18 00:40:14 +01:00
Christoph Oelckers
3e318e4555 Merge branch 'master' of https://github.com/rheit/zdoom
Conflicts:
	.gitignore
	src/CMakeLists.txt
2014-02-16 21:08:44 +01:00
Christoph Oelckers
861a0f0f09 Merge branch 'master' of https://github.com/Gaerzi/zdoom 2014-02-16 18:59:02 +01:00
Gaerzi
02cd6eebf4 A_Log formatted text
Make DECORATE version of Log consistent with ACS version.
2014-02-16 18:29:01 +01:00
Alex Qyoun-ae
dd5f273128 Added possibly missing brackets 2014-02-14 05:10:48 +04:00
Edward Richardson
0db82f02cf P_HitWater ignore extra floors below real floor
P_HitWater incorrectly assumed extra floors were always above the real
floor.
2014-02-12 20:30:37 +13:00
Randy Heit
3cff307e77 Add Get/SetLineActivation ACS functions 2014-02-04 19:53:10 -06:00
Randy Heit
8b02bb55aa Fix compiling with FMOD 4.36
- That stuff I thought that went poof in FMOD Ex 4.37 was apparently
  already gone in 4.36.
2014-01-30 20:30:40 -06:00
Christoph Oelckers
5e68e5873c Merge branch 'master' of https://github.com/rheit/zdoom 2014-01-26 14:33:04 +01:00
Christoph Oelckers
4e53df8bca - fixed: The 'load' command in GAMEINFO only worked if the filename contained a slash. 2014-01-26 14:32:44 +01:00
Randy Heit
7b63ee8ded Add more stuff to .gitignore 2014-01-21 19:48:46 -06:00
Randy Heit
0442c51d54 Fix building with old VC++ 2005 projects.
- Also needed to comment out strtod declarations in gdtoaimp.h and gdtoa.h
2014-01-21 19:41:29 -06:00
Braden Obrzut
efa9e0c3ee Merge branch 'maint' 2014-01-18 18:10:48 -05:00
Braden Obrzut
811a75ebf6 - Minor adjustments to SDL joystick code so that all axes have at least a small deadzone so that button mapping works properly. 2014-01-18 17:54:46 -05:00
Braden Obrzut
27f6b3c9f3 Merge branch 'maint' of github.com:rheit/zdoom into maint 2014-01-18 16:23:06 -05:00
Braden Obrzut
75fd674d31 - If the player doesn't have ` bound to open the console, don't close it with that key. 2014-01-18 16:20:52 -05:00
Braden Obrzut
919b928300 - Fixed: Taking an item in a Strife dialog didn't account for items that have the keep depleted flag set. 2014-01-18 15:45:11 -05:00
Braden Obrzut
ebcd0e9c49 - Removed redundant expression in R_FindPlane. 2014-01-18 15:40:48 -05:00
Braden Obrzut
7af8b78b9f - Applied Chilly's patch to fix excessive name change notifications. 2014-01-18 15:18:35 -05:00
Braden Obrzut
e5d7077d74 - Fixed: Shareware games couldn't bother with the actor has no frames errors since we don't load mods.
- Fixed: Heretic shareware used a different border for the statusbar.
2014-01-18 15:09:12 -05:00
Braden Obrzut
6f7885210b - Fixed: Some setups require the dynamic linking library to be linked explicitly, so specify it when using DYN_FLUIDSYNTH 2014-01-18 14:58:39 -05:00
Edoardo Prezioso
70717cd2fa - Cover the ASM_SOURCES fix for NO_ASM users too 2014-01-18 02:21:49 +01:00
Christoph Oelckers
7954263f5c Merge branch 'master' of https://github.com/rheit/zdoom 2014-01-18 01:19:36 +01:00
Christoph Oelckers
dc8f81c2a7 Merge branch 'master' of https://github.com/rheit/zdoom
Conflicts:
	src/sdl/iwadpicker_cocoa.mm
2014-01-18 01:18:21 +01:00
Christoph Oelckers
6824e8c931 Merge branch 'maint' 2014-01-18 01:12:06 +01:00