James R
e9869a55e3
Let dedicated servers end vote time too!
2019-04-04 16:13:31 -07:00
Monster Iestyn
3b3a37daad
level header's "forcecharacter" parameter doesn't take skin numbers anymore, so this isn't needed!
2019-04-03 19:51:36 +01:00
Monster Iestyn
453f673219
Spinning/swinging maces/chains can now use P_FindSpecialLineFromTag!
...
# Conflicts:
# src/p_mobj.c
2019-04-03 19:51:08 +01:00
Monster Iestyn
11b5b624bb
Whoops forgot this
2019-04-03 19:46:21 +01:00
Monster Iestyn
07e8ef6627
Split off part of P_SpawnSpecials into a new function called P_InitSpecials
...
This allows tag lists, gravity, weather, and the "CheckFor" vars to be initialised before running P_LoadThings or P_ResetDynamicSlopes, in case they could affect mobj spawning or cause a netgame desync somehow by carrying over the previous level's values
# Conflicts:
# src/p_spec.c
2019-04-03 19:46:10 +01:00
TehRealSalt
23948c14ec
Use more ring frames on the spawned in ones
2019-04-02 17:20:58 -04:00
Monster Iestyn
4f58d00eec
Merge branch 'master' into next
2019-04-02 15:47:07 +01:00
fickleheart
d633ba9421
something something character placeholders im tired
2019-04-01 23:34:53 -05:00
fickleheart
9a083665bd
Draw placeholder when no standings are available
2019-04-01 20:30:24 -05:00
fickleheart
4d3542d421
Fix encore stage rendering on replay hut
2019-04-01 20:17:36 -05:00
fickleheart
c5e166f259
Fix old replays not loading
2019-04-01 17:14:45 -05:00
fickleheart
b8ef18e983
Read and write standings to replays
2019-04-01 15:07:27 -05:00
fickleheart
f753e8edee
[FORMAT CHANGE] Add space for extrainfo pointer
2019-04-01 13:10:35 -05:00
fickleheart
aa1546a533
Show non-default lap count on replay screen too
2019-04-01 12:56:23 -05:00
fickleheart
733d8c1f7b
Fix normal speed replays showing as easy speed
2019-04-01 12:28:01 -05:00
fickleheart
e8260f9f36
Draw icons for directories
2019-04-01 12:25:12 -05:00
fickleheart
746f13a999
Don't draw options menu entry above replay infobox
2019-03-31 19:29:05 -05:00
fickleheart
3dd4e4aac7
Return to replay hut after watching a replay
2019-03-31 19:26:53 -05:00
fickleheart
e93927b911
Add subscreen to confirm replay watching
...
This will have other goodies on it later!
2019-03-31 17:29:41 -05:00
fickleheart
0ae4c905ad
Don't pause while the menu's up during replays
2019-03-31 16:28:29 -05:00
fickleheart
03af859535
Support directory navigation properly
2019-03-31 16:28:18 -05:00
Nev3r
00e90db72a
Merge branch 'less-obtuse-console-fixes' into 'master'
...
Console quality of life changes
See merge request STJr/SRB2!479
2019-03-31 16:15:05 -04:00
James R
aa82d67fca
Merge remote-tracking branch 'origin/master' into less-obtuse-console-fixes
2019-03-31 12:29:55 -07:00
fickleheart
17b30c0e3e
Add replay options screen
2019-03-31 13:50:29 -05:00
fickleheart
06e82cdf6d
Enable exiting and playing demos from replay hut properly
2019-03-31 13:50:20 -05:00
fickleheart
c21072ec29
Show music credit for credits
2019-03-31 13:09:49 -05:00
Nev3r
938e4477f6
Merge branch 'do-not-disturb-console' into 'master'
...
Keep console open in certain instances
See merge request STJr/SRB2!480
2019-03-31 05:54:11 -04:00
fickleheart
f00f9c9a0a
Display infobox for the currently-selected replay
2019-03-31 02:54:09 -05:00
fickleheart
29a80e01eb
List demos by title in the replay hut
2019-03-31 01:22:41 -05:00
fickleheart
a54a7de02d
Start on the replay hut menu!
2019-03-30 20:57:53 -05:00
fickleheart
93e07ae745
Move menu options around
...
1 Player now goes directly to Time Attack, and Extras
is now a submenu with Unlockables, Statistics, and a
currently-dummied option for Replay Hut.
2019-03-30 17:25:54 -05:00
James R
714b4068ca
Grab mouse on window focus
...
Window focus does not necessarily imply mouse movement.
2019-03-29 22:00:47 -07:00
Steel Titanium
e47854880a
Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into forceskin-by-name
2019-03-27 19:18:51 -04:00
Alam Arias
dc11f9b371
Merge remote-tracking branch 'upstream/master'
2019-03-27 19:13:41 -04:00
Alam Ed Arias
247c9429d2
Merge branch 'master' into next
2019-03-27 19:03:36 -04:00
Alam Ed Arias
8d51de4993
CircleCI: use libpng-dev
2019-03-27 18:51:20 -04:00
Alam Ed Arias
af1682d758
CircleCI: Debian Jessie is dead, long live Debian Stretch
2019-03-27 18:23:03 -04:00
Lachlan Wright
40f351debb
Add missing entry for SKINCOLOR_BUBBLEGUM in ColorOpposite()
2019-03-27 03:23:32 -04:00
Alam Arias
783f910d65
TravisCI: remove xcode7.3 on DPL mac build
2019-03-26 21:20:17 -04:00
James R
7ebf19fd00
Don't close console when starting title screen
2019-03-26 13:05:19 -07:00
James R
841daf940f
Don't close console when changing map
2019-03-26 13:04:11 -07:00
James R
d7ad7a4f40
Remove redundant CON_ClearHUD calls
2019-03-26 12:59:13 -07:00
James R
f995e8c241
Resize console upon resolution change
...
Basically, changing to a lower resolution won't cause your console to extend
past the screen anymore.
2019-03-26 12:30:02 -07:00
jameds
a8aea17469
Keep color across wrapped lines
...
And this works by inserting the same color code on each wrapped line.
2019-03-26 12:07:11 -07:00
jameds
f6143dafb0
Scroll console immediately upon pressing PageUp
2019-03-26 12:05:23 -07:00
Alam Arias
fea79d2185
mistype in merge of TavisCI config
2019-03-26 11:54:54 -04:00
Alam Arias
85b79ae822
Merge commit 'upstream/master~0'
2019-03-26 10:50:36 -04:00
Alam Arias
ef10d08db3
Merge commit 'upstream/master~1'
2019-03-26 09:48:13 -04:00
Monster Iestyn
7ef12f7dd7
Merge branch 'master' into next
2019-03-26 13:46:15 +00:00
Monster Iestyn
0194922509
Merge branch 'buildbot' into 'master'
...
Buildbot changes
See merge request STJr/SRB2!477
2019-03-26 09:44:56 -04:00