stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-29 05:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity
5431 commits 60 branches 11 tags 94 MiB
Commit graph

103 commits

Author SHA1 Message Date
Steel Titanium
bcd5176ad1
Update project files 2019-02-14 21:32:57 -05:00
Sally Cochenour
1e61cc6152 Better cpusleep 
- Default to 1, which means potential for a 1-frame loss every once in a while but no longer a complete cpu hog
- New minimum is 0, since -1 just did the exact same thing as 0.
 2019-01-28 14:12:08 -05:00
Marco Z
7806c43ecf Kart Public Next merge 2019-01-08 18:43:49 -05:00
SeventhSentinel
73542c008c merge srb2 next 2019-01-05 15:59:23 -05:00
mazmazz
5f632d9b3c Updated Kart icons to higher res 2019-01-03 12:26:25 -05:00
Digiku
bbd878e520 Merge branch 'mingw-64bit-cpu-target-revise' into 'master' 
MinGW64:Target nocona for 64-bit builds [revision]

See merge request STJr/SRB2!440
 2019-01-01 11:15:34 -05:00
mazmazz
4cfacf5cde Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile 2018-12-29 21:14:50 -05:00
Monster Iestyn
2d675750cf fix inconsistent "tabbing" in the VS project files from when I added in lua_blockmaplib.c 2018-12-23 21:52:49 +00:00
Alam Ed Arias
102fd11cb4 More work to cleanup the ARM builds 2018-12-22 19:50:32 -05:00
Alam Arias
b6a917cda1 Added ARM/ARM64 to whole vc10 sln 
Added ARM/ARM64 to zlib, libpng
Added ARM/ARM64 to srb2dd/srb2sdl
 2018-12-21 16:47:10 -05:00
Alam Ed Arias
6e79722437 Fix float-equal warning in Win32 interface 2018-12-16 14:01:28 -05:00
TehRealSalt
aa16edec1d Merge remote-tracking branch 'srb2public/next' into merge-next 2018-12-03 00:31:23 -05:00
Monster Iestyn
11cb163435 Backport the Blockmap library I made two years ago 2018-11-30 17:11:11 +00:00
TehRealSalt
5534017954 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
mazmazz
ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Monster Iestyn
08af33c51f Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't 2018-11-23 19:12:48 +00:00
Steel Titanium
fe43deacec Merge branch 'master' into responsefile-fix 2018-11-22 23:02:20 -05:00
toaster
aa607ecf4c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again 
# Conflicts:
#	src/d_clisrv.c
#	src/m_misc.c
 2018-11-18 18:26:50 +00:00
Steel Titanium
02c08a3e10 Some small changes 2018-11-14 21:01:54 -05:00
Steel Titanium
f02105732e Fix up compiling on DD version 2018-11-14 18:00:10 -05:00
Steel Titanium
c5a97dcfe6 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit 2018-11-14 17:28:41 -05:00
Alam Ed Arias
f73ea4f984 Clean up warnings 2018-11-14 10:52:16 -05:00
Monster Iestyn
f3b59c1731 Fix VC project files to include hw_clip.c/h 2018-11-14 12:11:57 +00:00
Marco Z
0b97b2a76c Missed #ifdef HAVE_LIBGME in win_snd 2018-11-13 22:50:08 -05:00
Steel Titanium
4836e711d3 Fix up 64-bit MINGW 2018-11-13 20:32:18 -05:00
mazmazz
2db2b6e6af Win32 boolean fixes 2018-11-13 17:24:19 -05:00
TehRealSalt
499faec555 Merge remote-tracking branch 'srb2public/next' 
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
 2018-11-07 16:15:14 -05:00
mazmazz
a288b95458 Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup 2018-10-19 22:04:26 -04:00
toaster
a1e1aa81b5 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/g_game.c
#	src/p_floor.c
#	src/p_user.c
#	src/r_data.c
#	src/r_data.h
#	src/v_video.c
 2018-10-14 21:52:05 +01:00
Sryder
6184f91dd3 Add an int to I_PlaySound to tell an interface which channel number SRB2 is using. 
I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.
 2018-10-13 23:01:11 +01:00
Steel Titanium
027e6e8e3c Change win_snd.c also 2018-10-07 15:00:48 -04:00
Steel Titanium
b812a6a4ab Really fix DD compiling this time. 2018-10-04 22:56:11 -04:00
Steel Titanium
fc5d969642 Fix DD compiling 2018-10-04 22:44:26 -04:00
Sryder
8afdda8249 Disable VSync by default. I wouldn't be surprised if there are issues that arise from it, and I'm fairly sure its always been slightly spotty. 2018-10-04 21:08:47 +01:00
mazmazz
0999b0f8a8 srb2dd music cleanup fixes 2018-09-14 13:24:15 -04:00
mazmazz
b0c47e2fb1 GME fix: play song in I_PlaySong, not I_LoadSong 
(cherry picked from commit 5f21bf230d9716b7cc5b52e4bf3591ebe01e9f3a)
 2018-09-14 10:45:39 -04:00
mazmazz
4d61f00b86 Refactor I_MusicType MusicPlaying and MusicPaused other targets 
(cherry picked from commit 9e6eebeb8d6b4119d87e9678bb6b0687e3dc5217)
 2018-09-14 10:45:39 -04:00
mazmazz
d535c14fc6 Refactoring and reordering other targets 
(cherry picked from commit cf065e106f68fb8af3b0568eba188c8235b1656e)
 2018-09-14 10:43:46 -04:00
mazmazz
44557d9c9d I_MusicPlaying, I_MusicPaused other targets 
(cherry picked from commit d5ec38815968e267aceb59a48a6cb6d3292c0b69)
 2018-09-14 10:28:35 -04:00
mazmazz
e58a8f4fe1 Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume other targets 
(cherry picked from commit 9fb9386f84b3739fe765a78bcb9683eb7e98bc36)
 2018-09-14 10:23:47 -04:00
mazmazz
46b53e8bae Added I_GetMusicType and removed midimode variable: other targets 
(cherry picked from commit 14b393ab16736bb44dab6fd4a90b7bdd8ff782e0)
 2018-09-14 09:55:45 -04:00
mazmazz
b59aa27104 Loose ends other targets 
(cherry picked from commit 9a5fc5f66a31baf713c6f32f7a696b933da6907b)
 2018-09-14 09:41:08 -04:00
toaster
08a23d7b87 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems 
# Conflicts:
#	src/g_game.c
#	src/v_video.c
 2018-08-26 12:42:55 +01:00
toaster
89cce5c461 More menu stuff! 
* Center level selection.
	* Re-work Record Attack screen.
	* Re-order MP Main menu, hide in NONET.
	* Combined yeeeah on vote screen.
	* Colour gametype on tab and tally.
	* (unrelated) Don't show "CHECK" if exiting.
 2018-07-02 01:55:01 +01:00
Steel Titanium
5c8c35e773 Deallocate when I_Quit() is called instead. 2018-06-23 15:09:11 -04:00
Steel Titanium
2139d4771f Default sound volume is too loud 2018-04-11 14:40:05 -04:00
TehRealSalt
36b52e1c67 Merge remote-tracking branch 'refs/remotes/srb2public/next' 
# Conflicts:
#	src/f_finale.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/m_misc.c
 2018-04-07 18:43:59 -04:00
Sryder
77af3a8f95 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
TehRealSalt
42ddd32406 Merge remote-tracking branch 'refs/remotes/srb2public/master' 2018-01-02 22:59:43 -05:00
Alam Ed Arias
f397b5fc3f Makefile: disable win_dbg for DirectDraw 2017-12-26 20:42:37 -05:00