Commit graph

5633 commits

Author SHA1 Message Date
Alam Ed Arias
8b86139749 fix EOL on src/p_enemy.c 2018-11-27 21:31:26 -05:00
Alam Ed Arias
08eb1097ab fix EOL on src/p_enemy.c 2018-11-27 21:31:18 -05:00
Alam Ed Arias
a90d77a911 fix EOL on src/p_enemy.c 2018-11-27 21:31:09 -05:00
Alam Ed Arias
3cbfb16e40 fix EOL on src/p_enemy.c 2018-11-27 21:31:01 -05:00
Alam Ed Arias
04807bcfa5 fix EOL on src/p_enemy.c 2018-11-27 21:30:48 -05:00
Alam Ed Arias
4c1691361b fix EOL on src/p_enemy.c 2018-11-27 21:30:19 -05:00
Alam Ed Arias
3f45f51a45 fix EOL on src/p_enemy.c 2018-11-27 21:29:18 -05:00
Alam Ed Arias
2b91c2226c fix EOL on src/p_enemy.c 2018-11-27 21:27:17 -05:00
Alam Ed Arias
81ef92a198 fix EOL on src/p_enemy.c 2018-11-27 21:27:05 -05:00
Alam Ed Arias
3f252630c4 fix EOL on src/p_enemy.c 2018-11-27 21:26:48 -05:00
Alam Ed Arias
bf83c1cd25 fix EOL on src/p_enemy.c 2018-11-27 21:25:07 -05:00
Alam Ed Arias
3ed9e0e373 fix EOL on src/p_enemy.c 2018-11-27 21:24:56 -05:00
Alam Ed Arias
3f55ce8e77 fix EOL on src/p_enemy.c 2018-11-27 21:18:29 -05:00
Alam Ed Arias
eeaaf66b04 fix EOL on src/p_enemy.c 2018-11-27 21:18:13 -05:00
Alam Ed Arias
0d053d9d1b fix EOL on src/p_enemy.c 2018-11-27 21:17:45 -05:00
Alam Ed Arias
cba6489fd7 Merge branch 'EOL-12' into EOL 2018-11-27 21:10:09 -05:00
Alam Ed Arias
92ff9929b2 fix EOL on src/p_enemy.c 2018-11-27 21:07:23 -05:00
Alam Ed Arias
457448501a Merge branch 'EOL-11' into EOL 2018-11-27 20:47:38 -05:00
Alam Ed Arias
c00cba17d0 fix EOL on src/p_enemy.c 2018-11-27 20:45:40 -05:00
Alam Ed Arias
13e4537dd7 Merge branch 'EOL-10' into EOL 2018-11-27 20:44:28 -05:00
Alam Ed Arias
351b3385d0 fix EOL on src/p_enemy.c 2018-11-27 20:41:27 -05:00
Alam Ed Arias
720cefbf69 Merge branch 'EOL-9' into EOL 2018-11-27 20:40:30 -05:00
Alam Ed Arias
f8aae10064 fix EOL on src/p_enemy.c 2018-11-27 20:38:59 -05:00
Alam Ed Arias
d89b38a05c Merge branch 'EOL-8' into EOL 2018-11-27 20:37:22 -05:00
Alam Ed Arias
b7eda67e07 fix EOL on src/p_enemy.c 2018-11-27 20:36:00 -05:00
Alam Ed Arias
6ef394aa1a Merge branch 'EOL-7' into EOL 2018-11-27 20:28:25 -05:00
Alam Ed Arias
1780ae7611 fix EOL on src/p_enemy.c 2018-11-27 20:26:42 -05:00
Alam Ed Arias
a8fc90c18a Merge branch 'EOL-6' into EOL 2018-11-27 20:25:29 -05:00
Alam Ed Arias
3f09f50f49 fix EOL on src/p_enemy.c 2018-11-27 20:24:05 -05:00
Alam Ed Arias
246193e81e Merge branch 'EOL-5' into EOL 2018-11-27 20:22:22 -05:00
Alam Ed Arias
96192a4f20 fix EOL on src/p_enemy.c 2018-11-27 20:19:50 -05:00
Alam Ed Arias
2d84877ce4 Merge branch 'EOL-4' into EOL 2018-11-27 20:17:52 -05:00
Alam Ed Arias
f5b5fb47f3 fix EOL on src/p_enemy.c 2018-11-27 20:12:53 -05:00
Alam Ed Arias
001b0eb6f3 Merge branch 'EOL-3' into EOL 2018-11-27 20:12:21 -05:00
Alam Ed Arias
9dfb32602c fix EOL on src/p_enemy.c 2018-11-27 20:08:23 -05:00
Alam Ed Arias
5270d1c535 Merge branch 'EOL-2' into EOL 2018-11-27 20:05:07 -05:00
mazmazz
e09b1446f4 Add wget to assets deb depends 2018-11-27 18:16:20 -05:00
Monster Iestyn
d2c822c583 backport string len tweaks I made to LUA_LoadLump in internal 2018-11-27 23:06:31 +00:00
Monster Iestyn
b4838e3afa remove redundant wadfile loop within wadfile loop for ANIMDEFS code 2018-11-27 23:05:33 +00:00
Alam Ed Arias
634518d7d7 fix EOL on p_enemy.c 2018-11-27 17:21:18 -05:00
Alam Ed Arias
73d61e8858 fix EOL on p_enemy.c 2018-11-27 17:15:55 -05:00
mazmazz
d29f9dbbe3 Fix i386 Launchpad build by commenting out pkg-config hacks 2018-11-27 16:47:00 -05:00
mazmazz
363541d16a Redundant type 1800 check for MT_COIN 2018-11-27 14:10:55 -05:00
Monster Iestyn
a6a4b74692 Merge branch '21-controls' into 'next'
Default control changes for 2.1.21

See merge request STJr/SRB2!343
2018-11-27 11:50:42 -05:00
mazmazz
f17ba0ad37 Move binary routine to binary-arch for Launchpad 2018-11-27 11:05:34 -05:00
Monster Iestyn
f526d99a27 use UINT8 * instead of void or Bytef * 2018-11-27 15:49:41 +00:00
Monster Iestyn
51d2f52dea Merge branch 'master' into next 2018-11-27 15:31:28 +00:00
Monster Iestyn
eefbb82cfb Merge branch 'save-soundmenu-toggles' into 'master'
Save sound toggles to config

See merge request STJr/SRB2!348
2018-11-27 10:07:06 -05:00
Monster Iestyn
0109382cb9 add HAVE_ZLIB around the rest of the zlib stuff in w_wad.c/h, move zlib.h inclusion down below doomdef.h etc includes in case that does anything for compiling (?) 2018-11-27 13:57:32 +00:00
mazmazz
e9130915cc Actually both libpng names are in the wild 2018-11-27 02:30:31 -05:00