Christoph Oelckers
a9bea7d774
Merge branch 'getsectorz_take2' of https://github.com/crimsondusk/zdoom
2014-03-31 19:12:47 +02:00
Christoph Oelckers
edcc257667
fixed: APROP_StencilColor was not implemented for CheckActorProperty.
2014-03-31 16:39:34 +02:00
Christoph Oelckers
bd3bd0ed22
Merge branch 'upstream' of https://github.com/Edward850/zdoom
2014-03-31 16:36:54 +02:00
Christoph Oelckers
639367df8d
Merge branch 'upstream2' of https://github.com/Edward850/zdoom
2014-03-31 16:00:11 +02:00
Christoph Oelckers
55844e00e5
Merge branch 'master' of https://github.com/crimsondusk/zdoom
2014-03-31 15:59:21 +02:00
Edward Richardson
016cc7ba96
Missed space in flags7 line.
2014-03-31 23:57:43 +13:00
Edward Richardson
79f6e77e2b
Remove garbage characters from info CCMD
2014-03-31 23:51:18 +13:00
crimsondusk
c47d77228d
- increased updaterevision's buffer sizes to prevent GIT_BRANCH from cut short
2014-03-30 21:27:05 +03:00
alexey.lysiuk
a97b068ed7
Enable fighting between different types of gargoyles and golems
...
In vanilla Heretic:
- Gargoyles are able to fight with Fire Gargoyles
- Golems are able to fight with Nitro Golems, both regular and ghosted versions
2014-03-30 13:27:27 +03:00
crimsondusk
d7a2435703
- the ACS functions GetSectorFloorZ and GetSectorCeilingZ now interpret tag=0 as 'any sector' and return the z height of whatever sector is at those coordinates.
2014-03-27 16:34:32 +02:00
Edward Richardson
697ef02871
Added StencilColor to Set/GetActorProperty
2014-03-28 00:23:12 +13:00
alexey.lysiuk
6a958b032c
Add NOBLOOD flag to Heresiarch actor
...
Heresiarch entity in vanilla Hexen doesn't spawn blood when hit
2014-03-18 12:29:14 +02:00
Christoph Oelckers
d7e81d2cb4
Merge branch 'fnodebuilder_new_delete_fix' of https://github.com/edward-san/zdoom
2014-03-16 13:27:21 +01:00
Edoardo Prezioso
5789ac6245
- Fixed new[]/delete mismatch in FNodeBuilder
...
Found with address sanitizer.
2014-03-16 13:21:08 +01:00
alexey.lysiuk
3c8e9b6dc0
Fix incorrect Maulotaur melee attack sound
...
It was STFHIT instead of STFPOW
2014-03-16 12:29:04 +02:00
alexey.lysiuk
6aa56202b6
Fix two issues with GL nodes handling
...
Fix inability to load GL nodes for maps with names longer than 5 characters.
Fix inability to load GL nodes from external GWA files.
2014-03-15 13:17:22 +02:00
Edward Richardson
40771d22a5
Player prediction fixes in PIT_CheckThing
...
Player prediction could end up executing functions for TOUCHY things or
modify velocities when BLASTED, among other things.
2014-03-15 04:15:30 +13:00
Edward Richardson
55362d2296
Merge remote-tracking branch 'upstream/master'
2014-03-14 20:59:24 +13:00
Edward Richardson
9dad8bdbbe
Clear old camera from previous level
...
The sound code could accidentally reference an old invalid camera during
level spawn
2014-03-13 18:27:39 +13:00
Christoph Oelckers
f44dc926e6
- fixed uniqueTid logic - patch by Edward-San.
2014-03-09 10:02:07 +01:00
Edward Richardson
79abe2d4e9
Made onground a player property
...
"onground" was a global, despite being treated as a player property and
crossed with instances from other players or prediction.
2014-03-03 01:00:47 +13:00
Edward Richardson
6d89fdbd53
Merge remote-tracking branch 'upstream/master'
2014-03-03 00:25:04 +13:00
Christoph Oelckers
8924ecbef9
Merge branch 'array_null_comparison_fix' of https://github.com/edward-san/zdoom
2014-03-01 23:29:10 +01:00
Edoardo Prezioso
1fb757f6f1
- Fixed useless 'array != NULL' check.
...
- 'notranslate != NULL' is completely useless, because 'notranslate' is an array, hence removed.
- I interpreted 'SbarInfoScript != NULL' as a typo, since 1)in the next expression inside the condition there's a dereference to 'SBarInfoScript[SCRIPT_CUSTOM]' and 2)'SBarInfoScript[SCRIPT_CUSTOM]' is checked against 'NULL', in line 352, and then dereferenced when introducing 'cstype'.
2014-03-01 22:27:40 +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
861a0f0f09
Merge branch 'master' of https://github.com/Gaerzi/zdoom
2014-02-16 18:59:02 +01:00