thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5673 commits 1 branch 12 tags 205 MiB
Commit graph

5673 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
811c82ba47 Fix goofup with addonsp patch unlock for loop from 2.1.13 merge 2019-02-28 15:48:27 +00:00
Monster Iestyn
974e3aa4f2 Merge branch 'public_next' 
# Conflicts:
#	src/d_main.c
#	src/dehacked.c
#	src/m_menu.c
#	src/m_menu.h
 2019-02-27 22:36:01 +00:00
Monster Iestyn
538605117e Merge branch 'master' into next 2019-02-27 20:35:07 +00:00
Monster Iestyn
4933e1de51 Merge branch 'updatelibgme' into 'master' 
Update game-emu-music lib to 0.6.2

See merge request STJr/SRB2!444
 2019-02-27 13:49:44 -05:00
Monster Iestyn
ea0c251a92 Merge branch 'sdl-new-windowicon' into 'master' 
SDL:Update XPM icon

See merge request STJr/SRB2!441
 2019-02-27 13:34:24 -05:00
Monster Iestyn
9ddad37455 Merge branch 'tails-bot-dead-forever-fix' into 'next' 
Tails bot dead forever fix

See merge request STJr/SRB2!461
 2019-02-27 12:39:56 -05:00
Monster Iestyn
e7952e4de7 Make sure that B_CheckRespawn can be called even if Tails is dead 2019-02-26 21:14:22 +00:00
Alam Ed Arias
482bfd0804 Merge branch 'hide-error-devmode' into 'next' 
Show line number on error, also hide under devmode

See merge request STJr/SRB2!458
 2019-02-21 23:05:09 -05:00
Alam Ed Arias
887a26f971 Merge branch 'master' into next 2019-02-21 22:42:26 -05:00
Alam Ed Arias
7a09161e69 Merge branch 'gcc8-statement-warning' into 'master' 
GCC8: Disable multi statement macros errors.

See merge request STJr/SRB2!459
 2019-02-21 22:32:38 -05:00
Steel Titanium
45e9e3f7f9 Disable multi statement macros errors. 2019-02-21 18:48:42 -05:00
Monster Iestyn
2ef1d63b63 Fix compiler warnings 2019-02-13 18:06:56 +00:00
Steel Titanium
93bed5f40d Show line number on error, also hide under devmode 2019-02-11 16:39:58 -05:00
Monster Iestyn
38546ba6d1 Merge branch 'polyobj_fix_vanilia' into 'master' 
Fix rendering gaps on polys with upper/lower textures

See merge request STJr/SRB2!453
 2019-02-11 15:05:44 -05:00
Monster Iestyn
4b8b8f90f4 Merge branch 'fix_skins_overflow' into 'next' 
Fix skin overflow error

See merge request STJr/SRB2!455
 2019-02-11 15:05:00 -05:00
MascaraSnake
edea95c55b Merge branch 'emblem_hardcoding' into 'master' 
Emblem and unlockable softcoding

See merge request STJr/SRB2Internal!210
 2019-02-06 02:24:56 -05:00
MascaraSnake
a0a3a8b4e0 Forgot the continue statements 2019-02-03 17:07:13 +01:00
MascaraSnake
a4dc3faf45 Emblem number in emblem definition is optional. If none is supplied, place in first free slot. 2019-02-03 17:03:33 +01:00
MascaraSnake
3c0cb14a29 In-map emblem coordinates are now set via emblem mapthings (thing type 322) instead of X/Y/Z fields in SOC 2019-02-03 14:32:07 +01:00
MascaraSnake
3ea09d4ffe Emblem and unlockable SOFTcoding! Emblems and unlockables are no longer predefined in the code and instead loaded from IWAD 2019-02-03 11:05:22 +01:00
MascaraSnake
0c3351cc5d Hardcoded emblems of the first four special stages 2019-01-30 23:01:58 +01:00
MascaraSnake
f5ff2b331a Spring Hill -> Christmas Chime 2019-01-29 22:26:15 +01:00
MascaraSnake
97476b6300 Updated/added emblem locations for GFZ, THZ, DSZ1, CEZ1, FHZ2 and HHZ 2019-01-28 21:28:38 +01:00
Steel Titanium
221ec15af0 How did I forget about this 2019-01-26 23:22:30 -05:00
Steel Titanium
34920c2951 Setup the tables even eariler. 
I really hate that PlayerMenu status hack, but that's really the only
way I could think off to show the entires for Tails, Knuckles and the
Sonic&Tails pair.
 2019-01-26 23:16:49 -05:00
Steel Titanium
31a884e542 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia 2019-01-26 00:51:39 -05:00
TehRealSalt
bcdfe2eb14 Update the SP menu stuff to use MAXSKINS 
Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
 2019-01-26 00:22:05 -05:00
Alam Ed Arias
2f65d2860a Merge branch 'master' into next 2019-01-20 17:01:01 -05:00
Alam Ed Arias
94748c3921 Merge branch 'apng-conditional-disable' into 'master' 
Disable the APNG code if the version of libpng is greater than 1.4.

See merge request STJr/SRB2!457
 2019-01-20 17:00:50 -05:00
Sryder
517a32e96d Disable the APNG code if the version of libpng is greater than 1.4. 
Since supposedly the current code *can't* work with newer versions of libpng that have the apng patch, it won't compile if that's what people have.
It seems like some distros are adding the apng patch to libpng and that'll make things annoying to compile for people.
I think it goes without saying, but if there's ever a fix to make newer libpng versions work with the APNG code then this can be reverted.
 2019-01-20 18:50:28 +00:00
Steel Titanium
123b97c5ed Fix skins overflow 2019-01-15 14:29:43 -05:00
fickleheart
81c73032e4 Fix rendering gaps on polys with upper/lower textures 2019-01-12 20:15:58 -05:00
Digiku
96f10f1f98 Merge branch 'master-20190101' into 'master' 
Post-2.1.23 public next merge (20190101)

Closes #46, #47, #45, #43, and #37

See merge request STJr/SRB2Internal!209
 2019-01-11 18:09:30 -05:00
Monster Iestyn
74cb384be2 revert to LF_SAVEGAME system code, removing all traces of saveoverride 
(I believe Sal wanted us to do this anyway, so...)
 2019-01-08 17:14:21 +00:00
mazmazz
3753e1be28 Fixed Addons Menu icons for search bar 2019-01-08 01:31:44 -05:00
mazmazz
6ae27013f2 Misssed alwaysfreelook defaults (first person) 2019-01-08 01:29:12 -05:00
mazmazz
58b3b6d236 Fix player.dta SIGNA0 overwriting regular end sign frame 2019-01-08 00:19:42 -05:00
mazmazz
8d930c7f47 GCC 7 fallthru bypasses (-Werror-implicit-fallthrough) 2019-01-07 23:06:47 -05:00
mazmazz
e5125d0746 Chat arrow offsets 2019-01-07 22:34:48 -05:00
mazmazz
1821edeee7 Update SRB2-CHAT nickname colors to 2.2 skincolors 2019-01-07 22:26:39 -05:00
mazmazz
275070b608 Correct addons menu back color 2019-01-07 21:58:42 -05:00
mazmazz
7a97ebe985 Dummy out SRB2-CHAT console colors 
Pending translation to 2.2 palette indexes
 2019-01-07 21:54:38 -05:00
mazmazz
95c2f34278 Addons menu merge fixes 2019-01-07 21:45:41 -05:00
mazmazz
38ad1ec027 WIP hu_stuff merge fixes 2019-01-07 17:56:55 -05:00
mazmazz
a436313987 Menu merge fixes 2019-01-07 17:56:43 -05:00
mazmazz
4f40d2abdb Merge errors for compile 2019-01-07 17:05:20 -05:00
Digiku
8e862b3c98 Update f_finale.c - Small credits update 2019-01-07 16:50:59 -05:00
mazmazz
1de7fcad8d Resolve r_data.c colormap conflict 2019-01-07 15:29:37 -05:00
Nev3r
6acdc428f7 Solved conflicts related to PK3s 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-01-07 19:00:31 +01:00
Monster Iestyn
69d7927ee8 resolve the conflict in p_spec.c 2019-01-07 17:02:05 +00:00