Commit graph

12012 commits

Author SHA1 Message Date
lachwright
87968c946b Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice 2020-11-24 14:56:22 +11:00
GoldenTails
930b5ea442 Replace credits with original authors 2020-11-23 21:42:33 -06:00
GoldenTails
8fef61aa29 Split dehacked.c into multiple files. 2020-11-23 21:42:26 -06:00
James R
349312327a Merge branch 'fix-dumb-checkstring-typo' into 'next'
Fix a dumb typo of luaL_checklstring i made whoops

See merge request STJr/SRB2!1266
2020-11-23 22:42:00 -05:00
GoldenTails
d806655769 Fix a dumb typo of luaL_checklstring i made whoops 2020-11-23 21:20:17 -06:00
Jaime Ita Passos
5bdee63117 Fix a crash 2020-11-23 12:53:59 -03:00
SMS Alfredo
fe066b3ef2 ...snickerdoodles 2020-11-23 09:23:02 -06:00
SMS Alfredo
ea7e06a616 Remove PF_SPINNING when jumping if you have SF_NOJUMPDAMAGE 2020-11-23 09:21:00 -06:00
SMS Alfredo
7b05ffd92d Revert "Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING"
This reverts commit ad9bf6085f.
2020-11-23 09:18:05 -06:00
SMS Alfredo
7bbd563b73 Remove unneeded S_PLAY_ROLL check 2020-11-22 23:23:35 -06:00
LJ Sonic
7ff6443659 Fix PlayerCmd not handling angle and aiming correctly 2020-11-23 01:23:34 +01:00
James R
8d71559afe Merge branch 'make-some-lua-globals-rw' into 'next'
Make several Lua global variables writable.

See merge request STJr/SRB2!1233
2020-11-22 18:47:53 -05:00
James R
8a30576d81 Merge branch 'plane-sorting-fix-part-3' into 'next'
Improved sprite sorting against 3d floors

See merge request STJr/SRB2!1235
2020-11-22 18:31:23 -05:00
James R
f39300ac74 Merge branch 'master' into no-dd-make 2020-11-22 15:29:37 -08:00
James R
6d9e036c7f Merge branch 'master' into next 2020-11-22 15:23:12 -08:00
James R
b059ed40c6 Merge remote-tracking branch 'origin/what-is-a-standard-2' 2020-11-22 15:19:39 -08:00
James R
40e954779e Resolve one last conflict in splat sorting
Can't use gz/gzt because there is no transformation to make those work
differently for splats.
2020-11-22 15:12:34 -08:00
Jaime Ita Passos
5293c52bca Remove SHORT macros for referencing patch width/height/offsets 2020-11-22 20:02:47 -03:00
James R
54da9552de Merge remote-tracking branch 'origin/next' into plane-sorting-fix-part-3 2020-11-22 14:41:42 -08:00
James R
30792e7820 Merge branch 'flame-orb' into 'next'
Flame Shield & Thunder Shield Adjustment (Closes #363)

Closes #363

See merge request STJr/SRB2!1220
2020-11-22 17:31:23 -05:00
James R
92625483a4 Merge branch 'replay-height-fix' into 'next'
Made height/spinheight and height change values in replays more accurate

See merge request STJr/SRB2!1241
2020-11-22 17:25:41 -05:00
James R
bec85c033a Merge branch 'replay-camera-update' into 'next'
Make the replay camera follow the player

See merge request STJr/SRB2!1243
2020-11-22 17:23:38 -05:00
James R
eb28532244 Merge branch 'remove-unused-music-types' into 'next'
Remove unused music type enums

See merge request STJr/SRB2!1253
2020-11-22 17:16:35 -05:00
James R
6d6eb79226 Merge branch 'uncap-palettes' into 'next'
Uncap palette lump palettes & allow flashpal palettes to display during pause

See merge request STJr/SRB2!1255
2020-11-22 17:16:21 -05:00
James R
b2a84a9376 Merge remote-tracking branch 'origin/master' into no-dd-make 2020-11-22 14:14:43 -08:00
James R
e17b4d0299 Merge branch 'echo-filenames' into 'master'
Echo filenames when compiling without ECHO=1

See merge request STJr/SRB2!1260
2020-11-22 17:11:03 -05:00
Jaime Ita Passos
2e21168395 Free GPU textures when adding a file 2020-11-22 18:23:35 -03:00
Riku Salminen
b9fa50f7ef No need to reset tokens twice 2020-11-22 23:23:32 +02:00
Riku Salminen
f51be77aa2 Now the fix actually does what the MR says... +lua banks 2020-11-22 23:19:24 +02:00
Jaime Ita Passos
0645c642d2 Improve GPU texture management. 2020-11-22 18:18:26 -03:00
Jaime Ita Passos
abe35fd008 Some interface fixes 2020-11-22 17:22:18 -03:00
Jaime Ita Passos
152c540c1e Fix sprite textures in models 2020-11-22 17:10:10 -03:00
Jaime Ita Passos
9ab3acae2d Change how texture deletion works in OpenGL 2020-11-22 17:03:04 -03:00
Jaime Ita Passos
071ec73389 Some fixes for spritestuff2 2020-11-22 03:47:15 -03:00
GoldenTails
e3c6d1cef3 Add NOECHOFILENAMES, if people don't want logspam. 2020-11-21 22:21:18 -06:00
James R
79bbb3fe46 Remove Direct Draw from the Makefiles
MINGW/MINGW64 implies SDL.
2020-11-21 15:19:54 -08:00
James R
5a8e653cd5 More concise 2020-11-21 13:43:32 -08:00
James R
377a9c10f0 Lua: disallow bitwise not on anything but number values
This fixes a crash.
2020-11-21 13:37:45 -08:00
Nev3r
e95a05880f Merge branch 'spritestuff2' into 'next'
New sprite features

See merge request STJr/SRB2!1257
2020-11-21 10:51:56 -05:00
GoldenTails
8cfa21fb20 Echo filenames when compiling without ECHO=1 2020-11-19 15:17:56 -06:00
GoldenTails
55f169f3c9 Move the GIF downscaling menu option up one to create some parity. 2020-11-19 13:45:04 -06:00
GoldenTails
12ac096a95 Add a menu option for aPNG downscaling. 2020-11-19 13:45:04 -06:00
GoldenTails
949c0c181d Add aPNG downscaling, and its associated consvar. 2020-11-19 13:45:04 -06:00
Jaime Ita Passos
389763a550 Update R_DrawFloorSprite_NPO2_8 and R_DrawTranslucentFloorSprite_NPO2_8 to have the lastest NPO2 optimizations 2020-11-19 00:59:37 -03:00
Jaime Ita Passos
5e890ee6f8 Merge branch 'next' into spritestuff2 2020-11-19 00:52:43 -03:00
SMS Alfredo
9163e73092 Allow no spin characters to water skip while spinning 2020-11-18 12:35:40 -06:00
SMS Alfredo
7ad8aa1477 Allow the Forcespin sector type to be used with intangible fofs
Didn't think simply removing the P_IsObjectOnGround was gonna work, but apparently it does.
2020-11-18 12:27:09 -06:00
SMS Alfredo
01a03a4daa lmao formatting 2020-11-18 12:03:48 -06:00
SMS Alfredo
09644d69c0 Don't force S_PLAY_SPIN when landing with PF_SPINNING if you have certain PA flags 2020-11-18 12:01:06 -06:00
SMS Alfredo
16fd754a39 Allow forcespin sectors to work on no spin characters 2020-11-18 11:49:17 -06:00