James R
|
79df0c5366
|
Merge branch 'CR_BRUH' into 'next'
Allow non-player objects to apply the CR_PLAYER carry type without crashing the game
See merge request STJr/SRB2!1274
|
2020-12-10 15:20:11 -05:00 |
|
James R
|
1d39ba59ad
|
Merge branch 'dumb-stuff' into 'next'
Fix TC_DASHMODE not accessible to v.getColormap; add missing skin flags
See merge request STJr/SRB2!1273
|
2020-12-10 15:17:28 -05:00 |
|
James R
|
a8f61b9f7b
|
Merge branch 'mario1up' into 'next'
Fix normal one-up sound playing in Mario mode
See merge request STJr/SRB2!1272
|
2020-12-10 15:15:08 -05:00 |
|
James R
|
ed9d5960ef
|
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
|
35c212f8ef
|
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
|
167715d8e0
|
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
|
df56fcca37
|
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
|
f1b060f695
|
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
|
fc27bbc6e4
|
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
|
34f09b2845
|
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
|
6793020c0c
|
Merge branch 'fixmul' into next
|
2020-12-10 11:53:03 -08:00 |
|
James R
|
5ce1c63969
|
Merge branch 'fixmul' into next
|
2020-12-10 11:51:18 -08:00 |
|
Louis-Antoine
|
d7a4e24e70
|
Add a shorthand alias for FRACUNIT
|
2020-12-10 11:49:29 -08:00 |
|
Louis-Antoine
|
0a4c8555a8
|
Add shorthand aliases for fixed-point functions
|
2020-12-10 11:48:40 -08:00 |
|
James R
|
a6d045cc18
|
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
|
6f5b5c7d7f
|
Oops!
|
2020-12-10 03:06:41 -08:00 |
|
James R
|
2e649de64f
|
Merge branch 'high-resolution-timer-2' into next
|
2020-12-10 02:55:02 -08:00 |
|
Zachary McAlpin
|
7eebfdc7d4
|
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
|
2020-11-30 23:48:49 -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 |
|
Zachary McAlpin
|
522dd26376
|
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
|
2020-11-29 13:59:10 -06:00 |
|
Nev3r
|
ed041a88a4
|
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
|
9fe6bd7ae9
|
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
|
17955311b9
|
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 |
|
SMS Alfredo
|
6b83600300
|
Allow non-player objects to apply the CR_PLAYER carry type without crashing the game
|
2020-11-28 22:03:02 -06:00 |
|
James R
|
e3cae2315a
|
Add missing *individual* skin flags
|
2020-11-28 02:22:08 -08:00 |
|
James R
|
7367acf00d
|
Replace TC macros with an enum that automatically counts up
Also fixes TC_DASHMODE not being accessible to Lua.
|
2020-11-28 02:19:52 -08:00 |
|
Zachary McAlpin
|
09d4fb3a69
|
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
|
2020-11-26 10:39:41 -06:00 |
|
Zippy_Zolton
|
9a8493f1c4
|
Fix normal one-up sound playing in Mario mode
|
2020-11-25 21:46:45 -06:00 |
|
James R
|
d6ed2f4ac8
|
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
|
12f36719b4
|
Allow player.lastlinehit and player.lastsidehit to be used outside of Knuckles' climbing ability
|
2020-11-25 14:31:24 -06:00 |
|
SMS Alfredo
|
0118d60c06
|
Expose player.skin and player.availabilities to Lua as Read-only
|
2020-11-25 12:35:36 -06:00 |
|
Zachary McAlpin
|
d418a8cd45
|
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
|
2020-11-24 20:42:08 -06:00 |
|
Zachary McAlpin
|
d96f1738a1
|
Expose the selectheading option from mapheader_t in Lua
|
2020-11-24 20:41:11 -06:00 |
|
lachwright
|
9172661e47
|
Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice
|
2020-11-24 14:56:22 +11: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 |
|
James R
|
df6a742547
|
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
|
8a9c3c57f7
|
Fix a dumb typo of luaL_checklstring i made whoops
|
2020-11-23 21:20:17 -06:00 |
|
Jaime Ita Passos
|
eee4548d3f
|
Fix a crash
|
2020-11-23 12:53:59 -03:00 |
|
SMS Alfredo
|
d33aab487a
|
...snickerdoodles
|
2020-11-23 09:23:02 -06:00 |
|
SMS Alfredo
|
a60a74e33e
|
Remove PF_SPINNING when jumping if you have SF_NOJUMPDAMAGE
|
2020-11-23 09:21:00 -06:00 |
|
SMS Alfredo
|
21d9e870aa
|
Revert "Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING"
This reverts commit 826a4429dd.
|
2020-11-23 09:18:05 -06:00 |
|
SMS Alfredo
|
fee455ec7a
|
Remove unneeded S_PLAY_ROLL check
|
2020-11-22 23:23:35 -06:00 |
|
LJ Sonic
|
2e71d1be63
|
Fix PlayerCmd not handling angle and aiming correctly
|
2020-11-23 01:23:34 +01:00 |
|
James R
|
85bf84193d
|
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
|
bd82b02478
|
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
|
4f39497feb
|
Merge branch 'master' into next
|
2020-11-22 15:23:12 -08:00 |
|
James R
|
fd8a15dc37
|
Merge remote-tracking branch 'origin/what-is-a-standard-2'
|
2020-11-22 15:19:39 -08:00 |
|
James R
|
1a2c2c8471
|
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 |
|