Monster Iestyn
|
1dd4ed4afa
|
Reorganise r_things.h
|
2020-03-08 21:17:30 +00:00 |
|
Monster Iestyn
|
e81ef824d6
|
Set the "spritename" variable within R_AddSingleSpriteDef rather than externally to it, since R_InstallSpriteLump is the only place it gets used anyway
This way we don't have to make it some extern in order for r_skins.c to use it
|
2020-03-08 19:51:18 +00:00 |
|
Monster Iestyn
|
37ecb47436
|
update Makefile, CMakeLists.txt and MSVC project files
|
2020-03-08 19:48:23 +00:00 |
|
Monster Iestyn
|
b2d9697e07
|
remove r_skins.c include in r_things.c, on second thoughts
|
2020-03-08 19:36:56 +00:00 |
|
Monster Iestyn
|
a67dbfff54
|
Create r_skins.c/.h, to contain skins code formerly in r_things.c/h
|
2020-03-08 19:32:07 +00:00 |
|
SteelT
|
7d14796954
|
Merge branch 'fix-ogllib' into 'master'
Fix -OGLlib
See merge request STJr/SRB2!794
|
2020-03-02 15:21:50 -05:00 |
|
Jaime Passos
|
8350a8c58a
|
Merge branch 'new-color-chat-fix' into 'master'
Fix new skin colors using default chat color
See merge request STJr/SRB2!822
|
2020-02-25 20:38:36 -05:00 |
|
Jaime Passos
|
b9fb6182ac
|
Merge branch 'amycrash' into 'master'
Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables
See merge request STJr/SRB2!823
|
2020-02-25 20:38:15 -05:00 |
|
Jaime Passos
|
fe93155578
|
Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables
|
2020-02-24 20:03:08 -03:00 |
|
Steel Titanium
|
ce801e1076
|
Fix new skin colors using default chat color
|
2020-02-24 16:58:19 -05:00 |
|
James R
|
711c8ed6b4
|
Merge branch 'console-in-menus-mk-ii' into 'master'
Console in menus again!
See merge request STJr/SRB2!797
|
2020-02-23 18:15:43 -05:00 |
|
James R
|
95b8f950b4
|
Merge branch 'nomd5-crash' into 'master'
Fix crash under NOMD5
See merge request STJr/SRB2!807
|
2020-02-23 18:15:04 -05:00 |
|
James R
|
3394102927
|
Merge branch 'exitmove-hideflags' into 'master'
Don't spawn the exitmove flags in Single Player
See merge request STJr/SRB2!813
|
2020-02-23 18:13:38 -05:00 |
|
Tatsuru
|
ff8a62819b
|
Oopsie 2
|
2020-02-22 22:36:44 -03:00 |
|
Tatsuru
|
4c00e33096
|
Oopsie
|
2020-02-22 21:14:05 -03:00 |
|
SteelT
|
0770f77371
|
Merge branch '2.2.2-prep' into 'next'
2.2.2 preparation
See merge request STJr/SRB2!811
|
2020-02-22 17:27:19 -05:00 |
|
Steel Titanium
|
03e38e9486
|
Enable use of the patch file
|
2020-02-22 16:42:24 -05:00 |
|
Steel Titanium
|
1c1163bd0f
|
Update version number to 2.2.2
|
2020-02-22 16:37:13 -05:00 |
|
James R
|
af12f26f37
|
Merge remote-tracking branch 'origin/master' into next
|
2020-02-21 21:06:27 -08:00 |
|
James R
|
f6df71ba54
|
Fix NOMD5 compiling
|
2020-02-21 21:06:04 -08:00 |
|
James R
|
0f2b8b8b2c
|
Register servername etc. under NOMD5
This fixes crashes in the menus.
|
2020-02-21 20:04:28 -08:00 |
|
Steel Titanium
|
76f26cda24
|
Merge branch 'master' into next
|
2020-02-21 21:01:29 -05:00 |
|
SteelT
|
cfd190c453
|
Merge branch 'warp-gamedata-corruption-fix' into 'next'
Warp gamedata corruption fix
See merge request STJr/SRB2!802
|
2020-02-21 21:00:29 -05: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
|
93046c5e59
|
Merge remote-tracking branch 'origin/master' into next
|
2020-02-20 17:30:50 -08:00 |
|
James R
|
08627752b2
|
Fix NOPNG compiling
|
2020-02-20 17:30:32 -08: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
|
62d943b609
|
Merge branch 'thin-fixed' into 'next'
Add more strings (and respective functions) for v.drawString().
See merge request STJr/SRB2!770
|
2020-02-20 19:27:01 -05:00 |
|
Monster Iestyn
|
5c33ff0458
|
clarify the situation a bit more in the comments
|
2020-02-20 20:38:01 +00:00 |
|
Monster Iestyn
|
903cc311a7
|
move -warp code to a later part of D_SRB2Main so G_LoadGameData isn't upset by G_SetGameModified
|
2020-02-20 20:31:11 +00:00 |
|
James R
|
54794f325d
|
:)
|
2020-02-19 14:44:22 -08:00 |
|
James R
|
61470201f9
|
Regex bruh moment
|
2020-02-19 14:37:42 -08:00 |
|
James R
|
7060083db5
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
Steel Titanium
|
281d40d6d2
|
Merge branch 'master' into next
|
2020-02-18 22:03:08 -05:00 |
|
James R
|
d3d8f85602
|
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
|
92f65fd822
|
Merge branch 'exitmove-tweaks' into 'next'
Exitmove tweaks
See merge request STJr/SRB2!709
|
2020-02-18 21:58:18 -05:00 |
|
James R
|
a447a3d8a9
|
Merge branch 'rscache' into 'master'
Fix R_CacheRotSprite not working with PNG lumps
See merge request STJr/SRB2!800
|
2020-02-18 21:54:45 -05:00 |
|
James R
|
b92d66a54c
|
Merge branch 'seenames-fix' into 'master'
Fix seenames not working without a SeenPlayer hook
See merge request STJr/SRB2!799
|
2020-02-18 21:53:28 -05:00 |
|
James R
|
c1a91cdc2e
|
Merge branch 'setrenderneeded-fix' into 'master'
Clear setrenderneeded after calling VID_CheckRenderer
See merge request STJr/SRB2!793
|
2020-02-18 21:53:14 -05:00 |
|
James R
|
26825a2b4c
|
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
|
2d8522b9ec
|
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
|
8054f341a1
|
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 |
|
Tatsuru
|
4a8de7cb55
|
Enough
|
2020-02-18 22:55:40 -03:00 |
|
Tatsuru
|
ec67e776dc
|
Standards 2
|
2020-02-18 22:50:22 -03:00 |
|
Tatsuru
|
c76a8e8a58
|
Standards
|
2020-02-18 22:46:16 -03:00 |
|
Steel Titanium
|
da15c92568
|
Merge branch 'master' into next
|
2020-02-18 17:41:13 -05:00 |
|
Jaime Passos
|
1dc080e8cd
|
Merge remote-tracking branch 'origin/master' into rscache
|
2020-02-18 19:38:19 -03:00 |
|
Jaime Passos
|
72edf514c2
|
Merge remote-tracking branch 'origin/master' into seenames-fix
|
2020-02-18 19:37:55 -03:00 |
|
SteelT
|
802bd4040f
|
Merge branch 'ftrim-tweak-2' into 'master'
M_Ftrim
See merge request STJr/SRB2!798
|
2020-02-18 17:24:05 -05:00 |
|
Steel Titanium
|
f0e2ba9e6a
|
Merge branch 'next' into the-colors-feel-so-right
|
2020-02-18 14:29:50 -05:00 |
|