Commit graph

5281 commits

Author SHA1 Message Date
James R
d8a2d6c7e2 Remove old string drawing functions 2019-06-26 18:23:58 -07:00
James R
295631b953 Support Level Title and Credit font in V_DrawStringScaled 2019-06-26 17:02:21 -07:00
James R
5e1d110ed5 Add V_DrawStringScaled 2019-06-26 16:45:26 -07:00
James R
9579f6ea9e Add font system to Makefile and Visual Studio project files 2019-06-26 16:33:59 -07:00
James R
8063cc6c2f Order correctly and include z_zone.h 2019-06-26 16:02:28 -07:00
James R
a2739b8032 Fix minor errors 2019-06-23 16:33:53 -07:00
James R
8ee25a7c8a Begin using the font system 2019-06-03 14:57:58 -07:00
James R
0b0b7c480b Set up with the font system 2019-06-03 14:57:05 -07:00
James R
4056c5bde6 Prepare a font system 2019-06-03 14:28:51 -07:00
James R
2b79547512 Fix XCode compiler errors
I'm faily certain this also fixes broken logic (g_game.c).
2019-05-28 19:04:27 -07:00
James R
d8967112c6 Fix compiler errors
The truncation handling in this one spot is okay, but the compiler isn't smart
enough for it. I'm leaving it as a warning because I'd like to make a dedicated
function for handling snprintf truncation in the future.
2019-05-28 15:11:37 -07:00
James R
9ec9c639dd Revert "Revert "Fix Post Processing in 64-bit Software 3P/4P""
This reverts commit 392f357b1a.
2019-05-28 15:09:29 -07:00
James R
c0e7c17cce Merge remote-tracking branch 'origin/v1' into v1 2019-05-28 14:24:52 -07:00
wolfs
6b568e4f43 Merge branch 'v1-lua-stuff' into 'v1'
V1 lua stuff

See merge request KartKrew/Kart!155
2019-05-28 07:59:45 -04:00
wolfy852
1a038ad463 Don't guard the return 2019-05-28 06:56:35 -05:00
wolfy852
96b5a1df43 Update patch.kart hash
THIS SHOULD BE THE LAST TIME I SWEAR
2019-05-28 06:33:38 -05:00
Sryder
01a0fb1c8f Fix Heatwave Post-processing Effect in 3P/4P 2019-05-27 22:59:58 +01:00
James R
392f357b1a Revert "Fix Post Processing in 64-bit Software 3P/4P"
This reverts commit 1a9b21c195.
2019-05-27 14:20:12 -07:00
James R
88d5e9b7d2 wip 2019-05-27 14:20:07 -07:00
Sryder
1a9b21c195 Fix Post Processing in 64-bit Software 3P/4P
Vid_BlitLinearScreen didn't make sure that it was actually meant to be copying the entire screen rows before doing it properly.
2019-05-27 22:03:17 +01:00
wolfs
93a91e222d Merge branch 'spinout-angle' into 'v1'
Spinout angle change when boosting

See merge request KartKrew/Kart!153
2019-05-26 20:10:56 -04:00
Latapostrophe
1bcebaadfd Lua fixes + new drawOnMinimap function 2019-05-26 15:05:10 +02:00
Latapostrophe
ba3e682e0e fix banana's SpinPlayer using the wrong inflictor 2019-05-26 11:19:26 +02:00
Latapostrophe
142c6aacac Merge branch 'lua-battlefullscreen-expose' into v1-lua-stuff 2019-05-26 11:18:00 +02:00
Latapostrophe
d97a0ce2b4 Move the friction change out of the offroad check 2019-05-25 14:13:35 +02:00
Latapostrophe
cb8af8eb95 add k_booostangle to dehacked 2019-05-25 14:11:26 +02:00
Latapostrophe
8628a543a5 give friction to brakes 2019-05-25 13:51:19 +02:00
Latapostrophe
ccd0ec96a4 let angle be changed while spun out and boosting 2019-05-25 13:08:38 +02:00
James R
38360f29ec Move FOV option out of OGL options 2019-05-22 23:16:20 -07:00
James R
e1451b7a98 Acknowledge fallback models as an OGL option indeed
(You may also be able to actually read that code too.)
2019-05-22 23:15:46 -07:00
wolfy852
519a289373 Fix the permanent instashield bug 2019-05-17 08:06:18 -05:00
wolfy852
1c52319d08 More credits updates 2019-05-17 03:55:51 -05:00
Latapostrophe
cd4b9abb78 SPB intangibility 2019-05-17 03:55:23 -05:00
wolfy852
f3b6b732f8 Update bonuschars credits 2019-05-13 12:49:44 -05:00
wolfy852
4f3fbb8da5 Fix viewpoint being reset on boost when spectating 2019-05-12 16:38:50 -05:00
wolfy852
ed55a63b58 Fix rewind previews not showing for player 1 2019-05-12 14:42:39 -05:00
wolfy852
08bf9ee1f5 whoops
Fixes stupid obvious mistakes and changes the prefcolor reset to item.
2019-05-12 04:22:34 -05:00
wolfy852
9ac41cca73 Merge remote-tracking branch 'remotes/pub/next' into v1
# Conflicts:
#	src/d_netcmd.c
#	src/r_main.c
#	src/v_video.c
2019-05-12 03:40:02 -05:00
wolfy852
5613446b6f Have Look Back reset your color to prefcolor 2019-05-12 03:21:46 -05:00
Alam Arias
d44a5d1013 fix the array-bounds warning by setting a upper limit 2019-05-09 23:10:23 -04:00
Alam Arias
9163a05192 fix up misleading indentation of a if statement 2019-05-09 23:03:32 -04:00
wolfy852
ed64cd4dac Default billboarding to "On" 2019-05-08 00:17:21 -05:00
wolfy852
1136d88bd6 Merge remote-tracking branch 'remotes/srb2pub/next' into upstream-merge 2019-05-07 21:43:12 -05:00
wolfs
10b47550a4 Merge branch 'public-musicplus-tagfix' into 'next'
Fix music load lag by reverting tag changes

See merge request STJr/SRB2!486
2019-05-07 22:42:13 -04:00
wolfy852
1b7d7cabdf Correct a merge mistake 2019-05-07 02:06:59 -05:00
wolfy852
26adea3234 Battle, not Match 2019-05-07 01:34:49 -05:00
wolfy852
2222738e1c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
# Conflicts:
#	src/d_netcmd.c
#	src/doomdef.h
#	src/doomstat.h
#	src/f_finale.c
#	src/g_game.c
#	src/hu_stuff.c
#	src/m_menu.c
#	src/p_spec.c
#	src/p_user.c
#	src/r_main.c
#	src/r_things.c
#	src/s_sound.c
#	src/v_video.c
#	src/y_inter.c
2019-05-06 22:40:12 -05:00
TehRealSalt
c8fdc95597 Forgot to update date 2019-05-06 22:54:47 -04:00
TehRealSalt
3e93180d3d Don't cover chat with pause effect 2019-05-06 22:39:20 -04:00
Sal
1c1435aea7 Merge branch 'version-prep' into 'master'
Version prep

See merge request KartKrew/Kart!148

(cherry picked from commit dfc4b22c911340e330a0f71fabb4a1461b5747ed)

2e221946 Final v1 colors
359d06f1 Modify the first shade of Byzantium
3a707c09 Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
889ead78 Fix wheel animations
2d9ae1ab Dumbass typo
e954f0b4 Missed a spot
5316e63a Merge branch 'next-colors' into 'v1'
55db2268 Merge branch 'anim-fix' into 'v1'
26159aae Merge branch 'deadzone-bullshit' into 'v1'
30c19caa Update version number
8f07ed77 Update patch.kart hash
2019-05-06 22:05:56 -04:00