3962 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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	fc2517d8e2	FlickyFly: Configure gravity by MTF_AMBUSH	2018-08-09 00:13:08 -04:00
MascaraSnake	21cb0cab3c	Reorganized the thing type numbers	2018-08-03 23:58:11 +02:00
Monster Iestyn	83d87c343b	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	b5ec286667	Merge branch 'master' into hardcoding-time-again	2018-08-02 16:04:54 +01:00
Monster Iestyn	be5d0406bd	Merge branch 'public_next' ... # Conflicts: # src/hardware/hw_md2.c	2018-07-31 19:41:54 +01:00
Monster Iestyn	74646052b0	Merge branch 'master' into next	2018-07-31 19:36:30 +01:00
Monster Iestyn	485d990949	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	16999b7080	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	c02ee9a502	Re-did this fix.	2018-07-28 01:58:25 -04:00
Alam Ed Arias	79e4c3760a	Merge branch 'master' into next	2018-07-20 17:35:53 -04:00
Alam Ed Arias	1ee7eda0ad	Fixup PROFILEMODE	2018-07-20 17:35:18 -04:00
Monster Iestyn	a06ef26149	Merge branch 'master' into next	2018-07-11 21:37:23 +01:00
Monster Iestyn	8e19611033	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	09ae0aae53	Merge branch 'master' into next	2018-07-11 21:18:39 +01:00
Monster Iestyn	c127ea3ceb	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	0a931a1364	Update f_finale.c	2018-07-07 20:20:46 -04:00
Alam Ed Arias	17570c1ad6	Merge branch 'master' into next	2018-07-07 16:42:50 -04:00
Alam Arias	a79b9a9127	Update m_misc.c	2018-07-07 20:41:11 +00:00
Alam Arias	7da6aca450	Update m_misc.c	2018-07-07 20:33:19 +00:00
Monster Iestyn	f1bba60373	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	130de10f97	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	3e9103bec2	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	761a221840	Merge remote-tracking branch 'STJrSRB2/master' into patch-1	2018-07-05 16:44:34 -05:00
Monster Iestyn	e5236c3137	Merge branch 'master' into next	2018-07-05 21:09:39 +01:00
Monster Iestyn	8c56e39c18	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	d77ba1dab6	Merge pull request #264 from LJSonik/password-security-fix ... Disable admin password by default	2018-07-05 20:16:19 +01:00
LJSonik	3b39b3b7c8	Merge branch 'master' into password-security-fix	2018-07-05 20:58:00 +02:00