Jaime Passos
48a9ea8d0e
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
SwitchKaze
99a1840101
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-23 11:50:13 -05:00
Jaime Passos
745a6bb0f0
Fix incorrect newdisplayplayer in forced ViewpointSwitch
2020-02-23 12:14:52 -03:00
lachwright
6e471ef8b2
Start CA_GLIDEANDCLIMB swimming functionality
2020-02-23 15:38:11 +08:00
Tatsuru
9368818731
Oopsie 2
2020-02-22 22:36:44 -03:00
Tatsuru
2e71bbf96e
Oopsie
2020-02-22 21:14:05 -03:00
James Hale
51137837c4
Custom skincolors
2020-02-21 21:56:39 -05:00
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
lachwright
db766f02a5
Merge branch 'next' into knuxtweaks
2020-02-21 16:28:17 +08:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Tatsuru
7f190f35f2
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
1463d8ba20
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye
2020-02-19 17:32:43 -03:00
James R
ba9f866acf
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
James R
c078af0022
Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER
2020-02-18 18:23:20 -08:00
Tatsuru
4f150cb811
Enough
2020-02-18 22:55:40 -03:00
Tatsuru
522a51b3a1
Standards 2
2020-02-18 22:50:22 -03:00
Jaime Passos
043057532c
Merge remote-tracking branch 'origin/master' into sal-oglshaderport
2020-02-17 12:28:16 -03:00
fickleheart
51ef6b3684
Merge remote-tracking branch 'upstream/master' into viewroll
2020-02-16 21:32:57 -06:00
James R
207c6e4483
SF_NONIGHTSSUPER for disabling super colors in NiGHTS
2020-02-12 18:03:39 -08:00
fickleheart
6a076091f7
Improvements to polyobjects carrying things:
...
- Fixed loss of precision in rotate carry causing objects to slide off
- Adjusted player carrying logic to make platforms less slippery
- Finally obsoleted the player-specific rotate hack now that I found the
actual problem :]
2020-02-10 00:07:25 -06:00
lachwright
c4122428d9
Move climbing checks to a separate function
2020-02-02 23:07:45 +08:00
James R
8c713b3467
Merge branch 'platform-fixes' into 'next'
...
Reset pmomz after applying it to momz
See merge request STJr/SRB2!747
2020-02-01 21:41:49 -05:00
Jaime Passos
e56273f909
Merge remote-tracking branch 'origin/next' into sal-oglshaderport
2020-02-01 23:02:15 -03:00
lachwright
f947c5e8f6
Merge branch 'next' into knuxtweaks
2020-02-01 18:00:55 +08:00
lachwright
529bcdc366
Distance orbital camera appropriately when gr_shearing is enabled
2020-02-01 17:01:27 +08:00
lachwright
17b6155df9
Have spin set fly1 to 2 instead of 0, akin to the previous cutoff behavior
2020-02-01 14:49:48 +08:00
lachwright
693d4b1120
Make flight controls less bullshit
2020-02-01 14:29:49 +08:00
lachwright
51fa7c17a5
Merge branch 'next' into platform-fixes
2020-02-01 13:34:04 +08:00
James R
ff2ec925ee
Merge remote-tracking branch 'origin/master' into next
2020-01-30 23:54:56 -08:00
fickleheart
62c75c0c81
Merge remote-tracking branch 'upstream/next' into viewroll
2020-01-26 18:01:58 -06:00
fickleheart
124077f1d9
Fix the minecart angle thing
2020-01-25 19:03:15 -06:00
lachwright
7346932122
Don't cancel Knuckles' landing animation on rising surfaces
2020-01-26 04:51:00 +08:00
lachwright
56c5132c79
Merge branch 'next' into platform-fixes
2020-01-26 04:34:57 +08:00
lachwright
433a2f4cf3
Don't spawn glide dust for SF_NOSKID characters
2020-01-26 04:33:41 +08:00
lachwright
8b7f90d645
Fix P_SpawnSkidDust description
2020-01-26 03:44:10 +08:00
LJ Sonic
0beae26e9d
Merge branch 'keep-body' into 'next'
...
Let clients rejoin the server without losing their status
See merge request STJr/SRB2!722
2020-01-24 18:50:03 -05:00
Tatsuru
96a33f315c
I don't know how these even come up
2020-01-24 01:03:38 -03:00
Jaime Passos
5bda98764a
towards
2020-01-23 19:17:05 -03:00
Louis-Antoine
f98be013ea
Do not protect non-IT players in tag gametypes
2020-01-23 18:52:16 +01:00
lachwright
8108fc7cf5
Reduce severity of glide landing & move skid dust to separate function
2020-01-23 01:02:44 +08:00
Louis-Antoine
f07b432df4
Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil
...
The old name made it really easy to accidentally read
R_IsPointInSubsector as R_PointInSubsector, and anyway it
didn't even make sense...
2020-01-22 16:58:57 +01:00
Louis-Antoine
a997683d1c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into keep-body
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
2020-01-22 03:57:22 +01:00
Louis-Antoine
08589dcd96
Give flashing tics to disconnected players and prevent drowning
2020-01-22 03:14:44 +01:00
Louis-Antoine
bb74b090cb
Ignore players towards exit count 30 seconds after their disconnection
2020-01-22 03:11:05 +01:00
Tatsuru
065b8adf42
In-map visual indicator
2020-01-19 19:02:03 -03:00
Sally Cochenour
3b18f17f16
Merge branch 'gl-dropshadows' into oglshaderport
2020-01-17 22:29:31 -05:00
fickleheart
186ef1852b
Merge remote-tracking branch 'upstream/next' into viewroll
2020-01-17 18:27:15 -06:00
Alam Ed Arias
2ce99b7914
Merge remote-tracking branch 'origin/next' into next
2020-01-16 20:17:58 -05:00
Sally Cochenour
f0617ce4b8
Merge branch 'gl-dropshadows' into oglshaderport
2020-01-16 14:55:55 -05:00
Alam Ed Arias
282abfd4ac
Merge branch 'master' into next
2020-01-16 12:08:36 -05:00