stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-06 01:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity
6208 commits 60 branches 11 tags 94 MiB
Commit graph

418 commits

Author SHA1 Message Date
AJ Freda
4806dadd88 Fixed a few unnoticable mistakes [vanilla] 2019-01-07 04:30:42 -05:00
mazmazz
09629f092f Ifdef nextFrame handling under USE_MODEL_NEXTFRAME 2019-01-07 04:30:40 -05:00
mazmazz
6ed896d462 Interpolation fix attempt? 
* Fix pglNormal3bv pointer because typo
 2019-01-07 04:30:39 -05:00
mazmazz
c13d3ff1dd Adapt re-enabled DrawMD2 code block for meshes 2019-01-07 04:30:37 -05:00
mazmazz
6653b9697f Hide/add Kart FTransform mirror and anglez behind ifdef 2019-01-07 04:30:36 -05:00
mazmazz
bbc3d27cee More hw_md2 merge errors; re-enable interpolation code block 2019-01-07 04:27:59 -05:00
mazmazz
039cf894f2 hw_md2 merge errors 2019-01-07 04:24:00 -05:00
mazmazz
34afceaa3b Ignore fread return value (buildbot error) 2019-01-07 04:23:19 -05:00
mazmazz
f0b20e302a Buildbot fixes (changed byte types to char; mixed d&c) 2019-01-07 04:23:17 -05:00
mazmazz
2e22b069f1 GCC compile fixes 2019-01-07 04:23:15 -05:00
Arthur
11be174603 Remove CONS_Printf message that isn't even doing what it says it is! 2019-01-07 04:21:45 -05:00
Arthur
9f0b121b15 Support for 'tinyframes', and lots more optimization 2019-01-07 04:21:44 -05:00
Arthur
295ca25171 Common model format, with MD2/MD3 loading 2019-01-07 04:21:43 -05:00
SeventhSentinel
49f2d65e95 Fix errors from merge 2019-01-06 01:00:30 -05:00
SeventhSentinel
73542c008c merge srb2 next 2019-01-05 15:59:23 -05:00
mazmazz
963819c81d Initialize skinnum for MD2 star colors (fix CLANG error) 2019-01-02 19:23:57 -05:00
Digiku
80e30c6aaa Merge branch 'MSVC-ARM' into 'master' 
ARM and ARM64 support with MSVC toolchain

See merge request STJr/SRB2!412
 2018-12-28 01:05:40 -05:00
Latapostrophe
1b61e15b1b Merge branch 'master' into SRB2-CHAT 2018-12-23 10:26:08 +01:00
Alam Ed Arias
102fd11cb4 More work to cleanup the ARM builds 2018-12-22 19:50:32 -05:00
Alam Arias
b6a917cda1 Added ARM/ARM64 to whole vc10 sln 
Added ARM/ARM64 to zlib, libpng
Added ARM/ARM64 to srb2dd/srb2sdl
 2018-12-21 16:47:10 -05:00
mazmazz
06ff171e19 Adjust vid.width floating point comparson for CHAT 2018-12-21 11:37:22 -05:00
Digiku
58a2cec70f Merge branch 'float_equal' into 'master' 
Clear Float equal warnings

See merge request STJr/SRB2!383
 2018-12-20 16:58:37 -05:00
Digiku
7982b1695a Merge branch 'ogl-zfighting-fix' into 'master' 
OpenGL z-fighting fix [by Azeonus]

Closes #43

See merge request STJr/SRB2!395
 2018-12-19 13:05:04 -05:00
mazmazz
96cad09db6 Change 0.05 to 0.05f 2018-12-18 16:59:59 -05:00
Azeonus
67cd6dcdd2 dispoffset OGL fix [by Azeonus] 2018-12-18 16:50:03 -05:00
Jimita
1d40676f3a
Merge branch 'master' into automap_fix 2018-12-17 17:46:29 -02:00
Alam Ed Arias
11aef0b3f1 Merge branch 'master' into float_equal 2018-12-16 13:52:45 -05:00
Latapostrophe
25e6d5388c merge conflict 2018-12-16 16:48:15 +01:00
Alam Ed Arias
15d0673685 fix compiling for clang 2018-12-14 21:31:37 -05:00
Alam Ed Arias
78634679f1 fix compiling for MSVC 2018-12-14 20:42:37 -05:00
Alam Ed Arias
6fd66bdb49 Clear float equal warnings 2018-12-14 20:34:06 -05:00
Monster Iestyn
e0079ea1a2 remove NearVertice (which was unused anyway), clean up maz's changes 2018-12-14 23:28:07 +00:00
mazmazz
abae63a64b SameVertice floating point match; fixes 64-bit OGL holes 2018-12-14 16:47:24 -05:00
Monster Iestyn
c1e0041a0b copy doom legacy's replacement for the den == 0.0 calc in fracdivline 2018-12-14 21:22:13 +00:00
Monster Iestyn
623d1574ce minor cleanup 2018-12-14 21:00:53 +00:00
Monster Iestyn
b42c306ef3 remove code from SearchDivline that was disabled ...and doesn't seem to exist anymore anyway 2018-12-14 18:14:08 +00:00
Monster Iestyn
52fd3dcbed split loading status code into a separate function 2018-12-14 18:11:30 +00:00
Monster Iestyn
02fc845a72 Make sure nptfront is explicitly > 0, so we don't alloc a poly for negative number points at all 2018-12-14 18:01:18 +00:00
Monster Iestyn
4089b6b8e9 use continue if NULL instead of a big if block if ...not NULL 
also, SplitPoly returns if ps < 0, so there's no need to check for ps >= 0 afterwards
 2018-12-14 18:00:08 +00:00
Monster Iestyn
3a125dbbd5 compare with actual doubles, not ints 2018-12-14 17:14:03 +00:00
MPC
6b22dc183b Fix the automap 2018-12-12 18:01:52 -03:00
TehRealSalt
5534017954 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
Monster Iestyn
4b0d45afd8 Merge branch 'opengl-noloading' into 'master' 
Hide OpenGL loading screen

See merge request STJr/SRB2!349
 2018-11-26 15:30:45 -05:00
Monster Iestyn
a71ca1d259 Merge branch 'fof-slope-skew-backport' into 'master' 
FOF wall slope skewing backport

See merge request STJr/SRB2!341
 2018-11-26 08:54:29 -05:00
mazmazz
930835f1a2 Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show 2018-11-25 21:47:56 -05:00
Sryder
683ebec120 Rotate All MD2s to match their standing slopes 
Needs to be tested in gravity flip
Also flips the normal on linedef based slopes so that it's facing the correct direction
Also makes it so slopelaunch doesn't always remove the standingslope (going down some slopes would cause it to be constantly unset and reset)
 2018-11-26 00:17:34 +00:00
mazmazz
ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Monster Iestyn
0a0336a674 Merge branch 'master' into fof-slope-skew-backport 
# Conflicts:
#	src/r_segs.c
 2018-11-23 22:40:28 +00:00
Alam Arias
30b9cef043
Merge pull request #326 from monster-psychic-cat/opengl_splitscreen_sky_fix 
Render the skies correctly on splitscreen in OpenGL mode
 2018-11-23 14:48:05 -05:00
Monster Iestyn
f7eea7ade3 Fix compiler errors 2018-11-22 20:08:57 +00:00
toaster
aa607ecf4c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again 
# Conflicts:
#	src/d_clisrv.c
#	src/m_misc.c
 2018-11-18 18:26:50 +00:00
Sryder
c46efa7c41 Set the screen textures to use max higher texture IDs 
This should hopefully alleviate the issue where textures overwrite the screen, or the screen overwrites the texture for now.
THIS IS NOT A FULL SOLUTION TO THE PROBLEM, but I highly doubt we'll ever be loading 4 billion textures at once, ever.
 2018-11-17 15:23:12 +00:00
Monster Iestyn
3e6fcf1b8b Merge branch 'opengl-hud-scale-fix' into 'master' 
OpenGL HUD scaling fix

See merge request STJr/SRB2!320
 2018-11-14 16:48:13 -05:00
Alam Ed Arias
f73ea4f984 Clean up warnings 2018-11-14 10:52:16 -05:00
Monster Iestyn
0d38061db8 Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode 2018-11-13 18:13:51 +00: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
MPC
eb4a72440a Render the skies correctly on splitscreen in OpenGL mode 2018-11-10 16:19:41 -03:00
toaster
45fc2c46e9 Merge branch 'fof-slope-skew-backport' of https://git.magicalgirl.moe/STJr/SRB2.git 2018-11-10 18:27:13 +00:00
Monster Iestyn
323c89dbaf fix using abs() on unsigned 2018-11-10 17:40:09 +00:00
Monster Iestyn
dd83652b71 Whoops, this broke my non-NEWCLIP test build 2018-11-10 16:10:25 +00:00
Monster Iestyn
c4569e61a8 Made some efforts to improve efficiency of new code, hard to tell if I've made it better or worse though honestly 
R_IsEmptyLine is now a thing too btw
 2018-11-10 16:09:21 +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
Monster Iestyn
a733a29f4c Starting work on porting hw_clip.c/h code, Makefiles and CMake can compile them at least 
Other notes:
* Renamed all new functions to have HWR_ prefix instead of gld_, for consistency
* HWR_FrustrumSetup and HWR_SphereInFrustum are disabled and require HAVE_SPHEREFRUSTRUM. This is because 1) SRB2CB did not need the code, so presumably neither will we, and 2) there are some OpenGL API functions used there that due to our way of using OpenGL we don't use outside of r_opengl.c, which makes dealing with HWR_FrustrumSetup complicated in theory
* The new clipping functions are not added to OpenGL's "main" rendering code itself just yet, they're just available to use now once hw_clip.h is included
 2018-11-10 16:08:26 +00:00
Monster Iestyn
925a56ad98 Merge branch 'opengl-improvements-backport' into 'master' 
Opengl improvements backport

See merge request STJr/SRB2!304
 2018-11-10 09:25:18 -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
Monster Iestyn
2fa0896fd0 Fix an error I made in HWR_DrawFixedPatch 2018-10-30 13:44:01 +00:00
Monster Iestyn
b022ff02a5 add missing SHORTs in HWR_DrawPatch and HWR_DrawCroppedPatch as well 2018-10-29 13:34:54 +00:00
Monster Iestyn
f8fd8f8ec5 HWR_DrawFixedPatch: Add V_OFFSET support for V_FLIP in hardware code as well, also add missing SHORTs for gpatch fields 2018-10-29 13:29:16 +00:00
toaster
8b382d2e40 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
Monster Iestyn
32077897b6 Removed all remaining traces of VID_X11 code in hw_drv.h and hw_data.h, the macro is no longer used by Linux etc versions of SRB2. 
Unlike the rest of the commits in this branch (as of writing), I didn't make this commit between 1 and 2 years ago, I made it right now ;)
 2018-10-27 19:58:51 +01:00
Monster Iestyn
aebcf3520b Remove pointless drawtextured variable and redundant fake planes checks (R_FakeFlat would already have made gr_frontsector/backsector something else if they were) 2018-10-27 19:32:55 +01:00
Monster Iestyn
3d88ee9d55 Added missing checks in HWR_AddLine from the software version, move v** vars to the top since R_PointToAngle calls use the same values anyway 2018-10-27 19:31:24 +01:00
Monster Iestyn
09eecd36b4 Hack to make sure even (extra)subsectors without planepolys have segs adjusted 
this fixes a crash in (old) GFZ2 at the ramp as a result of creating pv1/pv2. This probably means before pv1/pv2 there could have been some silly typecasting from vertex_t to polyvertex_t to get fixed vertex coords and such...
 2018-10-27 19:29:45 +01:00
Monster Iestyn
90cfa5ef16 Make new pv1/pv2 seg pointers, so AdjustSeg doesn't modify the v1/v2 pointers directly anymore 
Yes I know they're void * in r_defs.h's seg_t definition, it's quicker than trying to figure out if including hardware/hw_glob.h is a good idea or not
 2018-10-27 19:29:31 +01:00
Monster Iestyn
1cf2ce63c0 More optimising and otherwise fixing bizarre formatting in hw_trick.c 2018-10-27 18:58:05 +01:00
Monster Iestyn
2107aab666 Moved my added slope checks in hw_trick.c to isCeilingFloating/isFloorFloating 
I also optimised those two functions while I was there (why keep a "floating" variable when setting it to false guarantees the functions return false?)
 2018-10-27 18:57:28 +01:00
Monster Iestyn
787d5b598d gr_correcttricks fix: don't check if top/bottom textures are missing for sloped sectors, just ignore and cancel the hack 
This fixes GFZ2's mysterious flying flats at the ramp to the big room
 2018-10-27 18:56:38 +01:00
Monster Iestyn
67a2922558 Ensure file is closed whenever MD2 reading errors happen 2018-10-27 18:53:38 +01:00
Monster Iestyn
b150e842fc Add MD2_INDENT and MD2_VERSION so we can cleanly check that it's a valid MD2 from magic number/version 2018-10-27 18:53:18 +01:00
mazmazz
a288b95458 Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup 2018-10-19 22:04:26 -04:00
toaster
880e4c0631 Final weather stuff. 
* Multiplied rain speed by 3, per Oni's request.
* Disable weather density - force to 1 if weather draw distance, otherwise zero
* Move the ceilingpic check into a more convenient part of the weather spawning loop.
* `drawdist_precip_cons_t` - replaces "Infinite" with "None".
* Disable the lowest normal draw distance (256), given... both kart and srb2 are basically unplayable like that.
* Disable cv_drawdist_nights entirely.
 2018-10-14 22:32:34 +01: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
Monster Iestyn
61a29bed85 Remove unused sscount variable 
(it's only set to 0 in software, and only ++'d in OpenGL, what kind of sense does that make?)
 2018-10-11 19:59:26 +01:00
TehRealSalt
640e0e09c6 Merge branch 'master' into sal-cleanup 2018-10-08 00:22:44 -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
toaster
b1e02467bf Weather is already run client-side. What if we ran it render-side, for major performance gains? This commit will answer all your questions - and more! 2018-10-07 15:00:58 +01:00
TehRealSalt
8ba3f88553 Don't need thissec 2018-10-06 23:37:27 -04:00
TehRealSalt
ff7b402dc5 OGL support 2018-10-06 19:25:59 -04:00
TehRealSalt
e6fd41339a DrawFill supports splitscreen offset flags 2018-10-01 08:41:44 -04:00
Monster Iestyn
872e2f82c1 Redo OpenGL skewing support, so that it now itself supports the lower unpegged effect for FOFs in OpenGL! 2018-09-28 17:02:02 +01:00
toaster
e4f6015b50 Revamp flat alignment to be consistent across all renderer functions except for the software slope renderer, which me and fickle tried our best at but couldn't get to work. (This is a backport of 2.2 code that slightly postdates the improved flat alignment Kart's had for a while.) 
This fixes #11.
 2018-09-27 18:11:43 +01:00
toaster
f20710fbb4 Turns out I actually forgot to push this when I did the GL fade colour thing earlier, woops. 2018-09-22 21:05:20 +01:00
toaster
4fd4deff8a One last thing - make the OpenGL level loading bar screen have the correct background colour. 2018-09-22 12:43:54 +01:00
toaster
084b99a5c9 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
toaster
25ae5a5e7f Partially address Sal's review last night by switching to a more sensible default. I'm still unconvinced on the need to make encore mode a seperate knob on the grounds of overcomplexity and "you can't turn map hell off", but hopefully this'll be a shippable state we can come back to later. 
Also, thank you for reminding me, Sryder - disable my very, very limited progress on encore mode in openGL so that stages aren't an unintended hodgepodge of different colourschemes for the objects versus the level environment.
 2018-09-21 12:12:17 +01:00
toaster
123778766a Animated sky backport 2018-09-17 11:21:25 +01:00
TehRealSalt
c9994c6ad8 Changed MD2 coloring again 
Squares the colors to get nicer looking results (https://www.youtube.com/watch?v=LKnqECcg6Gw), as well as only blending a small chunk of the skincolor to prevent desaturation from the brightest/darkest values.
 2018-09-16 23:39:18 -04:00
TehRealSalt
ac2f81e423 New color brightness formula 
Gets more accurate looking results
 2018-09-16 23:28:10 -04:00
mazmazz
17cf310b84 nodigimusic nomusic nosound refactor other targets 
(cherry picked from commit 86f151db654beb14e8d6893cdff2adaa965e8e4b)
 2018-09-14 10:35:56 -04:00
TehRealSalt
f6ce2bfb54 Ignore texture on horizon lines when in OGL 
Before: https://cdn.discordapp.com/attachments/300531341957529602/484842910475354124/kart0110.png
After: https://cdn.discordapp.com/attachments/270211093761097728/484841628771680258/kart0109.png

Not a solution, but better than the previous.
 2018-08-30 17:53:25 -04:00