CobaltBW
4486ff065a
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 13:03:26 -07: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
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
LJ Sonic
d325c7e6d3
The year is 2021
2021-05-07 17:45:56 +02: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
Shane Ellis
a68fee3303
oops
2021-01-15 17:22:38 -05:00
Shane Ellis
794d927670
Add conditions for new player bot type
2021-01-15 16:44:26 -05: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
143ec3e40b
Merge branch 'master' into next
2020-12-12 02:38:51 -08:00
James R
b31c4db89d
Remove trailing whitespace
2020-12-12 02:37:03 -08:00
James R
2778cc3ce9
Merge remote-tracking branch 'origin/next' into hooklib-refactor
2020-12-12 02:02:38 -08: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
Nev3r
4013c0e0a1
Merge branch 'udmf-next' into udmf-multitag
2020-07-11 08:47:58 +02: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
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
Snu
d392c59935
Changed Bubble Shield functionality
2020-07-10 05:59:10 +01: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
067d9b9a63
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-06-24 19:31:19 -07:00
kaysrishaq
682791a024
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 17:09:29 -04:00
Louis-Antoine
67eef5a37f
Fix potential desynch when a player spawns
2020-05-28 11:03:35 +02:00
Jaime Passos
39c5ab4e17
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
Nev3r
5c605a8a39
Merge branch 'udmf-next' into udmf-multitag
2020-04-20 09:05:55 +02:00
James R
abb338d650
Merge branch 'continue_tweaks' into 'next'
...
A tangible mechanism to disable Continues
See merge request STJr/SRB2!865
2020-04-18 20:15:04 -04: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
James R
bd7d05fdf0
Merge branch 'gtr-replace' into 'next'
...
Separate PvP damage from ringslinger
See merge request STJr/SRB2!831
2020-04-09 19:51:52 -04:00
toaster
da86c17ee1
Disable continues outside of no-save/Ultimate by default, but allow SOC to re-enable them globally.
...
Please look at the merge request description for a full explanation, since I know the vanilla team has been hashing this out and I don't want to add fuel to the fire without at least presenting a solid case.
2020-03-26 20:16:44 +00:00
Louis-Antoine
e3cbdf8fab
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Zipper
4b28e19d16
Update p_inter.c
2020-03-05 18:48:20 -05:00
Zipper
4d8a523da9
Update p_inter.c
2020-03-05 18:30:27 -05:00
ZipperQR
da9bf34175
fix source player being nil
2020-03-05 12:26:27 +03:00
Tatsuru
761ec3b6a4
Separate PvP damage from non-friendly gametypes
2020-03-03 11:56:57 -03:00
Jaime Passos
4e7b47440f
G_CoopGametype, for all the GT_COOP cases
2020-02-29 00:57:22 -03:00
Jaime Passos
b103a792c0
Let spectators decide where they spawn
...
Also fixes some issues with tag gametypes
2020-02-23 19:23:00 -03:00
Jaime Passos
678935f26a
Turn players IT if they join the game after the hide time in tag gametypes
...
Except in gametypes with hide time stasis, because they can't change team.
2020-02-23 17:02:50 -03:00
Jaime Passos
572bffcd83
Award pink shields in friendly gametypes
2020-02-23 16:38:32 -03:00
Steel Titanium
76f26cda24
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
James R
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
James R
92f65fd822
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
James R
5a524f21da
Merge branch 'starpost-config-additions' into 'next'
...
Starpost config additions
See merge request STJr/SRB2!680
2020-02-01 21:42:43 -05:00
fickleheart
332b22a87a
Move spawnsnap to Special/ignore on sector trigger
...
Also includes splitting the starpost logic into its own function.
2020-01-24 23:54:54 -06:00
Louis-Antoine
b0b22b53d6
Ignore disconnected players in tag gametypes
...
Disconnected players do not become IT at round start.
If all non-ITs are disconnected, the round ends.
If all ITs are disconnected, one of the non-ITs
becomes IT, or the round ends if in Hide & Seek.
2020-01-23 19:58:13 +01:00
Tatsuru
e9a8c2d21a
No more losing lives when finished
2020-01-19 14:30:05 -03:00
James R
9a1cb0e30e
Merge branch 'software-dropshadows' into 'next'
...
Software dropshadows
See merge request STJr/SRB2!660
2020-01-17 18:56:13 -05:00
fickleheart
8a6173a3f2
Declare checkbase for both sides of the if statement
2020-01-12 09:11:57 -06:00
fickleheart
e60ba92a92
Checkpoint players at star post exact location with Ambush flag
2020-01-11 22:30:07 -06:00
fickleheart
1e2a4c2cce
Allow starpost Parameter to dictate order
2020-01-11 22:26:20 -06:00
