MascaraSnake
8c36b9efa5
Adapt basic PolyObject setup to UDMF
2020-05-04 22:40:49 +02:00
MascaraSnake
6e7373a475
Merge branch 'next' into udmf-next
2020-05-04 20:32:56 +02:00
MascaraSnake
7fec1211fd
Bugfix in XGL3 ZNODES parsing
2020-05-03 19:28:52 +02:00
MascaraSnake
700b340827
Allow map-wide gravity to be set via level header
2020-05-03 18:33:18 +02:00
MascaraSnake
4b87bee759
Add level header options for setting special stage time and spheres requirements
2020-05-03 17:56:49 +02:00
MascaraSnake
485a4e5035
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
2020-05-02 12:08:31 +02:00
MascaraSnake
3170f2b8c3
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_mobj.c
# src/r_segs.c
2020-04-24 21:15:53 +02:00
Monster Iestyn
d1d006a1a7
Merge branch 'thinker-cleanup' into 'next'
...
Plane movement thinker cleanup
See merge request STJr/SRB2!880
2020-04-24 14:30:52 -04:00
Monster Iestyn
4ef8093e92
Merge branch 'emeraldspawnfix' into 'next'
...
Fix emerald hunt not working properly, part 2
See merge request STJr/SRB2!887
2020-04-23 15:41:27 -04:00
sphere
f85bfc87f5
Move variable declarations outside of for loops.
2020-04-22 23:17:18 +02:00
sphere
e26788d014
Fix variable-length array definition, just in case.
2020-04-22 23:10:43 +02:00
sphere
01a1297631
Make P_SpawnEmeraldHunt even more concise, using Fisher-Yates shuffle.
2020-04-22 22:46:12 +02:00
sphere
b254cb186b
Fix a mistake with P_SpawnEmeraldHunt and make it more concise.
2020-04-22 20:38:58 +02:00
sphere
25affe6948
Make emerald hunt shards spawn at correct heights, and add Float option.
2020-04-22 18:58:40 +02:00
Nev3r
1afb0eb79f
Initialize pitch and roll on textmap mapthings too.
2020-04-22 09:00:29 +02:00
Nev3r
188ad67c58
Merge branch 'udmf-next' into udmf-thingargs
...
# Conflicts:
# src/p_setup.c
2020-04-22 08:58:40 +02:00
Nev3r
3d9d9d74f6
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
Louis-Antoine
f6e2c7063f
Rename lumpinfo_t.name2 to lumpinfo_t.fullname
2020-04-20 23:40:41 +02:00
Nev3r
7cf08e1a08
Add mapthing scale support; fields scale, scalex and scaley set the only mapthing scale field alike.
2020-04-19 15:18:36 +02:00
Nev3r
ca10b38b9c
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
2020-04-19 14:51:55 +02:00
MascaraSnake
09506112d7
Add enums to encapsulate the textmap colormap settings
2020-04-18 17:15:25 +02:00
MascaraSnake
f0c63ce76a
Merge branch 'udmf-next' into udmf-argenums
2020-04-18 16:56:21 +02:00
MascaraSnake
111da04b07
Add enums to encapsulate the textmap slope settings
2020-04-18 16:55:56 +02:00
Nev3r
2b2a18fdf1
Merge branch 'udmf-colormaps' into 'udmf-next'
...
UDMF colormaps
See merge request STJr/SRB2!855
2020-04-18 07:42:24 -04:00
MascaraSnake
fd598f315e
Add an enum for crumblestate
2020-04-17 23:54:37 +02:00
Nev3r
d40713d08b
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-04-14 22:20:54 +02:00
Nev3r
74bd23c275
Actually remove the entire code block in T_MovePlane(), and remove line_t.tagline as it served no other purpose.
2020-04-13 15:17:53 +02:00
Nev3r
ca694c8c43
Merge branch 'udmf-next' into udmf-thingargs
2020-04-12 10:02:12 +02:00
Nev3r
4128f826b7
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
...
# Conflicts:
# src/lua_hooklib.c
2020-04-12 09:57:19 +02:00
Nev3r
21de33bd08
Add mapthing arg support.
2020-04-11 12:54:34 +02:00
James R
b8d40a5783
Merge branch 'dye' into 'next'
...
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04:00
MascaraSnake
2133bc89e6
Merge branch 'udmf-next' into udmf-colormaps
2020-03-22 08:05:05 +01:00
MascaraSnake
1580e14cbc
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
892a8dd6e7
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
MascaraSnake
0ecf8616ba
Add sector flag that protects the colormap from being changed
2020-03-20 12:19:02 +01:00
MascaraSnake
7cf9ad2f2b
Adapt setup of colormap linedefs
2020-03-20 11:19:30 +01:00
Louis-Antoine
e3cbdf8fab
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Monster Iestyn
31b1188a3e
Merge branch 'master' into next
2020-03-15 20:32:43 +00:00
MascaraSnake
c2443b8e8c
Merge branch 'udmf-formatcheck' into udmf-colormaps
2020-03-15 16:26:00 +01:00
MascaraSnake
f689bc88aa
Add boolean variable that indicates if current map is in UDMF format
2020-03-15 16:23:15 +01:00
MascaraSnake
bc8a1350e4
Merge branch 'udmf-next' into udmf-colormaps
2020-03-15 09:58:39 +01:00
MascaraSnake
e545e5f9ba
Add UDMF colormap fields
2020-03-15 09:55:57 +01:00
Nev3r
68f60f3c29
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-03-11 09:31:31 +01:00
Monster Iestyn
f4cb6e1f5e
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
Jaime Passos
94738bfd2d
Don't get chosen as the tagger if you're a spectator
2020-02-23 19:28:16 -03:00
SteelT
a1cf58cf7f
Merge branch 'update-copyright-year' into 'master'
...
Update copyright year
See merge request STJr/SRB2!801
2020-02-21 20:59:56 -05:00
James R
fb0bedf02c
Merge branch 'ogl-colorbug' into 'master'
...
Fix OpenGL "color bug"
See merge request STJr/SRB2!795
2020-02-20 19:32:34 -05:00
James R
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Tatsuru
3022e38d15
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into Tatsuru/SRB2-dye
...
# Conflicts:
# src/d_player.h
# src/dehacked.c
2020-02-19 17:46:18 -03:00
Tatsuru
80edefa56e
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye
2020-02-19 17:32:43 -03:00
