kaysrishaq
6f859fd44d
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)
2020-06-19 11:11:18 -04:00
MascaraSnake
3ce62d7780
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_mobj.c
# src/p_polyobj.c
2020-06-09 09:38:01 +02:00
LJ Sonic
aeeb6e1b02
Merge branch 'next' into 'fix-spawn-desynch'
...
# Conflicts:
# src/p_map.c
2020-06-01 08:15:02 -04:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Louis-Antoine
4c5a413d42
Fix crash when setting a mobj's angle from a Lua script
2020-05-28 18:34:56 +02:00
SteelT
4b77741f37
Merge branch 'next-lc-uint16' into 'next'
...
Custom skincolors
See merge request STJr/SRB2!960
2020-05-28 11:23:05 -04:00
Louis-Antoine
d886e35576
Fix potential desynch when a player spawns
2020-05-28 11:03:35 +02: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
Monster Iestyn
11b115083e
added the ability to get the # of a mapthing_t in Lua
2020-05-22 18:32:34 +01:00
Sally Coolatta
f210b4a417
Sprite offset code
2020-05-08 19:38:51 -04:00
MascaraSnake
d2e21afaf1
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_mobj.c
# src/r_segs.c
2020-04-24 21:15:53 +02:00
Nev3r
96f6800ec3
Merge branch 'udmf-thingargs' into udmf-multitag
...
# Conflicts:
# src/doomdata.h
# src/lua_mobjlib.c
# src/p_setup.c
2020-04-22 10:54:27 +02:00
Nev3r
3c6ad3a9a8
Merge branch 'udmf-next' into udmf-multitag
...
# Conflicts:
# src/doomdata.h
# src/p_setup.c
2020-04-22 09:11:17 +02:00
Nev3r
fbb2450133
Merge branch 'udmf-next' into udmf-thingargs
...
# Conflicts:
# src/p_setup.c
2020-04-22 08:58:40 +02:00
Nev3r
3358413479
Merge branch 'udmf-pitch-and-roll' into 'udmf-next'
...
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
See merge request STJr/SRB2!882
2020-04-21 12:27:26 -04:00
Nev3r
1ebfeb3be6
Add mapthing pitch/roll Lua access as well.
2020-04-19 17:19:04 +02:00
Nev3r
f55f425d1a
Add Lua support.
2020-04-19 15:56:06 +02:00
Nev3r
da165d2d22
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
2020-04-19 14:51:55 +02:00
Nev3r
268a66a55a
Fix an outrageous typo which didn't get pushed for some reason.
2020-04-19 12:23:51 +02:00
Nev3r
95146cfdab
Make the Lua interface return/set the first tags from the local taglists.
2020-04-17 22:30:16 +02:00
Nev3r
e05d19b7b9
Fix typo involving the stringargs exposure.
2020-04-13 10:21:32 +02:00
Nev3r
dec80cb2a7
Add mapthing arg support.
2020-04-11 12:54:34 +02:00
MascaraSnake
9b76d3af6f
Merge branch 'next' into udmf-next
...
# Conflicts:
# extras/conf/Includes/SRB222_linedefs.cfg
# extras/conf/Includes/SRB222_misc.cfg
# src/p_spec.c
2020-03-21 20:04:31 +01:00
Louis-Antoine
4e7605f0e2
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Nev3r
63fb8f846b
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-03-11 09:31:31 +01:00
Monster Iestyn
f186def0bf
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
...
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
Sally Cochenour
18637b9eb2
2.2 shadow port
2020-03-01 22:12:50 -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
MascaraSnake
436d375dc0
Add mapthing tag field (not used yet)
2020-01-25 09:52:13 +01:00
fickleheart
ffbf72bdb6
Give me a break
2020-01-17 00:18:00 -06:00
fickleheart
7aafa300e9
Expose mobj->shadowscale to Lua
2020-01-11 18:28:15 -06: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
116fb2639e
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-10-28 14:29:10 -03:00
toaster
8de96771e2
Move INLEVEL macros for mobj_get and mobj_set to prevent mixed code/declaration errors.
2019-10-24 21:14:51 +01:00
Steel Titanium
3c71434a02
Allow access to players userdata outside levels.
...
In exchange for preventing access to any mobj_t userdata outside levels, including player's own mobj_t.
2019-10-14 22:12:26 -04:00
Jaime Passos
402012e973
I
2019-08-18 14:16:48 -03:00
toaster
c841193acc
Merge branch 'bossenable' into 'master'
...
Boss enable linedef (type 449)
See merge request STJr/SRB2Internal!272
2019-08-03 16:23:22 -04:00
toaster
5e6a3f0297
Instead of checking whether mobj->spawnpoint->extrainfo is in the correct range every tic, have a lua error for trying to set it outside (since there'll no doubt be other consequences to being outside the range too)
2019-08-01 18:12:26 +01:00
toaster
3b99335605
* Strip the word "function" from INLEVEL error messages, since they're now shared between access and function cases.
...
* Move it into lua_script.h, so it's available to everything that needs it.
2019-07-30 17:57:57 +01:00
toaster
c659e3f26b
Fix lua scripts erroring on the title screen because they're run there but it's not counted as GS_LEVEL (aka #168 ).
2019-07-30 17:48:13 +01:00
toaster
2fbb0bbb52
I know this isn't my branch, but found several reference haemmoragers and figured it'd be appropriate to commit here.
2019-07-13 13:43:22 +01:00
toaster
b745b4fe1b
With permission from Kart Krew (Sal and Sryder specifically - they don't know WHY vanilla's using it):
...
* Port across the additional colour translation maps, including mobj-level support for "colorized" objects.
* Make Fangboss and both Metal Sonic objects greyscale if, on spawn, there is a player in the game who is not a spectator whose skin is that character.
* Allow bosses with MF_GRENADEBOUNCE to opt out of the MF2_FRET colour-flashing tomfoolery, and give this flag to Fang.
2019-06-18 17:55:57 +01:00
TehRealSalt
089be795a2
Huge splitscreen refactor
...
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
Latapostrophe
62f1ac6ef6
Expose some more Kart functions, freeplay and rankings bumpers are now hud stuff you can toggle, + experimental playercmd hook
2019-01-13 14:40:48 +01:00
mazmazz
81352aece1
WIP 20190101 merge
...
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00