3365 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
wolfy852	2cbed2aa4f	Merge branch 'FileManagement' of http://git.magicalgirl.moe/STJr/SRB2Internal into FileManagement	2017-10-07 17:21:42 -05:00
wolfy852	b298c7a541	Fix p_spec.c and r_things.h, get the compiler to shut up ... This compiles with no errors or warnings, but hasn't been tested yet. Please review/test when you can.	2017-10-07 17:18:25 -05:00
Alam Ed Arias	1a8e99bf5c	Merge branch 'master' into FileManagement	2017-10-07 16:08:48 -04:00
Alam Ed Arias	c9a43f310d	Merge remote-tracking branch 'private/FileManagement' into FileManagement	2017-10-07 16:06:26 -04:00
Alam Ed Arias	602fbd356a	Merge branch 'master' into FileManagement	2017-10-07 16:06:10 -04:00
wolfy852	93584f6811	Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into FileManagement	2017-10-07 14:52:40 -05:00
wolfy852	a3cfa8dd5c	Fixes from toaster, plus some other stuff	2017-10-07 14:52:27 -05:00
wolfy852	69d0e84b00	Merge branch 'FileManagement' of http://git.magicalgirl.moe/STJr/SRB2Internal into FileManagement	2017-10-07 14:48:56 -05:00
wolfy852	efb30f93ab	Fixes from toaster, plus some other things	2017-10-07 14:48:49 -05:00
Alam Ed Arias	66201620dd	cleanup a few compiler warnings	2017-10-07 13:21:12 -04:00
Alam Ed Arias	c60caa5169	Merge branch 'public_next' into master	2017-10-07 12:46:16 -04:00
Alam Ed Arias	96c014deeb	Merge branch 'master' into next	2017-10-07 12:44:28 -04:00
Alam Ed Arias	1b576bacf3	Build: support GCC 8	2017-09-30 23:07:47 -04:00
Alam Ed Arias	6fbdf37b18	Build: support building with clang 5.0	2017-09-30 08:54:17 -04:00
Alam Ed Arias	075c4e0956	Travis: clang 4.0 and 5.0 is not up for trusy	2017-09-29 17:57:03 -04:00
Alam Ed Arias	472c74907e	Travis: fix misspelling	2017-09-29 17:52:12 -04:00
Alam Ed Arias	03ba14640f	Travis: test building with clang 3.9, 4.0 and 5.0	2017-09-29 17:43:20 -04: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
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
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
Nevur	77d7b1495c	Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement	2017-09-24 14:52:41 +02:00
Alam Ed Arias	62264901e5	Merge branch 'master' into next	2017-09-20 17:18:58 -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
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
toasterbabe	48c0ef2362	Remove extraneous DEH_WriteUndoline's.	2017-09-19 13:21:48 +01:00
toaster	3cc14e3985	Merge branch 'directionchar' into 'master' ... Autobrake & decoupling player sprite angle from camera angle See merge request !69	2017-09-19 07:56:22 -04:00