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

141 commits

Author SHA1 Message Date
wolfy852
ea90778c32 More credits updates 2019-05-17 03:55:51 -05:00
wolfy852
66439fe812 Update bonuschars credits 2019-05-13 12:49:44 -05:00
wolfy852
f61f7f4411 Merge remote-tracking branch 'remotes/pub/next' into v1 
# Conflicts:
#	src/d_netcmd.c
#	src/r_main.c
#	src/v_video.c
 2019-05-12 03:40:02 -05:00
wolfy852
2c363c4e1e Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 
# Conflicts:
#	src/d_netcmd.c
#	src/doomdef.h
#	src/doomstat.h
#	src/f_finale.c
#	src/g_game.c
#	src/hu_stuff.c
#	src/m_menu.c
#	src/p_spec.c
#	src/p_user.c
#	src/r_main.c
#	src/r_things.c
#	src/s_sound.c
#	src/v_video.c
#	src/y_inter.c
 2019-05-06 22:40:12 -05:00
TehRealSalt
201466b1c1 Merge v1 2019-05-02 01:36:19 -04:00
Monster Iestyn
ab0fe6b164 Merge branch 'master' into next 2019-04-02 15:47:07 +01:00
fickleheart
2fbb0ca5f4 Show music credit for credits 2019-03-31 13:09:49 -05:00
James R
69d7e98f34 Remove redundant CON_ClearHUD calls 2019-03-26 12:59:13 -07:00
Alam Arias
7d98adf6dc Merge commit 'upstream/master~1' 2019-03-26 09:48:13 -04:00
Monster Iestyn
a01a0a3dc3 Merge branch 'master' into next 2019-03-26 13:46:15 +00:00
Monster Iestyn
8c1c0875a2 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
4b7d2aea84 Move public demo vars to a single struct 2019-03-24 21:32:15 -05:00
fickleheart
7fc1f02b07 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays 
# Conflicts:
#	src/doomdef.h
#	src/g_game.c
#	src/p_user.c
 2019-03-19 22:17:25 -05:00
fickleheart
cd4fc40b9e Cache colormaps everywhere to avoid memory leaks 2019-03-16 00:39:52 -05:00
mazmazz
93626c2293 Merge remote-tracking branch 'public-gl/next' into public-musicplus-core 2019-03-13 19:45:07 -04:00
fickleheart
0d31981dc2 For now, only use netreplays on the title if available 2019-02-18 20:52:21 -06:00
fickleheart
c260e27cd9 Support netreplays in titledemos 
TDEMO###, where ### is a number from 1 to 255.
 2019-02-17 13:13:45 -06:00
fickleheart
d1d270c09d Don't force loading files for replays 2019-02-17 10:04:48 -06: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
Digiku
4f0be1b064 Update f_finale.c - Small credits update 2019-01-07 16:50:59 -05:00
Digiku
1c1331199d Update f_finale.c - Remove Torgo's real name by request 2019-01-07 03:41:25 -05:00
wolfy852
e115dbf34f Cast animtimer to int before negating 
Stops a Visual Studio compile error.
 2019-01-06 03:02:12 -06:00
mazmazz
b7bb570f97 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
mazmazz
f600c5fee0 Credits update 2018-12-23 14:41:41 -05:00
mazmazz
33434395f7 Add SRB2 Community Contributors to Special Thanks 2018-12-22 23:41:43 -05:00
mazmazz
90832938c9 Re-order Special Thanks -- groups first, then names in ABC order 2018-12-21 11:40:35 -05:00
mazmazz
f66ee8c4cd Add sirjuddington and CodeImp to Special Thanks credits 2018-12-20 17:27:25 -05:00
TehRealSalt
101feb9498 Add Miku's author to credits. 2018-12-05 21:58:26 -05:00
Monster Iestyn
33c1ac33f5 Merge branch 'next' into 21-version 
# Conflicts:
#	src/d_netcmd.c
 2018-12-02 15:45:07 +00: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
Wolfy
b8ce51bff2 Multiple admins 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
 2018-11-29 06:46:59 -06: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