thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3998 commits 1 branch 12 tags 205 MiB
Commit graph

234 commits

Author SHA1 Message Date
Monster Iestyn
3cce0b8a33 Merge branch 'public_next' 
# Conflicts:
#	src/sdl12/i_cdmus.c
#	src/win32ce/win_cd.c
 2018-08-21 15:40:54 +01:00
Monster Iestyn
eb5b5300ab Merge branch 'XPMupdate' into 'master' 
update XPM icon

See merge request STJr/SRB2!267
 2018-08-21 10:31:25 -04:00
Monster Iestyn
6797976531 Merge branch 'sdl_mixer_fixes' into 'master' 
SDL Mixer fixes

Closes #31

See merge request STJr/SRB2!260
 2018-08-16 16:57:14 -04:00
Steel Titanium
cd790eca91 Fix white being treated as transparent. 2018-08-10 19:02:03 -04:00
Alam Ed Arias
8f6d20d53c SDL: update IMG_xpm.c 2018-08-10 17:09:11 -04:00
Monster Iestyn
f6b8206660 Merge branch 'public_next' 
# Conflicts:
#	src/hardware/hw_md2.c
 2018-07-31 19:41:54 +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
Steel Titanium
d649700abf Re-did this fix. 2018-07-28 01:58:25 -04:00
Monster Iestyn
594eb92bed Use plain malloc instead of Z_Malloc to allocate sound buffers in mixer_sound.c's I_GetSfx. 
This should prevent I_FreeSfx making a mess of things later, hopefully.
 2018-07-14 18:15:59 +01:00
Steel Titanium
b7776da524 Merge remote-tracking branch 'upstream/master' into gme-lowvolume-fix 2018-07-05 01:20:32 -04:00
Steel Titanium
e104e01057 Merge remote-tracking branch 'upstream/master' into gme-pause 2018-07-05 01:16:43 -04:00
Monster Iestyn
105eee7e0a Merge branch 'public_next' 
# Conflicts:
#	src/d_main.c
#	src/d_netfil.c
#	src/p_setup.c
 2018-06-09 19:35:36 +01:00
Steel Titanium
61d8033d5e Fix pausing on gme 2018-06-03 18:15:20 -04:00
Steel Titanium
884f10d8d2 Removed CONS_Printf line. That wasn't meant to be commited. 2018-05-29 22:12:36 -04:00
Steel Titanium
5f72975466 Some small change 
Really this is just to prevent the music end up being disorted at max
volume
 2018-05-29 20:31:28 -04:00
Monster Iestyn
71fa00e423 Ignore mouse button events if the mouse's focus is not actually on the window at the moment. 
This should hopefully kill the F12 getting stuck issue once and for all.
 2018-05-28 21:29:46 +01:00
Steel Titanium
528cb48d5d GME low volume fix 2018-05-24 16:24:09 -04:00
Monster Iestyn
43743722c7 Merge branch 'public_next' 
# Conflicts:
#	src/f_finale.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/hardware/r_opengl/r_opengl.c
#	src/sdl12/hwsym_sdl.c
#	src/sdl12/i_video.c
 2018-04-06 18:42:07 +01:00
Steel Titanium
bd928ddb80 Merge remote-tracking branch 'upstream/master' into dedicated-nosoundinit 2018-04-03 16:16:20 -04:00
Sryder
9c1bf9798a Revert "Fix screenshot functionality in fullscreen in SDL2" 
This reverts commit 83d4f29367.

The reason I am reverting this is because the last commit actually fixes the *old* screenshot functionality, as the screen is being drawn back onto the buffer after they're swapped in the "real" size. Meaning the old function actually works perfectly fine now.
 2018-03-18 18:33:53 +00:00
Sryder
4e40a810f7 Fix wipes in low resolutions 2018-03-18 17:12:12 +00:00
Sryder
83d4f29367 Fix screenshot functionality in fullscreen in SDL2 2018-03-08 22:28:38 +00:00
Sryder
e6dff75aab Optimise the screen texture setup for SDL2, Post-processor, and wipes. 
Only use glCopyTexImage2D when first creating the screen texture, use glCopyTexSubImage2D anytime after that as it does not define a new texture each time.
Flushing of the screen textures has been implemented for when the screen size changes (so that the screen textures don't stay at a wrong size) and the game is closed, I believe they would leave a memory leak before.
 2018-03-07 22:55:21 +00:00
Monster Iestyn
c11a2ad9b6 Merge branch 'public_next' 
# Conflicts:
#	src/sdl/i_system.c
 2018-03-04 19:18:13 +00:00
Monster Iestyn
39949392ca more I_GetFreeMem fixes: don't attempt to set *total to 0L if total itself is NULL 2018-02-23 20:40:19 +00:00
Monster Iestyn
a4637a6dec Use __linux__ instead of LINUX/LINUX64 
Turns out compiling for Linux 32-bit using the Makefiles never actually defines LINUX! Apart from that, most of the existing Linux-specific code in SRB2's source code (except for tmap.s) actually uses __linux__ instead anyway
 2018-02-23 20:21:16 +00:00
Steel Titanium
6d663fefa7 Removed some redundant checks 2018-02-17 00:37:17 -05:00
Monster Iestyn
88179a7f8d Merge branch 'master' into file-loading-cleanup 2018-01-04 20:17:19 +00:00
Alam Ed Arias
b22ef1a85d Merge branch 'public_next' into private 2018-01-04 14:32:27 -05:00
Alam Ed Arias
7c3c09b95d SDL: disable check for noreturn 2018-01-04 14:29:29 -05:00
Monster Iestyn
afaf841280 Merge branch 'master' into file-loading-cleanup 2018-01-02 18:46:02 +00:00
Alam Ed Arias
af76943926 MSVC2015: fixup 2018-01-02 13:22:10 -05:00
Monster Iestyn
728d27f2d5 Merge branch 'public_next' 
# Conflicts:
#	src/doomdef.h
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
#	src/win32/win_vid.c
 2018-01-02 17:32:24 +00:00
Monster Iestyn
83a8a77beb Merge branch '2.1.20-preparation' into 'next' 
2.1.20 preparation

See merge request STJr/SRB2!215
 2017-12-27 16:53:43 -05:00
Alam Ed Arias
f1968e5145 Disable win_dbg 2017-12-26 20:24:08 -05:00
Monster Iestyn
75bc76e9b4 Remove all traces of "srb2.wad" support, since it is no longer needed now that srb2.pk3 is the IWAD (...IPK3?). srb2.wad cannot exactly be a pk3 file after all. 
Additionally, rename any remaining "srb2.srb" to "srb2.pk3" in the main source code files. Not sure whether to bother dealing with srb2.srb/srb2.wad mentions in project files for now.
 2017-12-07 18:26:12 +00:00
Monster Iestyn
7cb0138293 Change version number to 2.1.20 2017-11-08 15:06:42 +00:00
toaster
49a1266ccc Merge branch 'sal-misc-stuff' into 'master' 
Sal misc stuff (state overwriting, gamepad tweaks)

See merge request STJr/SRB2Internal!116
 2017-11-02 16:35:12 -04:00
toasterbabe
ead8fd6bf7 Update some strings that say "joystick". 2017-10-30 23:23:52 +00:00
Steel Titanium
799a819ee9 Merge remote-tracking branch 'upstream/master' into window_center_fix 2017-10-29 00:00:11 -04:00
toasterbabe
50d6208913 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement 2017-10-21 14:28:44 +01:00
wolfy852
93584f6811 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into FileManagement 2017-10-07 14:52:40 -05:00
Monster Iestyn
52620ac9b1 Obliterated OS/2 2017-10-07 18:11:14 +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
de4ea022c0 Merge branch 'public_next' 2017-09-29 17:23:47 +01: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
f1a347e55f Merge branch 'public_next' into master 2017-09-28 11:01:20 -04:00
Alam Ed Arias
2ccd397d11 Build: kill GCC 7's implicit-fallthrough warning 2017-09-28 09:39:47 -04:00
Monster Iestyn
b040113246 Removed the wrong endif by mistake 2017-09-16 20:59:35 +01:00
Monster Iestyn
a33bb70a0c Removed all support for Dreamcast, XBox, PSP, PS3, GP2X, Wii, and WinCE from files in the sdl/ folder. If you wanted these ports, use the SDL 1.2 code in sdl12 
Also removed GP2X setup from sdl/MakeNIX.cfg, use sdl12 for that too
 2017-09-16 20:26:04 +01:00