Commit Graph

139 Commits

Author SHA1 Message Date
TehRealSalt 936bd43266 Merge branch 'master' into merge-next 2018-11-29 09:46:46 -05:00
TehRealSalt 5534017954 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
TehRealSalt 38ebc4d838 Update version to v1.0.2 2018-11-26 09:34:15 -05:00
mazmazz ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
TehRealSalt fb3d0da38f v1.0.1 prep
Enable patch.kart, up version number
2018-11-18 04:00:05 -05:00
TehRealSalt 106d8c6d3f Remove "Kart" in front of the version number
Just looks silly :V
2018-11-14 01:12:58 -05:00
Sal f10e7bade4 Merge branch 'disable-develop' into 'master'
Disable DEVELOP mode

See merge request KartKrew/Kart!85
2018-11-14 00:52:00 -05:00
Sryder 6af56273bf Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
# Conflicts:
#	src/d_main.c
#	src/d_main.h
#	src/d_netcmd.c
#	src/doomtype.h
#	src/hardware/hw_md2.h
#	src/p_user.c
#	src/r_splats.h
#	src/s_sound.c
#	src/s_sound.h
#	src/screen.c
#	src/sdl/i_system.c
2018-11-10 21:14:53 +00:00
Monster Iestyn 8ba0f2a177 clipping code didn't seem so bad this time (at least compared to without), let's enable it now? 2018-11-10 16:09:52 +00:00
Monster Iestyn 1e98e3b4f2 More progress, NEWCLIP added to doomdef.h, sadly it actually all lags the game so I've disabled it for now
Other notes:
* on second thought I'll keep the hw_clip functions' gld prefixes rather than HWR, not like it matters either way
* despite the extra lag it does fix the issues with translucent walls and such when displayed at different vertical angles, such as with the GFZ1 waterfall
2018-11-10 16:08:56 +00:00
TehRealSalt 9a18b83c2a Disable DEVELOP mode 2018-11-07 16:19:02 -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
TehRealSalt 9de7a9d5cc Add textures.kart, re-define DEVELOP mode,
Disabling DEVELOP can be another branch; this means this can get in master quicker
2018-11-03 03:17:20 -04:00
TehRealSalt 36595b06af Merge branch 'master' into update-version 2018-10-17 20:31:56 -04:00
Sal 36696b1fbb Merge branch 'noclip-cam' into 'master'
Noclip cam

See merge request KartKrew/Kart!32
2018-10-07 23:15:06 -04:00
TehRealSalt fef3c63740 Moved colors around yet again for nicer invincibility effect
- Ruby is closer to the pinks (and where purples would be if it wrapped around)
- Sapphire is closer to the cyans
- Dream is right before the teals
2018-10-03 21:18:07 -04:00
TehRealSalt c75e40d08d MODID acquired
DEVELOP and USE_PATCH_KART undef'd as well
2018-10-01 16:24:38 -04:00
TehRealSalt 06c0e609c3 Prefix with Kart 2018-09-24 09:56:02 -04:00
TehRealSalt ec04ebdda3 Say "mb.srb2.org" instead of "the forums on srb2.org" :V 2018-09-24 09:53:11 -04:00
TehRealSalt 2e3f0481b1 Version number update part 1
- Change from "v1.4.8" to "v1.0.0"
- Remove the random additional "DevEXE" moniker outside of DEVELOP mode
- For some reason, the version number of "1.4.8" was also set separately in DEVELOP mode, even though in vanilla it's intended to always be 0. Changed this back.

TODO (*after* feature freeze):
- Request and update MODID
- Undef DEVELOP mode
2018-09-24 09:49:53 -04:00
TehRealSalt 3949d0fcdb Obvious first commit: enable the NOCLIPCAM define again 2018-09-22 22:22:44 -04:00
TehRealSalt e2a7146667 Reeling back on this again
Kinda want to save it for another branch
2018-09-20 17:11:59 -04:00
TehRealSalt b2099678d1 Enable noclip cam again.
It's just... TOO good, despite the couple of issues with it
2018-09-18 23:56:26 -04:00
TehRealSalt f2838f7ab3 More color tweaks
- Renamed Grey to Nickel, and Cloudy to Grey
- Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey
- Drastically changed Navy to be more distinct from Jet
- Replaced Indigo with Pomegranate
- Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow)
- Updated color opposite table to match
2018-09-17 02:09:22 -04:00
TehRealSalt eca535d369 Instead of doing productive things, I changed around skincolors again
- Renamed Ivory to White, removed Nickel and old White, and improved Silver and Grey.
- Improved Pink & Ruby.
- Added Ketchup, replaced Canary with Mustard.
- Removed Army.
2018-09-13 02:07:00 -04:00
Latapostrophe 3af7b7bf91 merge sonicitems into chat-changes so that it's not lagging 10 years behind 2018-07-31 19:45:49 +02:00
TehRealSalt 81d7b21d43 Rearranged color order
Invincibility should look just a tad smoother now
2018-07-10 22:59:19 -04:00
toaster fe8b98ec22 On a hunch, looked it up. Turns out it's a common typo, and that a nickle is actually a type of green woodpecker!! :V 2018-07-02 19:06:05 +01:00
TehRealSalt 3184d2a7b0 Removed Amber & Jade, added Canary & Lime, changed Blueberry & Mint 2018-07-02 13:54:01 -04:00
toaster e76c328129 Sorry, Sal! In my defense, you don't need to recompile from scratch for any of this, despite what it may look like, as the skincolour name lists are walled off from the rest of the dehacked lists...
More menu/highlight things:
* Rename "Default" to "Game type", to make clearer what it's doing.
* Tweak race colouring slightly.
* Put a highlight around the level select icon, and make it consistent with voting.
* Allow setting the highlight colour to affect the intermissions.
* Fix bug with gametype colour getting for record attack.

A handful of skincolour things:
* Rename Turqouise to Aqua, because it resembles one of my fav 2.2 colours with that name.
* Fix incomplete Steel Blue -> Steel rename.
* Merge the very similar Blueberry and Sapphire...
* ... so Sapphire can be backported!
* And Ruby too.
2018-07-02 13:20:04 +01:00
TehRealSalt 4ffb80806b Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-02 03:36:43 -04:00
TehRealSalt b3cae5d633 Revamped colors
- The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more
- Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?!
- Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two.
- Caramel has been removed, Shiny Caramel takes its place.
- Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names.
- Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 03:30:33 -04:00
SeventhSentinel bd5c2d0720 Use patch.kart instead, almost finished Ballhog 2018-06-27 10:10:53 -04:00
SeventhSentinel 7fdc9c8035 Intro camera can noclip, fix several compile errors 2018-06-25 09:18:30 -04:00
wolfy852 8abeae7805 Chat Manager 2018-06-15 05:20:01 -05:00
TehRealSalt 76013dad19 Merge remote-tracking branch 'refs/remotes/srb2public/next'
# Conflicts:
#	src/doomdef.h
2018-01-03 16:27:36 -05:00
TehRealSalt f2fb100515 Stupidly minor "Sonic Robo Blast 2" -> "SRB2Kart" 2018-01-02 23:15:13 -05:00
Monster Iestyn ac3fef15eb Rob is now in charge of Mod IDs, change MODID comment in doomdef.h to reflect this 2017-12-13 19:07:02 +00:00
Monster Iestyn 7cb0138293 Change version number to 2.1.20 2017-11-08 15:06:42 +00:00
TehRealSalt 10aa83e614 More minor adjustments
- Display the skin's realname in RA menus
- Can no longer set your skincolor to none on the RA menu
- Edited several color names to fit within 14 characters
2017-10-21 13:22:54 -04:00
ZTsukei 89f239b601 Merge branch 'zarrotsu' of http://git.magicalgirl.moe/KartKrew/Kart into zarrotsu 2017-10-17 18:24:10 -04:00
ZTsukei 4387455d9c Fixing post-map name being weird 2017-10-17 18:23:50 -04:00
TehRealSalt 5fe2f4928f Merge remote-tracking branch 'refs/remotes/srb2public/next' into zarrotsu
# Conflicts:
#	src/doomdef.h
#	src/sdl/i_main.c
#	src/sdl/i_video.c
#	src/y_inter.c
2017-10-17 15:53:34 -04:00
ZTsukei ba7580d8e2 = Nerfed Megas across the board.
- Rarer
 - Speed reduced from +25% to +20%
 - Getting squished doesn't last as long
= Nerfed the Banana Meta - or at least changed it
 - You don't wipeout for as long
 - You don't lose as much speed from wiping out (1/2 instead of 1/4)
= Respawning after death is faster
 - Lakitu drops you faster, only three floaty sounds instead of four
= Adjusted the camera to the values given by Sev
2017-10-13 15:44:17 -04:00
ZTsukei 7c71feb274 Fixed thrown items (99% sure)
Thrown items are thrown farther now; distance based on CC.
2017-10-11 10:49:14 -04:00
ZTsukei b95f1d568a Updated item weights
Fix attempt for thrown items
2017-10-10 21:09:38 -04:00
ZTsukei b59246f413 Added Donut Plains Bushes 2017-09-04 22:32:14 -04:00
ZTsukei ee7ea5f6cb Fixed the word "ZONE" not appearing in the title 2017-09-01 18:58:12 -04:00
ZTsukei a1f2f5b675 New level tag "ZONETITLE" can be set to replace the word "ZONE" in a level. "NOZONE" overrides it and forces no display at all. 2017-09-01 13:01:59 -04:00
ZTsukei 5d26588759 Added allllllll the old mobjs. Still need to reassign level ids. 2017-08-31 23:16:03 -04:00