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
lachwright
9a41bca7d7
Reset pmomz after transfer to momz
2020-01-16 22:56:01 +08:00
James R
522ef41b98
Merge branch 'extra-life-jingle' into 'master'
...
Optionally use a sound for 1-Up
See merge request STJr/SRB2!668
2020-01-15 23:38:21 -05:00
James R
ce4e6aa36b
It's FALLTHRU not fallthru
...
It took a week and me staying up until 2AM to look at the damn manpage and
figure out THIS is why I was getting an error about 'if (tutorialmode)' falling
through. But I still don't know why it didn't trigger on the MT_TNTBARREL case.
Oh well.
2020-01-15 02:14:20 -08:00
fickleheart
6a80bf2629
wip viewroll stuff
2020-01-14 23:29:56 -06:00
Tatsuru
0ef62248ab
Logistical problems
2020-01-13 19:12:02 -03:00
James R
5e9a1003b6
Merge branch 'targetproblem' into 'next'
...
Homing Targetting Issues
See merge request STJr/SRB2!671
2020-01-12 15:43:08 -05:00
Tatsuru
b7a67bd8ca
toaster guidance
2020-01-11 21:35:19 -03:00
Tatsuru
445269ce14
Expose colorization to mappers and SOC
2020-01-11 20:40:57 -03:00
Monster Iestyn
54f1cd601e
Merge branch 'master' into next
2020-01-11 18:38:09 +00:00
toaster
0a720e70c5
Make P_HomingAttack and P_LookForEnemies consistent, preventing targeting TNT barrels just launching you in place.
2020-01-11 14:41:37 +00:00
Sally Cochenour
889bb09e6c
Merge branch 'namirays' into oglshaderport
2020-01-11 09:32:59 -05:00
James R
47af4f51ee
Merge branch 'orbital-flickering' into 'master'
...
Don't give player translucency when looking down with the orbital camera
See merge request STJr/SRB2!659
2020-01-10 16:02:44 -05:00
James R
5d281ebfd3
Merge branch 'playerthink-hook' into 'next'
...
PlayerThink Hook
See merge request STJr/SRB2!557
2020-01-10 15:58:30 -05:00
James R
f2445b27b5
1upsound always plays a sound instead of jingle
2020-01-10 12:55:03 -08:00
