Commit graph

93 commits

Author SHA1 Message Date
SeventhSentinel
046d66d803 Fix errors from merge 2019-01-06 01:00:30 -05:00
SeventhSentinel
1d58c6b8c2 merge srb2 next 2019-01-05 15:59:23 -05:00
MPC
79653dd094 fix the fucking warning 2018-12-17 18:09:29 -03:00
MPC
a28aeaf23b fix my fucking code 2018-12-17 17:57:53 -03:00
Latapostrophe
71074ccce1 make sure to change p_dispy and not y for /pm list. Also make MPC happy. 2018-12-17 21:39:49 +01:00
Latapostrophe
4c88271cfb 2.1.21 and all of the kart additions. Woo. 2018-12-17 20:43:59 +01:00
Latapostrophe
34f13e9f20 merge conflict 2018-12-16 16:48:15 +01:00
TehRealSalt
4507ee18fd Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
TehRealSalt
d0e691f01a Default gr_md2 to on 2018-11-17 20:55:12 -05:00
MPC
7c18702f84 Render the startup screen on OpenGL mode 2018-11-10 15:56:13 -03:00
TehRealSalt
c7b0df8172 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
18871da721 now that V_FLIP's effects are always supported in V_DrawFixedPatch, there's no need for the "flip" variable anymore 2018-10-30 14:22:21 +00:00
Monster Iestyn
2b16b8241f Make V_OFFSET no thing without V_NOSCALESTART, to remove any potential glitches with using it on its own 2018-10-29 12:36:09 +00:00
Monster Iestyn
81fb42a2b4 V_DrawFixedPatch: Tinker with the left/top offsets code so that V_OFFSET can support V_FLIP 2018-10-29 12:06:22 +00:00
toaster
e92d03ee94 As requested by Jeck:
* gr_md2 on the menu.
* Disable interpolerated model option completely for now.

Also, tweaked the GL menus a bit to suck less, since I was ferreting around in that area.
2018-10-27 21:16:19 +01:00
Latapostrophe
35f576c166 Spectate / enter game in chat + New console colours + Highlight chat scroll arrow + small cleanup for consolefill 2018-10-25 13:21:44 +02:00
toaster
9ad5b9da80 Merge branch 'master' into 'chat-changes'
# Conflicts:
#   src/hu_stuff.c
2018-10-21 08:27:28 -04:00
Latapostrophe
83a51f3b3d More messages in chatbox + new console backcolours 2018-10-21 14:09:25 +02:00
toaster
1142fddc71 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
TehRealSalt
1bce22cf72 Merge branch 'master' into sal-cleanup 2018-10-08 00:22:44 -04:00
Monster Iestyn
951b4d1582 Draw a star for continues if invalid skin numbers are somehow supplied 2018-10-05 22:42:36 +01:00
TehRealSalt
a67e375fe9 Brown text colormap instead of teal, revert sky-blue 2018-10-04 18:07:56 -04:00
TehRealSalt
32bb288b84 DrawFill supports splitscreen offset flags 2018-10-01 08:41:44 -04:00
toaster
383ba1d738 Forgot I did this optimisation! Updated for the new colours. 2018-09-23 16:39:07 +01:00
toaster
d2ca0d5bfe 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
Sal
739bbd3808 Merge branch 'encore' into 'master'
Encore

See merge request KartKrew/Kart!7
2018-09-22 17:52:33 -04:00
toaster
6884e4aa9a * Seven new text colours! Gold, Lavender, Tea-green, Steel, Pink, Teal, and Peach, all added to the menu highlights cvar.
* Revamp the saycmd colour list to take advantage of them. Peach and Purple are used the least...
* In all of the string drawers, replace colormap only when charflags changes.
* Add V_SKYMAP to dehacked.c alongside the above (oversight from when I added it yonks ago...)
2018-09-22 18:22:04 +01:00
toaster
9ab42d91cb Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into encore
# Conflicts:
#	src/info.c
#	src/m_menu.c
#	src/y_inter.c
2018-09-21 20:54:38 +01:00
TehRealSalt
e4a4ef83c1 Vote screen uses the font's intended character spacing 2018-09-02 22:53:40 -04:00
toaster
dfe1f865fc * Make some minor performance improvements.
* Make the I_Errors in filesrch.c more descriptive.
* Fix up the loading of sounds.kart such that it has SOME protection against being loaded with game-modifying lumps.
* SERIOUSLY fix up the MD5/mainwads++ section in D_SRB2Main, since 1) I broke it and 2) it was already a little broken in the first place but we just didn't notice it because #ifndef DEVELOP.
2018-08-29 12:50:25 +01:00
toaster
44c33561b5 Merge branch 'sonicitems' into encore 2018-08-26 12:45:02 +01:00
toaster
41b7625fa7 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems
# Conflicts:
#	src/g_game.c
#	src/v_video.c
2018-08-26 12:42:55 +01:00
toaster
b26828805e Missed one! 2018-08-26 12:38:53 +01:00
toaster
241c9c2260 Clean up a bunch of v_video.c functions that previously exhibited unfortunate side effects when run in non-green resolutions.
* V_DrawFixedPatch and ilk:
	* Change the offset of V_FLIP so it's not one screen-pixel off where its non-flipped sprite would have started being drawn from.
	* Write to x and y as well as desttop so that anti-screen-overflow checks later in the function behave properly with non-green resolutions.

* V_DrawFill:
	* Reduce number of operations performed upon `c`.

* V_DrawString and ilk:
	* Offset the left and right boundary checks in non-green resolutions such that you can actually draw stuff to the left of basevid screen x coordinate 0.
2018-08-25 19:52:17 +01:00
toaster
bb3bb48fe6 * Disable inverting on encore level select pictures at unanimous request of last night's netgame.
* Also, correct their alignment in y_inter.c.
2018-08-14 15:32:17 +01:00
toaster
e8c436ab76 * Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes).
* A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby!
* Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value.
* Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 22:23:40 +01:00
Latapostrophe
5aba0a4b5a merge sonicitems into chat-changes so that it's not lagging 10 years behind 2018-07-31 19:45:49 +02:00
Latapostrophe
a4bded8e9e SRB2chat test rework 2018-07-31 11:10:02 +02:00
TehRealSalt
ef16b32a6e HERE COMES A NEW CHALLENGER 2018-07-22 00:31:02 -04:00
toaster
f9ea0e7cd1 * Lots of Record Attack love!
* Record Attack Input display!
	* Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's.
	* Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info!
* Unrelated shit!
	* Improve loading Kart HUD graphics.
	* Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 23:13:36 +01:00
toaster
84aa14768f 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
toaster
580c529c5b Menu stuff!
* Bar of levels.
* Colourisation!
* New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid!
* New single page statistics screen!
* V_DrawFixedPatch now works at the edge of the screen!

Ghost fixes!
* On minimaps!
* Free memory after use!
* Don't spawn in midair on slopes!
2018-07-01 19:29:13 +01:00
toaster
990f9be612 * Modified, maybe-improved title. May need to be selectively reverted, but...
* To go with this, have the HUD fade in as the title goes away.
* After complaints, only do dogear gametype indicators on the voting screen for levels which don't match the prevailing gametype, and use thin font to intrude on the level pic less.
* Make the voting screen background a different graphic in battle.
* Improve behaviour of DrawDiag in GL.
2018-06-28 19:07:04 +01:00
toaster
2efe86e387 * AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN!
* Super important to allow dedicated servers to continue forever without needing to add Terminal.
    * To facilitate understanding, add gametype dog-ears to the vote screen!
    * To do the above, add V_DrawDiag! Works in GL, too!!
* Unrelated shit!
    * Fix a buffer overrun in the randmapbuffer!
    * Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn...
    * Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 15:47:56 +01:00
SeventhSentinel
55b29504ae Fade-in intro
Also made flashing not-local, again.
2018-06-26 10:14:59 -04:00
wolfy852
eca78519e4 Chat Manager 2018-06-15 05:20:01 -05:00
TehRealSalt
e9a1dbec82 Better menus 2018-06-14 20:18:29 -04:00
TehRealSalt
a1fad489c6 actnum is now a 2 character long string
For Cloud Cradle Zone, Act K
2018-06-05 01:34:05 -04:00
TehRealSalt
8fe068ef46 Merge remote-tracking branch 'refs/remotes/srb2public/next'
# Conflicts:
#	src/f_finale.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/m_misc.c
2018-04-07 18:43:59 -04:00