3796 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Monster Iestyn	9c6e739005	PS3 was deposed	2017-09-29 20:12:57 +01:00
Monster Iestyn	49542cdaa1	Remove XBOXSTATIC and FILESTAMP, since only the XBOX port needed them	2017-09-29 19:46:23 +01:00
Monster Iestyn	5a16c39af0	XBOX was eXecuted	2017-09-29 19:27:17 +01:00
Monster Iestyn	330399ea9b	Dreamcast is gone, so there is no need for KOS_GL_COMPATIBILITY anymore	2017-09-29 18:28:47 +01:00
Monster Iestyn	f4e535a64d	Burned Dreamcast port at the stake	2017-09-29 18:19:34 +01:00
Monster Iestyn	de4ea022c0	Merge branch 'public_next'	2017-09-29 17:23:47 +01:00
Monster Iestyn	ea372fae53	Merge branch 'master' into next	2017-09-29 17:15:57 +01:00
Alam Ed Arias	f0eee4737f	Menu: no more pop/push options	2017-09-28 17:45:27 -04:00
Alam Ed Arias	3e26e2a443	Menu: Compile M_DrawAddons without any optimizes	2017-09-28 17:38:14 -04:00
Monster Iestyn	c90ddbca36	Merge branch 'makefile-ports-tweaks-cleanup-etc' into 'master' ... Makefile ports tweaks cleanup etc See merge request !211	2017-09-28 17:31:33 -04:00
Alam Ed Arias	2629301947	Merge branch 'public_next' into master	2017-09-28 17:29:02 -04:00
toasterbabe	d38b627b85	woops	2017-09-28 22:20:16 +01:00
Alam Ed Arias	6c18d15b4a	Merge branch 'master' into next	2017-09-28 16:55:04 -04:00
Alam Ed Arias	01602fa1f1	Build: fixup warnings in Debug builds	2017-09-28 16:54:26 -04:00
Alam Ed Arias	16b3f65660	Merge branch 'master' into next	2017-09-28 16:28:22 -04:00
Alam Ed Arias	92aa0e000e	Travis: can not use set version with sdl2	2017-09-28 16:24:22 -04:00
Alam Ed Arias	1ab0697fee	Merge branch 'master' into next	2017-09-28 16:09:07 -04:00
Alam Ed Arias	a356beac2c	Travis: install SDL2 2.0.6 and SDL2_Mixer 2.0.1	2017-09-28 15:31:34 -04:00
toasterbabe	9446fe6cd6	Tweak some HUD stuff, including a more consistent application of MAXSCORE.	2017-09-28 20:24:40 +01:00
Alam Ed Arias	0eafaafca1	Travis: drop sdl2_mixer from MacPorts and use SDL 2.0.6	2017-09-28 13:49:57 -04:00
Alam Ed Arias	1be137f461	cleanup	2017-09-28 11:10:24 -04:00
Alam Ed Arias	3a2a6076b3	Merge branch 'public_next' into master	2017-09-28 11:09:48 -04:00
Alam Ed Arias	30a42c0d72	Merge branch 'master' into next	2017-09-28 11:07:35 -04:00
Alam Ed Arias	9adf5f811b	CircleCI: remove blank lines	2017-09-28 11:06:57 -04:00
Alam Ed Arias	5986720789	Build: fixups	2017-09-28 11:01:52 -04:00
Alam Ed Arias	f1a347e55f	Merge branch 'public_next' into master	2017-09-28 11:01:20 -04:00
Alam Ed Arias	ec125628ab	Merge branch 'master' into next	2017-09-28 10:16:35 -04:00
Alam Ed Arias	1ffdd2e945	Travis: still need to keep -Wno-tautological-compare for GCC 7	2017-09-28 10:15:10 -04:00
Alam Ed Arias	7f98c5c804	Build: do not error on fallthrough	2017-09-28 10:02:08 -04:00
Alam Ed Arias	2ccd397d11	Build: kill GCC 7's implicit-fallthrough warning	2017-09-28 09:39:47 -04:00
Alam Ed Arias	55f377ba3d	Build: kill GCC 7's format-overflow warnings	2017-09-28 09:13:46 -04:00
Alam Ed Arias	bdba212b2a	Makefile: add support for GCC 7.1 and 7.2	2017-09-28 09:13:01 -04:00
Alam Ed Arias	7e23014d5f	Makefile: support GCC 6.4	2017-09-28 09:04:36 -04:00
toasterbabe	f0ce22edb6	Fix issue #72 (where closed captioning jingles didn't account for pausing).	2017-09-27 15:37:52 +01:00
toasterbabe	7fb2e6633e	Fix a crash.	2017-09-27 14:43:18 +01:00
toasterbabe	295b100df4	Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into more_about_menus ... # Conflicts: # src/m_menu.c	2017-09-27 14:43:09 +01:00
TehRealSalt	fcc1554467	Play bubble breathe sound for bots	2017-09-24 13:43:36 -04:00
Nevur	77d7b1495c	Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement	2017-09-24 14:52:41 +02:00
TehRealSalt	09c3c58575	Obligatory "fixing a very tiny and very stupid mistake" commit :p	2017-09-21 17:38:42 -04:00
TehRealSalt	6b448f72ee	A_GhostMe lets you change fuse with var1, fixed the walking-spin frames bug For Real This Time	2017-09-21 17:34:53 -04:00
TehRealSalt	d55f84bec0	Camera scaling to splitscreen mode ... Stacks with analog's camera buff. The camera height of both are also now proportional with their dist	2017-09-21 16:43:55 -04:00
Alam Ed Arias	62264901e5	Merge branch 'master' into next	2017-09-20 17:18:58 -04:00
TehRealSalt	cfce6650ca	Fix holding spin while landing putting you in your walking state, remove commented out stuff	2017-09-20 16:53:05 -04:00
TehRealSalt	7c7bf243a2	Okay, nope, still nothing; reverting	2017-09-20 16:20:30 -04:00
TehRealSalt	4e7b817945	Does THIS fix the conflicts??	2017-09-20 16:14:00 -04:00
Monster Iestyn	829328637d	Merge branch 'netcode-fixes-the-sequel' into 'next' ... Netcode fixes the sequel See merge request !207	2017-09-20 15:00:09 -04:00
Monster Iestyn	533fdcae0a	Merge branch 'custom-savegames-home-path-fix' into 'master' ... Fix save games for a custom mod not saving to custom home folder See merge request !209	2017-09-20 14:56:39 -04:00
TehRealSalt	6a0f50cdf5	Resolve conflicts	2017-09-19 17:27:13 -04:00
TehRealSalt	4a51d4bee0	Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc-stuff ... # Conflicts: # src/g_game.h	2017-09-19 17:07:09 -04:00
toasterbabe	ca42659e03	Made a mistake in the directionchar branch. I'm pushing to master - naughty naughty - but nobody's around to stop me and it's my birthday c:	2017-09-19 14:22:17 +01:00