e9978b2955
Merge branch 'master' into thinkerlists
...
# Conflicts:
# src/f_finale.c
# src/p_enemy.c
2019-07-02 23:08:37 +02:00
726b0f6c83
correctly use P_UnsetThingPosition, P_SetThingPosition + P_DelSeclist around MF_NOBLOCKMAP addition in the TNT explosion code
2019-06-30 22:22:12 +01:00
658a3f2eea
comment out unused variable
2019-06-30 19:33:41 +01:00
9913cc39a1
Merge branch 'public_next'
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
# src/p_user.c
# src/r_data.c
2019-06-29 20:55:58 +01:00
e5a0bd8be3
Merge branch 'wooddebris-fix' into 'master'
...
Wood debris fix
See merge request STJr/SRB2Internal!240
2019-06-29 03:21:15 -04:00
3a9ce483f5
Merge branch 'master' into next
...
# Conflicts:
# src/r_data.c
2019-06-28 23:24:36 +01:00
2c906e9c29
Merge branch 'jimita-unfuck-awayview' into 'next'
...
unfuck awayview
See merge request STJr/SRB2!493
2019-06-28 18:21:52 -04:00
47eb711097
Merge branch 'public-musicplus-feature-endoflevel' into 'next'
...
Fade out music at end of level, before intermission
See merge request STJr/SRB2!472
2019-06-28 18:21:07 -04:00
836d3d3186
Fixed Canarivore gas going through the floor
2019-06-29 00:19:46 +02:00
f7357a02ae
Merge branch 'pk3-folders-are-not-textures-backport' into 'next'
...
Pk3 folders are not textures!
See merge request STJr/SRB2!502
2019-06-28 18:18:53 -04:00
016f1fe533
Merge branch 'morememoryshenanigans' into 'master'
...
More Memory Shenanigans
See merge request STJr/SRB2!501
2019-06-28 18:18:14 -04:00
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
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
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
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
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
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
8aeee22529
Merge branch 'bossfixes' into 'master'
...
Boss fixes
See merge request STJr/SRB2Internal!235
2019-06-25 16:36:23 -04:00
88f7ff06d8
Merge branch 'HUDfixes' into 'master'
...
HUD fixes
See merge request STJr/SRB2Internal!234
2019-06-24 17:47:44 -04:00
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
14a1af9396
Merge branch 'rainfixes' into 'master'
...
Rain fixes and associated
See merge request STJr/SRB2Internal!233
2019-06-24 15:07:35 -04:00
a801efa946
Forgot to do this.
2019-06-23 18:51:42 -04:00
2e200a784c
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into levelheader-startrings
2019-06-23 18:24:15 -04:00
7a23b19be8
Add startrings level header option
2019-06-23 18:15:40 -04:00
f8087565b7
Merge branch 'drawanglefixes' into 'master'
...
Drawangle fixes
Closes #153
See merge request STJr/SRB2Internal!236
2019-06-23 17:33:40 -04:00
826e8e1aaf
Fixed goofups I missed back 3 months ago
2019-06-23 17:51:58 +01:00
d9ca8b45d3
Saving work so far, UNTESTED
...
# Conflicts:
# src/r_data.c
2019-06-23 17:51:36 +01:00
8a778a4070
Simply truncate the per-map COLORMAP lump instead of not reading it at all.
...
Keep the warning though.
2019-06-23 15:02:32 +01:00
5f339fc2a9
Don't overlap strncpy in WAD file load
2019-06-23 14:52:49 +01:00
bb9b1b3b1f
Change COLORMAP lump size check to be exact
...
A lower size could technically be valid, but could easily run into strange issues.
2019-06-23 13:49:39 +01:00
bc254d9cf7
Kill Texture SOC feature.
...
As far as I know it's basically unused, and the strstr is inherently unsafe because there's no guarantee that a patch's contents are NULL terminated.
2019-06-23 13:48:29 +01:00
45922f80d1
Don't read from a per-map COLORMAP if it is too big.
...
Could this be changed to only read the first so many bytes?
2019-06-23 12:47:20 +01:00
ce6db1cc9c
Merge branch 'public_next'
2019-06-22 22:44:42 +01:00
c9456e141d
Merge branch 'master' into next
2019-06-22 22:42:13 +01:00
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
1af969d579
Merge branch 'pk3_leak' into 'master'
...
Pk3 Leaks
See merge request STJr/SRB2!500
2019-06-22 15:56:52 -04:00
5c54c4f922
Remove some more 2.1-related ringslinger offsets to the chat.
2019-06-22 20:17:09 +01:00
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
28a61f2f3c
Correct some oversights where drawangle was incorrectly ignored.
2019-06-22 17:07:18 +01:00
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
c8d145e474
Tweak Boss5MakeItRain's bomb launch angles to properly smash the ceiling in the new arena.
2019-06-22 17:03:28 +01:00
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
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
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
6cf376a9b5
Support backspace for resetting various menu values, just like Kart.
2019-06-22 16:50:46 +01:00
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
8444379d53
Free the zentries
2019-06-22 00:52:28 +01:00
83da71f809
Merge branch 'master' into pk3_leak
2019-06-22 00:28:14 +01:00
dcd4995eb3
Remember to end inflating
2019-06-22 00:19:34 +01:00
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