Monster Iestyn
52bca4f417
Merge branch 'bossfixes' into 'master'
...
Boss fixes
See merge request STJr/SRB2Internal!235
2019-06-25 16:36:23 -04:00
Jaime Passos
c32e1d2f96
Merge remote-tracking branch 'origin/flats' into flats-png
2019-06-25 16:04:24 -03:00
Jaime Passos
e0622c4489
Merge remote-tracking branch 'upstream/master' into flats-png
2019-06-25 16:02:35 -03:00
Jaime Passos
ea9853a3e8
Fix slope flat offsets
2019-06-25 14:58:34 -03:00
Jaime Passos
48c1fcd731
Delete R_CropFlat
2019-06-25 14:41:07 -03:00
Jaime Passos
9cc870931a
hHA
2019-06-25 14:40:00 -03:00
Jaime Passos
5a9bc30a5d
Merge remote-tracking branch 'upstream/master' into flats
2019-06-25 12:56:03 -03:00
Monster Iestyn
ebc02c4e0c
Merge branch 'HUDfixes' into 'master'
...
HUD fixes
See merge request STJr/SRB2Internal!234
2019-06-24 17:47:44 -04:00
Steel Titanium
c314c4b208
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
c2badc927f
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
c2a8c82b6a
Forgot to do this.
2019-06-23 18:51:42 -04:00
Steel Titanium
f2a98a32cf
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into levelheader-startrings
2019-06-23 18:24:15 -04:00
Steel Titanium
25e67ee061
Add startrings level header option
2019-06-23 18:15:40 -04:00
Monster Iestyn
050d9e1922
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
9c9b674262
Fixed goofups I missed back 3 months ago
2019-06-23 17:51:58 +01:00
Monster Iestyn
fea05ff9c5
Saving work so far, UNTESTED
...
# Conflicts:
# src/r_data.c
2019-06-23 17:51:36 +01:00
Sryder
ef9ad551f6
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
Sryder
d1b0a31e2b
Don't overlap strncpy in WAD file load
2019-06-23 14:52:49 +01:00
Sryder
1aa03c01dc
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
Sryder
ac80cc3834
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
Sryder
d491c62c7c
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
Monster Iestyn
0368689e27
Merge branch 'public_next'
2019-06-22 22:44:42 +01:00
Monster Iestyn
fe633a9f57
Merge branch 'master' into next
2019-06-22 22:42:13 +01:00
Monster Iestyn
1e29d627f0
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
toaster
b2488f11b7
Remove some more 2.1-related ringslinger offsets to the chat.
2019-06-22 20:17:09 +01:00
toaster
cda4ed73a6
Remove some more 2.1-related ringslinger offsets to the chat.
2019-06-22 20:15:57 +01:00
toaster
934709a910
Realised I forgot to do this. Without this commit, the drawangle update stuff is useless :V
2019-06-22 17:33:37 +01:00
toaster
cda5b386c4
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
462d359d47
Correct some oversights where drawangle was incorrectly ignored.
2019-06-22 17:07:18 +01:00
toaster
7d3e659f1f
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
e2fd835af4
Tweak Boss5MakeItRain's bomb launch angles to properly smash the ceiling in the new arena.
2019-06-22 17:03:28 +01:00
toaster
597119bd8a
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
892240bb77
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
982d97a267
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
032ef98209
Support backspace for resetting various menu values, just like Kart.
2019-06-22 16:50:46 +01:00
toaster
e27a43f976
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
toaster
7cf70cf89c
Add HUD icon for Pink shield. (Don't worry, this is my last expected commit in this branch. Gonna cherry pick everything unrelated to the Pink shield into a bunch of other branches now.)
2019-06-22 16:44:32 +01:00
Sryder13
19f25e6a8e
Free the zentries
2019-06-22 00:52:28 +01:00
Sryder13
bf2c82633c
Merge branch 'master' into pk3_leak
2019-06-22 00:28:14 +01:00
Sryder13
b9a9108dc4
Remember to end inflating
2019-06-22 00:19:34 +01:00
MascaraSnake
5a0a971084
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
1076b59bd1
Forgot to copy something over from the CR_ROPEHANG case
2019-06-21 23:42:48 +02:00
MascaraSnake
68a065ca9e
Always use the white sidemark sprite, since track switching is no longer "activated"
2019-06-21 23:40:28 +02:00
MascaraSnake
e0aff341e4
Also back by popular demand: Restricting the camera angle during a minecart ride
2019-06-21 23:34:49 +02:00
Monster Iestyn
e95696c94b
Merge branch 'public_next'
2019-06-21 22:13:39 +01:00
Monster Iestyn
cfa13f3fe4
Merge branch 'master' into next
2019-06-21 22:10:32 +01:00
Steel Titanium
8839b4ce8c
Merge branch 'public-notpublic-libopenmpt' into 'master'
...
libopenmpt support
See merge request STJr/SRB2Internal!229
2019-06-21 17:03:53 -04:00
MascaraSnake
3827a69415
By popular demand: Track switching only requires strafe instead of jump+strafe
2019-06-21 20:13:30 +02:00
toaster
a8a2a1ed4b
Correct some more oversights of switching to revitem for CA2_MELEE's particles.
2019-06-21 12:51:55 +01:00
toaster
9de0c56cdc
Don't give SH_PINK in Race/Competition. They're your opponents!
2019-06-21 12:35:37 +01:00
