3962 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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	2526d2996e	FlickyFly: Configure gravity by MTF_AMBUSH	2018-08-09 00:13:08 -04:00
MascaraSnake	f0f8698d04	Reorganized the thing type numbers	2018-08-03 23:58:11 +02:00
Monster Iestyn	594cc953b5	Fix Cacolantern's preparing sound being played everywhere across the map ... (or, in other words, fixing this to be the same as the equivalent state in the original SOC)	2018-08-02 16:15:30 +01:00
Monster Iestyn	502c80eaac	Merge branch 'master' into hardcoding-time-again	2018-08-02 16:04:54 +01:00
Monster Iestyn	f6b8206660	Merge branch 'public_next' ... # Conflicts: # src/hardware/hw_md2.c	2018-07-31 19:41:54 +01:00
Monster Iestyn	10668f14b8	Merge branch 'master' into next	2018-07-31 19:36:30 +01:00
Monster Iestyn	e4f38995e7	Merge branch 'gme-lowvolume-fix' into 'master' ... GME low volume fix See merge request STJr/SRB2!248	2018-07-31 14:35:32 -04:00
Monster Iestyn	6bf3274452	Merge branch 'gme-pause' into 'master' ... Fix pausing on gme See merge request STJr/SRB2!251	2018-07-31 14:33:56 -04:00
Steel Titanium	d649700abf	Re-did this fix.	2018-07-28 01:58:25 -04:00
Alam Ed Arias	6d9bf3c5b3	Merge branch 'master' into next	2018-07-20 17:35:53 -04:00
Alam Ed Arias	f80b4e18a2	Fixup PROFILEMODE	2018-07-20 17:35:18 -04:00
Monster Iestyn	107dbf7496	Merge branch 'master' into next	2018-07-11 21:37:23 +01:00
Monster Iestyn	1e4e0006cb	Merge branch 'opengl-fof-lowerunpegged' into 'master' ... OpenGL: FOF walls + Lower unpegged See merge request STJr/SRB2!258	2018-07-11 16:36:26 -04:00
Monster Iestyn	e9339b6356	Merge branch 'master' into next	2018-07-11 21:18:39 +01:00
Monster Iestyn	c8aaad253d	Merge branch 'opengl-projectsprite-fix' into 'master' ... OpenGL HWR_ProjectSprite fix See merge request STJr/SRB2!255	2018-07-11 16:15:42 -04:00
colette	639f0d335b	Update f_finale.c	2018-07-07 20:20:46 -04:00
Alam Ed Arias	e219f92c6b	Merge branch 'master' into next	2018-07-07 16:42:50 -04:00
Alam Arias	57f74bcc82	Update m_misc.c	2018-07-07 20:41:11 +00:00
Alam Arias	b4d84a171e	Update m_misc.c	2018-07-07 20:33:19 +00:00
Monster Iestyn	71a40a8125	Merge branch 'md2-fopen-error' into 'master' ... More helpful error messages See merge request STJr/SRB2!243	2018-07-06 14:38:59 -04:00
Monster Iestyn	5758beb6b2	Merge branch 'md2-smoother-interpolation' into 'master' ... Smoother MD2 interpolation See merge request STJr/SRB2!224	2018-07-06 14:38:37 -04:00
MonsterIestyn	a1ebb61b0a	Merge pull request #252 from GoldenTails/patch-1 ... Fixed MD2 models not loading correctly on Linux	2018-07-06 19:12:21 +01:00
GoldenTails	cdaadc0037	Merge remote-tracking branch 'STJrSRB2/master' into patch-1	2018-07-05 16:44:34 -05:00
Monster Iestyn	15812dfb30	Merge branch 'master' into next	2018-07-05 21:09:39 +01:00
Monster Iestyn	2004a852a6	Merge branch 'lua-exploit-fix' into 'master' ... Lua exploit fix See merge request STJr/SRB2!259	2018-07-05 16:08:08 -04:00
MonsterIestyn	e536a5fb28	Merge pull request #264 from LJSonik/password-security-fix ... Disable admin password by default	2018-07-05 20:16:19 +01:00
LJSonik	333a98fb59	Merge branch 'master' into password-security-fix	2018-07-05 20:58:00 +02:00