Steel Titanium
25e67ee061
Add startrings level header option
2019-06-23 18:15:40 -04:00
Monster Iestyn
0368689e27
Merge branch 'public_next'
2019-06-22 22:44:42 +01:00
Monster Iestyn
1e29d627f0
Merge branch 'make-credits-great-again' into 'next'
...
Prevent just anyone from skipping credits but allow admins
See merge request STJr/SRB2!478
2019-06-22 16:13:04 -04:00
Sryder
530214aa87
Remove now unused waypoint player variables.
2019-06-15 17:04:16 +01:00
James R
8ee25a7c8a
Begin using the font system
2019-06-03 14:57:58 -07:00
TehRealSalt
31534fe96b
Merge branch 'master' into versus-record
2019-05-29 22:23:17 -04:00
TehRealSalt
189c2d06fd
Merge branch 'rings' into new-items
2019-05-29 22:17:51 -04:00
TehRealSalt
e8edfb03fb
Merge branch 'master' into rings
2019-05-29 22:15:05 -04:00
TehRealSalt
792b41c406
Merge branch 'v1' into master
2019-05-29 21:50:14 -04:00
James R
2b79547512
Fix XCode compiler errors
...
I'm faily certain this also fixes broken logic (g_game.c).
2019-05-28 19:04:27 -07:00
Latapostrophe
ccd0ec96a4
let angle be changed while spun out and boosting
2019-05-25 13:08:38 +02:00
TehRealSalt
99ed66ac46
Bubble Shield, Flame Shield changes
2019-05-21 01:01:29 -04:00
TehRealSalt
bb6fe9fc54
Merge branch 'master' into rings
2019-05-14 22:26:22 -04:00
TehRealSalt
ce39456a24
Merge branch 'v1' into new-palette
2019-05-14 21:01:32 -04:00
Latapostrophe
c54cc42e74
Add command to disable followers clientside
2019-05-13 19:53:17 +02:00
wolfy852
4f3fbb8da5
Fix viewpoint being reset on boost when spectating
2019-05-12 16:38:50 -05:00
TehRealSalt
dc41fe3d8d
Port over only the relevant changes from the reduced-palette branch, update some of the Kart-specific stuff
2019-05-12 17:19:49 -04:00
wolfy852
ed55a63b58
Fix rewind previews not showing for player 1
2019-05-12 14:42:39 -05:00
TehRealSalt
5c3cac52e6
Merge branch 'master' into rings
2019-05-12 15:28:15 -04:00
Latapostrophe
a0e27c22e7
make followers work with replays
2019-05-12 13:41:46 +02:00
Latapostrophe
c83127293b
resolve conflict in m_menu
2019-05-12 10:48:54 +02:00
wolfy852
9ac41cca73
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/d_netcmd.c
# src/r_main.c
# src/v_video.c
2019-05-12 03:40:02 -05:00
wolfy852
e4af44956b
Merge remote-tracking branch 'remotes/pub/next' into followme
...
# Conflicts:
# src/r_things.h
2019-05-11 02:05:58 -05:00
wolfy852
26adea3234
Battle, not Match
2019-05-07 01:34:49 -05:00
TehRealSalt
3d129ad4ca
Merge branch 'v1' into rings
2019-05-06 23:54:20 -04:00
wolfy852
2222738e1c
Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
...
# Conflicts:
# src/d_netcmd.c
# src/doomdef.h
# src/doomstat.h
# src/f_finale.c
# src/g_game.c
# src/hu_stuff.c
# src/m_menu.c
# src/p_spec.c
# src/p_user.c
# src/r_main.c
# src/r_things.c
# src/s_sound.c
# src/v_video.c
# src/y_inter.c
2019-05-06 22:40:12 -05:00
TehRealSalt
f48a08cd53
Merge v1
2019-05-06 21:23:29 -04:00
Sal
80226b3c39
Merge branch 'skins-fix' into 'v1'
...
Remove skin shit
See merge request KartKrew/Kart!145
2019-05-06 21:07:24 -04:00
mazmazz
d944156744
Merge remote-tracking branch 'origin/master' into menu-execs
2019-05-02 18:47:43 -04:00
TehRealSalt
8f4d93995b
Merge v1
2019-05-02 17:51:54 -04:00
TehRealSalt
b679cfe5c5
Hide this debug message
2019-05-02 12:50:05 -04:00
TehRealSalt
3fed6b6995
Disable rewind between demos, too.
2019-05-02 12:36:11 -04:00
TehRealSalt
50be0cdbee
Don't keep fast-forward enabled between demos
2019-05-02 12:31:50 -04:00
TehRealSalt
00a3ea58ee
Add message boxes for file add errors
2019-05-02 12:03:50 -04:00
Sal
26159aae2a
Merge branch 'deadzone-bullshit' into 'v1'
...
Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
See merge request KartKrew/Kart!147
2019-05-02 09:25:07 -04:00
TehRealSalt
833cf980b4
Finish this
...
Now that I was told that the spinout slowdown bug was caused by this I was 100% convinced that we need to remove all of this bullshit ASAP
2019-05-02 09:20:49 -04:00
TehRealSalt
dfe873ca1f
Merge branch 'anim-fix' into skins-fix
2019-05-02 02:51:17 -04:00
TehRealSalt
ab7e747648
Fix warnings
...
Remove entries from dehacked, remove P_DoJump, remove debug stuff
2019-05-02 02:51:13 -04:00
TehRealSalt
2d9ae1abfd
Dumbass typo
2019-05-02 02:13:44 -04:00
TehRealSalt
5a1fc6f9f4
Remove outdated comment
2019-05-02 00:49:36 -04:00
TehRealSalt
889ead7840
Fix wheel animations
2019-05-02 00:44:04 -04:00
TehRealSalt
e59a7175be
Fix skin shit
2019-05-02 00:39:49 -04:00
TehRealSalt
3a707c093b
Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
2019-05-01 23:30:53 -04:00
TehRealSalt
0c6d27a319
Flush random map pool after all but 3 are played
2019-04-26 14:14:25 -04:00
TehRealSalt
435862b29d
finished scrambles
2019-04-26 13:34:30 -04:00
TehRealSalt
5abe25d0a5
Speed/Encore scrambles based on power level
...
Did not test yet
2019-04-24 01:47:43 -04:00
TehRealSalt
6f6bc3333f
Put behind cvar
2019-04-23 01:10:16 -04:00
Nev3r
09ff071656
Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks
...
Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list.
So it's safe to assume all thinkers inside the mobj list must be mobjs.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 16:39:57 +02:00
Nev3r
345984a396
Fix mobj list iteration oversights.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 12:58:22 +02:00
Nev3r
baeda5060c
Basic multiple thinker list implementation
...
Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 22:39:22 +02:00