Commit graph

1525 commits

Author SHA1 Message Date
James R
81b8abed53 Merge remote-tracking branch 'origin/master' into paper-items-i-hate-my-life 2020-10-28 21:51:28 -07:00
Jaime Passos
d2c000b252 Implement an "ignore colormaps" sprite rendering flag 2020-10-27 19:54:50 -03:00
Jaime Passos
cdc4a6d86e Implement blend modes 2020-10-27 00:03:41 -03:00
Sally Coolatta
62139f144a Paper item spawners
Code is a little horrendous in a few places but I will hopefully fix later :V
2020-10-26 22:20:02 -04:00
Sryder
01a37668bc Add missing MFD_TRANSSUB to dehacked 2020-10-26 11:22:27 +00:00
Sryder
11386e12ba Keep NUMTRANSMAPS what it was, instead add NUMEFFECTMAPS to end of enum
Should have easier merging and be less likely to break current effects.
2020-10-26 11:18:53 +00:00
Sryder
a585d3c9d1 Revert "Fix various things that used NUMTRANSMAPS for the number of translucent trans maps"
This reverts commit dc453fbbda.
2020-10-26 11:07:17 +00:00
Sryder
dc453fbbda Fix various things that used NUMTRANSMAPS for the number of translucent trans maps 2020-10-25 23:19:20 +00:00
Sryder
488ad70da3 Merge branch 'the-scary-22-merge' of git@git.do.srb2.org:KartKrew/Kart.git into additive-transmap 2020-10-25 14:43:44 +00:00
Sally Coolatta
2509d5a29c Merge branch 'the-scary-22-merge' into battle-rethink 2020-10-24 21:39:32 -04:00
Sally Coolatta
7c2bd0d1c2 Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
Sally Coolatta
9b6aa946ea Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
Sally Coolatta
fda698a290 Merge master 2020-10-24 18:34:07 -04:00
Zippy_Zolton
5a06c0e7b0 Dash state for Tails overlay 2020-10-23 00:47:47 -05:00
Sally Coolatta
69e4a1c59f Blue sphere jiggle physics 2020-10-22 22:15:07 -04:00
Sally Coolatta
9ad88cdfa9 Add center point mobj, polish the visual a bit more, reduce the speed that the barrier shrinks 2020-10-22 17:38:06 -04:00
Sryder
b341cacb0a Subtractive translation map 2020-10-19 11:57:12 +01:00
James R
e10e4d79c3 Merge branch 'bustflags' into 'next'
Bustable Wall and Floor flags.

See merge request STJr/SRB2!1163
2020-10-18 16:42:15 -04:00
Sryder
5558fb073a Basic additive transmap/blend support
Can currently be used on sprites only
added to flames by default because it makes sense
2020-10-18 19:10:19 +01:00
James R
66a6374dbe Merge branch 'lua-polyobjects' into 'next'
Lua polyobjects

Closes #19

See merge request STJr/SRB2!1140
2020-10-15 19:08:54 -04:00
Jaime Passos
96fa912bae Implement object-defined floor sprite slopes. 2020-10-14 00:57:13 -03:00
Jaime Passos
a6f2e8b9c6 Implement relative and absolute sprite offsets for objects (mobjs)
Added RF_ABSOLUTEOFFSETS and RF_FLIPOFFSETS
2020-10-13 12:57:36 -03:00
Jaime Passos
9bb09cdc8c OpenGL support for splats, fix some shadow draw bugs in Software 2020-10-12 19:53:21 -03:00
Jaime Passos
b4b4738c94 Changes to sprite rendering:
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
2020-10-12 00:13:22 -03:00
Jaime Passos
b44837324f Merge branch 'next' into patch-stuff-again-2 2020-10-10 17:01:10 -03:00
James R
880ff650a1 Merge remote-tracking branch 'origin/master' into finish-line-beam 2020-09-30 22:58:41 -07:00
Sally Coolatta
884eb3d515 Error icon for when a map is missing its signpost 2020-09-30 06:00:13 -04:00
Snu
4480273fc6 Remove all instances of PF_CANBUSTFLOORS 2020-09-29 20:16:06 +01:00
Snu
f0b7da9d79 Replace all instances of SF_CANBREAKWALLS and PF_CANBREAKFLOORS with SF_CANBUSTWALLS and PF_CANBUSTFLOORS, respectively. 2020-09-29 13:52:35 +01:00
Snu
ae8892a020 Remove SF_BUSTABLEBUSTER, change SF_CANBREAKFLOORS to a pflags; PF_CANBREAKFLOORS 2020-09-29 11:05:04 +01:00
Snu
7ddef08b34 Add SF_CANBREAKWALLS, SF_CANBREAKFLOORS and SF_BUSTABLEBUSTER 2020-09-29 09:45:34 +01:00
Sally Coolatta
285ec3e08c Player death uses damage types
- Fixed last place elimination not working (again)
- Replaces squishing from level geometry with good old fashioned crush death
2020-09-25 16:31:10 -04:00
Sally Coolatta
b5fcd74ef9 Merge master
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
2020-09-25 12:00:50 -04:00
Sal
e1c5acffb9 Merge branch 'dont-cheese-fault' into 'master'
Fault again if you spectate then respawn during a fault

See merge request KartKrew/Kart!315
2020-09-25 09:31:37 -04:00
Sal
89c5d35fce Merge branch 'spinout-type-cleanup' into 'master'
Don't run out wipeout in the air

See merge request KartKrew/Kart!314
2020-09-25 09:31:25 -04:00
James R
67adf48224 Merge remote-tracking branch 'origin/master' into finish-line-beam 2020-09-24 21:43:23 -07:00
GoldenTails
da266fc4fa Expose MODVERSION to Lua (because for some reason it wasn't).
The wiki even states its existence!
2020-09-23 22:28:29 -05:00
James R
ef108cbb36 Merge remote-tracking branch 'pub/next' 2020-09-20 14:07:54 -07:00
SteelT
d8bcc13fec Merge branch 'master' into trick-panels
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
#	src/k_kart.c
#	src/p_user.c
2020-09-18 00:54:45 -04:00
SteelT
d7a65640c4 Merge branch 'remove-bt_use-deprecation' into 'next'
Remove BT_USE and PF_USEDOWN warning

See merge request STJr/SRB2!1138
2020-09-10 16:06:20 -04: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
Monster Iestyn
9008a21c29 * added access to translucency and triggertag in polyobj_t
* added POF_ flags to INT_CONST in dehacked.c
2020-09-08 22:10:11 +01:00
Jaime Passos
98c6b54994 Improved memory management for patches 2020-09-07 02:23:07 -03:00
GoldenTails
2c303b935d Remove BT_USE and PF_USEDOWN warning
someone entertained the idea of maybe removing it, so might as well put this merge request up to see if people want it
2020-09-06 00:30:05 -05:00
Sal
4b9188b626 Merge branch 'discord-rpc-support' into 'next'
Discord Rich Presence

See merge request KartKrew/Kart-Public!207
2020-08-30 21:48:44 -04:00
Sally Coolatta
0b31f71b61 Merge branch 'master' into finish-line-beam 2020-08-29 21:53:04 -04:00
Steel Titanium
9be59cc560 Expose demo.playback to Lua 2020-08-27 14:58:46 -04:00
Sally Coolatta
3b8066a28e Merge branch 'next' into discord-rpc-support 2020-08-23 05:32:32 -04:00
Sally Coolatta
8e62efb79c Merge branch 'master' into next 2020-08-23 04:44:27 -04:00
lachwright
9feee5348d Correct misplaced MT_ARIDTOAD listing 2020-08-22 17:35:31 +08:00