Commit graph

5543 commits

Author SHA1 Message Date
Monster Iestyn
ea0c251a92 Merge branch 'sdl-new-windowicon' into 'master'
SDL:Update XPM icon

See merge request STJr/SRB2!441
2019-02-27 13:34:24 -05:00
Sal
930dd97abf Merge branch 'software-fov' into 'master'
Software FOV

See merge request KartKrew/Kart-Public!88
2019-02-27 01:18:49 -05:00
James R
64508edabc d'oh 2019-02-24 17:59:13 -08:00
James R
bfcb6cc67e Try to fix compiler errors 2019-02-24 17:47:33 -08:00
fickleheart
0d32f71d05 Change OGL splitscreen hack to match software behavior 2019-02-24 12:26:46 -06:00
fickleheart
f2d7021199 Adjust FOV change for 2p 2019-02-24 11:59:21 -06:00
fickleheart
39603af6a1 Add field-of-view support in software mode 2019-02-23 10:31:37 -06:00
fickleheart
b085355bdd Move fov cvar out of OGL-specific code 2019-02-23 10:18:20 -06:00
James R
1124c06220 I am pretty dumb 2019-02-21 22:54:09 -08:00
Alam Arias
82f2ee4384 Merge remote-tracking branch 'upstream/master' 2019-02-21 22:50:58 -05:00
Alam Ed Arias
7a09161e69 Merge branch 'gcc8-statement-warning' into 'master'
GCC8: Disable multi statement macros errors.

See merge request STJr/SRB2!459
2019-02-21 22:32:38 -05:00
Steel Titanium
45e9e3f7f9 Disable multi statement macros errors. 2019-02-21 18:48:42 -05:00
James R
e984c3d868 Document the playdemo command 2019-02-20 19:25:56 -08:00
james
5c041126d6 Add race placement criteria to view command 2019-02-20 19:13:32 -08:00
james
a3c2c97a75 Add setviews command 2019-02-20 19:05:40 -08:00
James R
a991af5c6a Remove jitters in view command 2019-02-20 18:58:17 -08:00
fickleheart
030428fc9e Maybe this is a better way to work around the DrawMasked crash... 2019-02-19 19:26:32 -06:00
fickleheart
a5a98eec2f Fix count limiter not always working right for titledemo netreplays 2019-02-19 17:33:02 -06:00
Alam Ed Arias
2b4cb4b40b Merge branch 'apng-oh-shit-fixes' into 'master'
Compiling errors for apng fixed

See merge request KartKrew/Kart-Public!69
2019-02-19 12:51:52 -05:00
fickleheart
5e6b3a650c Force intermission to 10 seconds on replays 2019-02-18 21:33:15 -06:00
fickleheart
ae3348e24d Allow viewing karma bombs during replays 2019-02-18 21:23:05 -06:00
fickleheart
35148c48c0 Crash fix I think (CHERRY PICK INTO BASE) 2019-02-18 21:08:11 -06:00
fickleheart
b731e63d76 Remove debug print 2019-02-18 20:54:37 -06:00
fickleheart
b176ca27b3 For now, only use netreplays on the title if available 2019-02-18 20:52:21 -06:00
fickleheart
bca918cdbf Let titledemos play while game is unfocused 2019-02-18 20:51:28 -06:00
fickleheart
97a663745a Use generic resync message for RNG desyncs 2019-02-18 20:51:02 -06:00
james
fbc017165c Remove extra whitespace 2019-02-17 23:09:52 -08:00
james
c689100e65 Create the correct dummy function 2019-02-17 15:50:42 -08:00
fickleheart
0b92743244 Support netreplays in titledemos
TDEMO###, where ### is a number from 1 to 255.
2019-02-17 13:13:45 -06:00
fickleheart
786e8875ae Whoops, saving the wrong file list 2019-02-17 11:52:23 -06:00
fickleheart
ed16a35795 Don't force loading files for replays 2019-02-17 10:04:48 -06:00
fickleheart
c00fcfe2ea Missed a ResetView line 2019-02-17 10:03:34 -06:00
fickleheart
20b83c84ef Merge remote-tracking branch 'remotes/james/netreplays-autoaddons' into new_netreplays 2019-02-17 08:52:21 -06:00
fickleheart
63d07acc38 Fix duplicated player views from ResetViews 2019-02-16 22:24:37 -06:00
fickleheart
15f6e3de48 Remove unnecessary ResetViews call 2019-02-16 22:19:17 -06:00
fickleheart
fb8ca7c760 Fix replays crashing upon completion 2019-02-16 22:19:05 -06:00
fickleheart
53fa9299c1 Fix views getting automatically changed in netreplays 2019-02-16 22:06:47 -06:00
fickleheart
5a5264e5dd Fix multiplayer ghosts crashing the game sometimes 2019-02-16 21:55:08 -06:00
fickleheart
d68e3efc72 Reset views away from spectators 2019-02-16 21:07:11 -06:00
fickleheart
68266a7250 Fuck you 2019-02-16 20:53:15 -06:00
fickleheart
8ae26d24e3 Merge remote-tracking branch 'remotes/james/netreplays-viewcommand' into new_netreplays
# Conflicts:
#	src/g_game.c
2019-02-16 20:20:11 -06:00
fickleheart
d2b34a0e20 Add cvar for netreplay saving options 2019-02-16 18:29:51 -06:00
james
5d3a657a41 Actually support no apng patch 2019-02-16 14:39:33 -08:00
james
488285e510 Support libpng without the apng patch and fix mingw (?) compiler errors 2019-02-16 14:20:55 -08:00
fickleheart
d7d029eb9e Don't prevent exiting games while recording at all 2019-02-16 16:16:35 -06:00
fickleheart
ffd7bca18a Merge remote-tracking branch 'remotes/james/netreplays-responder-fix' into new_netreplays 2019-02-16 15:50:46 -06:00
fickleheart
712bdfd4b6 Double default replay size 2019-02-16 15:49:54 -06:00
fickleheart
7c6226ee91 Try to keep the RNG seed in sync 2019-02-16 14:24:00 -06:00
fickleheart
bceebf7e3e Remove debug-related code 2019-02-16 13:58:32 -06:00
fickleheart
82b8590fbc Backwards compat for old replays 2019-02-16 13:49:31 -06:00