fickleheart
f60e92aa70
Move public demo vars to a single struct
2019-03-24 21:32:15 -05:00
fickleheart
f162dc0270
Use demo title as filename for multiplayer replays
2019-03-24 20:36:22 -05:00
fickleheart
5c4c0a5ff6
Merge remote-tracking branch 'remotes/upstream/next' into HEAD
2019-03-11 21:53:53 -05:00
fickleheart
ba6975607a
Move modified check on -file addons later in startup
2019-03-10 19:44:31 -05:00
wolfy852
f526955783
Fix the game getting flagged as modified by default
...
As a result, majormods trips for Lua and map replacements now, but modifiedgame isn't set for minor addons...
2019-03-10 19:27:45 -05:00
wolfy852
a24fe5e22d
Attempt to fix replaced maps not marking the game as modified
...
What this ACTUALLY does is mark the game as modified by default.
2019-03-10 18:55:55 -05:00
fickleheart
acf1827d9e
Handle capslock in just one place...?
2019-03-09 16:55:18 -06:00
fickleheart
1da3d7cc48
Fix join password not recognizing shifted characters
2019-03-06 22:07:28 -06:00
wolfy852
736bc77330
Incomplete: Split files added with -file into their own array
...
Compiles with no errors but the game errors on launch. With no files added, it gives "W_InitMultipleFiles: no files found". With files loaded via -file it gives "W_GetNumForName: PLAYPAL not found!"
2019-02-16 08:16:56 -06:00
james
66af5ce558
Do not start sound system when disabled
2019-02-06 17:24:13 -08:00
toaster
0eca0e6613
Turns out modifiedgame was getting set during startup because of making it use G_SetGameModified. Uh, woops?
2019-01-18 13:01:40 +00:00
toaster
4a87838f06
* Refactor all instances of majormods = true; to route through G_SetGameModified, and catch a few spots I missed in the process.
...
* Make G_SetGameModified only console-print for major mods.
* Add amnesty to "major mod" detection while loading files with custom savedatas.
* Improved the console prints for command `isgamemodified`.
2019-01-17 22:01:28 +00:00
toaster
0037f5c91d
First steps at implementing a mechanism that allows you to load non-cheaty good-faith mods such as custom characters with no Lua scripting, and play record attack with them. Features a few bad hacks and a few more areas of improvement; I'll try to iron them out before they hit next or master.
2019-01-15 19:01:55 +00:00
TehRealSalt
5be9f9e2d4
Add MUSICDEF lump for defining custom songs & replacing existing songs
...
Very rudimentary at the moment, but it's workable
2019-01-09 21:00:45 -05:00
SeventhSentinel
716ce5c343
Merge remote-tracking branch 'next' into merge-srb2
2019-01-06 02:02:33 -05:00
SeventhSentinel
1d58c6b8c2
merge srb2 next
2019-01-05 15:59:23 -05:00
SeventhSentinel
a595d0ba00
Load sounds.kart after patch.kart
2019-01-05 00:33:24 -05:00
Steel Titanium
a57626f828
Clean up the comments a bit
2019-01-04 19:55:05 -05:00
Steel Titanium
d2da1db6c8
Don't increment mainwads for sounds or music.kart
2019-01-04 00:32:01 -05:00
Sal
1b02805445
Merge branch 'map-palette-titlefix' into 'next'
...
Fix per-map palette not being reset properly when it should.
See merge request KartKrew/Kart-Public!9
2019-01-03 01:08:42 -05:00
Steel Titanium
4e0f4ed709
Remove double brackets
2019-01-02 13:04:56 -05:00
Steel Titanium
b63f4a66e8
Comment this out again.
...
How did this even get reverted...
2018-12-31 18:34:04 -05:00
Steel Titanium
26a257eda7
Better attempt at fixing this
2018-12-31 18:19:18 -05:00
Steel Titanium
de6c2a84f3
Attempt 1 to properly fix
2018-12-31 14:18:00 -05:00
Steel Titanium
fddd6fb0d5
Revert "Fix per-map palette not being reset properly on title"
...
This reverts commit b63e6ab325
2018-12-31 13:35:38 -05:00
Steel Titanium
b63e6ab325
Fix per-map palette not being reset properly on title
2018-12-30 23:38:38 -05:00
mazmazz
8877d888cb
Do not increment mainwads for music.dta
2018-12-23 23:54:26 -05:00
Digiku
15c9404f91
Merge branch 'addons-backport' into '2122-version'
...
Addons Menu backport to vanilla
See merge request STJr/SRB2!384
2018-12-23 18:08:06 -05:00
Latapostrophe
1b8be7f1a4
Merge branch 'master' into SRB2-CHAT
2018-12-23 10:26:08 +01:00
mazmazz
a5887d06e1
Fix mainwads check in d_main
2018-12-23 00:29:59 -05:00
Latapostrophe
4c88271cfb
2.1.21 and all of the kart additions. Woo.
2018-12-17 20:43:59 +01:00
mazmazz
6bdff246a8
Compile fixes; enable PK3 support in addons menu
...
* Add missing vars highlightflags, recommendedflags, warningflags from Kart
* V_GetStringColormap() use vanilla behavior because Kart behavior glitches for us
* V_GetStringColormap() made non-static
2018-12-15 21:44:39 -05:00
mazmazz
ede6b183b1
Merge branch 'addons_menu' into 'master'
...
Addons menu
See merge request KartKrew/Kart!8
2018-12-15 20:46:42 -05:00
MPC
91abc8ae9c
Remove MINIAUTOMAP code
2018-12-12 18:53:13 -03:00
MPC
3e70ce2565
Fix the automap
2018-12-12 18:01:52 -03:00
TehRealSalt
6d6b6a1e6b
Update GPL notice
2018-11-30 00:15:14 -05:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
TehRealSalt
4e532b7ae5
I like working on Kart...
2018-11-27 19:00:48 -05:00
Steel Titanium
77d12473ae
Take the command line params into account
...
Really I'm just making it return early if either of the parms are used.
2018-11-25 22:39:11 -05:00
mazmazz
91f2c4f8a7
Whitespace
2018-11-25 08:17:57 -05:00
mazmazz
22d0d8cb2e
Print GPL license notice and SEGA disclaimer in console on start
2018-11-25 08:12:19 -05:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Steel Titanium
97ea1966fd
Make the error less confusing
2018-11-22 22:59:46 -05:00
TehRealSalt
48f3c27625
Remove music.dta from loading
...
We've replaced/changed out all vanilla songs, so we no longer need it.
2018-11-15 19:17:06 -05:00
Sryder
9350721d12
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
...
# Conflicts:
# src/d_main.c
# src/d_main.h
# src/d_netcmd.c
# src/doomtype.h
# src/hardware/hw_md2.h
# src/p_user.c
# src/r_splats.h
# src/s_sound.c
# src/s_sound.h
# src/screen.c
# src/sdl/i_system.c
2018-11-10 21:14:53 +00:00
Monster Iestyn
51ee510b85
Merge branch 'gcc-compiling-cleanup' into 'master'
...
Compiling cleanup and fixes
See merge request STJr/SRB2!311
2018-11-10 13:56:17 -05:00
TehRealSalt
05ebf7f30c
Fix connecting w/ -splitscreen set
2018-11-08 15:24:10 -05:00
Monster Iestyn
91a44addd9
d_main.c: remove the _MAX_PATH define, the file hasn't used it since v2.0
2018-11-08 20:09:00 +00:00
Monster Iestyn
7c0fb1702f
D_PostEvent_end is only used by Allegro (used by the DOS port) to help timers work, so check for PC_DOS in preprocessor code. Also remove FUNCMATH from said function.
2018-11-07 21:21:36 +00:00
TehRealSalt
c7b0df8172
Merge remote-tracking branch 'srb2public/next'
...
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
2018-11-07 16:15:14 -05:00
