stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-24 11:40:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
12293 commits 173 branches 41 tags 295 MiB
Commit graph

10902 commits

Author SHA1 Message Date
lachablock
0c5018040c Merge remote-tracking branch 'origin/master' into next 2021-06-06 21:25:08 +10:00
sphere
c266a27073 Merge branch 'master' into 'master' 
Fix console text bleeding

See merge request STJr/SRB2!1434
 2021-06-06 07:01:30 -04:00
GoldenTails
409cba678d metalrecording 2021-06-05 18:35:44 -05:00
Monster Iestyn
090e5384d5 Merge branch 'blendmode-rangecheck' into 'next' 
Handle invalid blend modes

See merge request STJr/SRB2!1486
 2021-06-05 09:02:31 -04:00
lachablock
476dcc861b Restore P_AproxDistance Lua parity 2021-06-03 14:36:29 +10:00
sphere
2df75610e6 Merge branch 'allow-lua-to-override-special-stages' into 'next' 
Allows Lua to transport you to a different map in place of a Special Stage.

See merge request STJr/SRB2!1368
 2021-06-02 11:16:15 -04:00
sphere
8cfe7cd971 Merge branch 'unix-rdynamic' into 'next' 
Compile with -rdynamic for UNIXCOMMON platforms

See merge request STJr/SRB2!1481
 2021-06-02 06:31:14 -04:00
sphere
4aa3bea6ca Merge branch 'fix-console-splitting' into 'next' 
Fix the console splitting up halfway through startup.

Closes #349

See merge request STJr/SRB2!1494
 2021-06-02 06:31:01 -04:00
sphere
fb453491dd Merge branch 'models-spr2endstate' into 'next' 
Fix models interpolating to frame 0 from a same-sprite2 FF_SPR2ENDSTATE state

See merge request STJr/SRB2!1515
 2021-06-02 06:28:51 -04:00
sphere
d040b61edc Merge branch 'multitagging_plus' into 'next' 
Enhance the multitagging functionality added by !1485

See merge request STJr/SRB2!1524
 2021-06-01 17:25:29 -04:00
flarn2006
115254efc9 Fix compiler warning related to precedence 2021-06-01 17:10:29 -04:00
sphere
5a91f3326a Merge branch 'disable-int-emeralds' into 'next' 
Some more intermission features for Lua

See merge request STJr/SRB2!1329
 2021-06-01 15:38:00 -04:00
sphere
e203e457de Merge branch 'custom3drotate-scale-fix' into 'next' 
A_Custom3DRotate scale fix

See merge request STJr/SRB2!1525
 2021-06-01 15:02:43 -04:00
sphere
70bcb6081f Merge branch 'dashmode-lowroad' into 'next' 
Have Metal Sonic use spinheight while dashing

See merge request STJr/SRB2!1382
 2021-06-01 15:00:08 -04:00
sphere
69b6c409b5 Merge branch 'flicky-mapload-crash-fix' into 'next' 
Flicky mapload crash fix (and other tmthing-related fixes)

Closes #81

See merge request STJr/SRB2!1522
 2021-06-01 14:58:01 -04:00
flarn2006
172454f108 Fix offset_tags array indices 2021-06-01 10:09:57 -04:00
Nev3r
f7ee0dacf2 Merge branch 'lua_mapnumber' into 'next' 
Expose M_MapNumber to Lua

See merge request STJr/SRB2!1521
 2021-06-01 07:43:33 -04:00
Nev3r
2d155fa366 Merge branch 'remove-fracunit-2' into 'next' 
I have no idea why software does this.

See merge request STJr/SRB2!1517
 2021-06-01 07:42:36 -04:00
Nev3r
de0a91729b Merge branch 'buttered-lua' into 'next' 
Expose P_ButteredSlope to lua

See merge request STJr/SRB2!1397
 2021-06-01 07:39:19 -04:00
Nev3r
6edad47788 Merge branch 'no-airwalking-springs' into 'next' 
No airwalking (from horizontal springs)

See merge request STJr/SRB2!1428
 2021-06-01 07:38:04 -04:00
Nev3r
b49238f7c4 Merge branch 'remove-iterdeclarations' into 'next' 
Remove TAG_ITER_DECLARECOUNTER

See merge request STJr/SRB2!1398
 2021-06-01 07:36:50 -04:00
Nev3r
ab06ff011e Merge branch 'colorfret' into 'next' 
Respect mobj->color while enemies & bosses flash (resolves #531)

Closes #531

See merge request STJr/SRB2!1513
 2021-06-01 02:31:22 -04:00
Nev3r
9e7d619a5b Merge branch 'golden-nitpicks-use-of-base-10' into 'next' 
Use more readable hex constants in the Software Renderer splat and floorsprite drawers.

See merge request STJr/SRB2!1442
 2021-06-01 02:29:53 -04:00
sphere
4908712641 Merge branch 'go-away' into 'next' 
Make a few messages more helpful (resolves #485)

Closes #485

See merge request STJr/SRB2!1519
 2021-05-31 16:32:42 -04:00
sphere
65350e59c9 Merge branch 'rollout-stuff' into 'next' 
Rollout rock improvements

Closes #445, #221, and #532

See merge request STJr/SRB2!1401
 2021-05-31 16:12:17 -04:00
Radicalicious
3e91a8b2d4 Revert "Update p_user.c" 
This reverts commit 92209bf246
 2021-05-31 19:23:37 +00:00
Radicalicious
92209bf246 Update p_user.c 2021-05-31 15:09:54 -04:00
sphere
33d0438033 Merge branch 'fuckeggguard' into 'next' 
Make Armageddon Shield instantly kill Egg Guards (Closes #225)

Closes #225

See merge request STJr/SRB2!1378
 2021-05-31 09:34:14 -04:00
sphere
aec209ad2d Merge branch 'slider' into 'next' 
Allow sliders passage through spin gaps (resolves #576)

Closes #576

See merge request STJr/SRB2!1520
 2021-05-31 08:31:42 -04:00
sphere
ae9e0e7f08 Merge branch 'text-loops' into 'next' 
Custom title card bruh moments

See merge request STJr/SRB2!1501
 2021-05-31 08:25:43 -04:00
Nev3r
a48af30465 Merge branch 'easings' into 'next' 
Easing functions

See merge request STJr/SRB2!1467
 2021-05-31 02:34:02 -04:00
flarn2006
0b51b391f1 Make 96's flags consistent with 97-99 by default 2021-05-30 12:16:15 -04:00
sphere
fb4b3b8130 Merge branch 'ogl-fof-wall-slope-fix2' into 'next' 
Take slopes into account in FOF wall cutoff in HWR_ProcessSeg

Closes #192

See merge request STJr/SRB2!1361
 2021-05-30 11:32:30 -04:00
Monster Iestyn
d10cf4faf5 A_Custom3DRotate: don't scale hspeed and vspeed - they are angular speeds, not linear! 
(I added the scaling to this action somewhere between 7-9 years ago, and somehow never knew I made this mistake until now, welp.)
 2021-05-29 22:54:58 +01:00
flarn2006
f8fe763df2 Fix linedef type 99 2021-05-29 12:28:06 -04:00
flarn2006
2d4411d077 Remove empty 'else' block (also leftover) 2021-05-29 12:23:35 -04:00
flarn2006
5090de5809 Remove leftover debug printfs 2021-05-29 12:09:30 -04:00
flarn2006
93de054786 Fix linedef type 96 (I had it all wrong) 2021-05-29 11:08:57 -04:00
Nev3r
b978bc4507 Merge branch 'sw-tilted-npo2-span-opt' into 'next' 
NPO2 slope span optimization

See merge request STJr/SRB2!1216
 2021-05-29 09:30:58 -04:00
flarn2006
eee894581a Make linedef 96 skip the control sector 2021-05-29 00:54:31 -04:00
flarn2006
7d71d534d4 Add missing "/ FRACUNIT" to texture offset code 2021-05-29 00:40:06 -04:00
flarn2006
8d8f62baef Add additional multitagging functionality 2021-05-28 23:59:39 -04:00
SteelT
ad2b4b1809 Merge branch 'save-skin-names' into 'next' 
Save skin names in save files instead of skin numbers

See merge request STJr/SRB2!1503
 2021-05-28 22:05:20 -04:00
SteelT
c0f8cb29aa Merge branch 'select-heading-no-gaps' into 'next' 
[SUGOI] Level select no longer assumes that games will always be linear

See merge request STJr/SRB2!1492
 2021-05-28 21:51:52 -04:00
SteelT
2cb920a5a6 Merge branch 'failed-level-lua' into 'next' 
[SUGOI] Make stagefailed more useful, add linedef executor to toggle, and expose to Lua

Closes #361

See merge request STJr/SRB2!1463
 2021-05-28 21:51:00 -04:00
SteelT
a72d6bba22 Merge branch 'skin-unlocks-sanity' into 'next' 
[SUGOI] Remove skin->availability, add SECRET_SKIN

See merge request STJr/SRB2!1474
 2021-05-28 21:30:16 -04:00
Monster Iestyn
45b1223f3e My mistake, P_PreTicker calls P_MapStart and P_MapEnd too, so rework my earlier fix a bit 2021-05-28 18:56:32 +01:00
Monster Iestyn
ada6ec07db Fix Lua versions of P_ZMovement and its clones as well as P_MovePlayer so tmthing changes don't linger afterwards 2021-05-28 18:47:09 +01:00
Monster Iestyn
07801a2a18 move P_MapEnd call in P_LoadLevel further down, so that the P_MapStart/End pair also encloses cached actions and the MapLoad Lua hook 2021-05-28 18:42:19 +01:00
flarn2006
fd82357d4f Expose M_MapNumber to Lua 2021-05-27 18:35:15 -04:00
sphere
75938e2dfa Merge branch 'software-slope-plane-uv-fix-attempt' into 'next' 
Fix slope plane rotation and alignment (resolves #508)

Closes #508

See merge request STJr/SRB2!1464
 2021-05-27 16:56:16 -04:00
katsy
6286fc8b05 add sliding flag to spinheight conditions 2021-05-26 02:37:46 -04:00
katsy
a1235e144d allow sliders passage through spin gaps 2021-05-26 01:09:56 -05:00
katsy
b2ae7c79e7 make a few messages more helpful 2021-05-24 00:00:01 -05:00
Jaime Ita Passos
75397c347d Remove FRACUNIT/2 2021-05-22 21:09:06 -03:00
lachablock
750bdd9d60 Respect mobj->color while enemies & bosses flash, but in OpenGL 2021-05-22 23:25:36 +10:00
lachablock
99ad188263 Fix models interpolating to frame 0 from a same-sprite2 FF_SPR2ENDSTATE state 2021-05-22 18:17:48 +10:00
lachablock
4e5c3566c9 Respect mobj->color while enemies & bosses flash 2021-05-22 16:52:01 +10:00
Steel Titanium
d9395b0a73 Merge branch 'master' into next 2021-05-19 23:09:14 -04:00
Steel Titanium
7862a557c8 Merge branch 'bugfix-1' of https://github.com/rjpfonseca/SRB2 into rjpfonseca-bugfix-1 2021-05-19 22:57:38 -04:00
SteelT
695722269b Merge branch 'warnings' into 'master' 
Fix some compiler warnings

See merge request STJr/SRB2!1504
 2021-05-19 22:54:48 -04:00
sphere
60bbf1d8bc Merge branch 'fix-pit_checkthing-crash' into 'next' 
Check against null tmpusher source before attempting to push a thing.

See merge request STJr/SRB2!1413
 2021-05-19 08:12:30 -04:00
sphere
dc5572ba21 Merge branch 'trns-chunk-fix' into 'next' 
tRNS chunk fix

See merge request STJr/SRB2!1393
 2021-05-19 06:07:38 -04:00
sphere
bcd3a6b82b Merge branch 'optimize-getpatchpixel' into 'next' 
Optimize Picture_GetPatchPixel

See merge request STJr/SRB2!1342
 2021-05-19 06:07:23 -04:00
sphere
186ef0479d Merge branch 'death-of-musicslots2' into 'next' 
Remove music slot compatibility

See merge request STJr/SRB2!1321
 2021-05-19 05:27:31 -04:00
Jaime Ita Passos
5b86b8991c Use floating point trigonometry 2021-05-16 21:43:52 -03:00
Jaime Ita Passos
7500d12eeb Merge remote-tracking branch 'origin' into software-slope-plane-uv-fix-attempt 2021-05-16 20:56:53 -03:00
Steel Titanium
a2667f4dc9 Merge branch 'master' into next 2021-05-11 20:08:44 -04:00
sphere
d915da6509 Merge branch 'dashaction' into 'next' 
Scale minimum dashmode thok speed on actionspd, not normalspeed

See merge request STJr/SRB2!1311
 2021-05-10 08:45:26 -04:00
Lach
5cab285b2c Merge branch 'make-ghosts-target-origin' into 'next' 
Set the target of a spawned ghost to where it came from.

Closes #517

See merge request STJr/SRB2!1358
 2021-05-10 08:40:41 -04:00
Lach
5fb4b34f8c Merge branch 'steamed' into 'next' 
Make steam apply sprung flag

See merge request STJr/SRB2!1365
 2021-05-10 08:39:06 -04:00
Lach
e1843841bc Merge branch 'lunch' into 'next' 
Don't apply pw_justlaunched if the player didn't actually launch off a slope

See merge request STJr/SRB2!1447
 2021-05-10 08:37:55 -04:00
Lach
58a070ca03 Merge branch 'no-fire-shield-palflash' into 'next' 
No fire shield palflash (resolves #512)

Closes #512

See merge request STJr/SRB2!1473
 2021-05-10 08:37:20 -04:00
Lach
ecd59feafb Merge branch 'rosycolormap-raspberry' into 'next' 
Change Raspberry's chat colormap to V_ROSYMAP

See merge request STJr/SRB2!1441
 2021-05-10 08:36:26 -04:00
sphere
c25ecfc35f Merge branch 'more-slope-copying' into 'next' 
Add more actions for slope copying

See merge request STJr/SRB2!1406
 2021-05-10 07:43:03 -04:00
sphere
44f3edb218 Merge branch 'binary-multitagging' into 'next' 
Add linedef specials for multitagging in binary maps

See merge request STJr/SRB2!1485
 2021-05-10 07:42:55 -04:00
RJPFonseca
69647eb78d Used spaces instead of tabs in Makefile.cfg 2021-05-09 19:10:53 +01:00
James R
35244fa736 Clang: fix -Wimplicit-const-int-float-conversion 
Some of these integers exceed the precision of float. In
that case the number is rounded. The rounding shouldn't
matter too much anyway, so just shut the compiler up.
 2021-05-08 16:49:23 -07:00
James R
210c9419e4 Ignore -Wtrigraphs 2021-05-08 16:49:18 -07:00
Sally Coolatta
ec8e884a31 Removed this function 2021-05-08 12:56:33 -04:00
Sally Coolatta
5d93f86499 Merge branch 'next' into skin-unlocks-sanity 2021-05-08 12:55:46 -04:00
lachablock
d2db204058 Fix rollout rock controls in 2D mode 2021-05-08 18:34:32 +10:00
lachablock
755cf6e952 Merge remote-tracking branch 'origin/next' into rollout-stuff 2021-05-08 13:03:18 +10:00
lachablock
3880263f1f Add machine dashmode as a condition for gap passage. 
(Also remove the sprite2 check, we don't need to be that stingy since PlayerHeight hooks allow greater control over that now!)
 2021-05-08 12:27:29 +10:00
lachablock
47f465ccea Merge remote-tracking branch 'origin/next' into dashmode-lowroad 2021-05-08 12:16:46 +10:00
James R
87afa7655a CMake: fix ASM compile 
- target_sources from correct directory
- enable_language must be used in add_executable directory
 2021-05-07 18:59:51 -07:00
Sally Coolatta
d136c60a3f Add some comments, write an empty string instead of a boolean determining if the bot skin exists or not. 
I was a little scared of doing this at first, but after a bit of thought & some testing that it'll be fine.
 2021-05-07 20:13:16 -04:00
Sally Coolatta
a583027006 Remove prints 2021-05-07 19:52:29 -04:00
Sally Coolatta
dc6851dabc Save skin name instead of skin number into save files 
Allows you to save a game as any character, and you don't have to load the files in a specific order to access the save file.
 2021-05-07 19:41:44 -04:00
James R
9e7d80c2c4 Makefile: suppress DEL error 2021-05-07 16:08:24 -07:00
Monster Iestyn
a98b0834a6 Merge branch 'deh-buffer-unclog' into 'next' 
Fix a series of buffer overflows in SOC (primarily Character section) loading

See merge request STJr/SRB2!1457
 2021-05-07 18:47:51 -04:00
Monster Iestyn
70052a099c Merge branch 'acos' into 'next' 
arccosine Lua exposure

See merge request STJr/SRB2!1455
 2021-05-07 18:33:55 -04:00
James R
c06817d008 Makefile: fix mingw/64 swapped with 32-bit 2021-05-07 15:30:46 -07:00
Monster Iestyn
529d297895 Merge branch 'soc-caption' into 'next' 
[SUGOI] Allow setting sound captions in SOC

See merge request STJr/SRB2!1469
 2021-05-07 18:21:48 -04:00
Monster Iestyn
d00726cbe9 Merge branch 'monster-cleaning-up-again' into 'next' 
Monster cleaning up again

See merge request STJr/SRB2!1433
 2021-05-07 17:33:00 -04:00
Monster Iestyn
fa140c1eb3 Merge branch 'load-netgame-error-fixes' into 'next' 
Load netgame error fixes

See merge request STJr/SRB2!1482
 2021-05-07 17:27:19 -04:00
James R
ee72312dea Merge remote-tracking branch 'origin/master' into makefile-revision-final 2021-05-07 13:32:19 -07:00
Monster Iestyn
b7ff0164e9 Merge branch 'polyobject-ffloor-fix' into 'next' 
Polyobject over 3D floor fix for software renderer

See merge request STJr/SRB2!1488
 2021-05-07 16:11:03 -04:00
Sally Coolatta
4478265400 Fix title card patches not actually having enough room for an entire lump name 2021-05-07 14:15:37 -04:00
Sally Coolatta
8e8881b534 Fix custom title card text not looping properly 2021-05-07 14:14:31 -04:00