nashmuhandes
4292311f53
Merge branch 'master' of https://github.com/coelckers/gzdoom
...
# Conflicts:
# src/r_things.cpp
# src/r_things.h
2016-07-05 21:52:38 +08:00
Christoph Oelckers
148de414e0
- fixed: Checking for quest item 0 should not print an error message but silently fail.
2016-07-03 13:32:40 +02:00
nashmuhandes
05aae38031
Replaced copyrighted assets contained inside the engine PK3.
2016-04-27 22:35:28 +08:00
Randy Heit
55142078d8
Normalize line endings
2016-03-01 09:47:10 -06:00
Randy Heit
b8a24902bc
Move extra font characters into filter directories
2016-02-04 13:23:36 -06:00
Edward Richardson
e5c67cee83
Merge branch conflicts fix
...
- CONFLICT (content): Merge conflict in src/p_acs.cpp
- Updated position variables
2016-01-21 10:49:57 +13:00
Christoph Oelckers
006d3022ca
- changed the BFG decal for Freedoom to blue. With the software renderer this will be displayed as gray due to lack of blue in the palette. (Itz's still better than green, though.)
2016-01-05 17:10:47 +01:00
Christoph Oelckers
57150c8718
- fixed incorrect Strife player death sound.
2015-08-01 23:15:57 +02:00
Blue-Shadow
ccb49a4242
Fixed: missing '=' in conversation ID defs
...
Conversation ID definitions in strifeteaser1 were missing the equal sign
between the ID and actor class name.
2015-04-14 19:13:25 +03:00
Randy Heit
c36222d2ef
Externalized default key bindings
2015-04-05 21:40:53 -05:00
Randy Heit
62d036a63e
Added gametype-based filter
...
- For when IWADs are too specific, filter by the base gametype too.
- Minor small edits to the sndinfo.txt files so that zipdir will notice
the changes, since it doesn't check path names when checking for
file differences.
2015-04-05 20:24:49 -05:00
Randy Heit
89054f5d60
Use filtering and LOADACS to autoload strfhelp.o
...
- No more special case for STRFHELP in the executable!
2015-04-04 18:40:48 -05:00
Christoph Oelckers
b6a4511dd1
- move conversation ID definition to MAPINFO as well. Uses the newly added filter feature to handle the teaser differences.
2015-04-05 00:31:15 +02:00
Randy Heit
a5e67f7332
Split sndinfo.txt up into multiple files using filter directories.
...
- This means the original need for $ifdoom, $ifheretic, etc directives is
no more, but they need to stay for compatibility with third-party wads
that use them.
2015-04-03 22:58:58 -05:00
