spherallic
86b4f93610
Allow obtaining ring, time & grade emblems in regular SP gameplay.
2023-07-24 08:34:10 -04:00
sphere
d7a84b967c
Merge branch 'strongpower' into 'next'
...
Add player->powers[pw_strong], refactor attacks and busting conditions, and allow breaking floors and ceilings separately
See merge request STJr/SRB2!1366
2023-07-05 17:05:47 +00:00
katsy
f261b9f0e1
Add player->powers[pw_strong], refactor attacks and busting conditions, and allow breaking floors and ceilings separately
2023-07-05 17:05:47 +00:00
spherallic
1470d099e3
Update copyright year & credits
2023-03-31 14:53:31 +02:00
Alam Ed Arias
f5e1d9722f
Merge branch 'master' into next
2022-11-11 22:03:58 -05:00
Alam Ed Arias
7e0fa2d34c
Cleanup whitespace changes from SRB2_release_2.2.9
2022-11-11 21:19:25 -05:00
Eidolon
12c2ddb115
Merge branch 'uncappedrevengeance' into next
...
Uncapped
See merge request STJr/SRB2!1856
# Conflicts:
# src/dummy/i_system.c
# src/win32/win_sys.c
2022-11-08 21:13:50 -06:00
spherallic
612424e2e2
Merge branch 'next' into fancarry
2022-09-16 22:54:08 +02:00
Eidolon
c79df7d58e
Interpolate afterimages further back
2022-04-26 20:56:35 -05:00
Eidolon
ab7c2dfb3d
Interpolate mobj angles and player drawangle
2022-04-26 20:56:31 -05:00
spherallic
14295ac7de
2022
2022-03-03 20:24:46 +01:00
CobaltBW
48514ee88d
Fixed G_RemovePlayer crash in players.iterate
...
This was done by storing flag-for-removal status as a boolean inside the player struct.
Bot players are instead removed at the start of G_Ticker, rather than being removed immediately by G_RemovePlayer.
2021-07-15 15:04:24 -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
Shane Ellis
4e47f240ad
Add new botstuffs
2021-01-23 10:30:07 -05:00
katsy
54d79415d5
add carry type to fans
2020-12-31 02:21:14 -06:00
katsy
721170f5a0
lol
2020-12-14 05:32:51 -06:00
katsy
0ce9d9127a
add SF_NOSHIELDABILITY
2020-12-14 04:01:50 -05:00
James R
75c5c8ba6a
Add missing *individual* skin flags
2020-11-28 02:22:08 -08:00
James R
7f65023891
Merge branch 'bustflags' into 'next'
...
Bustable Wall and Floor flags.
See merge request STJr/SRB2!1163
2020-10-18 16:42:15 -04:00
Snu
afcadb3232
Remove all instances of PF_CANBUSTFLOORS
2020-09-29 20:16:06 +01:00
Snu
cd4f755e53
Replace all instances of SF_CANBREAKWALLS and PF_CANBREAKFLOORS with SF_CANBUSTWALLS and PF_CANBUSTFLOORS, respectively.
2020-09-29 13:52:35 +01:00
Snu
04b749f1f9
Remove SF_BUSTABLEBUSTER, change SF_CANBREAKFLOORS to a pflags; PF_CANBREAKFLOORS
2020-09-29 11:05:04 +01:00
Snu
07a57d0419
Add SF_CANBREAKWALLS, SF_CANBREAKFLOORS and SF_BUSTABLEBUSTER
2020-09-29 09:45:34 +01:00
GoldenTails
1f1589384a
Replace PF_USEDOWN with PF_SPINDOWN
2020-07-11 21:59:54 -05: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
f03addc5a7
Merge remote-tracking branch 'origin/next' into knuxtweaks
2020-07-04 18:53:26 +08: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
kaysrishaq
682791a024
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 17:09:29 -04:00
lachwright
edfd64877c
Add SF_NOSUPERSPRITES
2020-06-17 04:53:42 +08:00
LJ Sonic
e2b860dc28
Merge branch 'next' into 'fix-spawn-desynch'
...
# Conflicts:
# src/p_map.c
2020-06-01 08:15:02 -04:00
Louis-Antoine
67eef5a37f
Fix potential desynch when a player spawns
2020-05-28 11:03:35 +02:00
SwitchKaze
b37c73b008
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
ZipperQR
64edd91dbd
Dust devil support
2020-04-22 00:59:12 +03: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
James R
673a842043
Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER
2020-04-09 16:47:52 -07: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
Tatsuru
3022e38d15
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into Tatsuru/SRB2-dye
...
# Conflicts:
# src/d_player.h
# src/dehacked.c
2020-02-19 17:46:18 -03:00
Tatsuru
80edefa56e
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye
2020-02-19 17:32:43 -03:00
James R
26825a2b4c
Merge branch 'pw-justlaunched' into 'next'
...
Add pw_justlaunched to tell modders when a player launches from a slope
See merge request STJr/SRB2!792
2020-02-18 21:53:05 -05:00
James R
3fc9c7d298
Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER
2020-02-18 18:23:20 -08:00
fickleheart
0fbff66e25
Let scripters see if player just launched from slope
2020-02-16 21:34:07 -06:00
James R
64b7a5e4d6
SF_NONIGHTSSUPER for disabling super colors in NiGHTS
2020-02-12 18:03:39 -08:00
fickleheart
bea7ad2185
Merge remote-tracking branch 'upstream/next' into viewroll
2020-01-26 18:01:58 -06:00
Louis-Antoine
d374bf4f9b
Let clients rejoin the server without losing their status
...
This is accomplished by simply preserving
the player's body after disconnecting.
Bodies will despawn after the number of minutes
specified by the "rejointimeout" console variable (float).
A value of 0 disables the feature completely.
Clients rejoining are identified by their IP address,
and may rejoin even if the server is full or joins are disabled,
for as long as their body remains.
From a technical standpoint, when the user disconnects,
the player they were controlling does not leave,
the underlying player_t just keeps working normally,
except it does not receive any input anymore.
When the user reconnects, they are simply "relinked"
to their player_t.
Those "soulless" players can be identified through
their "quittime" field, which is the number of tics
elapsed since the user disconnected, or zero
if still connected. "quittime" is exposed to Lua.
2020-01-22 03:05:08 +01:00
fickleheart
c25e969676
wip viewroll stuff
2020-01-14 23:29:56 -06:00
Tatsuru
5d33ca42cf
Expose colorization to mappers and SOC
2020-01-11 20:40:57 -03:00
Steel Titanium
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00