stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-28 05:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity
4258 commits 60 branches 11 tags 94 MiB
Commit graph

286 commits

Author SHA1 Message Date
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
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
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
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
toaster
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
Latapostrophe
5224461184 another few whitepsaces i forgot from copypasting... 2018-10-23 18:35:42 +02:00
Latapostrophe
96877c22d3 I'm an idiot and COMPLETELY forgot about dehacked, also removed whitespaces 2018-10-23 18:31:34 +02:00
toaster
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
toaster
2426d4e348 SOC_PALM (untested) 2018-10-22 23:28:38 +01:00
toaster
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
toaster
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
toaster
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
Monster Iestyn
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
TehRealSalt
04212cc506 Karma SPB instead of confusing Mine gfx 2018-10-20 21:02:25 -04:00
Latapostrophe
39d24f2319 Mementos hardcode 2018-10-20 21:17:13 +02:00
TehRealSalt
e02a86ceae Finish visuals 
Sprites, animation, & speed lines
 2018-10-20 14:41:49 -04:00
Monster Iestyn
7d4e27937d Merge branch 'next' into lua-slopes 
# Conflicts:
#	src/lua_maplib.c
 2018-10-20 18:31:06 +01:00
Latapostrophe
4db656db1a Midnight Channel hardcode 2018-10-20 16:10:40 +02:00