TehRealSalt
c5a2a95ef1
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
TehRealSalt
bee3dfdc8d
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
TehRealSalt
3246ca6b33
More finished power level
...
broken, can't finish
2019-01-16 14:49:42 -05: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
09da50000e
Merge branch 'next' into music-credits
2019-01-09 03:08:20 -05:00
Marco Z
74c57ad447
Kart Public Next merge
2019-01-08 18:43:49 -05:00
TehRealSalt
f8a1cf849f
Merge branch 'master' into fortnite
2019-01-08 18:17:09 -05:00
SeventhSentinel
046d66d803
Fix errors from merge
2019-01-06 01:00:30 -05:00
SeventhSentinel
1d58c6b8c2
merge srb2 next
2019-01-05 15:59:23 -05:00
SeventhSentinel
74aba46823
In-game music credits
2019-01-04 04:44:55 -05:00
mazmazz
5347d5390f
Fixx GCC 4.4 array-bounds compile errors
2019-01-02 20:58:52 -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
47a329807a
Merge branch 'next' into SRB2-CHAT
2018-12-23 22:53:24 +01:00
Latapostrophe
1b8be7f1a4
Merge branch 'master' into SRB2-CHAT
2018-12-23 10:26:08 +01:00
Latapostrophe
9e49a9ca5d
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
Digiku
2b365bd7ce
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
mazmazz
861805ca0f
Add DEVELOP build flag to version string
2018-12-20 02:27:30 -05:00
Latapostrophe
d83c3ccfff
Some messages relevant to discussions now go in the chat.
2018-12-19 16:44:57 +01:00
TehRealSalt
edd3259cf4
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
Latapostrophe
34f13e9f20
merge conflict
2018-12-16 16:48:15 +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
b6d1cca4da
Merge remote-tracking branch 'public-gitlab/next' into addons-backport
2018-12-15 20:52:46 -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
TehRealSalt
b27c709879
a bunch of stuff I left uncommited
2018-12-15 19:14:30 -05:00
TehRealSalt
43af067415
Add a 5-second delay before the kill-field kicks in
...
Until it's ready, the orbs are transparent and the minimap icon blinks. Also, tons more sounds. ALSO, Super Overtime mode.
2018-12-06 18:13:40 -05:00
mazmazz
72e55b4623
Windows string adjustment
2018-12-06 15:42:58 -05:00
mazmazz
dac15d2283
Adjust version strings
2018-12-06 15:39:19 -05:00
TehRealSalt
dfa0522326
Battle Mode overtime
...
After the time limit is up, spawn a shrinking kill-field. This is one hefty initial commit!
2018-12-06 13:46:38 -05:00
mazmazz
5e6e0d539b
Use proper DD define for use_joystick
2018-12-06 06:50:18 -05:00
mazmazz
41ca8bb24a
Hex instead of octal colors
2018-12-05 13:08:25 -05:00
mazmazz
e30832216f
More concise bitness check
2018-12-05 13:06:56 -05:00
mazmazz
a0938bdd24
Make the ifdefs cleaner
2018-12-05 13:00:42 -05:00
mazmazz
d576ed31e0
_WINDOWS instead of _WIN32 for DD
2018-12-05 12:55:05 -05:00
mazmazz
b03da28390
Add various flags to version string
2018-12-05 11:43:33 -05:00
Monster Iestyn
c642015b81
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
Monster Iestyn
b32f5830ed
Merge branch 'next' into 21-version
2018-12-04 17:19:36 +00:00
Monster Iestyn
dfdba01591
Merge branch 'master' into next
2018-12-04 17:18:19 +00:00
mazmazz
872227f211
Change joystick default to auto-use joystick 1 and joystick 2 if plugged in (like Kart)
2018-12-03 23:36:36 -05:00
TehRealSalt
1f125100d5
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
TehRealSalt
a1bdfb1272
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-12-03 00:31:23 -05:00
Monster Iestyn
94ad0b880f
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
Jimita
a32fb94e09
Merge branch 'next' into lua_mapchange
2018-11-30 15:10:59 -02:00
MPC
e745cb60fc
Change MapChange so Lua returns the map number you change
2018-11-30 14:01:40 -03:00
TehRealSalt
2b3c17af62
Do 800 instead
2018-11-30 03:36:44 -05:00
Sal
1337624f89
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
wolfy852
c5d1950002
Rename "giveadmin" and "removeadmin" to "promote" and "demote"
2018-11-29 07:58:26 -06:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
wolfy852
beb58c55ac
I must be some kind of idiot.
2018-11-29 07:34:05 -06:00
Wolfy
42fc67a639
Remove hardcoded limit on admins
...
# Conflicts:
# src/d_netcmd.c
2018-11-29 07:05:49 -06:00
Wolfy
cabe9871e3
Multiple admins
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
2018-11-29 06:46:59 -06:00
