def090c9f0
Move the ifdef
2018-10-07 14:45:03 -04:00
a5fb2143fd
Merge branch 'fixer-mixer' into 'master'
...
Fixer mixer: Mixer Memory Leaks
See merge request STJr/SRB2!287
2018-10-07 13:10:26 -04:00
e4f2a3d7b6
Merge branch 'skill-option' into 'master'
...
-skill launcher option
See merge request KartKrew/Kart!34
2018-10-07 12:25:06 -04:00
d3e489e986
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
42307c0ea0
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
b1e02467bf
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
eebde386cf
Merge branch 'frameperfectegg' into 'master'
...
Frame Perfect Egg
See merge request KartKrew/Kart!31
2018-10-07 09:39:45 -04:00
64ceed280a
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
da4853f4d5
Merge branch 'droptweaks' into 'master'
...
Droptweaks
See merge request KartKrew/Kart!27
2018-10-07 09:37:02 -04:00
2f061a531a
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
fb6c329870
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
02597e0bf9
Fix compiler warnings.
2018-10-07 09:26:18 +01:00
8ba3f88553
Don't need thissec
2018-10-06 23:37:27 -04:00
ff7b402dc5
OGL support
2018-10-06 19:25:59 -04:00
d072dd2725
I think that should be NULL, not 0 actually.
2018-10-07 00:22:23 +01:00
7b417b573c
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
725a65c1f7
Call SDL_RWclose after an SDL_RWFromMem call to close the RWops.
2018-10-07 00:15:11 +01:00
031f142459
You got it, Sal
2018-10-06 21:53:39 +01:00
3d7a1d44d5
Do clipsolid for doorclosed only while your camera is outside of the sector
2018-10-06 16:22:36 -04:00
41ad3de999
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
ea6bdca949
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
2effb6adc3
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
1ec601af6b
Draw a star for continues if invalid skin numbers are somehow supplied
2018-10-05 22:42:36 +01:00
5a80d036e7
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
352c824ee1
Merge branch 'chat-changes' into 'master'
...
Chat changes
See merge request KartKrew/Kart!26
2018-10-05 11:47:45 -04:00
d1daa99289
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
df824eb370
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
3417f57e92
-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
b812a6a4ab
Really fix DD compiling this time.
2018-10-04 22:56:11 -04:00
fc5d969642
Fix DD compiling
2018-10-04 22:44:26 -04:00
399cf59b8a
Merge branch 'toast_misc' into 'master'
...
toast misc
Closes #11
See merge request KartKrew/Kart!19
2018-10-04 22:41:27 -04:00
49cb1ffe9f
Restore deleted endif
2018-10-04 22:38:59 -04:00
d51e4c3140
Scale explosions properly
2018-10-04 22:09:12 -04:00
c5e30aa018
Don't allow non-keyboard keys to screenshot/gif in menus
2018-10-04 22:06:56 -04:00
376656343a
Revert "Attempt to not let the camera into thok barriers"
...
This reverts commit 9f42e74fe2
2018-10-04 20:08:29 -04:00
7de16e2528
Foolish
2018-10-04 20:06:55 -04:00
79f5f4885c
Split zlib and libpng
2018-10-04 19:47:19 -04:00
639a170c78
Merge branch 'master' into sal-cleanup
2018-10-04 18:51:45 -04:00
6bae5e952b
Brown text colormap instead of teal, revert sky-blue
2018-10-04 18:07:56 -04:00
71efda2b20
Always move the camera
...
According to wolfs, this improves fps. Let's confirm, shall we?
2018-10-04 17:50:50 -04:00
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
744c41bc8a
Edit the text remaps
...
Lighter sky, lighter pink, steel is now called steel-blue
2018-10-04 14:30:54 -04:00
1cb2c22cbd
Dream is green, Olive is yellow
2018-10-04 14:28:38 -04:00
fef3c63740
Moved colors around yet again for nicer invincibility effect
...
- Ruby is closer to the pinks (and where purples would be if it wrapped around)
- Sapphire is closer to the cyans
- Dream is right before the teals
2018-10-03 21:18:07 -04:00
ad64279d28
Edit Pink, Navy, and Jet
2018-10-03 20:48:44 -04:00
fdf398d003
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_misc
2018-10-03 21:04:34 +01:00
dcdbf911a5
Don't have all of your mines disappear into the aether if you have to shield-drop ONE, because they're not all out at once. (This is only really relevant to debug testing, given picking up additional HUD-dropped mines isn't very likely.
2018-10-03 20:56:43 +01:00
60a26fcaa4
* Modify PIT_GrenadeRing to place less-complicated checks near the start of the function.
...
* Add the customary LUA_CallAction call to A_GrenadeRing.
* Revamp A_MineExplode into using a blockmap iterator. Having tested it it might be less laggy in some situations, but I think the drawing is causing the bulk of the problems here.
2018-10-03 20:51:15 +01:00
4c1a068bd7
Update A_GrenadeRing to also take the mapheader scale into account.
2018-10-03 20:23:59 +01:00
4aea053c2f
Allow client to open chat and scroll even if muted.
2018-10-03 20:09:32 +02:00
Steel Titanium