Alam Arias
ef10d08db3
Merge commit 'upstream/master~1'
2019-03-26 09:48:13 -04:00
Monster Iestyn
9da1033467
Fix credits gamestate in dedicated mode, by properly separating the timer variable code from the drawing code in a semi-hacky way
2019-03-25 21:35:04 +00:00
fickleheart
932f73a171
Cache colormaps everywhere to avoid memory leaks
2019-03-16 00:39:52 -05:00
Alam Arias
380bce88a0
remove whitespaces
2019-02-05 15:42:37 -05:00
fickleheart
606659dcff
Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff
2019-01-15 19:55:42 -06:00
TehRealSalt
e2b3cd181e
Gag spacing was not updated
2019-01-13 20:47:57 -05:00
TehRealSalt
0351f6285e
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
e944ef9cac
i,m gowonna update my name in the cwedits uwu
2019-01-11 18:11:52 -06:00
wolfy852
8baa538d43
Cast animtimer to int before negating
...
Stops a Visual Studio compile error.
2019-01-06 03:02:12 -06:00
mazmazz
4e07436276
Credits update
2018-12-23 14:41:41 -05:00
mazmazz
a03acf16b4
Add SRB2 Community Contributors to Special Thanks
2018-12-22 23:41:43 -05:00
mazmazz
8e40bdb59d
Re-order Special Thanks -- groups first, then names in ABC order
2018-12-21 11:40:35 -05:00
mazmazz
a4ddad6824
Add sirjuddington and CodeImp to Special Thanks credits
2018-12-20 17:27:25 -05:00
TehRealSalt
5e4bd29c9c
Add Miku's author to credits.
2018-12-05 21:58:26 -05:00
Monster Iestyn
94ad0b880f
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
TehRealSalt
e1c71f652d
Fixes to merge process
2018-11-29 10:07:35 -05:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
Wolfy
cabe9871e3
Multiple admins
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
2018-11-29 06:46:59 -06:00
TehRealSalt
d5abeafc91
Update credits for bonuschars
2018-11-29 06:54:36 -05:00
TehRealSalt
4f0c74e1dc
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
d824e05a6f
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
Digiku
f79adecdef
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
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Digiku
bacdb3a392
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
354037b251
Additional 2.1 credits update
2018-11-23 21:57:07 -05:00
Monster Iestyn
4db1220ad9
Merge branch 'master' into next
2018-11-23 21:01:03 +00:00
Digiku
032d6a02fe
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
f51d2950a5
Update credits for 2.1.21
2018-11-23 07:34:23 -05:00
mazmazz
d1209e3f3d
Make the credits pics darker
2018-11-22 20:08:02 -05:00
TehRealSalt
b8696fc0ff
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
c0b9cdb921
Fix for waiting player screen animation
2018-11-18 06:34:29 -05:00
TehRealSalt
24215074d0
Minor credits issues
2018-11-16 12:05:57 -05:00
TehRealSalt
4ceb09372a
Final credits
2018-11-15 22:55:01 -05:00
TehRealSalt
d0f869e8f5
Final title screen
2018-11-14 00:30:51 -05:00
TehRealSalt
01d4978149
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart
2018-11-13 21:02:49 -05:00
TehRealSalt
a8b57e6f0d
Title demos don't interrupt the music
2018-11-13 21:01:59 -05:00
toaster
1f93f57a42
final menu tweaks before i fall asleep in my chair
2018-11-14 01:27:01 +00:00
TehRealSalt
e9a432f7d0
Merge branch 'sfx-clean'
2018-11-12 04:26:02 -05:00
TehRealSalt
dbff5e96cf
Use S2 rips on the title screen
2018-11-11 19:22:15 -05:00
Sryder
9350721d12
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
f3d129e1a6
Merge branch 'master' into next
2018-11-10 19:05:33 +00:00
TehRealSalt
ab1faaeec5
Merge branch 'master' into staff_names
2018-11-08 14:47:38 -05:00
Monster Iestyn
b34e8c5390
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
13dea76a81
* 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
c7b0df8172
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
2282beec32
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
3a2249b1af
Cleaner code logic. Should make no real difference to exe, so not gonna upload another.
2018-11-05 14:28:32 +00:00
toaster
06ab5cf099
Fix "laststaff" setting
2018-11-05 14:03:09 +00:00
toaster
4568753e4c
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
55a3e4c81f
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
