Sally Coolatta
48c8843feb
Merge branch 'master' into stair-janking
2021-04-21 21:44:23 -04:00
lachablock
5e327e09c6
Merge master (resolve structgunch conflicts)
2021-04-20 16:09:59 +10:00
lachablock
6e9c3cd864
Lightning sparks when releasing purple/rainbow drifts
2021-04-20 15:57:45 +10:00
lachablock
ed91279391
Add electricity sparks & change purple spark colors
2021-04-17 17:21:18 +10:00
James R
3f09cd4f2b
Stair janking VFX
...
Little sparks spawn on one side of your jart while
stepping, plays for 4 frames on each side.
Loops if 10 tics of the janking animation remain.
2021-04-11 18:57:31 -07:00
SteelT
fc8bd429f3
Merge branch 'master' into invinc-changes
...
Also made changes to sparkles, invincibility speedlines now replaces the sparkles if boosting.
2021-04-06 22:40:02 -04:00
Sryder
216d282484
Fix team spinfire states missing in dehacked.
2021-04-04 15:43:15 +01:00
toaster
ebe38ff518
* Add a blend field to FOFs.
...
* Set via a fourth digit in the upper midtexture for transparent FOFs
* For example - #2551 is additive solid, #1282 is subtractive half...
* The original method of setting the upper midtexture to #900 or 901 still works, since I'm not out to break existing maps.
* Software: Remove the horrible `else if` ladder for FOF translucency. Algorithms, baby!
* OpenGL: Move to using `HWR_GetBlendModeFlag` in more places, for more long-term extensible support for multiple blendmodes.
2021-04-01 23:45:21 +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
Sryder
8344ac3489
Actually just get rid of seenplayer and NAMECHECK altogether.
2021-03-03 18:03:41 +00:00
Sryder
48d46c19e0
MT_NAMECHECK was missing from Lua MOBJTYPE_LIST array.
2021-03-03 17:51:10 +00:00
Sally Coolatta
420a6ccccb
Fix Dehacked loading
2021-02-28 22:39:47 -05:00
Sally Coolatta
20e2c78331
Delete seenames code
...
We had SEENAMES disabled before, and vanilla removed the define, so I went ahead and removed it. Repurposed the old seenames console variable for our nametags.
2021-02-28 21:27:23 -05: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
X.organic
5e832ece89
Move Dehacked table sanity check to deh_tables.c
2021-02-16 19:46:31 +01:00
James R
f3fa2c4f32
Merge branch 'shieldless' into 'next'
...
Add new skin flag SF_NOSHIELDABILITY
See merge request STJr/SRB2!1331
2020-12-15 21:00:53 -05:00
James R
bde40c36b1
Merge branch 'team-elementalfire' into 'next'
...
Player-Colored Elemental Fire for competitive gametypes
See merge request STJr/SRB2!1312
2020-12-15 20:47:45 -05:00
katsy
ead6180ef5
lol
2020-12-14 05:32:51 -06:00
katsy
f76803d8c0
go away whitespace
2020-12-14 04:05:14 -05:00
katsy
e6aff20076
ditto
2020-12-14 04:02:17 -05:00
James R
956fd338f0
Merge branch 'oldguards' into 'next'
...
Kill remaining HAVE_BLUA and SEENAMES
See merge request STJr/SRB2!1319
2020-12-12 17:34:04 -05:00
James R
41f1b3b97c
Kill SEENAMES
2020-12-12 02:11:23 -08:00
Zippy_Zolton
b153276057
Player-Colored Elemental Fire for competitive gametypes
2020-12-10 20:37:50 -06:00
James R
ff9c21c80b
Merge branch 'dehacked-hell-bruh' into 'next'
...
Fix some stuff I missed when rebasing `spritestuff2` to `dehacked-hell`... oops
See merge request STJr/SRB2!1286
2020-12-10 15:36:01 -05:00
Louis-Antoine
d7a4e24e70
Add a shorthand alias for FRACUNIT
2020-12-10 11:49:29 -08:00
GoldenTails
4eae6aaf3f
Fix weird spelling mistake
2020-12-05 05:00:59 -06:00
GoldenTails
db7cc8e988
Fix missing stuff
2020-12-02 19:47:00 -06:00
James R
6dea40beaa
Fix double define
2020-11-30 19:04:23 -08:00
LJ Sonic
079df8df4d
Merge branch 'fix-stacktrace' of https://git.do.srb2.org/STJr/SRB2.git into next
...
# Conflicts:
# src/dehacked.c
# src/dehacked.h
2020-11-29 21:54:15 +01:00
GoldenTails
17092cc5b0
Replace credits with original authors
2020-11-23 21:42:33 -06:00
GoldenTails
d673604b48
Split dehacked.c into multiple files.
2020-11-23 21:42:26 -06:00
