stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-23 11:10:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
8967 commits 172 branches 41 tags 285 MiB
Commit graph

8967 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime Passos
ae748d6d5c Fix patch generation 2020-01-07 20:05:33 -03:00
Jaime Passos
ce7f81c78d use enum for bpp 2020-01-07 20:04:18 -03:00
Jaime Passos
79116ae471 Provide some cleaner method to generate textures as flats. 
R_GenerateTextureAsFlat
 2020-01-07 16:51:02 -03:00
Jaime Passos
b8625d9efb AA trees are not needed at all for rotated patches 2020-01-07 16:10:38 -03:00
Jaime Passos
5a2ad5c2f3 Merge remote-tracking branch 'origin/next' into pictureformats 2020-01-07 16:10:25 -03:00
Jaime Passos
854d31a08b How did I even manage to do this? 2020-01-07 14:12:19 -03:00
Jaime Passos
1358507785 Fix OpenGL 2020-01-07 14:07:14 -03:00
Jaime Passos
5b5f371b0c R_GetTextureFlat -> R_GetLevelFlat 2020-01-07 13:27:59 -03:00
Jaime Passos
76a6710f8b Move location of R_CheckPowersOfTwo and R_CheckFlatLength 2020-01-07 12:46:46 -03:00
Jaime Passos
06d6e2e027 Move location of R_GetTextureFlat 2020-01-07 12:45:22 -03:00
Jaime Passos
762ce146eb Organise header files, use R_GetFlat 2020-01-07 12:43:27 -03:00
Jaime Passos
f85476c723 Move texture stuff to its own file 2020-01-07 12:35:10 -03:00
James R
fc1eff6eee Merge branch 'amyhearts-fix' into 'next' 
Fix NPC Amy's love hearts crashing if they didn't have a set fuse

See merge request STJr/SRB2!641
 2020-01-07 01:05:09 -05:00
Tatsuru
360e8f28b4 ifdefs make indenting confusing 2020-01-07 01:24:04 -03:00
Jaime Passos
9e0d28f32f How did I mess this up? 2020-01-06 22:08:51 -03:00
Jaime Passos
a089863823 Missing check 2020-01-06 21:16:33 -03:00
Jaime Passos
db8735129a Don't force 16bpp if the bit depth was already higher! 2020-01-06 21:02:25 -03:00
Jaime Passos
42895b2c5f Make error messages consistent 2020-01-06 20:42:46 -03:00
Jaime Passos
218fdaeaf8 Fix patch conversion 2020-01-06 20:39:38 -03:00
Jaime Passos
d5c44350c2 Initialise 2020-01-06 20:20:05 -03:00
Jaime Passos
edb0bbcd6d Cleanup, NOW 2020-01-06 20:16:48 -03:00
MascaraSnake
b95d1cef01 Merge branch 'ignore-glsegs' into 'next' 
Add missing glseg checks (and remove a superfluous one)

See merge request STJr/SRB2!642
 2020-01-06 17:08:32 -05:00
Jaime Passos
4407eb0c0a Fix warnings 2020-01-06 18:31:08 -03:00
Jaime Passos
a1af6b9134 Picture formats test 2020-01-06 18:22:23 -03:00
Alam Ed Arias
5b93230a94 Merge branch 'master' into next 2020-01-06 10:28:21 -05:00
Alam Ed Arias
21c224fce0 idented hell 2020-01-06 09:58:05 -05:00
MascaraSnake
759b1c82e2 Add missing glseg checks (and remove a superfluous one) 2020-01-06 14:40:59 +01:00
MascaraSnake
1cbf7aba0d Merge branch 'move-map-copying' into 'next' 
Reorder map loading

See merge request STJr/SRB2!635
 2020-01-06 04:24:39 -05:00
Alam Ed Arias
0fbc459243 cleanup whitespace 2020-01-05 21:49:07 -05:00
Tatsuru
07f9ddc45a Don't fuck with the fuse if it's negative 2020-01-05 23:41:22 -03:00
Tatsuru
fce1313517 No comments 2020-01-05 23:19:52 -03:00
Tatsuru
664bce71de :amybruh: 2020-01-05 23:18:38 -03:00
James R
0bbc11c2a9 Merge branch 'lua-neatstuff' into 'next' 
Extra functionality for lua

See merge request STJr/SRB2!601
 2020-01-05 20:54:17 -05:00
James R
ea3c36eb13 Merge branch 'fix-mouse-grabbing' into 'master' 
Fix mouse being grabbed even when not used

See merge request STJr/SRB2!639
 2020-01-05 18:46:13 -05:00
Louis-Antoine
e847777a35 Fix mouse being grabbed even when not used 
The other way around this time.
 2020-01-06 00:40:28 +01:00
Louis-Antoine
88c8049c77 Revert "Fix mouse being grabbed even when not used" 
This reverts commit 6c85c4e1d3.
 2020-01-06 00:38:40 +01:00
James R
6af0249d01 Merge branch 'vgetcolorfixes' into 'master' 
Fix usage of V_GetColor

See merge request STJr/SRB2!638
 2020-01-05 17:12:21 -05:00
James R
fa690e2133 Merge branch 'appveyor-gcc-8.1' into 'master' 
Use GCC 8.1 for AppVeyor 64-bit builds

See merge request STJr/SRB2!624
 2020-01-05 17:12:06 -05:00
James R
e4f88d142e Merge branch 'connect-ip-textbox' into 'master' 
Add clipboard functionality to the Connect via IP textbox.

See merge request STJr/SRB2!597
 2020-01-05 17:06:45 -05:00
Louis-Antoine
6c85c4e1d3 Fix mouse being grabbed even when not used 2020-01-05 18:39:16 +01:00
Jaime Passos
deee2a0d6f I was using V_GetColor in a lot of places I shouldn't have, making the game look wrong with a non-default colour profile. 
Though, I left R_RainbowColormap alone.
 2020-01-05 03:20:05 -03:00
MascaraSnake
18ccdd855a Merge branch 'remove-vertex-z-mk2' into 'next' 
Remove "z" from "vertex_t"

See merge request STJr/SRB2!636
 2020-01-04 19:31:16 -05:00
James R
0a061616ef Merge branch 'fix-nonslope-slopes' into 'next' 
Provide a fix for "non-sloped" slopes launch/land behavior by checking the normal's components.

See merge request STJr/SRB2!634
 2020-01-04 16:17:38 -05:00
Nev3r
9999be2d6e Remove vertex_t's z variable. 2020-01-04 18:29:02 +01:00
Nev3r
91222f7527 Adapt P_ClosestPointOnLine3D() to be much like FV3_ClosestPointOnLine() and use vector3_t's as args, save for the hypotenuse calculation, which remains the same; the output should be the same as before. 
Adapt the rope hang snapping to the new function's form.
 2020-01-04 18:28:25 +01:00
Nev3r
49667689c1 Provide a fix for "non-sloped" slopes launch/land behavior by checking the normal's components. 2020-01-04 11:27:31 +01:00
MascaraSnake
1e42dc7ee5 Move P_ProcessLinedefsAfterSidedefs into P_LoadMapData, but move map data copying after everything else 2020-01-04 11:08:05 +01:00
MascaraSnake
a6926e339f Merge branch 'no-compress' into 'next' 
Compressing sidedefs can break both special effects and netgame syncing, so let's get rid of it

See merge request STJr/SRB2!628
 2020-01-03 16:38:42 -05:00
MascaraSnake
26bb0b3c67 Compressing sidedefs can break both special effects and netgame syncing, so let's get rid of it 2020-01-03 21:50:27 +01:00
Alam Ed Arias
a26c5f5428 Merge branch 'master' into next 2020-01-03 14:56:37 -05:00