thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-02 06:04:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
21457 commits 2 branches 14 tags 206 MiB
Commit graph

87 commits

Author SHA1 Message Date
James R
151dccf32f Parity between title screen and menu version info 2023-01-01 15:40:51 -08:00
Eidolon
be021baa02 Add extern "C" in C++ to all headers 2022-12-30 19:26:16 -06:00
toaster
48d451cfef Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into new-menus 
# Conflicts:
#	src/d_ticcmd.h
#	src/deh_soc.c
#	src/deh_soc.h
#	src/deh_tables.c
#	src/dehacked.c
#	src/f_finale.c
#	src/g_game.c
#	src/m_menu.c
 2022-05-21 18:57:46 +01:00
Sally Coolatta
a83504c1a4 WIP title screen 2022-05-19 03:19:33 -04:00
toaster
b4af07ffed Merge branch 'master' into new-menus 
# Conflicts:
#	src/d_main.c
#	src/dehacked.c
#	src/m_menu.c
#	src/v_video.c
#	src/y_inter.c
 2021-10-18 01:18:37 +01:00
Latapostrophe
f2f0a6cbe2 New titlecards 2021-04-30 18:11:36 +02:00
Sally Coolatta
2af75a2bd1 Fix merge conflicts 2021-01-11 00:06:34 -05:00
Sally Coolatta
e6a9e5a68e Merge branch 'master' into new-menus 2020-11-08 02:49:28 -05:00
Sally Coolatta
631f698432 Cleanup 
So for whatever reason it's still giving me a warning about functions in i_threads having duplicate definitions, even though they clearly do not.

I'm completely stumped so I'm just gonna mess with my compile setup....... in the mean time, if anyone else could try to compile it, I'd appreciate it, so we know if it's just my end or if its something else
 2020-08-15 08:32:56 -04:00
Sally Coolatta
0dc21106e5 Lua stuff is done 2020-08-15 07:47:18 -04:00
Sally Coolatta
135e9b9797 f_finale now compiles 2020-08-11 23:13:25 -04:00
Sally Coolatta
43c627b02e Merge f_finale.c/h 2020-08-06 15:35:07 -04:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge 
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
 2020-05-29 13:43:38 -04:00
mazmazz
505fb1761d Add NOWIPE behavaior for colormap fades 2020-05-25 00:19:41 -04:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Jaime Passos
aa4e3384bb Merge remote-tracking branch 'origin/master' into wipes2 2019-12-11 12:57:59 -03:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
Jaime Passos
cbe17383e0 Slap colormap fades everywhere 2019-12-04 19:25:39 -03:00
Jaime Passos
476e6cc6ed Fix crossfades 
Fixes NoReload using the wrong wipestyle.
Also fixes non-titlemap title screen wipes using the wrong wipestyle.
 2019-11-22 17:44:42 -03:00
Jaime Passos
349dab0b4b remove UINT8 wipecolorfill 2019-11-18 20:07:37 -03:00
Jaime Passos
3ed8470b58 remove unused levelwipes 2019-11-18 19:22:46 -03:00
Jaime Passos
925940b44e Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-18 18:48:19 -03:00
Jaime Passos
f37e0de8c5 stuff 2019-11-18 11:39:54 -03:00
Jaime Passos
46f88101b2 Small mistake 2019-11-15 19:36:25 -03:00
Jaime Passos
bc7686c16a LEVELWIPES 2019-11-15 18:21:12 -03:00
Jaime Passos
96ce48f4f2 F_WipeColorFill 2019-11-14 21:31:20 -03:00
Jaime Passos
7168d72580 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 20:24:42 -03:00
toaster
35b6e8ca94 Disable menu input on the title screen for the first second (ie, before the flash), to guarantee people won't start the menu the very first tic after the fade and ruin the animation. (Console and gif/screenshot recording still works, for the impatient.) 2019-11-14 12:52:34 +00:00
Jaime Passos
4acdb54d87 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-12 20:36:06 -03:00
James R
6ae6089343 That's a lot of whitespace 2019-11-07 13:42:54 -08:00
Jaime Passos
82d64fbc1c tweak fade colormaps just a little bit 2019-11-05 12:28:01 -03:00
Jaime Passos
ffc9626355 fix fades for real 2019-11-05 12:10:42 -03:00
mazmazz
a7e38c5cc5 Alacroix gfx optimization; dynamic loading/unloading of title gfx resolutions 2019-11-03 16:21:21 -05:00
mazmazz
ad0b9e40ae Alacroix title screen character frames 2019-11-03 10:34:12 -05:00
mazmazz
288d9f9e39 Load Alacroix character frames 2019-11-03 06:30:27 -05:00
mazmazz
0b6651eb00 Remove TTCOUNTERSET to simplify custom title SOC 2019-11-02 12:40:12 -04:00
Jaime Passos
76a5b60e39 Merge remote-tracking branch 'origin/master' into f_wipes 2019-10-28 23:14:00 -03:00
mazmazz
31d7254d14 Merge branch 'master' into new-title 2019-10-25 22:29:29 -04:00
TehRealSalt
2324282569 Merge master 2019-10-03 12:16:24 -04:00
Jaime Passos
fe3ee4f8fd some adjusts 2019-09-10 16:54:40 -03:00
Jaime Passos
53568ba62f Better fades 2019-09-09 23:31:48 -03:00
mazmazz
c662413edd WIP 2.2 title screen (Alacroix) 2019-09-02 22:40:28 -04:00
Jaime Passos
af8c67c59a uh 2019-08-19 14:43:48 -03:00
TehRealSalt
71f35c7f5b Add encore_towhite 2019-08-10 02:07:18 -04:00
TehRealSalt
5da84b78a2 Encore wiggle 2019-08-10 01:59:23 -04:00
TehRealSalt
aad0dbd076 Encore invert fade 2019-08-10 00:54:16 -04:00
TehRealSalt
f188c290e5 Start on new menus 2019-08-09 04:25:22 -04:00
Alam Ed Arias
06b339f6ae curbgname need one more byte to hold the NULL 2019-08-08 23:46:08 -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
toaster
dec517f224 Merge branch 'ending' into 'master' 
ENDINGS

See merge request STJr/SRB2Internal!264
 2019-08-03 16:23:51 -04:00