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

6303 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steel Titanium c93fb440e5
use VERSIONSTRING 2019-07-30 20:56:03 -04:00
Alam Ed Arias a8637d034e SDL2: more consts 2019-07-29 19:22:14 -04:00
Alam Ed Arias 1a643b1bd9 SDL2: more const in xpm code 2019-07-29 19:08:55 -04:00
Alam Ed Arias ed0754382f Merge remote-tracking branch 'private/master' into newicon 2019-07-29 19:04:19 -04:00
Alam Ed Arias b77780e1e7 Fix building with MSVC 2019-07-29 19:02:45 -04:00
Alam Ed Arias e50dc7c779 Merge branch 'public_next' into private 2019-07-29 18:31:01 -04:00
Alam Ed Arias 963d2f5da3 Merge branch 'master' into next 2019-07-29 18:05:33 -04:00
Alam Ed Arias 66f84efd02 SDL2: fixed compiling mixer interface with MSVC 2019-07-29 17:56:35 -04:00
Steel Titanium 98adcb1de3
Change it back to const char 2019-07-28 18:19:00 -04:00
Steel Titanium 74cbf2b4f3
Update mac icon 2019-07-28 17:06:01 -04:00
Steel Titanium e5b8bb52ef
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into newicon 2019-07-28 16:04:46 -04:00
Monster Iestyn 18e2c2461f Merge branch 'wavingflag' into 'master' 
New CEZ scenery

See merge request STJr/SRB2Internal!257
 2019-07-28 15:44:00 -04:00
Steel Titanium 9813cbc857 More icon stuff 2019-07-27 01:13:54 -04:00
Steel Titanium 64bb70bef4 Fix crash with GME sounds when being freed 2019-07-27 01:13:54 -04:00
Monster Iestyn cb278388f0 Merge branch 'recordattack-bg-fixes' into 'master' 
Record Attack bg fixes

See merge request STJr/SRB2Internal!259
 2019-07-20 11:33:06 -04:00
Monster Iestyn 0f8c046c6f On second thoughts I'll go back to 8 for length in these variables, since as far as I can tell the code doesn't need it to be longer anyway 2019-07-20 16:30:30 +01:00
Steel Titanium 181ecee202 Let's not use this 2019-07-16 19:26:16 -04:00
Steel Titanium 3ffb7b6192 New icons 
Also update IMG_xpm.c
 2019-07-16 19:20:00 -04:00
Monster Iestyn c8cfc3110f Merge branch 'public_next' 2019-07-16 18:28:49 +01:00
Monster Iestyn 6eaf7625a9 Merge branch 'master' into next 2019-07-16 18:26:46 +01:00
Monster Iestyn 3e708e62e8 Merge branch 'fix-gme-free' into 'master' 
Fix crash with GME sounds when being freed

See merge request STJr/SRB2!504
 2019-07-16 13:25:51 -04:00
Monster Iestyn e50147f7f0 Merge branch 'master' into recordattack-bg-fixes 2019-07-16 17:04:42 +01:00
Monster Iestyn 5ef4dda9b9 Instead of ignoring blank menutypes in M_IterateMenuTree, ignore them in the MIT_ functions instead. 
(I'm doing this because MIT_GetMenuAtLevel appears to actually care about whether menutype is zero or not unlike the others; I don't want to break the code designed around that)
 2019-07-15 20:25:57 +01:00
Monster Iestyn 049789025f Merge branch 'titlesky-fixes' into 'master' 
Titlemap fixes

See merge request STJr/SRB2Internal!258
 2019-07-14 19:38:07 -04:00
Monster Iestyn d44a8ab78e Slightly unrelated tweak: bghide && titlemapinaction clearly takes precedence over bgname if both are present, so reorder these if statement blocks 2019-07-14 22:36:14 +01:00
Monster Iestyn a1e6f5bdb3 remove some of the GS_TIMEATTACK hacks I added because I now realise I can just turn titlemapinaction off when entering the menus \o/ 2019-07-14 22:28:19 +01:00
Monster Iestyn f6842a80b4 Fixes for menus: 
* add gamestate != GS_TIMEATTACK checks to prevent Record Attack or NiGHTS Mode losing their backgrounds
* increase bgname to 9 to include the extra NULL byte? (is this a good idea actually)
* make M_IterateMenuTree ignore menu levels without a menutype value
 2019-07-14 21:58:48 +01:00
Steel Titanium 4e839596a1
Fix crash with GME sounds when being freed 2019-07-14 14:55:04 -04:00
Monster Iestyn fac6de9c2e The titlemap glitches turned out to be linked to deathmatchstarts, which wasn't actually properly cleared out each level load ...let's actually fix that, lol. 
(Neither were the CTF starts but those didn't directly cause any problems luckily)
 2019-07-14 18:10:03 +01:00
sphere 79cf8eb08d Add a blue variant of the pole banner & change some doomednums. 2019-07-14 17:30:33 +02:00
Monster Iestyn 5c54022a89 Add static keyword to these variables for correctness 2019-07-14 16:23:01 +01:00
Monster Iestyn 794235a848 Fix mixed code-and-declaration error 2019-07-14 16:19:48 +01:00
Monster Iestyn 6cf82fbb43 Merge branch 'libopenmpt-fixes' into 'master' 
Improved libopenmpt loading

See merge request STJr/SRB2Internal!251
 2019-07-14 11:03:14 -04:00
MascaraSnake ca7de207d4 Merge branch 'wallspike-fix' into 'master' 
Fix wall spikes that start retracted

See merge request STJr/SRB2Internal!255
 2019-07-14 10:55:10 -04:00
Monster Iestyn d30af084d7 Merge branch 'thinkerlists-fix' into 'master' 
Thinkerlists fix

Closes #161

See merge request STJr/SRB2Internal!253
 2019-07-14 10:52:56 -04:00
sphere ee937c4df0 Add a blue variant of the waving flags. 2019-07-14 16:50:45 +02:00
sphere cfc56c9541 Don't upscale the waving flags, make them twice as large instead 2019-07-14 15:30:00 +02:00
toaster b3e953c8c3 Correct some extant fuckups. 2019-07-14 14:21:32 +01:00
MascaraSnake 441ef4b01b Merge branch 'wood-debris-unmute' into 'master' 
Unmute wood debris

See merge request STJr/SRB2Internal!254
 2019-07-14 04:07:38 -04:00
sphere 106f6498e2 Add meleestate to MT_WALLSPIKE. 2019-07-14 01:29:36 +02:00
sphere e68e510ca2 Assign sound to the wood debris object. 2019-07-13 23:15:56 +02:00
toaster 323d5d61d3 Correct some more minor issues with hw_light.c and the ALAM_LIGHTING. (Hi Alam! ^u^) 2019-07-13 14:07:40 +01:00
toaster 47f138ac34 I know this isn't my branch, but found several reference haemmoragers and figured it'd be appropriate to commit here. 2019-07-13 13:43:22 +01:00
Jonas Sauer 166f1fac66 Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. 
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
 2019-07-13 01:42:03 +02:00
Monster Iestyn 35adf2ce4a fix leftshift of negative value MascaraSnake also gets 2019-07-09 21:48:18 +01:00
Monster Iestyn f62087ef30 Fix MascaraSnake's issues with sign-compare (hopefully) 2019-07-09 21:43:38 +01:00
Monster Iestyn 63d337211e Merge branch 'eggcolosseum' into 'master' 
Egg Colosseum (CEZ3 remaster)

See merge request STJr/SRB2Internal!248
 2019-07-09 16:32:24 -04:00
Monster Iestyn 11a24b88ee Merge branch 'seaegg_tweaks' into 'master' 
Sea Egg

See merge request STJr/SRB2Internal!244
 2019-07-09 16:25:07 -04:00
Monster Iestyn dc71e297bb Fixed mixed-code-and-declaration, shadowed variables, etc ...and the compiler doesn't like P_AddEachTimeThinker being inline anymore for some reason, oh well 2019-07-09 21:15:12 +01:00
Steel Titanium 60cb2de6a0
Seperate declarations from code 2019-07-09 15:51:11 -04:00