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 |
|
SwitchKaze
|
d992b52577
|
Return nil on skincolor invalid field access
|
2020-12-21 15:48:49 -06: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
|
d673604b48
|
Split dehacked.c into multiple files.
|
2020-11-23 21:42:26 -06:00 |
|
Louis-Antoine
|
31f5cada65
|
Delete unneeded check
|
2020-11-15 01:24:12 +01:00 |
|
Louis-Antoine
|
ff7ca5450f
|
Only call the Lua API for overridden actions
|
2020-11-15 01:15:58 +01:00 |
|
Louis-Antoine
|
05ae84bd09
|
Fix Lua stacktrace not showing in various situations
|
2020-11-13 19:12:25 +01:00 |
|
Louis-Antoine
|
2ebbbecf94
|
Add missing lua_pop call
|
2020-11-13 18:19:13 +01:00 |
|
Sally Coolatta
|
875493d778
|
Remove the need for setting rotation axis in spriteinfo for models
Now it just does it like Software
|
2020-10-30 02:15:49 -04:00 |
|
Jaime Passos
|
b44837324f
|
Merge branch 'next' into patch-stuff-again-2
|
2020-10-10 17:01:10 -03:00 |
|
Zachary McAlpin
|
bff3b20c4a
|
Made states unmodifable in CMD building code
|
2020-10-06 16:54:23 -05:00 |
|
Zachary McAlpin
|
36d7ddeb09
|
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into playercmd-kart-port
|
2020-10-06 02:07:05 -05:00 |
|
kaysrishaq
|
87d71bf811
|
Update lua_infolib.c
|
2020-09-18 17:47:38 -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 |
|
Jaime Passos
|
98c6b54994
|
Improved memory management for patches
|
2020-09-07 02:23:07 -03:00 |
|
Jaime Passos
|
7bc4af41ab
|
Merge branch 'pictureformats' into patch-stuff-again-2
|
2020-08-15 20:48:28 -03:00 |
|
Jaime Passos
|
a7f3dd7eff
|
Refactor patch loading
|
2020-08-08 05:16:47 -03:00 |
|
Zachary McAlpin
|
3e79966be9
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playercmd-kart-port
|
2020-07-25 20:06:12 -05:00 |
|
Jaime Passos
|
10189ecdc0
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
|
2020-07-21 22:25:00 -03:00 |
|
SwitchKaze
|
a9f19fbd18
|
Deny standard color accessibility changes
|
2020-07-20 12:06:57 -05:00 |
|
SwitchKaze
|
5044fba6ac
|
Re-enable built-in color modification
|
2020-07-19 17:23:08 -05:00 |
|
Zachary McAlpin
|
6877df94bc
|
Ported Lat's PlayerCmd hook to vanilla SRB2
|
2020-07-17 00:08:38 -05:00 |
|
SwitchKaze
|
4184d83ef2
|
Fix skincolor-related memory leak
|
2020-07-14 17:09:31 -05:00 |
|
kaysrishaq
|
f5fe73571b
|
Don't check empty string for duplicate name
|
2020-07-12 12:02:49 -04:00 |
|
Kays Ishaq
|
01d6f45642
|
Update lua_infolib.c
|
2020-07-12 11:12:16 -04:00 |
|
kaysrishaq
|
009f163847
|
lua_isboolean -> lua_toboolean
solves bugged set field accessible
|
2020-07-12 10:07:32 -04:00 |
|
kaysrishaq
|
2ee8418eab
|
A bit of cleaning
|
2020-07-12 07:56:25 -04:00 |
|
kaysrishaq
|
be8f10d039
|
various color fixes
|
2020-07-12 07:39:52 -04:00 |
|
Jaime Passos
|
c385eca5d2
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
|
2020-07-06 19:29:14 -03:00 |
|
SwitchKaze
|
58cac1fd73
|
Make colors UINT16, increase color freeslots to 1024
|
2020-05-23 19:35:36 -05:00 |
|
SwitchKaze
|
afe56667b8
|
Update to 2.2.4
|
2020-05-22 16:47:51 -05:00 |
|
Jaime Passos
|
c69a4f9ced
|
Merge remote-tracking branch 'origin/next' into pictureformats
|
2020-05-15 01:34:54 -03:00 |
|
James R
|
45abbb0be6
|
You don't need to push the value twice, it's only used once
|
2020-04-09 17:30:53 -07:00 |
|
Monster Iestyn
|
0a360e1d90
|
Merge branch 'fix-setspriteinfo' into 'next'
Fix lib_setSpriteInfo indexes being off-by-one
See merge request STJr/SRB2!854
|
2020-03-22 16:40:34 -04:00 |
|
Jaime Passos
|
4579c6f631
|
Fix lib_setSpriteInfo indexes being off-by-one
|
2020-03-19 19:09:34 -03:00 |
|
Louis-Antoine
|
46df2b9551
|
Use HAVE_BLUA as fuel for my fireplace
|
2020-03-19 18:36:14 +01:00 |
|
Jaime Passos
|
81a57d5fac
|
Merge remote-tracking branch 'origin/next' into pictureformats
|
2020-03-07 20:43:16 -03:00 |
|
SwitchKaze
|
044e19e328
|
Prohibit modification of built-in colors
In addition, fixes a bug where loading a custom color using command line params exhibits strange behavior.
|
2020-02-29 23:14:49 -05:00 |
|
SwitchKaze
|
99a1840101
|
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
|
2020-02-23 11:50:13 -05:00 |
|
James Hale
|
51137837c4
|
Custom skincolors
|
2020-02-21 21:56:39 -05:00 |
|
James R
|
2274129f57
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
Jaime Passos
|
3b29ec3fbc
|
Merge remote-tracking branch 'origin/next' into pictureformats
|
2020-01-07 16:10:25 -03:00 |
|
Jaime Passos
|
4e0810e8a3
|
Picture formats test
|
2020-01-06 18:22:23 -03:00 |
|
Jaime Passos
|
be227cc58c
|
un-ROTSPRITE rollangle and spriteinfo
|
2019-12-17 13:09:25 -03:00 |
|
Steel Titanium
|
a5cdb0a4b3
|
Update copyright date on source files
|
2019-12-06 13:49:42 -05:00 |
|
Jaime Passos
|
2fa2ebe4a7
|
Optimise
|
2019-11-14 14:12:36 -03:00 |
|
Jaime Passos
|
0a44158db9
|
Other things I missed. Also added SF_NONIGHTSROTATION. Do I even have to keep the old behaviour? I have no idea.
|
2019-11-14 12:27:22 -03:00 |
|
Jaime Passos
|
3e759a2b75
|
rename rollaxis to rotaxis
|
2019-11-13 12:47:30 -03:00 |
|
Jaime Passos
|
ae630a9a23
|
Rotation axis (will rename internally later)
|
2019-11-13 12:36:44 -03:00 |
|
Jaime Passos
|
4a93426233
|
Avoid running setter metamethods when not appropriate to do so
|
2019-11-08 22:13:50 -03:00 |
|