stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-25 20:20:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
11203 commits 173 branches 41 tags 295 MiB
Commit graph

11203 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
0d3c03ccd6 Left word jump (whoo that took long) 2020-01-08 02:54:17 -08:00
Sally Cochenour
fe809b2734 Fullbright transparent planes 
(I disagree with this feature so hard but w/e)
 2020-01-08 04:10:23 -05:00
James R
9e703f935a Right word jump 2020-01-08 01:03:44 -08:00
Sally Cochenour
465b3b1559 Water surface shader 
Does not warp anything beneath the surface YET, just the texture itself, but it's far better than nothing
 2020-01-08 03:37:46 -05:00
MascaraSnake
faac4ea545 Don't create colormap data out of sidedef text for fake planes linedef (the colormap data isn't even used anymore) 2020-01-08 09:28:37 +01:00
MascaraSnake
45404f7f27 Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next 2020-01-08 08:43:55 +01:00
MascaraSnake
031e7cfb82 Fix a condition in the flame jet thinkers I accidentally messed up 2020-01-08 08:43:36 +01:00
MascaraSnake
2d7b43c244 Implement linedef string arguments 2020-01-08 08:42:35 +01:00
fickleheart
6211c80a69 Mixed code and declaration stuff 2020-01-08 00:22:17 -06:00
fickleheart
5abf0c24f9 oh god I forget why this is here but let's not remove it now 2020-01-08 00:21:03 -06:00
James R
0597d0ccbd Merge branch 'dashmode-tweaks' into 'next' 
Dashmode tweaks

See merge request STJr/SRB2!646
 2020-01-08 01:10:44 -05:00
fickleheart
c133e645f7 Merge remote-tracking branch 'upstream/next' into next-newcontrols 2020-01-07 23:43:43 -06:00
Sally Cochenour
7d8ff43019 Basic fog shader 
HWR_FogBlockAlpha is still very inaccurate, which gives different results than Software even with the shader, but it's a start
 2020-01-07 20:55:36 -05:00
Sally Cochenour
a35a2c81e2 Fix errors 2020-01-07 19:30:09 -05:00
Jaime Passos
cdc2a8a923 Fix shadowed declarations 2020-01-07 20:07:35 -03:00
Jaime Passos
8202ea86b7 Fix Picture_GetPatchPixel 2020-01-07 20:05:40 -03:00
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
MascaraSnake
b6ab1af424 Check slope flags explicitly instead of setting them directly (in case they ever change) 2020-01-07 21:50:14 +01: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
Sally Cochenour
ca5b56181b Merge next 2020-01-07 07:35:39 -05:00
lachwright
01b8bd21cc Dashmode tweaks: 
- Remove the ability for non-SF_MACHINE players in dashmode to break spikes and monitors
- Replace instances of dashmode magic numbers with dashmode constants
- Add dashmode constants to dehacked.c
 2020-01-07 15:38:48 +08: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
lachwright
e069e149d9 Apply skin's highresscale to continue screen 2020-01-07 13:56:54 +08: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
Steel Titanium
808d731652 Update copyright statements for changed names 2020-01-06 17:16:27 -05:00
MascaraSnake
b358acc621 Merge branch 'udmf-next' into linedef-args 2020-01-06 23:10:53 +01: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
MascaraSnake
c79608dad5 Add slope linedefs to UDMF ZB config 2020-01-06 20:45:02 +01:00
MascaraSnake
9ff4de4ae2 Merge branch 'linedef-args' of git.magicalgirl.moe:STJr/SRB2 into linedef-args 2020-01-06 17:41:30 +01:00
MascaraSnake
fff0b3e66c Adapt setup of copy slope linedef to UDMF 2020-01-06 17:39:39 +01:00
Alam Ed Arias
5b93230a94 Merge branch 'master' into next 2020-01-06 10:28:21 -05:00