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

9617 commits

Author SHA1 Message Date
Steel Titanium e9a03401cb Port netticbuffer from Kart 2020-07-19 15:24:27 -04:00
Steel Titanium 05ac0fc7ea Fix muspostbossname sometimes returning garbage. 2020-07-19 13:47:33 -04:00
Hannu Hanhi b03e7f63c5 Fix shader comment 2020-07-19 16:07:53 +03:00
Hannu Hanhi 92ebbdfc10 Don't override custom shaders with model lighting shader 2020-07-18 15:48:37 +03:00
Hannu Hanhi c1cf41fb0c Add capability to use model lighting with shaders enabled 2020-07-18 15:08:59 +03:00
Jaime Passos 48a6652973 Move the sky dome code out of r_opengl.c, fix issues with shaders 2020-07-17 02:48:05 -03:00
James R 7c2f81e4ed Merge branch 'next-lc-uint16' into 'next' 
Fix skincolor-related memory leak

See merge request STJr/SRB2!1066
 2020-07-16 22:01:07 -04:00
James R fa90ff6bae Merge remote-tracking branch 'origin/master' into next 2020-07-16 19:00:21 -07:00
James R d6b831053f Merge branch 'fix-lib_freeslot' into 'next' 
Fix lib_freeslot

See merge request STJr/SRB2!1064
 2020-07-14 18:32:10 -04:00
SwitchKaze 734033250d Fix skincolor-related memory leak 2020-07-14 17:09:31 -05:00
kaysrishaq 7f9175033d minor lua fixes 
minor lua fixes
 2020-07-14 01:34:57 -04:00
kaysrishaq 29a116ba81 Fix lib_freeslot 2020-07-13 18:56:07 -04:00
James R 34bd0d9fe7 Merge branch 'various-color-fixes' into 'next' 
Various color fixes

See merge request STJr/SRB2!1060
 2020-07-13 18:24:55 -04:00
kaysrishaq f541c37ebc Fix formatting 
PREFAVAILABLE -> S_PrefAvailable
move declarations to top of blocks
 2020-07-13 15:16:49 -04:00
James R f5c5ec000d Use SRB2VERSION here... 2020-07-13 08:59:41 -07:00
James R 93615b07be Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-13 08:58:43 -07:00
James R 00ceca8cc6 Merge remote-tracking branch 'origin/master' into next 2020-07-12 17:11:22 -07:00
James R 4985d94386 Merge remote-tracking branch 'origin/master' into cmake-adjustments 2020-07-12 16:24:24 -07:00
James R 42b0ab1851 Merge branch 'p-xymovement-lua-exposure' into 'next' 
Expose several movement-related functions to Lua.

See merge request STJr/SRB2!884
 2020-07-12 19:11:47 -04:00
James R 839f086216 A few more instances of "gr" to purge 2020-07-12 16:09:43 -07:00
Kays Ishaq e849c9898e move dupenum declaration to beginning of block 2020-07-12 19:05:27 -04:00
James R b9a24001d8 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
GoldenTails ada06910dc Expose P_MovePlayer to Lua. 2020-07-12 18:02:50 -05:00
GoldenTails 4b3d6f04f8 Expose P_PlayerZMovement to Lua. 
Finishing off these changes; how a player moves vertically.
 2020-07-12 18:02:50 -05:00
GoldenTails df1fd0c456 Expose P_SceneryZMovement to Lua. 
Still more complex than P_RingZMovement.
 2020-07-12 18:02:50 -05:00
GoldenTails 4710e4f07c Expose P_RingZMovement to Lua. 
Ever wanted to move like a ring vertically?
 2020-07-12 18:02:50 -05:00
GoldenTails 6d3a2919a2 Expose P_ZMovement to Lua. 
Because P_XYMovement wasn't enough.
 2020-07-12 18:02:50 -05:00
GoldenTails 27c25bfa1e Expose P_SceneryXYMovement to Lua. 
Ironically this seems slightly more advanced than P_RingXYMovement...
 2020-07-12 18:02:50 -05:00
GoldenTails 6ac3d62321 Expose P_RingXYMovement to Lua. 
Ever wanted to move like a ring horizontally?
 2020-07-12 18:02:50 -05:00
GoldenTails fe67781d68 Expose P_XYMovement to Lua. 
It was so easy; it took a grand total of one compile to implement!
Why wasn't this done before...
 2020-07-12 18:02:49 -05:00
James R bc2f83ec05 Merge branch 'p-rail-thinker-lua-exposure' into 'next' 
Expose P_RailThinker to Lua.

See merge request STJr/SRB2!1059
 2020-07-12 18:54:28 -04:00
James R 6c875a8097 Merge branch 'marathoninfo2' into 'next' 
Marathon Run fixes (Resolves #184)

Closes #184

See merge request STJr/SRB2!1061
 2020-07-12 18:47:38 -04:00
James R 6f8dfb6fca Merge branch 'version-prep-is-a-stinky-butt-head' into 'master' 
Automate some of the version numbers nonsense

See merge request STJr/SRB2!1054
 2020-07-12 18:45:51 -04:00
James R f1a5f5952b Merge branch 'fix-required-flat' into 'next' 
Comment out unused border patch variables.

See merge request STJr/SRB2!1055
 2020-07-12 18:42:42 -04:00
Hannu Hanhi 3a488c243f Fix translucency comparison from previous commit 2020-07-12 22:23:15 +03:00
Hannu Hanhi 9909746718 Fix crash by handling precip mobjs correctly in ogl sprite sorting 2020-07-12 21:50:00 +03:00
toaster 0a625d3e19 Fix live event backups being created at run start; there's no meaningful progress in GFZ1 to recover from. 2020-07-12 19:00:58 +01:00
kaysrishaq a73f468ea4 Don't check empty string for duplicate name 2020-07-12 12:02:49 -04:00
Kays Ishaq 6e4b14588c Update lua_infolib.c 2020-07-12 11:12:16 -04:00
kaysrishaq a734129eae lua_isboolean -> lua_toboolean 
solves bugged set field accessible
 2020-07-12 10:07:32 -04:00
Nev3r 2cdfb8ffc6 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-12 14:59:38 +02:00
toaster e1a217dc10 Two minor fixes for Marathon Mode. 
* Apply the RTA penalty to the live event backup rather than the current timer. (Resolves #184)
* Snap the character name and timer mode text to the bottom of the screen, just above the bar.
 2020-07-12 13:00:08 +01:00
kaysrishaq 74cfeaff30 A bit of cleaning 2020-07-12 07:56:25 -04:00
kaysrishaq 0f9e3554e2 various color fixes 2020-07-12 07:39:52 -04:00
GoldenTails 7015e656ce Expose P_RailThinker to Lua. 2020-07-12 00:36:22 -05:00
GoldenTails 572bafa0f9 Use kinda counter-intuitive ternary operator to hack in a check for "use" for 2.2 compatibility 2020-07-11 21:59:54 -05:00
GoldenTails da3ab1a14c Ok fiiineee, I'll support 2.2 2020-07-11 21:59:54 -05:00
GoldenTails a2635b2b86 The only "use" that I had to change to "spin" after a manual half hour search 2020-07-11 21:59:54 -05:00
GoldenTails 1f1589384a Replace PF_USEDOWN with PF_SPINDOWN 2020-07-11 21:59:54 -05:00
GoldenTails 999d8018ca Oops! Missed a couple... 2020-07-11 21:59:54 -05:00
GoldenTails 8b140b1831 Replace 'use' with 'spin' in game control constants 2020-07-11 21:59:54 -05:00
GoldenTails 8616823d7d Remove another unneeded comment 2020-07-11 21:59:54 -05:00
GoldenTails 7b4dee87e6 Remove unneeded comment 2020-07-11 21:59:54 -05:00
GoldenTails 457714e480 Remove 2 characters of whitespace 
This is what I get for using find+replace I guess lol
 2020-07-11 21:59:54 -05:00
GoldenTails 465ad1a7bc Replace all occurances of BT_USE with BT_SPIN (2.3?) 
I'd use `next-major` but it doesn't exist lol
 2020-07-11 21:59:54 -05:00
James R 84373b1726 Merge branch 'opengl-blending-fix' into 'next' 
Fix ASTBlendPixel outputting empty pixels sometimes

See merge request STJr/SRB2!945
 2020-07-11 20:57:30 -04:00
James R 6c3663812b Merge branch 'ogl-linkdraw' into 'next' 
MF2_LINKDRAW support for OpenGL

See merge request STJr/SRB2!1031
 2020-07-11 20:52:11 -04:00
James R 479bbeacbe Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-11 17:41:46 -07:00
James R 2f30e81fdd ADD to the buffer size 
(cherry picked from commit bae37aea2c1b1ffab22f79e27415914f7e25fc89)
 2020-07-11 17:41:09 -07:00
James R ab3878e282 masterserver_token is back 
(cherry picked from commit e7d949aeb2b9ef2297287ba35f9296684078f184)
 2020-07-11 17:41:09 -07:00
James R 0b5062d31c Set timeout on HMS connections 
(cherry picked from commit fcbe4e668f1ac79811d1ab2fb9cfd44729e56e93)
 2020-07-11 17:41:09 -07:00
James R f32d91cc57 Resize response body buffer as needed 
(cherry picked from commit 85fef2655cc78c9453aed423f5a1df6011ce3262)
 2020-07-11 17:41:09 -07:00
James R 4e1d54c332 It's not always GCC, but it probably is gcc (I hope) 2020-07-11 12:45:35 -07:00
sphere e95265a7fa Comment out unused border patch variables, so GFZFLR01 isn't required anymore. 2020-07-11 12:11:26 +02:00
Nev3r a9dbf6daf6 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-11 08:47:32 +02:00
James R 6a54e5f4a6 Merge remote-tracking branch 'origin/master' into next 2020-07-10 23:04:50 -07:00
James R 8bcc2662d1 Merge branch 'netid-take-2' into 'next' 
Use ordered id for netvars instead of shitty hash

See merge request STJr/SRB2!1010
 2020-07-11 02:00:06 -04:00
James R df98601b12 Merge branch 'bubbleshieldoverhaul' into 'next' 
Bubble Shield overhaul

See merge request STJr/SRB2!1046
 2020-07-11 01:56:53 -04:00
James R f336b1e979 Merge branch 'i-added-the-branch-name-into-the-version-command-when-outside-of-develop-mode' into 'master' 
Adds the branch name into the version command printout when outside of DEVELOP mode.

See merge request STJr/SRB2!981
 2020-07-11 01:48:38 -04:00
James R 5cebf5c7bf Merge branch 'makefile-detect-version' into 'master' 
Detect GCC version in Makefile

See merge request STJr/SRB2!1002
 2020-07-11 01:47:50 -04:00
James R 99e0c48f7b Fix a lot of stuff related to the version automation 2020-07-10 22:39:46 -07:00
James R 1757002ddb Automate VERSION/SUBVERSION; move version related definitions to version.h 
CMake support. Srb2win.rc still needs touchy, whatever.
 2020-07-10 22:20:33 -07:00
Steel Titanium e22964ee0a I screwed up 2020-07-10 23:16:18 -04:00
Steel Titanium db6fc75b4f Update player.dta hash 2020-07-10 20:53:42 -04:00
Steel Titanium 778089458c Merge branch 'next' into 226-prep 2020-07-10 20:06:16 -04:00
Louis-Antoine f8aefc2fd3 Revert "Fix computation of very high pings" 
This reverts commit 82dbe95e22.
 2020-07-11 01:55:40 +02:00
Steel Titanium d9483dabfd Merge branch 'next' into 226-prep 2020-07-10 19:11:28 -04:00
Steel Titanium 759f9171a2 Update patch.pk3 hash again 2020-07-10 19:09:49 -04:00
Jaime Passos d87c874559 Fix GL y-shearing ignoring a Y-flipped transform 2020-07-10 19:19:51 -03:00
Steel Titanium dcd56a7fe3 Update patch.pk3 hash and Srb2win.rc 2020-07-10 18:13:01 -04:00
toaster 958d397cdb Merge branch 'marathoninfo' into 'next' 
Marathon Run adjustments

See merge request STJr/SRB2!1048
 2020-07-10 17:54:51 -04:00
Steel Titanium 307125e84e Update version number 2020-07-10 17:29:03 -04:00
Nev3r 6c6f16e158 Merge branch 'ogl-model-spr-uv-fix' into 'next' 
Fix models that use sprite textures

See merge request STJr/SRB2!1049
 2020-07-10 17:17:52 -04:00
toaster 217ac14ac5 Introduce a live event backup penalty for non MA_INGAME runs, since the change to saving time causes problems for this. 2020-07-10 21:36:37 +01:00
toaster 4c9cdcca0d Hopefully fix the issue, which I can't recreate, of live event backups being created even if they shouldn't. 2020-07-10 21:27:34 +01:00
toaster 1956e9e670 Change the default value of the In-game/Realtime timer selection, based on speedrunner feedback. 2020-07-10 21:24:25 +01:00
toaster 8a5069156f Add a small amount of extra info to the Evaluation screen for Marathon Mode, on request from multiple runners. 2020-07-10 21:16:28 +01:00
Hannu Hanhi ad57426713 Adjust model uvs to power of two texture if sprite texture is used 2020-07-10 23:05:21 +03:00
toaster 205d4c8d20 Fix the issue where custom exits with skipped intermission screens (notably, Black Core Zone 2 and 3) would cause the game to softlock when playing on a save file, or with a live event backup. 2020-07-10 20:30:16 +01:00
Hannu Hanhi 5fdc4578db Merge remote-tracking branch 'upstream/next' into ogl-linkdraw 2020-07-10 21:14:57 +03:00
Snu be8f0853ef Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2 into bubbleshieldoverhaul 
Updated to 2.2.5
 2020-07-10 17:08:53 +01:00
Nev3r 710097a0ca Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-10 11:47:16 +02:00
Snu d392c59935 Changed Bubble Shield functionality 2020-07-10 05:59:10 +01:00
Lachlan Wright 12ea5398c8 Merge branch 'restore-supergold' into 'next' 
Restore SKINCOLOR_SUPERGOLD1-5 changes from 2.2.3

See merge request STJr/SRB2!1042
 2020-07-09 12:37:31 -04:00
Lachlan Wright 867728ca16 Merge branch 'custom-color-fixes' into 'next' 
Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades

Closes #179 and #182

See merge request STJr/SRB2!1043
 2020-07-09 12:37:16 -04:00
GoldenTails 59bd6d45a3 Whose idea was it to make the aPNG speed 1/2x by default?! 2020-07-08 18:14:11 -05:00
lachwright 3226a5d699 Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades 2020-07-09 05:56:11 +08:00
lachwright c28ed25628 Restore SKINCOLOR_SUPERGOLD1-5 changes from 2.2.3 2020-07-09 00:00:21 +08:00
SteelT 31364d2120 Merge branch '225-prep' into 'next' 
2.2.5 preparation

See merge request STJr/SRB2!1039
 2020-07-07 14:55:06 -04:00
Lachlan Wright 337ec7bf6c Merge branch 'remove-tricks' into 'next' 
Remove Software tricks

See merge request STJr/SRB2!1036
 2020-07-07 13:47:33 -04:00
Lachlan Wright b9a088b16f Merge branch 'fix-autoexec-netvars' into 'next' 
Fix autoexec file trying to set netvars when joining from command-line

See merge request STJr/SRB2!1040
 2020-07-07 13:47:13 -04:00
lachwright 994bf78fe2 Update Srb2win.rc 2020-07-08 00:48:01 +08:00
lachwright 129fd2e27b Update patch.pk3 hash 2020-07-08 00:42:31 +08:00
toaster 274f649a02 M_RATHON header text. 2020-07-07 17:30:20 +01:00
Louis-Antoine 0858c2f6ed Fix autoexec file trying to set netvars when joining from command-line 2020-07-07 16:19:25 +02:00
lachwright 706b3c509d Make A_FlickyCenter usable in SOC/Lua 2020-07-07 20:42:00 +08:00
James R d31c6ac5b5 Contact the master server admims 2020-07-06 19:15:40 -07:00
Steel Titanium 7d75c72263 Update the version number 2020-07-06 21:29:02 -04:00
Steel Titanium ded902678c Update md5 hash for player.dta and patch.pk3 2020-07-06 21:22:57 -04:00
Louis-Antoine 78f8a44c25 Fix timeout 2020-07-07 02:06:26 +02:00
Jaime Passos 3a4ce6aea3 Merge remote-tracking branch 'origin/next' into opengl-blending-fix 2020-07-06 19:48:13 -03:00
Steel Titanium 7d00255dc4 Merge branch 'master' into next 2020-07-06 12:13:00 -04:00
Nev3r 42d92eab2c Fix erroneous merge conflict resolution. 2020-07-06 11:54:55 +02:00
Nev3r fd5b05cafc Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
Jaime Passos 4f6420274f Remove Software tricks 2020-07-06 01:26:56 -03:00
Jaime Passos 5c5d907251 gr_ -> gl_ 2020-07-06 01:15:08 -03:00
Jaime Passos a739cb0da9 Remove unused texture formats 2020-07-06 00:58:09 -03:00
Jaime Passos 3d50bef0e5 Rename structs, turn GrTextureFormat_t into an enum 2020-07-06 00:52:10 -03:00
Jaime Passos ac04853f8c Remove GrTexInfo 2020-07-06 00:35:48 -03:00
Jaime Passos abeedc4b65 Delete hw_glide.h 2020-07-06 00:27:34 -03:00
Hannu Hanhi b4aa5cecc1 Merge remote-tracking branch 'upstream/next' into ogl-linkdraw 2020-07-05 13:27:51 +03:00
James R de8019f163 Merge branch 'hahaha-credits' into 'next' 
The credit

See merge request STJr/SRB2!1033
 2020-07-04 18:00:49 -04:00
LJ Sonic 9c1bee694b Merge branch 'knuxtweaks' into 'next' 
Knuckles tweaks

See merge request STJr/SRB2!1030
 2020-07-04 16:37:35 -04:00
LJ Sonic 9f69396054 Merge branch 'fix-gif-delay' into 'next' 
Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with

See merge request STJr/SRB2!1023
 2020-07-04 16:28:59 -04:00
LJ Sonic 6c61baa818 Merge branch 'fix-oldbrak-missiles2' into 'next' 
Take 2: Fix Old Brak missiles + add pw_ignorelatch

See merge request STJr/SRB2!1006
 2020-07-04 16:28:48 -04:00
James R 96bccd5f9f Credit Oni for CODE 2020-07-04 12:59:56 -07:00
James R d9005203c7 Fuck you macro 2020-07-04 12:52:01 -07:00
James R e741a7b3c7 Actually save the cvar name in demos 2020-07-04 12:51:07 -07:00
LJ Sonic 17616967d3 Merge branch 'levelflat_name' into 'next' 
Use levelflat->name instead of flatname

See merge request STJr/SRB2!1024
 2020-07-04 08:46:04 -04:00
LJ Sonic 77e39a0fd5 Merge branch 'make-linedef-422-smarter' into 'next' 
Make Linedef type 422 smarter

See merge request STJr/SRB2!1014
 2020-07-04 08:35:42 -04:00
lachwright 17daf2faa2 Reduce speed cut when gliding underwater 2020-07-04 19:17:38 +08:00
LJ Sonic cf4087a014 Merge branch 'jetjawsound' into 'next' 
Jet Jaw Sounds

See merge request STJr/SRB2!1018
 2020-07-04 07:09:43 -04:00
LJ Sonic 804ba6da9e Merge branch 'more-platform-fixes' into 'next' 
More platform fixes

See merge request STJr/SRB2!999
 2020-07-04 07:07:17 -04:00
LJ Sonic 8d511ed565 Merge branch 'cez3debris' into 'next' 
New Debris for CEZ3

See merge request STJr/SRB2!1012
 2020-07-04 07:00:20 -04:00
lachwright f03addc5a7 Merge remote-tracking branch 'origin/next' into knuxtweaks 2020-07-04 18:53:26 +08:00
LJ Sonic 98c657e703 Merge branch 'sf_nosupersprites' into 'next' 
Add SF_NOSUPERSPRITES

See merge request STJr/SRB2!1000
 2020-07-04 06:51:11 -04:00
LJ Sonic 5ee94c8ce7 Merge branch 'patch-1' into 'next' 
Rename "Legacy" control scheme

See merge request STJr/SRB2!1029
 2020-07-04 06:50:15 -04:00
lachwright 527e682931 Add sightcheck boolean to P_RadiusAttack 
Also now destroys Egg Guard shields, and circumstantially Minuses
 2020-07-04 18:27:06 +08:00
Lachlan e2bdb56f97 Merge remote-tracking branch 'origin/next' into more-platform-fixes 2020-07-04 05:25:38 +08:00
Lachlan cdb247d08f Fix compiler warning 2020-07-04 05:25:34 +08:00
LJ Sonic 3679df07aa Merge branch 'dragonbomber-height' into 'next' 
Fix Dragonbomber z positioning

See merge request STJr/SRB2!1004
 2020-07-03 17:05:10 -04:00
LJ Sonic 07bbebd9b0 Merge branch 'shift-when-hiding-in-1p-menu' into 'next' 
Tweak display of hidden items in "1 Player" menu

See merge request STJr/SRB2!1013
 2020-07-03 17:04:42 -04:00
LJ Sonic 6e7446dea3 Merge branch 'ff_horizontalflip' into 'next' 
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)

See merge request STJr/SRB2!987
 2020-07-03 16:56:32 -04:00
Lachlan e44d93f76b Fix skiddust positional scaling 2020-07-04 04:30:57 +08:00
Lachlan 84000a0add P_Earthquake: Use P_RadiusAttack in favor of thinker iteration 2020-07-04 04:00:28 +08:00
Lachlan 7e72009a87 Fix buildbot warning 2020-07-04 03:21:48 +08:00
SteelT 186335c2ac Merge branch 'na-char-replays' into 'next' 
Add support for saving/loading per-skin NiGHTS replays

See merge request STJr/SRB2!1025
 2020-07-03 14:51:05 -04:00
lachwright 8652bbc1a5 Knuckles changes: 
- Buffed crouch landing; lasts slightly shorter and cuts speed less
- Support for swimming! Knuckles has slightly different glide controls when he has swim sprites underwater
- Improved glide controls in 2D mode
- Super Knuckles perks: land from a glide or latch onto a wall to generate a shockwave and damage nearby enemies
- Refactored skid dust
- Made super sparks use FF_FULLBRIGHT
- Added P_SpawnSkidDust and P_Earthquake to Lua
 2020-07-04 01:54:00 +08:00
colette 1cc2ab120d "Legacy controls" was a mistake of a name 2020-07-02 23:17:33 -04:00
Hannu Hanhi b29873ce1c Better MF2_LINKDRAW support for OpenGL 2020-07-03 00:28:52 +03:00