Sally Cochenour
c4dd88bbae
Turn sparkles that warn you when you're about to hit a new drift spark!
2020-03-15 21:59:22 -04:00
Sally Cochenour
fa34e4eee4
Merge branch 'master' into sal-waypoints
2020-03-15 20:21:17 -04:00
Monster Iestyn
f3bfa2b1db
Merge branch 'master' into next
2020-03-15 20:32:43 +00:00
fickleheart
33a9e5aa83
Merge remote-tracking branch 'upstream/master' into shaders-222
...
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
# src/i_video.h
# src/r_main.c
# src/r_main.h
# src/screen.c
# src/sdl/i_video.c
# src/sdl/ogl_sdl.c
# src/w_wad.c
2020-03-14 12:52:15 -05:00
Sally Cochenour
c6f3ac651e
Switch red & blue sparks, add yellow sparks, add big spark sprites
2020-03-14 01:43:54 -04:00
Latapostrophe
f98a74638f
More explicit var names for countdown and countdown2
2020-03-11 07:37:33 +01:00
Latapostrophe
1abe899060
Push race countdowns and functions to set them
2020-03-10 12:57:30 +01:00
Latapostrophe
d7146021c1
Push consoleplayer and displayplayers to Lua
2020-03-10 11:53:28 +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
253ab49c07
Merge remote-tracking branch 'origin/master' into 22shadows
2020-03-05 21:36:58 -08:00
Sal
10fe9434f6
Merge branch 'blizzard' into 'master'
...
Weather system refactor, Blizzard weather type
See merge request KartKrew/Kart!200
2020-03-06 00:09:43 -05:00
Sally Cochenour
7a3733d75c
More remenants
2020-03-01 17:37:10 -05:00
Sally Cochenour
30d391b6b2
FINISH removing the shadows...
2020-03-01 17:35:49 -05:00
Sally Cochenour
3633dc341a
Merge branch 'master' into targets
2020-03-01 15:42:49 -05: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
Jaime Passos
c1156ef29c
Fix (technically functional) string comparison counting an extra character in the comparison length
2020-02-25 22:34:19 -03:00
Jaime Passos
31be6ef867
Fix TYPEOFLEVEL options not having enough bits for TOL_ flags
2020-02-25 22:30:34 -03:00
fickleheart
564cb7d41c
Fix missing menuname entries
2020-02-24 17:56:00 -06:00
fickleheart
1e656618f6
Allow using lump names in ExecCfg
2020-02-24 11:44:27 -06:00
Sally Cochenour
c7daa33bb8
Merge branch 'master' into draw-flags
2020-02-24 00:52:45 -05:00
Jaime Passos
41469d0116
Remove unused SOC menu types
2020-02-23 22:31:17 -03: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
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -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
a1cf43605a
Merge branch 'the-colors-feel-so-right' into 'next'
...
New skin colors, add support for preferred opposite color to save cards, new lua features.
See merge request STJr/SRB2!787
2020-02-18 22:02:01 -05:00
James R
ba9f866acf
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
James R
3070a09dde
Merge branch 'pw-justlaunched' into 'next'
...
Add pw_justlaunched to tell modders when a player launches from a slope
See merge request STJr/SRB2!792
2020-02-18 21:53:05 -05:00
James R
b329536bd1
Merge branch 'titlecard-options' into 'next'
...
Allow more options for when the titlecard shows up
See merge request STJr/SRB2!765
2020-02-18 21:52:03 -05:00
James R
c078af0022
Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER
2020-02-18 18:23:20 -08:00
Steel Titanium
f1204a80aa
Merge branch 'next' into the-colors-feel-so-right
2020-02-18 14:29:50 -05:00
Steel Titanium
299d8b2772
Merge branch 'next' into the-colors-feel-so-right
2020-02-16 22:56:27 -05:00
fickleheart
598f66a997
Let scripters see if player just launched from slope
2020-02-16 21:34:07 -06:00
fickleheart
e17467ad22
Allow SHOWTITLECARDFOR = NONE
2020-02-16 21:32:40 -06:00
fickleheart
427e99f222
Merge remote-tracking branch 'upstream/master' into titlecard-options
2020-02-16 21:32:27 -06:00
Steel Titanium
08533debe6
Add six new skin colors
2020-02-14 22:30:37 -05:00
James R
207c6e4483
SF_NONIGHTSSUPER for disabling super colors in NiGHTS
2020-02-12 18:03:39 -08:00
Jaime Passos
495812aa0e
Cast Moment
2020-02-12 13:59:08 -03:00
Jaime Passos
83112c8248
Add MAXTOL
2020-02-12 13:41:30 -03:00
Jaime Passos
e844f8dbad
Merge remote-tracking branch 'origin/next' into tolfix
2020-02-12 13:03:16 -03:00
Jaime Passos
edf7c16bbe
Merge branch 'gtr-shift' into 'next'
...
1 left shifted by zero is still 1
See merge request STJr/SRB2!766
2020-02-11 23:33:43 -05:00
Monster Iestyn
dc5fd6be11
Use the provided Regex strings to properly turn the entire info.h states/mobjtypes lists into strings for dehacked.c
...
...it's surprising what we actually missed in the states list, apart from just the missing state (yes this makes the states fix branch redundant)
2020-02-09 19:15:04 +00:00
Jaime Passos
f5a46bd70f
Don't add a TOL_ twice.
2020-02-09 16:11:52 -03:00
Jaime Passos
0fdd8c3283
1 left shifted by zero is still 1
2020-02-08 18:50:05 -03:00
fickleheart
33c103c319
Allow more options for when the titlecard shows up
2020-02-08 11:13:40 -06:00
Zwip-Zwap Zapony
ff57802823
Fix missing "RINGSNUMTICS" in dehacked.c
...
This fixes 16/20 of the HUD items in dehacked.c being off by one
(Same case as the MFE_ flags thing)
Also fixes dehacked.c mentioning "LAPS", which doesn't exist
2020-01-26 10:53:37 +01:00
