vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,200 Commits 50 Branches 7 Tags 75 MiB
Commit Graph

53 Commits

Author SHA1 Message Date
TehRealSalt de72403fb9 Add MUSICDEF lump for defining custom songs & replacing existing songs 
Very rudimentary at the moment, but it's workable
 2019-01-09 21:00:45 -05:00
SeventhSentinel 73542c008c merge srb2 next 2019-01-05 15:59:23 -05:00
Digiku 393c64b8bc Merge branch 'expanded-nmuslist' into 'next' 
Expand NMUSList to include HUD changes

See merge request STJr/SRB2!388
 2019-01-01 15:06:04 -05:00
mazmazz 1b7a9aaa01 2.1 Score/Time/Rings lump name 2018-12-16 16:53:13 -05:00
mazmazz 899120e475 Revert NMUSlist to original 2.1 2018-12-16 16:42:57 -05:00
mazmazz d7321fd8c4 Pull expanded NMUSlist from 2.2 2018-12-16 16:40:40 -05:00
mazmazz 046d36a657 Remove Kart entries from NMUSlist 2018-12-16 16:08:31 -05:00
mazmazz 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
mazmazz 37950341ec Merge remote-tracking branch 'public-gitlab/next' into addons-backport 2018-12-15 20:52:46 -05:00
mazmazz 0a3b3736bf Handle Kart-specific changes; add PK3 to exttable 2018-12-15 20:50:33 -05:00
mazmazz b32f50648d Merge branch 'addons_menu' into 'master' 
Addons menu

See merge request KartKrew/Kart!8
 2018-12-15 20:46:42 -05:00
TehRealSalt aa16edec1d Merge remote-tracking branch 'srb2public/next' into merge-next 2018-12-03 00:31:23 -05:00
Monster Iestyn e0a1c43813 Free lump names *before* either lumpinfo or the WAD itself! 2018-11-30 14:19:47 +00:00
TehRealSalt aa9b36ac04 Fix this memory freeing 2018-11-29 22:31:20 -05:00
TehRealSalt 4cfaf746bb Reimplement png warning 2018-11-29 11:16:40 -05:00
TehRealSalt d9654bcc1a Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 10:26:38 -05:00
TehRealSalt 46571fbda2 Fixes to merge process 2018-11-29 10:07:35 -05:00
Monster Iestyn 305ad4f73e backport some cleanup that I clearly missed wasn't there already to do with ZWAD lump loading 2018-11-29 14:16:02 +00:00
TehRealSalt 5534017954 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
Monster Iestyn 3e6388c183 use UINT8 * instead of void or Bytef * 2018-11-27 15:49:41 +00:00
Monster Iestyn 1889c36dea add HAVE_ZLIB around the rest of the zlib stuff in w_wad.c/h, move zlib.h inclusion down below doomdef.h etc includes in case that does anything for compiling (?) 2018-11-27 13:57:32 +00:00
Alam Ed Arias b7f7c2ecf7 PK3: fixup support for newer version of zlib 2018-11-26 20:08:26 -05:00
Alam Ed Arias 4e332b3848 Fix MSVC build 2018-11-26 18:27:07 -05:00
MonsterIestyn b53cd70201
Merge branch 'next' into PK3-BackportNext 2018-11-26 18:56:51 +00:00
mazmazz ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Nev3r d7b3cf9314 Forgot the alignment for compact structs. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-11-25 11:35:19 +01:00
Nev3r 32a9e40baa Progress? 
Get all IO outputs used for possible errors.
Attempt to fix errors from travis-ci.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-11-25 11:11:50 +01:00
Nev3r 7c44054aa3 Take out the ifdef? 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-11-25 09:48:52 +01:00
Nev3r ec67c4cbd6 Fix uninitialized pointer. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-11-24 23:39:31 +01:00
Nev3r a1fb333e9b Revamped the lumpinfo_t array generation code. 
-The resource type is 'adequately*' detected first.
-The type-specific behaviors are now contained in their own functions, which are called accordingly for each.
-The PKZip lumpinfo_t generation has been almost entirely rewritten.
-If the functions return null pointer, the resource addition is considered invalid and pops an error.
 2018-11-24 22:58:35 +01:00
Nev3r cb0c31fa9a Final touches 
-Backported multiple per-wad/pk3 ANIMDEFS supported now, just like TEXTURES.
-Removed now-unused function.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-11-24 09:26:52 +01:00
Nev3r 0487558a98 Add missing tweaks 
Also remove a test printf.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-11-23 17:58:45 +01:00
Nev3r c548aaa347 Backported PK3 support to 2.1 
Hopefully I'm not missing anything.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-11-23 16:58:16 +01: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
Monster Iestyn 0f37411e2b Make sure handles of files opened by W_LoadWadFile are closed if we abort loading the files for whatever reason. 
ESPECIALLY if the file is already loaded in SRB2, that's just silly.
 2018-11-02 20:48:12 +00:00
toaster a1e1aa81b5 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/g_game.c
#	src/p_floor.c
#	src/p_user.c
#	src/r_data.c
#	src/r_data.h
#	src/v_video.c
 2018-10-14 21:52:05 +01:00
toaster 1324e0bfcd * Fix a memory leak regarding implementation of SOC_ (improperly copypasted code from LUA_LoadLump!!) 
* Optimise the repeated strlen usage into a single call, which is stored for later.
 2018-10-08 18:50:17 +01:00
toaster 6cc7f97d8a Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into addons_menu 
# Conflicts:
#	src/m_menu.c
 2018-09-22 23:00:46 +01:00
TehRealSalt 2defaa4b74 .PNG error shows lump name 2018-09-10 15:15:14 -04:00
TehRealSalt 76033a51d7 // we're fucking sick of this 
Why hasn't SRB2 already done this themselves YEARS ago...
 2018-09-09 18:24:09 -04:00
toaster b6dbecd2f8 Addons menu. 
Bitch.
 2018-08-28 21:08:47 +01:00
Monster Iestyn 84727f4205 Created W_OpenWadFile for opening WAD files with the path correction code. 
This is used by Command_Addfile in the MD5 calculation code, so that it can search subfolders properly and allow addfile in netgames to treat them the same way as in SP
 2017-02-16 21:55:17 +00:00
frozenLake e3b94c04fd Added transmaps to non modifying lump list. 2017-01-08 18:13:46 -06:00
Monster Iestyn 83c4dba4ce Fix crash reported by FuriousFox at http://mb.srb2.org/showthread.php?t=41536 
Basically this makes sure numwadfiles is updated before loading the SOC/Lua scripts, so if a Lua script calls COM_BufInsertText with the contents "addfile scr_mysticrealm.wad" it can't overwrite the last written wadfile slot! Not that COM_BufInsertText really should be used like that to begin with
 2016-06-02 20:16:25 +01:00
Inuyasha f07585191b copyright dates/statements updated and such 
(no actual SLOC changes)
 2016-05-17 17:42:11 -07:00
Monster Iestyn 4f9bb15e4d "Loading SOC from" console message now also displays the name of the SOC_ lump 2016-03-03 18:31:17 +00:00
Monster Iestyn cd198d6809 merge SOC_****, MAINCFG and OBJCTCFG searches into one big search for any of them 
This makes it so that it doesn't matter what order you place SOC lumps within a WAD... relative to other SOC lumps at least, anyway
 2016-01-30 17:19:05 +00:00
Monster Iestyn af3c4755dc All lumps with the "SOC_" prefix in their names are now read as SOCs. 2016-01-17 19:43:26 +00:00
RedEnchilada bd5dcb0b0a Make sure lump name is zeroed out before writing so it always ends in a terminating char 
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9047 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
 2015-03-31 18:00:14 -04:00
Alam Ed Arias 73b3287b19 SRB2 2.1.14 release 2015-01-01 14:50:31 -05:00