622 commits

Author	SHA1	Message	Date
Jaime Passos	0aba0aa4b9	Merge remote-tracking branch 'origin/master' into openglskydome2	2019-09-27 22:47:10 -03:00
Steel Titanium	6a870b4467	Various of changes ... Changed any instance of "joystick" in strings to "gamepad" Renamed some cvars Added a define for MAX_JOYSTICK Added back the missing command line params.	2019-09-23 22:46:44 -04:00
Steel Titanium	dfee7efd33	Merge branch 'master' into internal-hotplug-stableid	2019-09-23 00:44:34 -04:00
toaster	113568095a	* Resolve compiling issues with logmessages. ... * Improve logfile print. (I know Steel wanted it gone entirely, but I feel like it's relevant to have it in game..?)	2019-09-20 17:22:09 +01:00
toaster	20d098de8f	Merge branch 'betterdirs' into 'master' ... Better directory structure See merge request STJr/SRB2Internal!321	2019-09-20 11:36:56 -04:00
Jaime Passos	5f6c702ed6	sky barreling	2019-09-17 23:38:04 -03:00
Alam Ed Arias	35e3d9acab	Revert "Merge branch 'gl_skydome' into 'master'" ... This reverts merge request !326	2019-09-17 20:20:09 +00:00
Steel Titanium	00d64c380d	Merge branch 'newicon' into 'master' ... New EXE icon See merge request STJr/SRB2Internal!265	2019-09-12 14:05:32 -04:00
Jaime Passos	fec579db8c	Merge remote-tracking branch 'origin/master' into gl_skydome	2019-09-10 19:20:20 -03:00
Alam Ed Arias	9d64ee88a0	Be clear on what FALLTHRU we really want	2019-09-09 15:02:13 -04:00
Steel Titanium	555b4e1766	Fix function being redefined	2019-09-08 19:39:23 -04:00
Steel Titanium	995ab1c84d	Merge branch 'master' into internal-hotplug-stableid ... Just merged in known working code, note that I haven't tested it, so I have no idea if it compiles still.	2019-09-08 01:55:36 -04:00
Steel Titanium	8ee0a9309b	Better directory structure	2019-09-08 01:29:09 -04:00
Jaime Passos	f6d2b5109b	PRBoom sky dome	2019-09-03 02:12:17 -03:00
Monster Iestyn	f3484f7ded	Merge branch 'public_next' ... # Conflicts: # src/config.h.in # src/d_clisrv.c # src/d_netcmd.c # src/doomdef.h # src/p_map.c # src/p_maputl.c # src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj	2019-08-20 13:54:48 +01:00
Monster Iestyn	e52a314ddb	Update version to 2.1.25	2019-08-16 20:14:01 +01:00
Alam Ed Arias	92a954609d	Merge branch 'public_next' into private	2019-08-08 23:41:19 -04:00
Alam Ed Arias	5a79a446df	Tested to be compile with Mingw64 9.1.0	2019-08-08 21:25:46 -04:00
mazmazz	688fdf35f9	Use strtok instead of strtok_r	2019-08-07 01:29:05 -04:00
toaster	015abfc970	Revert "Revert "Fix MIDI Soundfont code shadowing a global variable."" ... This reverts commit 99dbcb9f65.	2019-08-04 12:04:01 +01:00
toaster	384dc0674e	Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" ... This reverts commit 603d5805f7.	2019-08-04 12:03:57 +01:00
toaster	603d5805f7	Revert "Merge branch 'musicplus-aug2019-b' into 'master'" ... This reverts commit 56bfdb7113, reversing changes made to c29cfbef9b.	2019-08-04 11:32:55 +01:00
toaster	99dbcb9f65	Revert "Fix MIDI Soundfont code shadowing a global variable." ... This reverts commit 3591e3d092.	2019-08-04 11:28:04 +01:00
toaster	3591e3d092	Fix MIDI Soundfont code shadowing a global variable.	2019-08-04 10:28:10 +01:00
mazmazz	bddafbeece	Merge branch 'internal-musicplus-jingle' into musicplus-aug2019	2019-08-04 02:41:37 -04:00
mazmazz	fd4d3a6a69	Mixer X menu touchup	2019-08-04 02:30:34 -04:00
mazmazz	b99f06c0c9	Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx	2019-08-04 01:10:21 -04:00
mazmazz	dd9efebab5	Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle	2019-08-03 23:38:49 -04:00
Alam Ed Arias	a8637d034e	SDL2: more consts	2019-07-29 19:22:14 -04:00
Alam Ed Arias	1a643b1bd9	SDL2: more const in xpm code	2019-07-29 19:08:55 -04:00
Alam Ed Arias	ed0754382f	Merge remote-tracking branch 'private/master' into newicon	2019-07-29 19:04:19 -04:00
Alam Ed Arias	b77780e1e7	Fix building with MSVC	2019-07-29 19:02:45 -04:00
Alam Ed Arias	e50dc7c779	Merge branch 'public_next' into private	2019-07-29 18:31:01 -04:00
Alam Ed Arias	66f84efd02	SDL2: fixed compiling mixer interface with MSVC	2019-07-29 17:56:35 -04:00
Steel Titanium	98adcb1de3	Change it back to const char	2019-07-28 18:19:00 -04:00
Steel Titanium	74cbf2b4f3	Update mac icon	2019-07-28 17:06:01 -04:00
Steel Titanium	9813cbc857	More icon stuff	2019-07-27 01:13:54 -04:00
Steel Titanium	64bb70bef4	Fix crash with GME sounds when being freed	2019-07-27 01:13:54 -04:00
Steel Titanium	c35afa2c96	Merge branch 'master' into musicplus-sdlmixerx	2019-07-22 22:20:08 -04:00
Steel Titanium	af959ee309	Some fixup	2019-07-22 22:01:05 -04:00
Steel Titanium	181ecee202	Let's not use this	2019-07-16 19:26:16 -04:00
Steel Titanium	3ffb7b6192	New icons ... Also update IMG_xpm.c	2019-07-16 19:20:00 -04:00
Monster Iestyn	c8cfc3110f	Merge branch 'public_next'	2019-07-16 18:28:49 +01:00
Steel Titanium	4e839596a1	Fix crash with GME sounds when being freed	2019-07-14 14:55:04 -04:00
Monster Iestyn	5c54022a89	Add static keyword to these variables for correctness	2019-07-14 16:23:01 +01:00
Steel Titanium	60cb2de6a0	Seperate declarations from code	2019-07-09 15:51:11 -04:00
Steel Titanium	21c6836fe0	Some few comments	2019-07-09 00:56:22 -04:00
Steel Titanium	164e797670	Better loading code for modules	2019-06-29 20:35:31 -04:00
mazmazz	5b0f7d2850	Merge branch 'master' into musicplus-sdlmixerx	2019-06-29 19:31:01 -04:00
mazmazz	923dc34215	Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle	2019-06-29 18:33:45 -04:00