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
Jaime Ita Passos
a1553c4623
Update r_opengl.c
2021-05-22 20:08:11 -03:00
Jaime Ita Passos
75ebdda31b
Merge remote-tracking branch 'origin' into gl-texfmt-p8-ap88-a8-ai8-fix
2021-05-22 19:44:57 -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
James R
c13e1a74dd
Reject banned players with refusereason
2021-05-10 18:10:53 -07:00
James R
8486a9386d
serverinfo: enumerate refusereason
2021-05-10 18:10:16 -07:00
James R
22bfc2db78
Refactor HandleConnect refusals
...
Also removed some version fields from serverconfig_pak and
clientconfig_pak. Client version will be checked with
SRB2APPLICATION and MODVERSION.
Not updating PACKETVERSION because those packets shouldn't
have been packetversion'd in the first place.
2021-05-10 17:50:01 -07:00
James R
0edbca5e02
Actually report server version mismatches
...
Incompatible servers get dropped from the server list. It
turns out the server list is also used when connecting
directly to a server. This meant that if you tried
connecting to a server that was incompatible, you'd just
get an infinite connection screen, as if the server was
completely unreachable.
Now it won't drop the server if you are directly
connecting to it. I also copied some incompatibility
messages from HandleConnect.
2021-05-10 16:51:18 -07: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
LJ Sonic
07e69c5eb3
Add copyright date ranges for files created in 2020
2021-05-07 18:04:30 +02:00
LJ Sonic
d325c7e6d3
The year is 2021
2021-05-07 17:45:56 +02:00
lachablock
8b021ec16b
but if you close your eyes EH OH, EH OH
2021-05-07 12:38:24 +10:00
Tatsuru
3159d5a6e4
2.2.9 prep
2021-05-06 21:58:21 -03:00
sphere
6053740ef7
Merge branch 'light-userdata-is-wrong' into 'next'
...
Stop using metatables with light userdata
See merge request STJr/SRB2!1495
2021-05-06 12:14:36 -04:00
sphere
413c8563c9
Merge branch 'things-to-tide-you-over' into 'next'
...
Update URL on the addon screen
See merge request STJr/SRB2!1489
2021-05-06 08:18:12 -04:00
James R
ec8b63d675
Makefile: remove last of unused flags
2021-05-05 21:21:55 -07:00
James R
f9813844e7
Update CMakeLists.txt to use Sourcefiles
...
This establishes (near) parity of source code file lists
between the Makefile and CMakeLists.txt
To make that change I messed around CMakeLists.txt a bit.
It now uses target_sources and target_compile_definitions.
I also removed some MSVC stuff since we don't actually
care about MSVC--it made things easier.
CMake minimum version 3.0 -> 3.13 for target_sources.
2021-05-05 04:00:44 -07:00
James R
3d7205d494
Fix minor errors with Windows ECHO, DEL, MD
...
- Quotes were not removed by ECHO.
- DEL would print an error on nonexistent file.
- MD would do this plus return a nonzero exit code.
2021-05-04 22:34:20 -07:00
James R
888073d64d
Fix make clean printing header
2021-05-04 16:54:47 -07:00
James R
b31056c7d9
Rewrite Makefile to be modular as well as more automated
...
Some key points for programmers:
- Source code files are mostly listed in a 'Sourcefile'.
So you no longer directly edit the object list. There
can be multiple Sourcefiles and they can even live in
subdirectories--the directory name will be prepended to
every filename in the list. Of course, the Makefile
still needs to be edited to read from each Sourcefile.
- Different rules are no longer required for source code
files that live in subdirectories (such as sdl/ or
hardware/). Subdirectories Just Work so go ham!
In addition to those points, another important change is
that the bin directory is no longer divided into platform
subdirectories (Linux64, Mingw, etc). Executables now go
directly into bin. If you use DEBUGMODE or target 64-bit,
then subdirectories for 'debug' and '64' will be made
though.
Oh by the way, I don't think make clean actually removed
files before on Windows. It should now. I also fixed as
many little inconsistencies like that as I noticed.
And now just an overview of the technical aspects that
shouldn't affect anyone who doesn't REALLY care about the
Makefile...
objs and dep directories have been moved to a make
directory. Makefile.cfg and its variants have been moved
out of their various subdirectories to src/Makefile.d
make distclean removes the bin and make directories
entirely, but make clean and cleandep still only affect
the current build target.
When I say automation, I mean that a lot of copy pasting
in the Makefile has been reduced.
2021-05-04 04:22:37 -07:00
James R
44d217807f
Collect makefiles
2021-05-03 23:07:44 -07:00
Steel Titanium
80fe39bbd1
Fix MusicChange hook not returning some values correctly
2021-05-03 01:40:02 -04:00
James R
aee963f4e9
Replace LUA_PushLightUserdata with LUA_PushUserdata
...
See 7df6a30983a87042
2021-05-02 21:59:23 -07:00
James R
ed5a7f51e8
Revert "Merge branch 'lightmemedata' into 'next'"
...
This reverts commit d4c08a8410e100f21dda
2021-05-02 21:32:07 -07:00
GoldenTails
ab84bd5370
Fix the console splitting up halfway through startup.
2021-05-02 00:03:35 -05:00
Tatsuru
aac3ca320b
Update LOCATIONSTRING2 as well
2021-05-01 10:24:28 -03:00
Sally Coolatta
381ead4d7e
Level select no longer assumes that games will always be linear
...
- If a level is in-between two with the same header, it would previously create two headers with the same name. Now it groups all levels with the same header together.
- Previously, a header would only be visible if its first map was visible. Now it will show the header if you've visited any level under the header.
For SUGOI.
2021-04-30 21:46:09 -04:00
LJ Sonic
f97dc1093a
Merge branch 'kitchensync' into 'next'
...
Attempt to resolve teleportation resync issue
See merge request STJr/SRB2!1490
2021-04-30 20:39:11 -04:00
katsy
815db01438
adjust cooldown to 5 seconds (bandage fix for 2.2.9)
2021-04-30 20:30:35 -04:00
katsy
858cb98e57
attempt to resolve teleportation resync issue
2021-04-30 17:26:09 -05:00
Tatsuru
ea7b332525
Visit srb2.org/addons to get & make addons!
2021-04-30 15:49:09 -03:00
Jaime Ita Passos
b4a09405a7
Use 64-bit math for calculating the texture origin X/Z
2021-04-29 19:24:37 -03:00
Jaime Ita Passos
9d41325843
Only adjust slope offsets if the plane isn't rotated
2021-04-28 22:15:05 -03:00
Jaime Ita Passos
090f304f33
Use 64-bit x/y in R_GetSlopeZAt
2021-04-28 22:00:20 -03:00
Jaime Ita Passos
1cf13a22e4
Merge branch 'next' into polyobject-ffloor-fix
2021-04-28 20:29:41 -03:00
Monster Iestyn
b8ba2c5b70
Merge branch 'next' into load-netgame-error-fixes
...
# Conflicts:
# src/d_clisrv.c
2021-04-28 18:08:48 +01:00
Jaime Ita Passos
8f47a7e9cc
Prevent texture wobbling on planes with no flat alignment
2021-04-27 22:59:06 -03:00
Jaime Ita Passos
0fba870a35
Revert "Use floating point trig in R_SetSlopePlane"
...
This reverts commit 63761a2d07
2021-04-27 22:54:56 -03:00
Jaime Ita Passos
63761a2d07
Use floating point trig in R_SetSlopePlane
2021-04-27 20:42:59 -03:00
Jaime Ita Passos
1c6296653a
Use floating point GetSlopeZAt for the texture origin vector
2021-04-27 20:32:41 -03:00
Jaime Ita Passos
e4b8dc6584
Fix sloped plane offsets in Software, and fix rotated flat alignment in OpenGL.
...
+ unrelated slope plane optimizations in Software
2021-04-27 19:01:09 -03:00
Jaime Ita Passos
548554431b
Handle invalid blend modes properly
2021-04-27 00:20:41 -03:00
Jaime Ita Passos
85c53b35cd
Use old routine for PO2 spans
2021-04-26 22:17:03 -03:00
Vincent Robinson
f437d6afec
Add linedef specials for multitagging in binary maps
2021-04-26 16:27:39 -07:00
LJ Sonic
3491112818
Update copyright date
2021-04-27 00:33:24 +02:00
LJ Sonic
0d4d3a5207
Revert "Lua: ensure order of MIN, MAX possible values"
...
This reverts commit c51c478740
2021-04-26 21:11:24 +02:00
LJ Sonic
cd4cfba500
Delete faulty return
2021-04-26 21:10:32 +02:00
Monster Iestyn
34fa977192
move the old "can't load the level" error to its proper place, added specific error messages for all the times that unarchiving Lua banks can fail
2021-04-26 19:07:11 +01:00
LJ Sonic
664f5fe5b1
Merge branch 'erz3-tol' into 'next'
...
Give TOL_ERZ3 an appropriate identifier (closes #516 )
Closes #516
See merge request STJr/SRB2!1471
2021-04-26 06:08:31 -04:00
LJ Sonic
7d167f531b
Merge branch 'lua-minmax-plus' into 'next'
...
Let Lua cvars use preset values in addition to MIN and MAX
See merge request STJr/SRB2!1480
2021-04-26 06:06:58 -04:00
Steel Titanium
7cd41a8eb7
Compile with -rdynamic on UNIXCOMMON platforms
2021-04-26 03:48:38 -04:00
James R
92aeadc36b
It is impossible for a string to be allocated in this case
2021-04-25 22:01:40 -07:00
James R
85914cc7cd
Free zstring when switching to preset value
...
This is only applicable for bounded cvars (MIN, MAX),
since otherwise there's no way to allocate a zstring.
2021-04-25 21:55:04 -07:00
James R
c51c478740
Lua: ensure order of MIN, MAX possible values
...
Cvars could now have a range (MIN, MAX) plus some preset
values, but Lua could not take advantage of this due to
table order not being guaranteed.
2021-04-25 21:51:24 -07:00
Sally Coolatta
4bafd62271
Only return skin string number if it existed
2021-04-25 18:44:07 -04:00
Sally Coolatta
92107f28d5
Add string variable for unlockables and emblems
...
Skin unlockables / skin emblems are now checked at runtime to see if there's any matches.
2021-04-25 17:54:47 -04:00
Sally Coolatta
f0b9e0e415
Default to first usable skin instead of 0, I_Error if none are usable
2021-04-25 16:38:33 -04:00
LJ Sonic
d18fc8882f
Merge branch 'dont-load-dont-unload' into 'next'
...
Fix a dedicated crash in Special Stage intermissions (2.2.9 RC1)
See merge request STJr/SRB2!1475
2021-04-25 16:35:46 -04:00
LJ Sonic
1d07fc2de3
Merge branch 'spritedef-add-hotfix' into 'next'
...
Spritedef add hotfix
See merge request STJr/SRB2!1476
2021-04-25 16:34:39 -04:00
LJ Sonic
1e394a80bf
Merge branch 'possible-netgame-quit-crash-hotfix' into 'next'
...
Possible netgame quit crash hotfix
Closes #487
See merge request STJr/SRB2!1477
2021-04-25 16:33:49 -04:00
Sally Coolatta
382c0aa7de
Fix overshadowed declaration
2021-04-25 16:27:15 -04:00
Monster Iestyn
70939a7a3d
Set "allocated" flag to off if setting a string from PossibleValue afterwards, or if not setting a new value at all.
2021-04-25 21:08:12 +01:00
LJ Sonic
02ee480abe
Merge branch 'gl-colormapped-epolyflag' into 'next'
...
Fix uninitialized reads in PreparePolygon
See merge request STJr/SRB2!1392
2021-04-25 14:19:24 -04:00
sphere
a90642bfa9
Merge branch 'ogl-midtexture-zfighting-fix' into 'next'
...
Render midtextures on two-sided lines with a z-buffer offset
See merge request STJr/SRB2!1376
2021-04-25 14:02:02 -04:00
Monster Iestyn
65624bf6c0
Change numadded counter to UINT16 instead of UINT8, to allow for more sprites properly
2021-04-25 19:01:51 +01:00
Tatsuru
376d6cd6a2
Don't try to free patches in dedicated
2021-04-25 14:26:43 -03:00
Sally Coolatta
8278e621fb
Removed skin->availability
...
Locked skins now are a specific unlockable type, instead of being tied to the skin's properties.
This has plagued custom gamedata since 2.2 launch. It's extremely obnoxious having to set aside random numbers as dummy unlockables just to ensure that Amy Fang & Metal are unlocked from the start in a custom map pack.
Other changes made to accommodate this:
- R_GetSkinAvailabilities is now created from the list of unlockables set to skin type. (1st skin unlockable defined is (1), 2nd skin unlockable defined is (1 << 1), etc...)
- The "Added skin x" print shows up when loading addons but not at all for the base game, because the previous behavior of hiding based on if the skin was locked would now require iterating unlockables, which felt wrong to do during that stage of the loading process
- I noticed in my test wad that Sonic&Tails would give you Sonic&Sonic out if Tails was locked. I fixed that by making both skins required to show the character select option.
Mods that reserved empty dummy unlockables for Amy Fang and Metal won't have to do anything. Mods that wanted to re-lock them behind different requirements will have to update, but in the future they will not have to be in specific slots. Additionally, now Sonic Tails and Knuckles can also be locked for mods.
2021-04-25 07:18:32 -04:00
Radicalicious
e510e71617
Remove fire shield flash
2021-04-23 15:50:48 -04:00
Tatsuru
4f2f94d02d
Compatibility with the current identifier
2021-04-21 22:22:37 -03:00
