Eidolon
be021baa02
Add extern "C" in C++ to all headers
2022-12-30 19:26:16 -06:00
Sally Coolatta
8cdfcea319
Prevent modifying cliprect, wordier vars
2022-12-11 16:47:25 -05:00
Sally Coolatta
b95a18676f
Clipping rectangle
...
Instead of the absolute insanity that is V_DrawCroppedPatch, which makes you specify the number of pixels to crop off the top/left and then the number of pixels to show after the crop ... you just use V_SetClipRect to create a rectangle for any future draws to be cropped down to, and V_ClearClipRect afterwards to clear it.
Currently only supported by V_DrawStretchyFixedPatch. Ideally other drawing functions should also receive clipping rectangle support too.
2022-12-11 13:53:51 -05:00
James R
b5310a1f68
Add typedef.h
...
All typedefs for structs that were present in other header
files have been moved to here. (Except node_t because the
renderer and netcode both define node_t LOL.)
2022-11-27 17:21:40 -08:00
toaster
e65d17cd4d
Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into ironman
...
# Conflicts:
# src/g_demo.c
2022-11-21 15:49:29 +00:00
Sally Coolatta
29595f946b
Add V_VFLIP
...
Ironman can now be shitty
2022-11-03 08:47:44 -04:00
James R
8742a55077
Add cv_palette and cv_palettenum
...
Cheats; override the current palette
2022-11-03 05:44:33 -07:00
James R
495c58e53f
Add V_STRINGDANCE -- dancing letters
...
They do a wiggle~
2022-09-29 14:38:59 -07:00
James R
2b9701d01e
Load palette before map data
...
Fixes PNG patch conversion crashing when called from vres
at game startup.
Also does not reload palette every time the resolution is
changed. (This had no effect on the SDL backend, don't
worry.)
2022-09-24 21:17:41 -07:00
VelocitOni
8a5707ad83
Merge branch 'master' into hostcode
2022-09-13 17:08:15 -04:00
James R
a477182ea7
Draw PINGD before delay number
2022-08-24 21:43:21 +01:00
toaster
73dabaeab6
Merge branch 'master' into new-menus
...
# Conflicts:
# src/d_clisrv.c
# src/deh_soc.c
# src/lua_baselib.c
# src/m_cheat.c
# src/m_menu.h
# src/y_inter.c
2022-03-29 17:14:38 +01:00
toaster
c1f3237157
Boss API + assorted relevant bugfixes, will go over the featureset of this branch with a fine toothed comb when it's time to write the merge request description so this is all you're getting right now
2022-02-24 21:19:03 +00:00
SinnamonLat
5801d67706
Add profile # and player name on the card
2022-02-20 15:23:08 +01:00
SinnamonLat
c44300d39f
Use mockup design for cards, allow moving around and getting out of the profile menu. Still can't make/edit profiles
2022-02-16 10:29:01 +01:00
SinnamonLat
3deba803ae
Conflicts from merging profiles back
2022-02-15 01:38:43 +01:00
SinnamonLat
1789dd1255
Rudimentary start on profiles
2022-02-14 23:14:25 +01:00
toaster
87d797a45a
Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into new-menus
...
# Conflicts:
# src/Sourcefile
# src/d_main.c
# src/m_menu.c
# src/v_video.c
# src/v_video.h
2022-02-14 13:10:36 +00:00
Sally Coolatta
fcc5c8e0c4
Interpolate music credits
2021-12-25 04:57:35 -05:00
toaster
b4af07ffed
Merge branch 'master' into new-menus
...
# Conflicts:
# src/d_main.c
# src/dehacked.c
# src/m_menu.c
# src/v_video.c
# src/y_inter.c
2021-10-18 01:18:37 +01:00
Latapostrophe
f2f0a6cbe2
New titlecards
2021-04-30 18:11:36 +02:00
toaster
e27506c660
* Made it possible to perform palette calculations in gamma-corrected space. Now used by:
...
* Blend tables generated by the game.
* The Color Cube accessibility tool.
* Fixed another stupid typo that got in the way of FF_BLENDMASK working.
* Some minor adjustments for code cleanliness.
2021-04-01 19:28:01 +01:00
toaster
40cbc30bff
Mammoth commit, sorry.
...
All my work thus far on solving the drawflag/renderflag/additive/subtractive conundrum.
Outstandng problems:
* Bad additive/subtractive tables means that they appear opaque except under certain conditions.
* No support for FOFs, Polyobjects, or linedefs in OpenGL yet.
* All OpenGL support mostly done blind, may or may not function in practice.
If nothing else, the hard engineering problems are solved and it's just bug hammering...
2021-03-31 22:46:23 +01:00
Sally Coolatta
9d7ec0ab8f
Merge SRB2 next
...
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
Sryder
a06e4da65b
Additive and subtractive for the HUD
2021-02-01 17:53:27 +00:00
Sally Coolatta
2af75a2bd1
Fix merge conflicts
2021-01-11 00:06:34 -05:00
Sally Coolatta
e6a9e5a68e
Merge branch 'master' into new-menus
2020-11-08 02:49:28 -05:00
Sally Coolatta
afbbfc9b1f
Fix cvars
...
My wrist burns...
2020-10-24 21:32:07 -04:00
Sally Coolatta
9b6aa946ea
Merge remote-tracking branch 'srb2/master' into the-scary-22-merge
2020-10-24 19:28:06 -04:00
Jaime Passos
b44837324f
Merge branch 'next' into patch-stuff-again-2
2020-10-10 17:01:10 -03:00
SteelT
6a168ac5e9
Merge branch 'pictureformats' into 'next'
...
PNG conversion refactoring
See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
Jaime Passos
15eb91be69
Use color look-up table for PNG conversion
2020-09-10 02:10:31 -03:00
Jaime Passos
bf52125494
Change method of color look-up table generation
2020-09-10 01:43:46 -03:00
Sally Coolatta
08b76dd52f
Fix the HUD
2020-08-18 06:09:27 -04:00
Sally Coolatta
f5bf0371de
Revert "TEMPORARY: Revert Got_AddPlayer and disable D_SendPlayerConfig"
...
This reverts commit 49e2f98beb .
2020-08-18 03:54:31 -04:00
Sally Coolatta
49e2f98beb
TEMPORARY: Revert Got_AddPlayer and disable D_SendPlayerConfig
...
Bare minimum for levels to load again, need to figure out why the 2.2 merged version isn't working
2020-08-16 00:15:05 -04:00
Sally Coolatta
873474ac87
Make it to s_sound
2020-08-15 01:54:45 -04:00
James R
fe4f311da5
.
2020-08-14 22:38:15 -07:00
James R
e1a745db1f
REMOVE THE LAST OF CV_ALLCAPS
2020-08-14 21:01:41 -07:00
Jaime Passos
cb3660331a
Refactor renderer switching
2020-08-14 22:27:16 -03:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
1a058cb0cd
Fix extra V_MAGENTAMAP definition
2020-08-10 17:07:47 -04:00
Sally Coolatta
f6ad84f572
and h
2020-08-09 16:05:06 -04:00
Sally Coolatta
3d53adaa2b
Sliding HUD
...
- Split HUD stuff into k_hud.c/h
- V_SPLITSCREEN replaces the old function that sets V_SPLITSCREEN/V_HORZSCREEN flags system, and instead automatically moves it based on player number
- V_SLIDEIN makes HUD items slide in after the intro animation.
2020-07-26 05:47:53 -04:00
Sally Coolatta
3e36e15628
Merge master
2020-06-08 00:52:37 -04:00
Sally Coolatta
a3ec4f22a1
Finished nametags
2020-06-03 23:29:43 -04:00
Sally Coolatta
120dc253af
Merge remote-tracking branch 'origin/iwantmychat' into nametags
2020-06-03 20:19:26 -04:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
SwitchKaze
58cac1fd73
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
Sally Coolatta
0dd19f4f50
Merge branch 'master' into new-menus
2020-05-16 04:37:44 -04:00