7226 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Alam Ed Arias	fb72955780	fix EOL on src/p_enemy.c	2018-11-27 21:17:45 -05:00
Alam Ed Arias	c43b200221	Merge branch 'EOL-12' into EOL	2018-11-27 21:10:09 -05:00
Alam Ed Arias	5b77b35eea	fix EOL on src/p_enemy.c	2018-11-27 21:07:23 -05:00
Alam Ed Arias	0765c83ccc	Merge branch 'EOL-11' into EOL	2018-11-27 20:47:38 -05:00
Alam Ed Arias	04e42e1d56	fix EOL on src/p_enemy.c	2018-11-27 20:45:40 -05:00
Alam Ed Arias	0646e96c77	Merge branch 'EOL-10' into EOL	2018-11-27 20:44:28 -05:00
Alam Ed Arias	b09940fdda	fix EOL on src/p_enemy.c	2018-11-27 20:41:27 -05:00
Alam Ed Arias	247388c6f7	Merge branch 'EOL-9' into EOL	2018-11-27 20:40:30 -05:00
Alam Ed Arias	05d5d1f254	fix EOL on src/p_enemy.c	2018-11-27 20:38:59 -05:00
Alam Ed Arias	8e0b7dd804	Merge branch 'EOL-8' into EOL	2018-11-27 20:37:22 -05:00
Alam Ed Arias	0c2a93f750	fix EOL on src/p_enemy.c	2018-11-27 20:36:00 -05:00
Alam Ed Arias	993c0831fc	Merge branch 'EOL-7' into EOL	2018-11-27 20:28:25 -05:00
Alam Ed Arias	1cbda4b3c2	fix EOL on src/p_enemy.c	2018-11-27 20:26:42 -05:00
Alam Ed Arias	a9249937e4	Merge branch 'EOL-6' into EOL	2018-11-27 20:25:29 -05:00
Alam Ed Arias	a958a80a61	fix EOL on src/p_enemy.c	2018-11-27 20:24:05 -05:00
Alam Ed Arias	816bc0d146	Merge branch 'EOL-5' into EOL	2018-11-27 20:22:22 -05:00
Alam Ed Arias	7a70c0e748	fix EOL on src/p_enemy.c	2018-11-27 20:19:50 -05:00
Alam Ed Arias	ab1af1c0af	Merge branch 'EOL-4' into EOL	2018-11-27 20:17:52 -05:00
Alam Ed Arias	761ff7cc6c	fix EOL on src/p_enemy.c	2018-11-27 20:12:53 -05:00
Alam Ed Arias	69114a5374	Merge branch 'EOL-3' into EOL	2018-11-27 20:12:21 -05:00
Alam Ed Arias	b2012b0771	fix EOL on src/p_enemy.c	2018-11-27 20:08:23 -05:00
Alam Ed Arias	76c6de01c4	Merge branch 'EOL-2' into EOL	2018-11-27 20:05:07 -05:00
mazmazz	93b6503773	Add wget to assets deb depends	2018-11-27 18:16:20 -05:00
Monster Iestyn	e158206e55	backport string len tweaks I made to LUA_LoadLump in internal	2018-11-27 23:06:31 +00:00
Monster Iestyn	cb53bc8afe	remove redundant wadfile loop within wadfile loop for ANIMDEFS code	2018-11-27 23:05:33 +00:00
Alam Ed Arias	dfc142c1d5	fix EOL on p_enemy.c	2018-11-27 17:21:18 -05:00
Alam Ed Arias	f2a4656bd6	fix EOL on p_enemy.c	2018-11-27 17:15:55 -05:00
mazmazz	0d5d0b2f27	Fix i386 Launchpad build by commenting out pkg-config hacks	2018-11-27 16:47:00 -05:00
mazmazz	97ea4086a5	Redundant type 1800 check for MT_COIN	2018-11-27 14:10:55 -05:00
Monster Iestyn	cd57be640c	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	559cf93e4a	Move binary routine to binary-arch for Launchpad	2018-11-27 11:05:34 -05:00
Monster Iestyn	3e6388c183	use UINT8 * instead of void or Bytef *	2018-11-27 15:49:41 +00:00
Monster Iestyn	6e839d30a2	Merge branch 'master' into next	2018-11-27 15:31:28 +00:00
Monster Iestyn	95e13d9ad3	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	1889c36dea	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	b0474084f8	Actually both libpng names are in the wild	2018-11-27 02:30:31 -05:00
mazmazz	0314469c7e	Changelog version for main package	2018-11-27 02:14:47 -05:00
mazmazz	7c343d0f69	Fix debian desktop icon	2018-11-27 02:11:57 -05:00
mazmazz	ce32413633	Smarter libgme ldflag detection	2018-11-27 01:51:22 -05:00
mazmazz	e099d2aaf2	Tar-ignore options for main deb	2018-11-27 01:26:32 -05:00
mazmazz	e4ce0ab9f1	Merge remote-tracking branch 'public-gitlab/master' into 21-deb	2018-11-27 01:18:00 -05:00
mazmazz	5599fe61a5	Main deb tweaks	2018-11-27 01:17:34 -05:00
mazmazz	e7ae21a61c	Separate asset files from clean step; No more hacky NOCLEAN file	2018-11-27 00:49:07 -05:00
mazmazz	349308ef01	Do not clean files before source building	2018-11-27 00:39:34 -05:00
mazmazz	77bf02f02e	Don't clean files on Launchpad build	2018-11-26 23:02:02 -05:00
mazmazz	f6bde1844e	Keep the assets/ files; ignore the assets/debian/tmp files in source packaging	2018-11-26 22:39:22 -05:00
mazmazz	6a80cc60b6	Only package debian/tmp/[data]/file in asset source package; extra instructions	2018-11-26 22:23:44 -05:00
mazmazz	0062fded19	Fixed broken date strings in debian package files; skip asset download if that file already exists	2018-11-26 21:49:25 -05:00
Alam Ed Arias	b7f7c2ecf7	PK3: fixup support for newer version of zlib	2018-11-26 20:08:26 -05:00
Alam Ed Arias	9a042cd5e2	Merge branch 'master' into next	2018-11-26 19:49:19 -05:00