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
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
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
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
James R
0a85046b22
Merge branch 'bt_spin' into 'next'
...
Replace all occurances of BT_USE with BT_SPIN (2.2!)
See merge request STJr/SRB2!982
2020-08-09 21:03:17 -04:00
James R
9955ff1357
Merge branch 'kill-dos' into 'next'
...
Remove support for DOS
See merge request STJr/SRB2!1090
2020-08-08 21:26:18 -04:00
Nev3r
3d90a6aebe
Merge branch 'udmf-next' into 'next'
...
Merge udmf-next into next
See merge request STJr/SRB2!1075
2020-07-28 14:03:59 -04:00
Steel Titanium
62c85ea4a5
WIP: Remove support for DOS
...
WIP because I don't know if this wording is right for the error.
2020-07-25 18:55:51 -04:00
Jaime Passos
10189ecdc0
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-21 22:25:00 -03:00
James R
7432d65342
Parenthesis
2020-07-21 16:16:03 -07:00
James R
f6527e56b3
Merge branch 'next-lc-uint16' into 'next'
...
Allow modification of built-in skincolors
See merge request STJr/SRB2!1078
2020-07-21 17:56:12 -04:00
SwitchKaze
a9f19fbd18
Deny standard color accessibility changes
2020-07-20 12:06:57 -05:00
James R
9841464e39
Merge branch 'next-lc-uint16' into 'next'
...
Fix skincolor-related memory leak
See merge request STJr/SRB2!1066
2020-07-16 22:01:07 -04:00
SwitchKaze
4184d83ef2
Fix skincolor-related memory leak
2020-07-14 17:09:31 -05:00
kaysrishaq
a3558c29e3
Fix lib_freeslot
2020-07-13 18:56:07 -04:00
James R
f8b659e4bd
Merge branch 'various-color-fixes' into 'next'
...
Various color fixes
See merge request STJr/SRB2!1060
2020-07-13 18:24:55 -04:00
Kays Ishaq
639de75fc1
move dupenum declaration to beginning of block
2020-07-12 19:05:27 -04:00
kaysrishaq
f5fe73571b
Don't check empty string for duplicate name
2020-07-12 12:02:49 -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
GoldenTails
a59c03fefe
Ok fiiineee, I'll support 2.2
2020-07-11 21:59:54 -05:00
GoldenTails
b3198ed063
Replace PF_USEDOWN with PF_SPINDOWN
2020-07-11 21:59:54 -05:00
GoldenTails
acbf983083
Remove another unneeded comment
2020-07-11 21:59:54 -05:00
GoldenTails
36e1c30e19
Replace all occurances of BT_USE with BT_SPIN (2.3?)
...
I'd use `next-major` but it doesn't exist lol
2020-07-11 21:59:54 -05:00
James R
f4989f36bd
Fix a lot of stuff related to the version automation
2020-07-10 22:39:46 -07:00
Nev3r
9210b2ba0b
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-07-10 11:47:16 +02:00
lachwright
804aa8a8bc
Make A_FlickyCenter usable in SOC/Lua
2020-07-07 20:42:00 +08:00
Jaime Passos
c385eca5d2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-06 19:29:14 -03:00
Nev3r
6b38fe4b2c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-07-06 11:13:27 +02:00
LJ Sonic
83f53943a6
Merge branch 'knuxtweaks' into 'next'
...
Knuckles tweaks
See merge request STJr/SRB2!1030
2020-07-04 16:37:35 -04:00
LJ Sonic
b558c523a2
Merge branch 'fix-oldbrak-missiles2' into 'next'
...
Take 2: Fix Old Brak missiles + add pw_ignorelatch
See merge request STJr/SRB2!1006
2020-07-04 16:28:48 -04:00
LJ Sonic
325867ea59
Merge branch 'jetjawsound' into 'next'
...
Jet Jaw Sounds
See merge request STJr/SRB2!1018
2020-07-04 07:09:43 -04:00
LJ Sonic
ac070380c1
Merge branch 'cez3debris' into 'next'
...
New Debris for CEZ3
See merge request STJr/SRB2!1012
2020-07-04 07:00:20 -04:00
lachwright
6a7565686b
Merge remote-tracking branch 'origin/next' into knuxtweaks
2020-07-04 18:53:26 +08:00
LJ Sonic
5c61f059e8
Merge branch 'sf_nosupersprites' into 'next'
...
Add SF_NOSUPERSPRITES
See merge request STJr/SRB2!1000
2020-07-04 06:51:11 -04:00
LJ Sonic
080a5acd0f
Merge branch 'ff_horizontalflip' into 'next'
...
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)
See merge request STJr/SRB2!987
2020-07-03 16:56:32 -04:00
lachwright
0a3b728e81
Knuckles changes:
...
- Buffed crouch landing; lasts slightly shorter and cuts speed less
- Support for swimming! Knuckles has slightly different glide controls when he has swim sprites underwater
- Improved glide controls in 2D mode
- Super Knuckles perks: land from a glide or latch onto a wall to generate a shockwave and damage nearby enemies
- Refactored skid dust
- Made super sparks use FF_FULLBRIGHT
- Added P_SpawnSkidDust and P_Earthquake to Lua
2020-07-04 01:54:00 +08:00
Nev3r
e301d268ec
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
...
# Conflicts:
# src/hardware/hw_main.c
2020-06-30 20:29:48 +02:00
Zippy_Zolton
74ece42ee2
Jet Jaw Sounds
2020-06-25 00:38:07 -05:00
sphere
97ebb50e12
Give ACZ3 boss MF_NOCLIP(HEIGHT) when entering pinch phase, to prevent softlocking.
2020-06-21 16:01:24 +02:00
Zippy_Zolton
9c194f4186
Thanks for the feedback, I have fixed your issues.
2020-06-20 02:04:18 -05:00
Zippy_Zolton
50f51715a7
New Debris for CEZ3
2020-06-20 02:02:13 -05:00
kaysrishaq
6f859fd44d
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)
2020-06-19 11:11:18 -04:00
kaysrishaq
248cd81ee9
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 17:09:29 -04:00
SteelT
dbd5198ac2
Merge branch 'marathonmode' into 'next'
...
MARATHON RUN
See merge request STJr/SRB2!941
2020-06-17 19:36:10 -04:00
Steel Titanium
06f76f07f4
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport
...
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
2020-06-17 18:15:07 -04:00
lachwright
ab7b4a29e5
Add SF_NOSUPERSPRITES
2020-06-17 04:53:42 +08:00
SteelT
9e85267b36
Merge branch 'next-lc-uint16' into 'next'
...
Custom skincolor bugfixes
See merge request STJr/SRB2!971
2020-06-11 20:08:50 -04:00