lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
5793 commits 1 branch 29 tags 122 MiB
Commit graph

5793 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn a25f4b8194 Make sure that B_CheckRespawn can be called even if Tails is dead 2019-02-26 21:14:22 +00:00
Alam Ed Arias e36193e44e 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 2f8eadd211 Merge branch 'master' into next 2019-02-21 22:42:26 -05:00
Alam Ed Arias 7667122912 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 c1deea0714 Disable multi statement macros errors. 2019-02-21 18:48:42 -05:00
Monster Iestyn 8f667906eb Fix compiler warnings 2019-02-13 18:06:56 +00:00
Steel Titanium 76724c9c13
Show line number on error, also hide under devmode 2019-02-11 16:39:58 -05:00
Monster Iestyn ca176b6225 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 e6cb47e2f2 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 8cbac26653 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 5eb089cc14 Forgot the continue statements 2019-02-03 17:07:13 +01:00
MascaraSnake 00cad05550 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 bc30bd06df 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 8c345b87ca 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 0dd8779b91 Hardcoded emblems of the first four special stages 2019-01-30 23:01:58 +01:00
MascaraSnake 88a6dbae9b Spring Hill -> Christmas Chime 2019-01-29 22:26:15 +01:00
MascaraSnake f6dd521fd0 Updated/added emblem locations for GFZ, THZ, DSZ1, CEZ1, FHZ2 and HHZ 2019-01-28 21:28:38 +01:00
Steel Titanium 0aa965c59f How did I forget about this 2019-01-26 23:22:30 -05:00
Steel Titanium bce093fd06 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 74bf3164f8 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia 2019-01-26 00:51:39 -05:00
TehRealSalt 0d1c501664 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 74850fea17 Merge branch 'master' into next 2019-01-20 17:01:01 -05:00
Alam Ed Arias b8b605a9c7 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 b18a8dbc8d 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 fad341b0e9 Fix skins overflow 2019-01-15 14:29:43 -05:00
fickleheart 7e026824a4 Fix rendering gaps on polys with upper/lower textures 2019-01-12 20:15:58 -05:00
Digiku 2e066876d4 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 f3796dc7f6 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 a050ed956a Fixed Addons Menu icons for search bar 2019-01-08 01:31:44 -05:00
mazmazz 47bd042a7e Misssed alwaysfreelook defaults (first person) 2019-01-08 01:29:12 -05:00
mazmazz d5de5e9f49 Fix player.dta SIGNA0 overwriting regular end sign frame 2019-01-08 00:19:42 -05:00
mazmazz e02fd489a7 GCC 7 fallthru bypasses (-Werror-implicit-fallthrough) 2019-01-07 23:06:47 -05:00
mazmazz 8ea8bf2587 Chat arrow offsets 2019-01-07 22:34:48 -05:00
mazmazz 5066e340f4 Update SRB2-CHAT nickname colors to 2.2 skincolors 2019-01-07 22:26:39 -05:00
mazmazz e403d1bacc Correct addons menu back color 2019-01-07 21:58:42 -05:00
mazmazz dfc427e81a Dummy out SRB2-CHAT console colors 
Pending translation to 2.2 palette indexes
 2019-01-07 21:54:38 -05:00
mazmazz 411b1b4f54 Addons menu merge fixes 2019-01-07 21:45:41 -05:00
mazmazz a775a63dfd WIP hu_stuff merge fixes 2019-01-07 17:56:55 -05:00
mazmazz 875aee60a0 Menu merge fixes 2019-01-07 17:56:43 -05:00
mazmazz b3f7b169b2 Merge errors for compile 2019-01-07 17:05:20 -05:00
Digiku 4f0be1b064 Update f_finale.c - Small credits update 2019-01-07 16:50:59 -05:00
mazmazz 7aa55f24f5 Resolve r_data.c colormap conflict 2019-01-07 15:29:37 -05:00
Nev3r 7d09149b04 Solved conflicts related to PK3s 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-01-07 19:00:31 +01:00
Monster Iestyn 9effa134d2 resolve the conflict in p_spec.c 2019-01-07 17:02:05 +00:00
Monster Iestyn 96ad8dd81a resolve conflict in r_main.c 2019-01-07 16:52:46 +00:00
Digiku 1c1331199d Update f_finale.c - Remove Torgo's real name by request 2019-01-07 03:41:25 -05:00
mazmazz 015e7b9862 Resolve p_setup and d_netcmd conflicts (20190101 public merge) 2019-01-07 03:07:24 -05:00
mazmazz e18eb69a0b Resolved filesrch.c conflicts (20190101 public merge) 2019-01-07 02:54:26 -05:00
mazmazz e9150b6645 Resolve m_menu.c conflicts (20190101 public merge) 2019-01-07 02:31:45 -05:00
Digiku d5870e6f8a Merge branch 'changecontrol-text-overflow-fix' into 'master' 
Resolve buffer overflow crash when configuring System Menu and GIF controls

See merge request STJr/SRB2!445
 2019-01-04 19:39:17 -05:00