stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 10:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
6293 commits 172 branches 41 tags 280 MiB
Commit graph

6293 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
826e8e1aaf Fixed goofups I missed back 3 months ago 2019-06-23 17:51:58 +01:00
Monster Iestyn
d9ca8b45d3 Saving work so far, UNTESTED 
# Conflicts:
#	src/r_data.c
 2019-06-23 17:51:36 +01:00
Sryder
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
Sryder
5f339fc2a9 Don't overlap strncpy in WAD file load 2019-06-23 14:52:49 +01:00
Sryder
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
Sryder
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
Sryder
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
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
b02c21b818 Remove some more 2.1-related ringslinger offsets to the chat. 2019-06-22 20:15:57 +01:00
toaster
29c4fa306a 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
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
toaster
02e315a4ee 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
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
toaster
50e4a65f99 Correct some more oversights of switching to revitem for CA2_MELEE's particles. 2019-06-21 12:51:55 +01:00
toaster
d5e91ed8d7 Don't give SH_PINK in Race/Competition. They're your opponents! 2019-06-21 12:35:37 +01:00
toaster
3597b1c485 Make minor adjustments to the CA2_MELEE and CA_TWINSPIN stuff. 2019-06-21 00:43:03 +01:00
toaster
f7fe418f7c Slight buff to MT_LHRT. 2019-06-20 23:43:05 +01:00
toaster
f182bb867f 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-20 22:57:47 +01: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