fickleheart
cd4fc40b9e
Cache colormaps everywhere to avoid memory leaks
2019-03-16 00:39:52 -05:00
Alam Arias
dc5024f94c
remove whitespaces
2019-02-05 15:42:37 -05:00
fickleheart
0121d47049
Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff
2019-01-15 19:55:42 -06:00
TehRealSalt
b560a90890
Gag spacing was not updated
2019-01-13 20:47:57 -05:00
TehRealSalt
761aada745
Turn the "Music" section of the credits into only the people on Krew who contributes music
...
Meant to do this in song-credits, since individual songs are now properly credited there.
2019-01-12 04:13:49 -05:00
fickleheart
4213a9cbb6
i,m gowonna update my name in the cwedits uwu
2019-01-11 18:11:52 -06:00
wolfy852
e115dbf34f
Cast animtimer to int before negating
...
Stops a Visual Studio compile error.
2019-01-06 03:02:12 -06:00
TehRealSalt
101feb9498
Add Miku's author to credits.
2018-12-05 21:58:26 -05:00
TehRealSalt
46571fbda2
Fixes to merge process
2018-11-29 10:07:35 -05:00
TehRealSalt
5534017954
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
TehRealSalt
1a4648b6e9
Update credits for bonuschars
2018-11-29 06:54:36 -05:00
TehRealSalt
478f895ea0
Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap
...
I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V
(Shouldn't FLUSHMAPBUFFEREARLY be on now...?)
2018-11-26 04:27:31 -05:00
Monster Iestyn
1b2aea81dc
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
Digiku
40dfe89273
Merge branch '21-source-copyright' into 'master'
...
Update source copyrights to 2018
See merge request STJr/SRB2!346
2018-11-25 07:36:41 -05:00
mazmazz
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Digiku
62443c9090
Merge branch '21-credits-update' into 'master'
...
Extra credits update .21
See merge request STJr/SRB2!345
2018-11-25 07:21:31 -05:00
mazmazz
cf8b4a6cb1
Additional 2.1 credits update
2018-11-23 21:57:07 -05:00
Monster Iestyn
4e616f54ad
Merge branch 'master' into next
2018-11-23 21:01:03 +00:00
Digiku
9a3d2d0ee5
Merge branch '21-credits-update' into 'master'
...
2.1.21 credits update
See merge request STJr/SRB2!339
2018-11-23 07:38:28 -05:00
mazmazz
2f7f472ca2
Update credits for 2.1.21
2018-11-23 07:34:23 -05:00
mazmazz
0d4cd35e13
Make the credits pics darker
2018-11-22 20:08:02 -05:00
TehRealSalt
5c67e22c22
Random map buffer only gets added to when
...
Needs another temporary buffer for the vote screen so that it doesn't roll dupes
2018-11-20 00:13:08 -05:00
TehRealSalt
9acd0ffe8b
Fix for waiting player screen animation
2018-11-18 06:34:29 -05:00
TehRealSalt
e85e621d2c
Minor credits issues
2018-11-16 12:05:57 -05:00
TehRealSalt
692ea23a42
Final credits
2018-11-15 22:55:01 -05:00
TehRealSalt
f859139353
Final title screen
2018-11-14 00:30:51 -05:00
TehRealSalt
7c2535808f
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart
2018-11-13 21:02:49 -05:00
TehRealSalt
1ab5ac58a7
Title demos don't interrupt the music
2018-11-13 21:01:59 -05:00
toaster
5d2e638e8a
final menu tweaks before i fall asleep in my chair
2018-11-14 01:27:01 +00:00
TehRealSalt
d0f21ca415
Merge branch 'sfx-clean'
2018-11-12 04:26:02 -05:00
TehRealSalt
91ae26e213
Use S2 rips on the title screen
2018-11-11 19:22:15 -05:00
Sryder
6af56273bf
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
...
# Conflicts:
# src/d_main.c
# src/d_main.h
# src/d_netcmd.c
# src/doomtype.h
# src/hardware/hw_md2.h
# src/p_user.c
# src/r_splats.h
# src/s_sound.c
# src/s_sound.h
# src/screen.c
# src/sdl/i_system.c
2018-11-10 21:14:53 +00:00
Monster Iestyn
fced19d291
Merge branch 'master' into next
2018-11-10 19:05:33 +00:00
TehRealSalt
69287984db
Merge branch 'master' into staff_names
2018-11-08 14:47:38 -05:00
Monster Iestyn
0bdbdd1b1e
Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)
2018-11-08 16:26:55 +00:00
toaster
8e6ecb5e98
* Add numbers to the staff name strings as Sryder requested.
...
* Make the maximum number of staff ghosts 99 instead of 100. It's a minor thing, and insignificant in the grand scheme of things, but it fixes a bugbear I haven't been able to get out of my head since originally starting to maintain this code. (In the case of 100, it'd do S00, which'd have some fucky effects on ordering. If we WANTED to start with S00, we shoulda used that slot in the first place.)
2018-11-07 21:42:10 +00: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
toaster
5ccfc111e8
Disable attempt at preventing replays with the same staff member back to back, based on Discord discussion. If the RNG does this to you, you're on your own.
2018-11-05 23:18:34 +00:00
toaster
7be7c600bf
Cleaner code logic. Should make no real difference to exe, so not gonna upload another.
2018-11-05 14:28:32 +00:00
toaster
0d0eaf5f99
Fix "laststaff" setting
2018-11-05 14:03:09 +00:00
toaster
75d08f2048
TITLE SCREEN DEMOS: Pick a random Staff Attack demo!!!
...
Also: Fix watching a demo replay of a map with a palette not resetting your palette back to normal when you go back to the menu(/titlescreen).
2018-11-05 13:45:40 +00:00
Monster Iestyn
29b242a5bd
Merge branch 'endgame-code-refactor-backport' into 'next'
...
Endgame code refactor
See merge request STJr/SRB2!297
2018-10-19 17:31:19 -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
Monster Iestyn
31f3f8b8e7
Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame
2018-10-11 21:24:53 +01:00
Monster Iestyn
9c464742b7
Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now
...
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
2018-10-11 20:00:45 +01:00
toaster
d42736fe3d
Include srb2.org in the credits per Rob's wishes.
2018-10-01 21:23:00 +01:00
toaster
21ba9921da
Some credits tweaks (alphabetical ordering plus new names, plus slight downwards adjustment of TYLER52)
2018-09-28 20:10:22 +01:00
Sal
8ff0e976c2
Merge branch 'new-voices' into 'master'
...
New voices
See merge request KartKrew/Kart!15
2018-09-22 20:22:59 -04:00
TehRealSalt
118d9caad1
New voices
...
- Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?)
- Win/lose quotes are played at full volume for the person who said it.
- A new sound effect plays when you hit someone with voices disabled.
- Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions
- Added our skin sound constants to the dehacked list.
- Unrelated: finish line sfx plays in splitscreen
2018-08-28 16:29:50 -04:00
toaster
a6d1e799f9
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes).
...
* A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby!
* Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value.
* Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 22:23:40 +01:00
