Randy Heit 775e33ede7 Merge branch 'master' into scripting ... Conflicts: src/actor.h src/g_doom/a_archvile.cpp src/g_shared/a_morph.cpp src/p_enemy.h src/p_local.h src/p_mobj.cpp src/sc_man_tokens.h src/thingdef/thingdef_codeptr.cpp src/thingdef/thingdef_exp.h src/thingdef/thingdef_expression.cpp src/thingdef/thingdef_states.cpp wadsrc/static/actors/actor.txt		2015-01-29 20:53:08 -06:00
..
acs
actors	Merge branch 'master' into scripting	2015-01-29 20:53:08 -06:00
graphics	Multi-intermission waits for all players + changes	2014-06-17 19:46:10 +12:00
maparrows
mapinfo	- made CheatKey and EasyKey vector graphics configurable through MAPINFO.	2014-10-25 10:19:14 +02:00
sbarinfo
shaders/d3d
sounds
sprites	- replaced pistol pickup sprite.	2014-10-24 23:19:57 +02:00
textures
xlat	- fixed bad edit in linedef translation.	2014-08-21 13:38:47 +02:00
althudcf.txt
animated.lmp
animdefs.txt
compatibility.txt	Added compat profile for TNT MAP31	2014-11-10 18:37:14 +13:00
confont.lmp
dbigfont.lmp
decaldef.txt
decorate.txt
dehsupp.txt
etc.h.txt
fontdefs.txt
in_epi1.txt
in_epi2.txt
in_epi3.txt
in_htc1.txt
in_htc2.txt
in_htc3.txt
indexfont
iwadinfo.txt	- Added detection for The Adventures of Sqaure (based off MTrop's submission).	2014-09-04 19:36:08 -04:00
language.enu	- Added GOD2 and BUDDHA2 cheats.	2014-10-25 09:38:40 +02:00
language.fr	- Expand environment variables for autoload paths.	2014-07-15 21:26:26 -04:00
language.ita
language.ptb	- specte typo in language.ptb.	2013-08-10 21:15:06 +02:00
lockdefs.txt
menudef.txt	Added Retina/HiDPI option to video mode menu (OS X only)	2015-01-08 12:50:23 +02:00
netnotch.dat
notch.dat
reverbs.txt
sbarinfo.txt
sbigfont.lmp
sndinfo.txt	- use a separate sound for the net notches on the startup screen.	2014-10-25 18:18:35 +02:00
sndseq.txt
spaldoom.lmp
spalhtic.lmp
teaminfo.txt
terrain.txt
textcolors.txt
textures.txt	- Enable Doom 1.1 status bar support.	2012-11-09 23:03:53 +00:00
things.h.txt
vga-rom-font.16
x11r6rgb.txt
xhairs.txt