TehRealSalt
978c4f7e24
Minor fixes
2019-08-10 09:50:42 -04:00
TehRealSalt
5da84b78a2
Encore wiggle
2019-08-10 01:59:23 -04:00
TehRealSalt
36e4f25cc9
Uses pre-defined colormap lumps now
...
Works much faster now. I'd like to clean up this code some though
2019-08-07 02:21:04 -04:00
TehRealSalt
792b41c406
Merge branch 'v1' into master
2019-05-29 21:50:14 -04:00
wolfy852
1c52319d08
More credits updates
2019-05-17 03:55:51 -05:00
TehRealSalt
ce39456a24
Merge branch 'v1' into new-palette
2019-05-14 21:01:32 -04:00
wolfy852
f3b6b732f8
Update bonuschars credits
2019-05-13 12:49:44 -05:00
TehRealSalt
dc41fe3d8d
Port over only the relevant changes from the reduced-palette branch, update some of the Kart-specific stuff
2019-05-12 17:19:49 -04:00
wolfy852
9ac41cca73
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
2222738e1c
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
f1f664e9b1
Merge v1
2019-05-02 01:36:19 -04:00
Monster Iestyn
4f58d00eec
Merge branch 'master' into next
2019-04-02 15:47:07 +01:00
fickleheart
c21072ec29
Show music credit for credits
2019-03-31 13:09:49 -05:00
James R
d7ad7a4f40
Remove redundant CON_ClearHUD calls
2019-03-26 12:59:13 -07:00
Alam Arias
ef10d08db3
Merge commit 'upstream/master~1'
2019-03-26 09:48:13 -04:00
Monster Iestyn
7ef12f7dd7
Merge branch 'master' into next
2019-03-26 13:46:15 +00: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
f60e92aa70
Move public demo vars to a single struct
2019-03-24 21:32:15 -05:00
fickleheart
be458c1d05
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
932f73a171
Cache colormaps everywhere to avoid memory leaks
2019-03-16 00:39:52 -05:00
mazmazz
937a423664
Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
2019-03-13 19:45:07 -04:00
fickleheart
b176ca27b3
For now, only use netreplays on the title if available
2019-02-18 20:52:21 -06:00
fickleheart
0b92743244
Support netreplays in titledemos
...
TDEMO###, where ### is a number from 1 to 255.
2019-02-17 13:13:45 -06:00
fickleheart
ed16a35795
Don't force loading files for replays
2019-02-17 10:04:48 -06: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
Digiku
8e862b3c98
Update f_finale.c - Small credits update
2019-01-07 16:50:59 -05:00
Digiku
e45c54dc60
Update f_finale.c - Remove Torgo's real name by request
2019-01-07 03:41:25 -05:00
wolfy852
8baa538d43
Cast animtimer to int before negating
...
Stops a Visual Studio compile error.
2019-01-06 03:02:12 -06:00
mazmazz
2326a58bc7
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05: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