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

6141 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster f9f92abc44 ha ha ha ha ha ha ha ha 
Sea Egg is majorly changed according to Mystic's ancient instructions (excepting the flying FOF rock, I cared not for fucking around with FOFs).

Specifically:
* Faster paced fight.
* Instantly travels horizontal distance.
* Fakes no longer hurt papa, and spin out like a deflating balloon when he dies.
* New attack: When surfacing, produces an electric shockwave. Replaces underwater shock. Designed for new, shallow arena.
* Support for multiple bosses in the same map distinguished by parameter.

Will upload map to fight the new battle in on the MR.
 2019-06-30 15:37:33 +01:00
MascaraSnake e5a0bd8be3 Merge branch 'wooddebris-fix' into 'master' 
Wood debris fix

See merge request STJr/SRB2Internal!240
 2019-06-29 03:21:15 -04:00
MascaraSnake 836d3d3186 Fixed Canarivore gas going through the floor 2019-06-29 00:19:46 +02:00
Monster Iestyn 3e404051c9 Merge branch 'console-colors-touchup' into 'master' 
Console color shenanigans

Closes #156

See merge request STJr/SRB2Internal!238
 2019-06-28 18:16:12 -04:00
Monster Iestyn e2859aab5d Merge branch 'titlemap-fix' into 'master' 
Fix Titlemap with mazmazz's fancy menu stuff

See merge request STJr/SRB2Internal!228
 2019-06-28 18:15:46 -04:00
Monster Iestyn 88dc34818e Give MT_WOODDEBRIS the MF_SCENERY flag, so it can be made to join its MT_ROCKCRUMBLEn friends in dying after hitting the ground. 
(Untested)
 2019-06-28 21:40:20 +01:00
Steel Titanium 251494c3c8 Fix console back color not being correct. 
This also adds support for using such colors in a text prompt
 2019-06-26 22:08:17 -04:00
Monster Iestyn e63e36f5e4 Merge branch 'levelselect-tweaks' into 'master' 
Some small tweaks to level select

See merge request STJr/SRB2Internal!230
 2019-06-25 16:50:44 -04:00
Monster Iestyn ac669d77c4 Merge branch 'levelheader-startrings' into 'master' 
Startrings level header option

Closes #155

See merge request STJr/SRB2Internal!237
 2019-06-25 16:43:16 -04:00
Monster Iestyn 8aeee22529 Merge branch 'bossfixes' into 'master' 
Boss fixes

See merge request STJr/SRB2Internal!235
 2019-06-25 16:36:23 -04:00
Monster Iestyn 88f7ff06d8 Merge branch 'HUDfixes' into 'master' 
HUD fixes

See merge request STJr/SRB2Internal!234
 2019-06-24 17:47:44 -04:00
Steel Titanium 8026fe0d4b Some few changes. 
The amount of rings you start with also applies when you respawn from a starpost.

Startrings counts the ring total requirement for a perfect bonus.
 2019-06-24 16:21:03 -04:00
Nev3r 14a1af9396 Merge branch 'rainfixes' into 'master' 
Rain fixes and associated

See merge request STJr/SRB2Internal!233
 2019-06-24 15:07:35 -04:00
Steel Titanium a801efa946 Forgot to do this. 2019-06-23 18:51:42 -04:00
Steel Titanium 2e200a784c Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into levelheader-startrings 2019-06-23 18:24:15 -04:00
Steel Titanium 7a23b19be8 Add startrings level header option 2019-06-23 18:15:40 -04:00
Monster Iestyn f8087565b7 Merge branch 'drawanglefixes' into 'master' 
Drawangle fixes

Closes #153

See merge request STJr/SRB2Internal!236
 2019-06-23 17:33:40 -04:00
Monster Iestyn ce6db1cc9c Merge branch 'public_next' 2019-06-22 22:44:42 +01:00
Monster Iestyn c9456e141d Merge branch 'master' into next 2019-06-22 22:42:13 +01:00
Monster Iestyn 755e4a8b2c Merge branch 'make-credits-great-again' into 'next' 
Prevent just anyone from skipping credits but allow admins

See merge request STJr/SRB2!478
 2019-06-22 16:13:04 -04:00
Monster Iestyn 1af969d579 Merge branch 'pk3_leak' into 'master' 
Pk3 Leaks

See merge request STJr/SRB2!500
 2019-06-22 15:56:52 -04:00
toaster 5c54c4f922 Remove some more 2.1-related ringslinger offsets to the chat. 2019-06-22 20:17:09 +01:00
toaster 3e14ab4e03 Realised I forgot to do this. Without this commit, the drawangle update stuff is useless :V 2019-06-22 17:23:04 +01:00
toaster 28a61f2f3c Correct some oversights where drawangle was incorrectly ignored. 2019-06-22 17:07:18 +01:00
toaster 3021116797 Some preliminary work to make multiple bosses in the same map work nicely together, by allowing parameter to alter the linedef executor tag to call in increments of 100. 
Also: Making sure every single reserved tag is recorded as an LE_ constant.
 2019-06-22 17:03:39 +01:00
toaster c8d145e474 Tweak Boss5MakeItRain's bomb launch angles to properly smash the ceiling in the new arena. 2019-06-22 17:03:28 +01:00
toaster 81882b63b8 As I wanted MI to do but he was too exhausted at the time from hardcoding, make the Fang bullet knockback less hardcoded and instead give it MF2_SUPERFIRE. 
# Conflicts:
#	src/p_mobj.c
 2019-06-22 17:03:10 +01:00
toaster 64827348c7 HUD stuff. 
* Re-fix chat HUD position, and make it not move in match (which it needed to do in 2.1).
* Fix HU_drawPing for the new palette.
* Change the condition for greying out players, since the current one was buggy.
* Allow for tokens on the coop MP HUD, and use the small emeralds so there's space for them.
* Fix the mapping between skincolours and name colours in new chat, specifically to take into account every possible text colour (as opposed to the port previously done, which only used the 2.1 text colours and looked like ass as a result).
 2019-06-22 16:54:05 +01:00
toaster e6ce55f7b5 Do some minor HUD fixes. 
* Move HUD text's anchoring to underneath STR instead of above Lives.
* Adjust chat position slightly, to take advantage of SRB2's HUD layout having less content towards the bottom (unlike Kart, where it has roughly equal).
* Fix Match emeralds not displaying while in tab rankings with all-seven invuln/shoes bonus active.
 2019-06-22 16:53:38 +01:00
toaster 6cf376a9b5 Support backspace for resetting various menu values, just like Kart. 2019-06-22 16:50:46 +01:00
toaster 6371de806b Improve rain/weather. 
* Like Kart, remove cv_precipdensity.
* Like Kart, replace "Infinite" draw distance value with "None".
* Better thinker with more return optimisation.
* Better placement of thinking in rendering, to avoid ceiling-mounted sprite glitches.
 2019-06-22 16:50:30 +01:00
Sryder13 8444379d53 Free the zentries 2019-06-22 00:52:28 +01:00
Sryder13 83da71f809 Merge branch 'master' into pk3_leak 2019-06-22 00:28:14 +01:00
Sryder13 dcd4995eb3 Remember to end inflating 2019-06-22 00:19:34 +01:00
MascaraSnake e20949ef77 Merge branch 'new-acz-minecarts' into 'master' 
ACZ hardcoding (including minecarts)

See merge request STJr/SRB2Internal!231
 2019-06-21 17:45:03 -04:00
MascaraSnake 287c25b8f9 Forgot to copy something over from the CR_ROPEHANG case 2019-06-21 23:42:48 +02:00
MascaraSnake 4385e07c0b Always use the white sidemark sprite, since track switching is no longer "activated" 2019-06-21 23:40:28 +02:00
MascaraSnake ed7a109ce9 Also back by popular demand: Restricting the camera angle during a minecart ride 2019-06-21 23:34:49 +02:00
Monster Iestyn 149a8bb760 Merge branch 'public_next' 2019-06-21 22:13:39 +01:00
Monster Iestyn f84c898040 Merge branch 'master' into next 2019-06-21 22:10:32 +01:00
Monster Iestyn fb182369f6 Merge branch 'stand(alone)-lump-comedy' into 'master' 
Stand(alone) lump comedy

See merge request STJr/SRB2!499
 2019-06-21 17:06:23 -04:00
Monster Iestyn 04215b732e Merge branch 'fof-slopes-level-load-fix' into 'next' 
FOF slopes level load fix

See merge request STJr/SRB2!498
 2019-06-21 17:05:54 -04:00
Steel Titanium fe7b041346 Merge branch 'public-notpublic-libopenmpt' into 'master' 
libopenmpt support

See merge request STJr/SRB2Internal!229
 2019-06-21 17:03:53 -04:00
MascaraSnake 28abc883be By popular demand: Track switching only requires strafe instead of jump+strafe 2019-06-21 20:13:30 +02:00
Monster Iestyn f7a32835d5 Fix warnings/errors found during compiling, mostly of the mixed-declaration-and-code or shadowed variables variety 2019-06-20 20:05:07 +01:00
Monster Iestyn bc2804d383 Fix the clearly accidental duplication of lumpinfo's memory allocation in ResGetLumpsStandalone 2019-06-20 13:24:54 +01:00
MascaraSnake d388547021 Some more minecart fixes 2019-06-19 00:10:28 +02:00
MascaraSnake c11a3010d9 Fixed the Canarivore gas slowdown being much too weak 2019-06-18 19:29:53 +02:00
MascaraSnake 3634321f43 ... 2019-06-18 19:06:05 +02:00
Monster Iestyn 62ed90b252 fix type mismatch by typecasting 2019-06-17 20:54:06 +01:00