Monster Iestyn
12752e0a43
Merge branch 'zlib-split' into 'master'
...
Makefile: Split zlib and libpng
See merge request STJr/SRB2!285
2018-10-08 07:20:27 -04:00
TehRealSalt
1bce22cf72
Merge branch 'master' into sal-cleanup
2018-10-08 00:22:44 -04:00
TehRealSalt
d5c06b31ad
Fix Hyudoro arrows being visible
2018-10-08 00:16:27 -04:00
TehRealSalt
1acee694aa
Don't let chat/console eat inputs from anyone besides player 1
2018-10-08 00:14:29 -04:00
TehRealSalt
7a6a2f8946
Merge branch 'master' into net-screen
2018-10-07 23:26:56 -04:00
Sal
2f43e56774
Merge branch 'noclip-cam' into 'master'
...
Noclip cam
See merge request KartKrew/Kart!32
2018-10-07 23:15:06 -04:00
Sal
85430da37f
Merge branch 'thinkerclean' into 'master'
...
Nuke a bunch of iteration things that have no purpose in SRB2Kart.
See merge request KartKrew/Kart!25
2018-10-07 23:14:53 -04:00
TehRealSalt
b5f409fcb8
Merge branch 'master' into net-screen
2018-10-07 18:54:22 -04:00
TehRealSalt
68a06a14c8
Rocket Sneakers appear beside you
2018-10-07 18:53:46 -04:00
Steel Titanium
0c9e8cff07
Change win_snd.c also
2018-10-07 15:00:48 -04:00
Steel Titanium
4d883e740d
Change order of the ifdef
2018-10-07 14:52:25 -04:00
Steel Titanium
fa1377d540
Move the ifdef
2018-10-07 14:45:03 -04:00
Sryder
db332478d5
Merge branch 'skill-option' into 'master'
...
-skill launcher option
See merge request KartKrew/Kart!34
2018-10-07 12:25:06 -04:00
Sryder
9e1584fbb0
Fix the mixed declaration and code warnings that only don't appear currently because of a tiny Makefile issue.
2018-10-07 15:35:54 +01:00
toaster
e3c052e1d0
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into karmegg
...
# Conflicts:
# src/p_inter.c
2018-10-07 15:17:31 +01:00
toaster
2ad2cbcc0a
Weather is already run client-side. What if we ran it render-side, for major performance gains? This commit will answer all your questions - and more!
2018-10-07 15:00:58 +01:00
Sryder
b46aa4201e
Merge branch 'frameperfectegg' into 'master'
...
Frame Perfect Egg
See merge request KartKrew/Kart!31
2018-10-07 09:39:45 -04:00
Sryder
ce2980f228
Merge branch 'colors' into 'master'
...
Edit Pink, Navy, and Jet, add brown text
See merge request KartKrew/Kart!28
2018-10-07 09:39:22 -04:00
Sryder
b631a8436d
Merge branch 'droptweaks' into 'master'
...
Droptweaks
See merge request KartKrew/Kart!27
2018-10-07 09:37:02 -04:00
toaster
49472858d9
Karma Eggman. Does what it says on the egg. Tried very hard not to merge conflict with frameperfectegg.
...
Also includes some adjustments to:
* Horizontal offset of Eggman countdown in splitscreen again. It's not perfectly centered either way, but on second thought I like this better.
* Sound of Lat`'s Mine/SPB explosions - now uses same sound as Karma bombing, instead of that shitty paraloop.
* Correctly wipe k_eggmanblame when it is appropriate to do so.
2018-10-07 11:40:06 +01:00
Sryder
d9d98ec1a9
Fix the crashing bug hopefully
...
A value of 1 in freesrc for Mix_LoadWAV_RW and Mix_LoadMus_RW calls SDL_RWclose on the RWops anyway.
For Mix_LoadWAV_RW the RWops is freed right after the data is loaded (because it makes a copy of the data in memory)
For Mix_LoadMUS_RW the RWops is freed when Mix_FreeMusic is called (because the data is not a copy)
So setting 1 on freesrc doesn't actually free the RWops immediately on Mix_LoadMus_RW *unless* it failed to load any music.
2018-10-07 10:37:45 +01:00
Sryder
00c36a9d9e
Fix compiler warnings.
2018-10-07 09:26:18 +01:00
TehRealSalt
f026615dfe
Don't need thissec
2018-10-06 23:37:27 -04:00
TehRealSalt
d8cf9327a6
OGL support
2018-10-06 19:25:59 -04:00
Sryder
d7f373a42d
I think that should be NULL, not 0 actually.
2018-10-07 00:22:23 +01:00
Sryder
224b228089
Mix_QuickLoad_RAW sets a flag in the Mix_Chunk so that Mix_FreeChunk doesn't actually Free the sound.
...
Checks for the flag when freeing, and if it's 0, we free the data manually after Mix_FreeChunk.
I went back to Z_Malloc and Z_Free for this because they still work after this.
2018-10-07 00:15:42 +01:00
Sryder
052df3265e
Call SDL_RWclose after an SDL_RWFromMem call to close the RWops.
2018-10-07 00:15:11 +01:00
toaster
0b532a4dea
You got it, Sal
2018-10-06 21:53:39 +01:00
TehRealSalt
8d39d4be31
Do clipsolid for doorclosed only while your camera is outside of the sector
2018-10-06 16:22:36 -04:00
toaster
8478243082
Access to map hell maps in record attack. Currently dependent on 50 emblems.
...
Also: temporarily cleaned up the M_CanShowLevelInList record attack conditions to automatically match what we want, instead of requiring us to apply a bunch of vanilla flags just to emulate our "available unless explicitly hidden" MP mechanism like is currently in maps.kart.
2018-10-06 21:08:09 +01:00
TehRealSalt
3ed027a4f7
Remove R_DoorClosed
...
This function has caused me, so much unexpected pain because of just how out of the way it is, and NOTHING else uses it
2018-10-06 15:13:57 -04:00
toaster
977130dbf6
Halt frame-perfect egg crash.
...
(The code is slightly modified from what I put in bug-reports as a potential fix, but I'm glad I was on the right track.)
2018-10-05 23:24:26 +01:00
Monster Iestyn
951b4d1582
Draw a star for continues if invalid skin numbers are somehow supplied
2018-10-05 22:42:36 +01:00
TehRealSalt
37b5a9327c
Merge branch 'master' into net-screen
2018-10-05 16:13:25 -04:00
Sal
1c3ad7d12a
Merge branch 'always-move-cam' into 'master'
...
Move camera less often
See merge request KartKrew/Kart!30
2018-10-05 11:47:55 -04:00
Sal
10c194d95b
Merge branch 'chat-changes' into 'master'
...
Chat changes
See merge request KartKrew/Kart!26
2018-10-05 11:47:45 -04:00
Sryder
2488e3a6d9
Merge branch 'vsync-default-off' into 'master'
...
Disable VSync by default
See merge request KartKrew/Kart!29
2018-10-05 10:44:48 -04:00
Latapostrophe
d4bc7d14ba
Say-team (key and command) now depend of G_GametypeHasTeams(), so you'll only have to modify this function to have say-team work in the gametypes of your choice.
2018-10-05 12:13:11 +02:00
TehRealSalt
bd812b6ece
-skill launcher option
...
Requested by Sev(?), for map editing; sets kartspeed using the same name as Doom's difficulty launcher option
2018-10-04 23:58:44 -04:00
TehRealSalt
59c4400a60
-splitscreen launcher option
...
Now you can join a game in splitscreen mode from a launcher
2018-10-04 23:55:28 -04:00
Steel Titanium
413d5e46c6
Really fix DD compiling this time.
2018-10-04 22:56:11 -04:00
Steel Titanium
8368647b29
Fix DD compiling
2018-10-04 22:44:26 -04:00
Steel Titanium
1656b77bc0
Restore deleted endif
2018-10-04 22:38:59 -04:00
TehRealSalt
083862b38b
Scale explosions properly
2018-10-04 22:09:12 -04:00
TehRealSalt
f1c7eb4907
Don't allow non-keyboard keys to screenshot/gif in menus
2018-10-04 22:06:56 -04:00
TehRealSalt
b33ad2ad2a
Merge branch 'master' into net-screen
2018-10-04 20:16:25 -04:00
TehRealSalt
99ce5f5700
Revert "Attempt to not let the camera into thok barriers"
...
This reverts commit 6f10f15627
2018-10-04 20:08:29 -04:00
TehRealSalt
697d625a41
Foolish
2018-10-04 20:06:55 -04:00
Steel Titanium
2eb9bebcd9
Split zlib and libpng
2018-10-04 19:47:19 -04:00
TehRealSalt
1955ff0dd0
Merge branch 'master' into sal-cleanup
2018-10-04 18:51:45 -04:00
