Commit Graph

300 Commits

Author SHA1 Message Date
TehRealSalt 5d8a63da64 Add TC_ to dehacked 2018-11-30 03:43:16 -05:00
TehRealSalt 5534017954 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
TehRealSalt 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
Monster Iestyn 1b2aea81dc Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
mazmazz ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
TehRealSalt 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
TehRealSalt 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
TehRealSalt 3f35ffd7c6 Franticized items for 2nd place VS SPB'd 1st 2018-11-22 23:38:54 -05:00
Monster Iestyn 66900c70ee Merge branch 'master' into next 2018-11-20 13:55:36 +00:00
TehRealSalt 4590d5c5cf Fix SKINCOLOR_ prefix not registering in Lua 2018-11-19 22:38:54 -05:00
TehRealSalt 0e3b225011 Remove duplicate/removed objects
As well as other compile errors
2018-11-18 03:43:33 -05:00
TehRealSalt 0de2d52bfd add TOL_TV to dehacked 2018-11-16 12:04:24 -05:00
TehRealSalt cb8bbf8e4c Ensure MS packets are sent correctly 2018-11-16 12:01:57 -05:00
Alam Ed Arias 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
Alam Ed Arias d14f87b8c6 Cleanup whitespace 2018-11-14 10:54:33 -05:00
TehRealSalt 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
Monster Iestyn fced19d291 Merge branch 'master' into next 2018-11-10 19:05:33 +00:00
TehRealSalt 1e4d196e5e Merge remote-tracking branch 'srb2public/next' 2018-11-08 17:37:05 -05:00
Monster Iestyn d8f3a20e65 Merge branch 'Playerquit_hook' into 'next'
"PlayerQuit" Lua Hook

See merge request STJr/SRB2!127
2018-11-08 15:53:35 -05:00
Monster Iestyn 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
Monster Iestyn 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
TehRealSalt 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
TehRealSalt 2b9b1e3bff These are integers, whoops 2018-11-07 18:37:06 -05:00
TehRealSalt 95a1637437 Add Kart globals 2018-11-07 18:31:07 -05:00
TehRealSalt 868118d0cd IsPlayerAdmin support, since admin was removed 2018-11-07 18:07:34 -05:00
TehRealSalt 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
GoldenTails a3bc7ddfa0 Add Lua Ultimate Mode global variable so people can use it. 2018-11-06 18:09:45 -06:00
toaster e958dfc909 MT_POKEY, MT_ENEMYFLIP and the fancharacters - and the associated states/thinker modifications - gone. 2018-11-05 23:06:28 +00:00
TehRealSalt 5c1cc6e1df Merge branch 'master' into all_hardcode 2018-11-02 01:42:34 -04:00
TehRealSalt 6a31959381 Merge branch 'master' into brake-drift 2018-11-01 17:37:10 -04:00
TehRealSalt 03d64cbced Merge branch 'master' into brake-drift 2018-11-01 17:35:45 -04:00
TehRealSalt deb51d1eb4 Merge branch 'master' into battle-visuals 2018-11-01 17:35:01 -04:00
TehRealSalt 7e9300c420 Lap hands touch-up 2018-11-01 16:15:25 -04:00
TehRealSalt 7891a11fba Battle points are visible 2018-11-01 00:57:38 -04:00
TehRealSalt 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
TehRealSalt ea4ca2eb1f Brake drfit effect 2018-10-31 21:35:17 -04:00
Monster Iestyn 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
toaster 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
wolfy852 932f1f929a SOC_CHAO hardcode
TODO: fix comment alignment
2018-10-30 20:35:33 -05:00
toaster 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
TehRealSalt 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
toaster 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
TehRealSalt f2f03d03a7 Merge branch 'master' into fz-time-over 2018-10-24 21:39:02 -04:00
TehRealSalt 25414edb57 Merge branch 'master' into fz-time-over 2018-10-24 21:20:51 -04:00
Latapostrophe 6e67aaa9cd Resolved conflict 2018-10-25 01:35:55 +02:00
Latapostrophe 77fd7704e8 Midnight Channel: HUD static effect hardcode 2018-10-24 23:55:12 +02:00
toaster 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
TehRealSalt 017d606828 fzboom.wad hardcode 2018-10-23 17:48:09 -04:00
toaster 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
toaster 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