Sally Cochenour
b1ec5654bc
Merge branch 'master' into targets
2020-03-22 14:31:17 -04:00
MascaraSnake
62603ff226
Merge branch 'udmf-next' into udmf-colormaps
2020-03-22 08:05:05 +01: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
MascaraSnake
f92d5806b5
Add sector flag that protects the colormap from being changed
2020-03-20 12:19:02 +01:00
MascaraSnake
79852f0ec0
Adapt setup of colormap linedefs
2020-03-20 11:19:30 +01:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Sryder
c268313f0a
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/Makefile
# src/k_kart.c
# src/p_map.c
# src/p_setup.c
# src/p_spec.c
2020-03-16 00:13:42 +00:00
Monster Iestyn
f3bfa2b1db
Merge branch 'master' into next
2020-03-15 20:32:43 +00:00
MascaraSnake
0e4ecdd894
Merge branch 'udmf-formatcheck' into udmf-colormaps
2020-03-15 16:26:00 +01:00
MascaraSnake
6645030a39
Add boolean variable that indicates if current map is in UDMF format
2020-03-15 16:23:15 +01:00
MascaraSnake
cbcabfd925
Merge branch 'udmf-next' into udmf-colormaps
2020-03-15 09:58:39 +01:00
MascaraSnake
ffb8928141
Add UDMF colormap fields
2020-03-15 09:55:57 +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
Latapostrophe
1f5bbb2c3d
Merge branch 'push-more-lua' into awful-mix
2020-03-11 07:37:47 +01:00
Latapostrophe
f98a74638f
More explicit var names for countdown and countdown2
2020-03-11 07:37:33 +01:00
Latapostrophe
b7702f5ff5
Merge branch 'antifreeze' of https://gitlab.com/fickleheart/srb2kart-mods into awful-mix
2020-03-10 21:46:12 +01:00
Latapostrophe
207e68e55d
Merge branch 'gl-qol' into v1.2-frankeinstein
2020-03-10 20:34:20 +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
Jaime Passos
81a57d5fac
Merge remote-tracking branch 'origin/next' into pictureformats
2020-03-07 20:43:16 -03:00
James R
18aa2972e5
Merge remote-tracking branch 'origin/master' into parties-only
2020-03-05 21:41:23 -08:00
fickleheart
cf11f1ef6e
SUPER EXPERIMENTAL FREEZE-B-GONE
2020-03-05 22:19:39 -06:00
Sally Cochenour
3633dc341a
Merge branch 'master' into targets
2020-03-01 15:42:49 -05:00
Louis-Antoine
fc07604031
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate
2020-02-29 13:43:47 +01:00
Jaime Passos
d5f6e5fcc6
Race is Competition without the lives
2020-02-28 23:47:38 -03:00
James R
4f40edaf01
Maybe localdisplayplayers is a bad idea
2020-02-23 23:21:20 -08:00
James R
f164320c88
Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen
2020-02-23 23:20:20 -08:00
Jaime Passos
75ff8c1789
Don't get chosen as the tagger if you're a spectator
2020-02-23 19:28:16 -03:00
SteelT
fcb0c62bf7
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
aa0d40212e
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
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Tatsuru
7f190f35f2
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
1463d8ba20
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye
2020-02-19 17:32:43 -03:00
Jaime Passos
b0ce2e088f
Merge remote-tracking branch 'origin/next' into pictureformats
2020-02-19 02:25:36 -03:00
James R
1bc6f2cd91
Merge branch 'startup-file-not-found' into 'master'
...
Fix the issue !678 did, but just don't exit if the file was added twice
See merge request STJr/SRB2!753
2020-02-18 21:50:11 -05:00
MascaraSnake
c2311dca45
Merge branch 'next' into udmf-next
2020-02-18 18:39:11 +01:00
Sally Cochenour
07d355e4d3
FIX COLOR BUG
2020-02-17 01:19:28 -03:00
MascaraSnake
f4a7a5db11
Some fixes for the linedef alpha field
2020-02-10 20:26:29 +01:00
James R
956ae6b823
Don't I_Error on startup files only if a file was added twice
2020-02-01 19:32:08 -08:00
Louis-Antoine
5eae1ca914
Add "resendgamestate" command
2020-01-31 15:57:04 +01:00
Jaime Passos
447ee1a04c
Remove redundancy
2020-01-26 23:46:07 -03:00
Monster Iestyn
eca4bc63da
Merge branch 'master' into next
...
# Conflicts:
# src/g_game.c
2020-01-26 19:23:05 +00:00
MascaraSnake
e22661e150
Implement linedef alpha field (replaces specials 900-908)
2020-01-26 12:24:52 +01:00
MascaraSnake
08386ead09
Use tag instead of angle for skyboxes
2020-01-25 10:26:38 +01:00
MascaraSnake
0080844c5b
Use tag instead of angle for polyobject spawn points and anchors
2020-01-25 10:15:20 +01:00
MascaraSnake
0cb61af3d2
Use tag field to setup vertex slopes
2020-01-25 10:01:01 +01:00
MascaraSnake
436d375dc0
Add mapthing tag field (not used yet)
2020-01-25 09:52:13 +01:00
MascaraSnake
bf24c18ba2
Rename some UDMF fields whose names have different meanings in other UDMF implementations
2020-01-24 23:02:42 +01:00
MascaraSnake
588a76efe4
Merge branch 'next' into udmf-next
2020-01-24 22:38:26 +01:00
Louis-Antoine
bb157866b7
Ignore disconnected players in tag gametypes
...
Disconnected players do not become IT at round start.
If all non-ITs are disconnected, the round ends.
If all ITs are disconnected, one of the non-ITs
becomes IT, or the round ends if in Hide & Seek.
2020-01-23 19:58:13 +01:00
