lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
11,555 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

11555 Commits

Author SHA1 Message Date
James R 9a77cf6306 Merge branch 'lastlineshit' into 'next' 
Allow player.lastlinehit and player.lastsidehit to be usable outside of Knuckles' climbing ability

See merge request STJr/SRB2!1271
 2020-12-10 15:14:16 -05:00
James R 1d31fe3759 Merge branch 'exposed!!!' into 'next' 
Expose player.skin and player.availabilities to Lua as Read-only

See merge request STJr/SRB2!1269
 2020-12-10 15:09:55 -05:00
James R 77c51c62c2 Merge branch 'expose-selectheading' into 'next' 
Expose mapheader_t's selectheading option to Lua

See merge request STJr/SRB2!1268
 2020-12-10 15:07:23 -05:00
James R 857113b60e Merge branch 'crunchyroll' into 'next' 
Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice

See merge request STJr/SRB2!1267
 2020-12-10 15:07:01 -05:00
James R 8701caa110 Merge branch 'blua-urite' into 'next' 
Fix crash when trying to use bitwise NOT on true/false/nil

See merge request STJr/SRB2!1262
 2020-12-10 15:03:39 -05:00
James R c841750868 Merge branch 'no-spin-jump' into 'next' 
Fix a Few Spin Related Bugs (Closes #286 and #360)

Closes #286 and #360

See merge request STJr/SRB2!1256
 2020-12-10 15:02:29 -05:00
James R 4275d52267 Merge branch 'marathon-mode-tokens' into 'next' 
Fix emeralds,  tokens, etc not resetting when restarting marathon mode in first level

See merge request STJr/SRB2!1252
 2020-12-10 14:57:23 -05:00
James R 7834be445d Merge branch 'fixmul' into next 2020-12-10 11:53:03 -08:00
James R a967fa2190 Merge branch 'fixmul' into next 2020-12-10 11:51:18 -08:00
Louis-Antoine 3aecc22764 Add a shorthand alias for FRACUNIT 2020-12-10 11:49:29 -08:00
Louis-Antoine 39a320734d Add shorthand aliases for fixed-point functions 2020-12-10 11:48:40 -08:00
James R a5d228773d Merge branch 'reload-bans' into 'next' 
Fix reloadbans clearing ban.txt and clearbans not actually saving the changes

See merge request STJr/SRB2!1215
 2020-12-10 14:28:13 -05:00
James R 0df5d8ff58 Oops! 2020-12-10 03:06:41 -08:00
James R 2ab71571aa Merge branch 'high-resolution-timer-2' into next 2020-12-10 02:55:02 -08:00
Zachary McAlpin 7fde15d066 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading 2020-11-30 23:48:49 -06:00
James R d004515d6a Fix double define 2020-11-30 19:04:23 -08:00
LJ Sonic eef3028110 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
Zachary McAlpin 51d52f7327 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading 2020-11-29 13:59:10 -06:00
Nev3r ecb333511b Merge branch 'fix-playercmd' into 'next' 
Fix PlayerCmd not handling angle and aiming correctly

See merge request STJr/SRB2!1265
 2020-11-29 05:30:01 -05:00
Nev3r ab649e853d Merge branch 'optimise-overridden-actions' into 'fix-stacktrace' 
Only call the Lua API for overridden actions

See merge request STJr/SRB2!1254
 2020-11-29 05:27:33 -05:00
Nev3r bcf6823cbf Merge branch 'dehacked-hell' into 'next' 
Split dehacked.c into multiple files.

See merge request STJr/SRB2!1222
 2020-11-29 05:18:45 -05:00
Zachary McAlpin 0280721f08 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading 2020-11-26 10:39:41 -06:00
James R 4ab667c6a0 Merge branch 'spritestuff2-fixes' into 'next' 
Some fixes for spritestuff2

See merge request STJr/SRB2!1264
 2020-11-25 19:26:49 -05:00
SMS Alfredo 5c71fe0710 Allow player.lastlinehit and player.lastsidehit to be used outside of Knuckles' climbing ability 2020-11-25 14:31:24 -06:00
SMS Alfredo b2d6d4f83f Expose `player.skin` and `player.availabilities` to Lua as Read-only 2020-11-25 12:35:36 -06:00
Zachary McAlpin d095517999 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading 2020-11-24 20:42:08 -06:00
Zachary McAlpin 76822cef2b Expose the selectheading option from mapheader_t in Lua 2020-11-24 20:41:11 -06:00
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 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