0aa965c59f
How did I forget about this
2019-01-26 23:22:30 -05:00
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
0d1c501664
Update the SP menu stuff to use MAXSKINS
...
Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
2019-01-26 00:22:05 -05: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
dda94e4498
Remove irrelevant attempts at majormod setting for SOC events which explicitly can only happen if a gamedata is created.
2019-01-17 22:12:59 +00: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
2f2d3768d5
* Increased leniency for SOC wrt "major mods".
...
* If your file defines state and object freeslots in SOC, you are allowed to modify those freeslots IN ANY SOC SCRIPT IN THE SAME FILE without being marked as a "major mod".
* If your file contains broken unlockables/emblems that don't actually have effect for any reason, it's not counted as a "major mod".
* Added add-ons menu message for adding a "major mod".
2019-01-17 20:51:41 +00:00
105958d29f
Update the (unused) SP menu stuff to use MAXSKINS
2019-01-15 20:09:55 -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
e443285801
Merge branch 'dehacked-versioning' into 'next'
...
Update SOC version, make base SRB2 SOC throw a warning
See merge request KartKrew/Kart-Public!11
2019-01-11 20:25:00 -05:00
0a34d4bafa
Merge branch 'kart-public-travis-deployer' into 'next'
...
Implement OSX and Debian installer building for Travis
See merge request KartKrew/Kart-Public!8
2019-01-09 01:42:44 -05:00
2f30625c82
Merge branch 'drift-spark-adjustment' into 'next'
...
Minimum speed to get drift sparks
See merge request KartKrew/Kart-Public!20
2019-01-09 01:18:30 -05:00
7806c43ecf
Kart Public Next merge
2019-01-08 18:43:49 -05:00
78ac038864
Merge branch 'mobjscale-global' into 'next'
...
Add a global for mobjscale
See merge request KartKrew/Kart-Public!10
2019-01-08 17:00:34 -05:00
eebdda0833
Minimum speed to get drift sparks
2019-01-06 17:17:52 -05:00
73542c008c
merge srb2 next
2019-01-05 15:59:23 -05:00
2db9fa1b96
Update SOC version, make base SRB2 SOC throw a warning
2019-01-03 16:30:50 -05:00
e7ffd86c6e
Fixx GCC 4.4 array-bounds compile errors
2019-01-02 20:58:52 -05:00
827461cc36
Support for per-map intermission music
2019-01-02 05:15:23 -05:00
b7bb570f97
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
077469cbab
Fix savegamename being improperly built due to missing null char after copying timeattackfolder
2018-12-30 19:39:36 -05:00
c2dc5788bf
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-24 17:30:59 -05:00
31c6b6ef77
remove these unnecessary typedefs for assignments to variables that are actually already boolean to begin with, since the rhs resolves to a boolean anyway
2018-12-24 19:37:52 +00:00
936b9ecebc
Fix disablespeedajdust in SOCs being set like an integer value instead of a boolean
2018-12-24 19:29:54 +00: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
bea76aa4bf
Merge branch 'save-override' into 'next'
...
Feature: Save override for level header
See merge request STJr/SRB2!392
2018-12-19 13:04:41 -05:00
9e596d15af
Save override for level header
...
Kind of like 2.2's, but with backwards-compatability with 2.1
2018-12-16 20:09:59 -05:00
cc22ef3f05
Add deprecation warning to admin
2018-12-16 16:05:18 -05:00
25e6d5388c
merge conflict
2018-12-16 16:48:15 +01:00
b84470ec51
Fix savegamename being improperly built due to missing null char after copying timeattackfolder
2018-12-13 12:01:07 -05:00
2422501ab9
Add a mapobjectscale global
...
Should be no different than it was before, now it's just less tedious to type :V
2018-12-12 21:55:59 -05:00
33c1ac33f5
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
ac64290cc7
Forgotten include
2018-11-30 17:07:30 -05:00
5d8a63da64
Add TC_ to dehacked
2018-11-30 03:43:16 -05:00
5534017954
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
c70cf5908d
IsPlayerAdmin support, since admin was removed
...
# Conflicts:
# src/lua_baselib.c
2018-11-29 07:12:15 -06:00
b8ce51bff2
Multiple admins
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
2018-11-29 06:46:59 -06:00
b5bf8e09c3
Karma fireworks
...
Additionally:
- FZ boom no longer has that weird smoke bit before it spawns the smoke column
- Item blinking color is brighter
2018-11-26 02:17:14 -05:00
1b2aea81dc
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
d467399480
Keep track of the place SPB is following
...
This makes it so that if the SPB'd person is passed, then the person who's getting SPB'd won't get the increased item odds for the weird feedback loop.
2018-11-24 20:41:17 -05:00
e265d910d3
Item roulette fun-times
...
- Colorize items, Combi-Catcher style, while the roulette is still going. Nice Chaotix reference, and tells you when the game's just lagged.
- Items blink when you first get them! They blink white when you wait out the whole roulette, red when you mash, or rainbow for enhanced items! Blinking prevents items from being stolen too, so items can't be literally stolen before you even have a chance to see what it was.
- New item roulette sound for mashing
- Fix TC_ limits in Lua
2018-11-23 19:15:14 -05:00
3f35ffd7c6
Franticized items for 2nd place VS SPB'd 1st
2018-11-22 23:38:54 -05:00
66900c70ee
Merge branch 'master' into next
2018-11-20 13:55:36 +00:00
4590d5c5cf
Fix SKINCOLOR_ prefix not registering in Lua
2018-11-19 22:38:54 -05:00
0e3b225011
Remove duplicate/removed objects
...
As well as other compile errors
2018-11-18 03:43:33 -05:00
0de2d52bfd
add TOL_TV to dehacked
2018-11-16 12:04:24 -05:00
cb8bbf8e4c
Ensure MS packets are sent correctly
2018-11-16 12:01:57 -05:00
4e9fc881a2
Fix =sizeof-pointer-memaccess: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination?
2018-11-14 16:26:46 -05:00
d14f87b8c6
Cleanup whitespace
2018-11-14 10:54:33 -05:00
13b51823ba
Some tweaking
...
- Swap order of Silver & Gold, for menu appearances & bug fixing
- Ensure that totalplaytime and matchesplayed aren't kept when M_ClearSecrets getss called in M_EraseDataResponse
- Set sensible defaults for emblem sprite/color
2018-11-12 17:09:37 -05:00
fced19d291
Merge branch 'master' into next
2018-11-10 19:05:33 +00:00
1e4d196e5e
Merge remote-tracking branch 'srb2public/next'
2018-11-08 17:37:05 -05:00
d8f3a20e65
Merge branch 'Playerquit_hook' into 'next'
...
"PlayerQuit" Lua Hook
See merge request STJr/SRB2!127
2018-11-08 15:53:35 -05:00
a9cfd6a781
Merge branch 'lua-slopes' into 'next'
...
Lua support for slopes
See merge request STJr/SRB2!307
2018-11-08 15:52:44 -05:00
0bdbdd1b1e
Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)
2018-11-08 16:26:55 +00:00
bc7e865e6b
Serious deep-cleaning to most of the kartstuff
...
More optional fields, more careful eye placed on return values and other checks
2018-11-07 21:04:57 -05:00
2b9b1e3bff
These are integers, whoops
2018-11-07 18:37:06 -05:00
95a1637437
Add Kart globals
2018-11-07 18:31:07 -05:00
868118d0cd
IsPlayerAdmin support, since admin was removed
2018-11-07 18:07:34 -05:00
499faec555
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
a3bc7ddfa0
Add Lua Ultimate Mode global variable so people can use it.
2018-11-06 18:09:45 -06:00
e958dfc909
MT_POKEY, MT_ENEMYFLIP and the fancharacters - and the associated states/thinker modifications - gone.
2018-11-05 23:06:28 +00:00
5c1cc6e1df
Merge branch 'master' into all_hardcode
2018-11-02 01:42:34 -04:00
6a31959381
Merge branch 'master' into brake-drift
2018-11-01 17:37:10 -04:00
03d64cbced
Merge branch 'master' into brake-drift
2018-11-01 17:35:45 -04:00
deb51d1eb4
Merge branch 'master' into battle-visuals
2018-11-01 17:35:01 -04:00
7e9300c420
Lap hands touch-up
2018-11-01 16:15:25 -04:00
7891a11fba
Battle points are visible
2018-11-01 00:57:38 -04:00
a193a4adf2
YOU GOT EM
...
Flashes on screen whenever you get more than 1 karma point at a time, getting you back into the game.
2018-10-31 23:34:13 -04:00
ea4ca2eb1f
Brake drfit effect
2018-10-31 21:35:17 -04:00
e9ea1b47d5
Fix the game crashing if you put params with no "=" for some reason in some of the SOC blocks, just stop going through the lines if that happens
2018-10-31 19:26:29 +00:00
8370064706
Merge branch 'wolfs_hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
...
# Conflicts:
# src/dehacked.c
# src/info.c
# src/info.h
2018-10-31 15:19:39 +00:00
932f1f929a
SOC_CHAO hardcode
...
TODO: fix comment alignment
2018-10-30 20:35:33 -05:00
f1a6e1e6cd
Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
...
# Conflicts:
# src/info.c
# src/info.h
# src/p_mobj.c
2018-10-29 21:36:39 +00:00
9f18164ad4
The motherload: all of my Lua is hardcoded
...
This took like 6 straight hours of work, never ask me for anything ever again
2018-10-29 05:00:08 -04:00
19a6bd948c
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode
...
# Conflicts:
# src/dehacked.c
# src/info.c
# src/info.h
# src/p_enemy.c
# src/p_mobj.c
2018-10-25 10:46:18 +01:00
f2f03d03a7
Merge branch 'master' into fz-time-over
2018-10-24 21:39:02 -04:00
25414edb57
Merge branch 'master' into fz-time-over
2018-10-24 21:20:51 -04:00
6e67aaa9cd
Resolved conflict
2018-10-25 01:35:55 +02:00
77fd7704e8
Midnight Channel: HUD static effect hardcode
2018-10-24 23:55:12 +02:00
3d2efc751f
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode
...
# Conflicts:
# src/info.c
# src/p_inter.c
2018-10-24 22:15:08 +01:00
017d606828
fzboom.wad hardcode
2018-10-23 17:48:09 -04:00
2b968a5087
With the permission of Sev, SOC_SEV, SOC_SG, SOC_PEAC and SOC_DHST are now done.
2018-10-23 22:16:40 +01:00
75669a4b9b
SOC_COAT and SOC_SMOK.
...
To make the MT_PETSMOKER make vaping clouds for Volcanic Valley instead, apply MTF_OBJECTSPECIAL on the spawnpoint.
Since I had to compile, I ALSO discovered SOC_PALM's palmtree was already hardcoded as well!!!! Gosh dang inconsistencies...
2018-10-23 20:44:54 +01:00
86c4542a98
Remove all of the DKRBALLOON stuff I added from SOC_PALM, as the object already existed as MT_DOOD_BALLOON.
2018-10-23 17:47:15 +01:00
5224461184
another few whitepsaces i forgot from copypasting...
2018-10-23 18:35:42 +02:00
96877c22d3
I'm an idiot and COMPLETELY forgot about dehacked, also removed whitespaces
2018-10-23 18:31:34 +02:00
2c06d55f46
SOC_XMAS (untested). Well, mostly. At least, all elements with sprites provided - there are two bushes that, weirdly enough, do not have their graphics provided in gfx.kart but ARE soc'd, and I feel like there's no point hardcoding that stuff..?
...
Also, I'm being cheeky and doing this in the middle of a lecture. :shitsfree:
2018-10-23 14:59:09 +01:00
2426d4e348
SOC_PALM (untested)
2018-10-22 23:28:38 +01:00
43bb6749fe
D2 Balloon Panic, plus minor, minor touchup to Rusty Rig lamp's light positioning. (Sorry, Drt.)
2018-10-22 22:36:04 +01:00
ffa9289cc6
Rusty Rig plus minor touchups to what I did already (I haven't made a new exe this stuff is simple enough, and I'll test it when I do the balloon panic stuff)
2018-10-22 21:56:14 +01:00
dceab0ce70
Hardcoding start! toast's stuff specifically.
...
* Marble Zone!
* Torch decoration.
* Incense burner decoration.
* CD Special Stage 1!
* The UFO, now with improved death animation!
* Turns out I duplicated sounds that already existed in sounds.kart. When we touch up the files later, yalls can remove both `DSFUFOx`'s from it.
2018-10-22 00:34:47 +01:00
e15ed742c1
add ESLOPE ifdef checks around all the Lua slope support code that was there before I was involved
2018-10-21 16:27:54 +01:00
04212cc506
Karma SPB instead of confusing Mine gfx
2018-10-20 21:02:25 -04:00
39d24f2319
Mementos hardcode
2018-10-20 21:17:13 +02:00
e02a86ceae
Finish visuals
...
Sprites, animation, & speed lines
2018-10-20 14:41:49 -04:00
Steel Titanium