stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-10 10:11:04 +00:00
Code Issues Projects Releases Packages Wiki Activity
13755 commits 181 branches 42 tags 186 MiB
Commit graph

619 commits

Author SHA1 Message Date
MascaraSnake
baa99150d0 Adapt Fang waypoint to UDMF 2021-12-25 09:58:00 +01:00
MascaraSnake
5eb2448a40 Adapt Pterabytes to UDMF 2021-12-21 21:57:35 +01:00
MascaraSnake
bfcbf5136b Adapt SDURF and Puma to UDMF 2021-12-21 17:28:29 +01:00
MascaraSnake
72e2c24fdb Adapt some reserved tags to UDMF 2021-12-20 23:28:18 +01:00
MascaraSnake
1b023732d0 Adapt rock spawner to UDMF 2021-12-13 08:24:52 +01:00
MascaraSnake
c4775ed37b Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs 
# Conflicts:
#	extras/conf/SRB2-22.cfg
#	src/p_ceilng.c
 2021-12-03 19:10:29 +01:00
sphere
491ffc7447 Merge branch 'firedeath' into 'next' 
Fix #214 (Crushstacean + Fireball Player Removal)

Closes #214

See merge request STJr/SRB2!1629
 2021-11-26 14:11:09 +00:00
SMS Alfredo
cf79bc8382 Fix #214 (Crushstacean + Fireball Player Removal) 2021-11-26 14:11:09 +00:00
SMS Alfredo
865c0a081d Make Overlay objects account for player->drawangle 2021-10-29 10:40:25 +00:00
MascaraSnake
a5959c0248 Merge branch 'next' into udmf-plane-linedefs 
# Conflicts:
#	src/p_inter.c
 2021-09-17 10:34:07 +02:00
Tatsuru
bb0a0bd4ab Merge branch 'oneline' into 'next' 
Add a missing scale assignment to A_Boss3ShockThink

See merge request STJr/SRB2!1588
 2021-09-12 22:04:28 +00:00
SMS Alfredo
d5cdb2dc78 Add a missing scale assignment to A_Boss3ShockThink 2021-09-12 22:04:28 +00:00
Tatsuru
9187656b90 Merge branch 'shocksplit' into 'next' 
Split up x/y/z averages in A_Boss3ShockThink (resolves #589)

Closes #589

See merge request STJr/SRB2!1538
 2021-09-12 21:49:28 +00:00
CobaltBW
4f04097066 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into addplayer 2021-06-29 14:32:46 -07:00
MascaraSnake
259700be3c Get rid of customspeed in EV_DoElevator and read speed from args[1] 2021-06-25 11:11:16 +02:00
MascaraSnake
7025f12d95 -Pass tag as argument to EV_ functions 
-Get rid of junk linedefs for specialized EV_ calls
-Store tag in args[0]
 2021-06-25 10:12:16 +02:00
Shane Ellis
09f445f227 Merge branch 'next' into 'addplayer' 
# Conflicts:
#   src/g_game.c
 2021-06-19 20:20:45 -04:00
LJ Sonic
e3a5da3f6f Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into HEAD 
# Conflicts:
#	src/lua_hook.h
#	src/lua_hooklib.c
 2021-06-19 20:49:12 +02:00
sphere
df5c9933ec Restore toggle for Robo-Hood to not jump away from nearby players. 2021-06-16 16:12:38 +02:00
lachablock
4d1b3edb03 Split up x/y/z averages in A_Boss3ShockThink 2021-06-08 17:21:54 +10:00
James R
4d22b9f17f Merge remote-tracking branch 'origin/next' into hooklib-refactor 2021-06-07 18:12:52 -07:00
Shane Ellis
18c47afc76 Merge branch 'next' into 'addplayer' 
# Conflicts:
#   src/lua_baselib.c
#   src/r_skins.c
 2021-06-02 11:47:11 -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
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
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
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
Sally Coolatta
5d93f86499 Merge branch 'next' into skin-unlocks-sanity 2021-05-08 12:55:46 -04:00
lachablock
755cf6e952 Merge remote-tracking branch 'origin/next' into rollout-stuff 2021-05-08 13:03:18 +10:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
Tatsuru
3159d5a6e4 2.2.9 prep 2021-05-06 21:58:21 -03: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
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
Monster Iestyn
7511911846 Merge branch 'custom3dcrash' into 'next' 
Fix sigsegv caused by bad target check in A_Custom3DRotate

See merge request STJr/SRB2!1430
 2021-03-24 14:24:21 -04:00
katsy
42cfcbf7be fix sigsegv in A_Custom3DRotate 2021-03-21 16:09:11 -05:00
Lachlan Wright
77feee73c3 Revert "Merge branch 'player-speed' into 'next'" 
This reverts merge request !1309
 2021-02-27 03:38:13 +00:00
lachwright
cf389179e8 Rollout rock improvements: 
- No longer struggles to start to accelerating at certain angles
- Carrying a player onto a rollout rock no longer leaves them in their ride state
- Changed dispoffset might alleviate some sorting issues
- Changes the player's camera angle when sprung horizontally
- Works better in reverse gravity
 2021-02-15 01:11:03 +11:00
LJ Sonic
09d911a5b6 Revert "Replace all instances of P_AproxDistance with FixedHypot" 
This reverts commit 75633bde50.
 2021-02-13 17:45:20 +01:00
LJ Sonic
36c193f317 Merge branch 'fix-boss2pogotarget' into 'next' 
Make several actions actually check for a player smh (Fixes #387)

Closes #387

See merge request STJr/SRB2!1340
 2021-01-25 18:11:38 -05:00
Shane Ellis
ea6879b5c2 missed a couple spots 2021-01-24 12:43:13 -05:00
Shane Ellis
161e1c42cb Update p_enemy.c 2021-01-15 17:29:15 -05:00
Shane Ellis
56e9b99f28 Revert "Add conditions for new player bot type" 
This reverts commit 4b9a95a538
 2021-01-15 22:28:01 +00:00
Shane Ellis
4b9a95a538 Add conditions for new player bot type 2021-01-15 16:46:15 -05:00
GoldenTails
08146c9cad Have A_ThrownRing check for a player too 2020-12-19 21:30:13 -06:00
GoldenTails
60564197af Have A_DetonChase check for a player too 2020-12-19 21:12:09 -06:00
GoldenTails
f9e5681a6b Actually check for a player smh 2020-12-19 20:33:29 -06:00
James R
a86a7822d1 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-12 15:38:46 -08:00
James R
75633bde50 Replace all instances of P_AproxDistance with FixedHypot 2020-12-12 14:53:54 -08:00
James R
9649a9fbae Merge branch 'player-speed' into 'next' 
Make player->speed and other things use R_PointToDist2

See merge request STJr/SRB2!1309
 2020-12-12 17:38:02 -05:00
James R
93e4f43e4b Hooklib macros names -> uppercase + documentation 2020-12-12 03:16:30 -08:00
James R
c8cc9c7a6f Remove trailing whitespace 2020-12-12 02:40:46 -08:00
James R
2778cc3ce9 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-12 02:02:38 -08:00
Zippy_Zolton
916cacb38f snailer 2020-12-10 19:01:09 -06:00
James R
8d382e49fb Big Large Lua Hooklib Refactor 
* Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks
  to, at the most basic level, only two calls.
* Lua tables (the array part) are used to index hooks. Such tables contain only
  hooks of the same type.
* Hook types are defined in one place so you no longer need to sync up the enum
  and name array.
 2020-12-10 00:36:41 -08:00
Tatsuru
9770368ee9 Initialize junk line tag lists 2020-11-30 18:21:06 -03:00
LJ Sonic
eef3028110 Merge branch 'fix-stacktrace' of https://git.do.srb2.org/STJr/SRB2.git into next 
# Conflicts:
#	src/dehacked.c
#	src/dehacked.h
 2020-11-29 21:54:15 +01:00
Louis-Antoine
13ba25f4fe Only call the Lua API for overridden actions 2020-11-15 01:15:58 +01:00
Nev3r
c62ef355ef Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag 
# Conflicts:
#	src/lua_baselib.c
#	src/lua_maplib.c
 2020-10-27 20:48:25 +01:00
Monster Iestyn
ddd59a6e9d A_Boss1Laser (pinch phase): Reset var1 to locvar1 each time so we don't accidentally spawn koopas (or something else) as a result of hitting enemies with the laser 2020-09-26 17:31:49 +01:00
Tatsuru
48d6ae8e53 Decolorize players as intended 2020-08-24 23:53:21 -03:00
Nev3r
ad55f5f872 Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_ceilng.c
#	src/p_floor.c
#	src/p_mobj.c
#	src/p_mobj.h
#	src/p_polyobj.c
#	src/p_saveg.c
#	src/p_setup.c
#	src/p_spec.c
#	src/p_spec.h
#	src/p_user.c
#	src/r_bsp.c
#	src/r_defs.h
 2020-07-10 18:18:07 +02:00
lachwright
3226a5d699 Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades 2020-07-09 05:56:11 +08: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
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
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
James R
067d9b9a63 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-06-24 19:31:19 -07:00
lachwright
cab87b4632 lol should have tested before pushing 2020-06-19 15:59:09 +08:00
lachwright
47d9d87654 Fix the Eggman signpost's background color 2020-06-19 15:49:24 +08:00
kaysrishaq
682791a024 brak missile fix, pw_ignorelatch, small Recycler fix 2020-06-18 17:09:29 -04:00
Steel Titanium
d3d5496a78 Fix facecolor may be used uninitialized. 2020-06-17 14:09:49 -04:00
SteelT
c810ea3945 Merge branch 'next-lc-uint16' into 'next' 
Custom skincolor bugfixes

See merge request STJr/SRB2!971
 2020-06-11 20:08:50 -04:00
SwitchKaze
d589e6bc95 Fix signpost shade. 2020-05-29 21:41:20 -05:00
SteelT
f0b64971a0 Merge branch 'next-lc-uint16' into 'next' 
Custom skincolors

See merge request STJr/SRB2!960
 2020-05-28 11:23:05 -04:00
SwitchKaze
b37c73b008 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
SwitchKaze
46191cade7 Update to 2.2.4 2020-05-22 16:47:51 -05:00
Monster Iestyn
c9c7327011 A_SplitShot fix: don't even attempt to A_FaceTarget (or anything beyond) if there is no target to face to begin with 2020-05-21 19:42:48 +01:00
MascaraSnake
33a22331f8 Merge branch 'waypoints' into 'next' 
Store waypoints at map load instead of iterating through the thinker list to find them

See merge request STJr/SRB2!938
 2020-05-18 16:00:46 -04:00
MascaraSnake
9cd9d2e0d7 Merge branch 'carry-dust-devil' into 'next' 
Add carry types to Dust devils

See merge request STJr/SRB2!886
 2020-05-15 02:50:29 -04:00
ZipperQR
6a9543b1c2 no message 2020-05-14 03:35:46 +03:00
MascaraSnake
36843cbfd6 Merge branch 'next' into waypoints 2020-05-12 23:51:32 +02:00
MascaraSnake
435e6c9812 Rename variables for Fang waypoints, in preparation for new global waypoint data structure 2020-05-12 14:53:10 +02:00
James R
7257fc730a Remove instances of HAVE_BLUA that actually disable Lua now 2020-05-10 19:59:56 -07:00
Jaime Passos
39c5ab4e17 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-05-09 17:12:52 -03:00
lachwright
9d21d790a4 Prevent laser sprites clipping into walls/off ledges 2020-05-08 02:58:56 +08:00
lachwright
36b400387e Remove MF_NOBLOCKMAP from MT_LASER so Silver can find it 2020-05-07 23:24:33 +08:00
lachwright
3a1988fc01 Fix knockback scaling 2020-05-07 22:47:34 +08:00
lachwright
63cb58a10a Update new GFZ3 laser 2020-05-06 09:03:03 +08:00
lachwright
92c900f284 New GFZ3 laser 2020-05-06 09:01:02 +08:00
ZipperQR
0d7c49e7e4 no message 2020-05-03 14:02:23 +03:00
ZipperQR
64edd91dbd Dust devil support 2020-04-22 00:59:12 +03:00
Nev3r
aa0d76f8fa Delete tags. 2020-04-18 00:23:24 +02:00
Nev3r
7904856e8e Remove presumably the remaining old tag references in the gamelogic. 2020-04-17 22:28:41 +02:00
Nev3r
439fde3434 Replace most P_FindSpecialLineFromTag() cases with Tag_FindLineSpecial(), which settle with the first found result. 2020-04-14 23:59:22 +02:00
James R
b8d40a5783 Merge branch 'dye' into 'next' 
Expose colorization to mappers and SOC

See merge request STJr/SRB2!679
 2020-04-09 19:50:32 -04:00
Louis-Antoine
892a8dd6e7 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
Louis-Antoine
e3cbdf8fab Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Monster Iestyn
f4cb6e1f5e Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff 
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
 2020-03-09 13:54:56 +00:00
Jaime Passos
3ce4ddf854 Fix incorrect team gametype rule being used in A_OldRingExplode 2020-02-28 23:25:25 -03:00
Jaime Passos
51c593e633 Fix homing ring using the wrong team gametype rule 2020-02-28 23:21:27 -03:00
SwitchKaze
6415e10216 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-23 11:50:13 -05:00
James Hale
56b67a3b4f Custom skincolors 2020-02-21 21:56:39 -05:00