1a21c5efbe
Code cleanup as requested by Sal and Sryder.
...
* majormods and savemoddata cannot coexist as true values, so going through and making situations that involve both only reference one.
* Clean up comments in `dehacked.c`.
2019-01-26 16:58:45 +00:00
d045af07b1
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into majormods
2019-01-21 21:56:49 +00:00
e9d95f07c1
Fix everything Sal wanted changed.
2019-01-21 21:51:54 +00:00
4c8737da08
Final v1.0.2 commit (probably)
...
- Update chars.kart hash, AGAIN!
- Fix spectators being visible on minimap when F12ing people
- Optimize how splitscreen players are drawn on top of the minimap
- Remove duplicated cvar registrations
- Move cv_resynchattempts and cv_netticbuffer from D_ClientServerInit to D_RegisterServerCommands and D_RegisterClientCommands respectively, so they can save to config properly
- Increase "Frequent" gametype switch frequency even more
- "SRB2" version dehacked warning ignores srb2.srb
2019-01-18 04:30:38 -05:00
66273898b7
* 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
ad7b3dece0
Bump up the frequency of voting rule changes
...
This is in our changelog, but I didn't actually get around to doing it. Would've been foolish to ship with that :V
2019-01-16 16:19:16 -05:00
885d2e2965
Fix XD_REMOVEPLAYER not having a proper corresponding netxcmdname
...
Caught while working on power levels -- turns out it wasn't a total waste of time when I should've been working on the rest of v1.0.2!
2019-01-16 16:16:11 -05:00
081872aa85
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
72bc1b48f6
Merge branch 'next' into music-credits
2019-01-09 03:08:20 -05:00
7806c43ecf
Kart Public Next merge
2019-01-08 18:43:49 -05:00
49f2d65e95
Fix errors from merge
2019-01-06 01:00:30 -05:00
73542c008c
merge srb2 next
2019-01-05 15:59:23 -05:00
5d51754936
In-game music credits
2019-01-04 04:44:55 -05:00
e7ffd86c6e
Fixx GCC 4.4 array-bounds compile errors
2019-01-02 20:58:52 -05:00
8d56c2f486
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
b7d7472a88
Merge branch 'next' into SRB2-CHAT
2018-12-23 22:53:24 +01:00
1b61e15b1b
Merge branch 'master' into SRB2-CHAT
2018-12-23 10:26:08 +01:00
c7060aa5ad
Remove mute boolean from playermsg hook, fix username stuff still being there, potential memory leaks, and added back the ip message.
2018-12-22 16:44:58 +01:00
28c8ad3dbb
Merge branch 'jump-spin-axes' into 'next'
...
Feature: Jump/Spin axes
See merge request STJr/SRB2!389
2018-12-20 16:57:05 -05:00
7f8d16d3cd
Add DEVELOP build flag to version string
2018-12-20 02:27:30 -05:00
a31b85e124
Some messages relevant to discussions now go in the chat.
2018-12-19 16:44:57 +01:00
c69cfefb6d
2.2 backport of jump/spin axes
...
Needs the config default-changing shenanigans done still, not sure how to tackle that yet. Now the game is TOTALLY playable from a fresh install if you just plug in a controller.
2018-12-16 17:45:49 -05:00
25e6d5388c
merge conflict
2018-12-16 16:48:15 +01:00
f0967520ed
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
37950341ec
Merge remote-tracking branch 'public-gitlab/next' into addons-backport
2018-12-15 20:52:46 -05:00
b32f50648d
Merge branch 'addons_menu' into 'master'
...
Addons menu
See merge request KartKrew/Kart!8
2018-12-15 20:46:42 -05:00
df89781623
Windows string adjustment
2018-12-06 15:42:58 -05:00
ba60989c00
Adjust version strings
2018-12-06 15:39:19 -05:00
f0c7848e50
Use proper DD define for use_joystick
2018-12-06 06:50:18 -05:00
9055c9aeab
Hex instead of octal colors
2018-12-05 13:08:25 -05:00
c5b349ddc4
More concise bitness check
2018-12-05 13:06:56 -05:00
1ea2fa447a
Make the ifdefs cleaner
2018-12-05 13:00:42 -05:00
389c2d4ea1
_WINDOWS instead of _WIN32 for DD
2018-12-05 12:55:05 -05:00
a6dcd5555e
Add various flags to version string
2018-12-05 11:43:33 -05:00
ae14fd2f85
Fix motd being broken for admins
...
It turns out the game was sending the full size of the motd buffer (254) rather than just the size of the string made, therefore sending a load of garbage and making the game apparently execute unknown or illegal net commands
2018-12-04 21:09:28 +00:00
e353e2ef70
Merge branch 'next' into 21-version
2018-12-04 17:19:36 +00:00
f2b0db5a1c
Merge branch 'master' into next
2018-12-04 17:18:19 +00:00
c799584f3d
Change joystick default to auto-use joystick 1 and joystick 2 if plugged in (like Kart)
2018-12-03 23:36:36 -05:00
919667ed39
Just do MapChange hook on G_InitNew
...
Everything that's supposed to call it also calls this...
2018-12-03 00:33:35 -05:00
aa16edec1d
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-12-03 00:31:23 -05:00
33c1ac33f5
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
6d7689c1a7
Merge branch 'next' into lua_mapchange
2018-11-30 15:10:59 -02:00
54cae84849
Change MapChange so Lua returns the map number you change
2018-11-30 14:01:40 -03:00
d3ecdeb364
Do 800 instead
2018-11-30 03:36:44 -05:00
ce14755156
Merge branch 'rename-cmds' into 'master'
...
Rename "giveadmin" and "removeadmin" to "promote" and "demote"
See merge request KartKrew/Kart!117
2018-11-29 11:18:57 -05:00
f2072b973b
Rename "giveadmin" and "removeadmin" to "promote" and "demote"
2018-11-29 07:58:26 -06:00
5534017954
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
c517862f7e
I must be some kind of idiot.
2018-11-29 07:34:05 -06:00
b59718d3ad
Remove hardcoded limit on admins
...
# Conflicts:
# src/d_netcmd.c
2018-11-29 07:05:49 -06:00
b8ce51bff2
Multiple admins
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
2018-11-29 06:46:59 -06:00
toaster