Steel Titanium
c7778af7d6
Update version number to 2.2.2
2020-02-22 16:37:13 -05:00
James R
f8c9912d25
Merge remote-tracking branch 'origin/master' into next
2020-02-21 21:06:27 -08:00
James R
1a251ccee2
Fix NOMD5 compiling
2020-02-21 21:06:04 -08:00
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
SteelT
0d02983d97
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
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
e6dafe3002
Merge remote-tracking branch 'origin/master' into next
2020-02-20 17:30:50 -08:00
James R
441be52fd8
Fix NOPNG compiling
2020-02-20 17:30:32 -08: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
4331b13952
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
8eb80cbf75
clarify the situation a bit more in the comments
2020-02-20 20:38:01 +00:00
Monster Iestyn
7ee6ff2b03
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
185c8a073e
:)
2020-02-19 14:44:22 -08:00
James R
ccfea66d68
Regex bruh moment
2020-02-19 14:37:42 -08:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Steel Titanium
42f141d32f
Merge branch 'master' into next
2020-02-18 22:03:08 -05: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
903e9ee17e
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
7ff3fb6a36
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
f39785672d
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
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
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
Tatsuru
4f150cb811
Enough
2020-02-18 22:55:40 -03:00
Tatsuru
522a51b3a1
Standards 2
2020-02-18 22:50:22 -03:00
Tatsuru
c562a4eea4
Standards
2020-02-18 22:46:16 -03:00
Steel Titanium
9efae0bda0
Merge branch 'master' into next
2020-02-18 17:41:13 -05:00
Jaime Passos
d32b88b18c
Merge remote-tracking branch 'origin/master' into rscache
2020-02-18 19:38:19 -03:00
Jaime Passos
e98e0c785a
Merge remote-tracking branch 'origin/master' into seenames-fix
2020-02-18 19:37:55 -03:00
SteelT
8d6d574fa5
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
f1204a80aa
Merge branch 'next' into the-colors-feel-so-right
2020-02-18 14:29:50 -05:00
Monster Iestyn
41bdc91bf0
Merge branch 'master' into next
2020-02-18 17:38:05 +00:00
James R
f51772b29d
Fix M_Ftrim
...
- Use '%f' instead of '%g' to avoid going scientific. Should also fix some
compiler warnings.
- The trailing zero trimming code is now useful. It started on the terminating
byte before and wouldn't have done anything with '%g' anyway.
- Use the absolute fractional value to avoid a sign.
2020-02-17 19:38:14 -08:00
Jaime Passos
304806d221
Fix LUAh_SeenPlayer not working
2020-02-17 23:06:38 -03:00
Jaime Passos
93acc4254c
Fix R_CacheRotSprite not working with PNG lumps
2020-02-17 22:59:36 -03:00
James R
d6251a763b
Merge branch 'viewroll' into 'next'
...
Rolling
See merge request STJr/SRB2!690
2020-02-17 00:10:57 -05:00
James R
e664a44f0b
Merge branch 'push-special-params' into 'master'
...
"+" command line parameters make sense
See merge request STJr/SRB2!707
2020-02-17 00:05:49 -05:00
James R
d1aa45212d
Merge branch 'trim-floats' into 'master'
...
Trim the trailing zeros off floats for cvars
See merge request STJr/SRB2!716
2020-02-17 00:04:15 -05:00
James R
88809684ef
Merge branch 'extra-emblem-display' into 'next'
...
Extra emblem hint display
See merge request STJr/SRB2!721
2020-02-17 00:00:36 -05:00
James R
256c9a20db
Merge branch 'local-color-table' into 'master'
...
Local Color Table for GIF movie mode
See merge request STJr/SRB2!742
2020-02-16 23:58:11 -05:00
James R
2b71af5127
Merge branch 'stoppedclock-exposed' into 'next'
...
Expose stoppedclock to Lua
See merge request STJr/SRB2!771
2020-02-16 23:55:33 -05:00
James R
c4003109b9
Merge branch 'tolfix' into 'master'
...
Don't freeslot TOL_ twice
See merge request STJr/SRB2!779
2020-02-16 23:52:45 -05:00
James R
9117060cee
Merge branch 'lua-hud-get-rotsprites' into 'next'
...
Get rotated sprites with v.getSprite(2)Patch
See merge request STJr/SRB2!773
2020-02-16 23:51:49 -05:00
James R
b8e143d253
How many bruh moments can we have?
2020-02-16 20:45:09 -08:00
James R
b758e7b75b
Merge branch 'colormap_flags_refactor' into 'next'
...
Clean up the mess that is extracolormap_t::fog
See merge request STJr/SRB2!790
2020-02-16 23:28:26 -05:00
James R
b20750f88c
Merge branch 'grfang' into 'master'
...
Allow models for skin/sprites with same name
See merge request STJr/SRB2!767
2020-02-16 23:21:07 -05:00
Jaime Passos
5c050e785b
move hw texture used to be always below.
2020-02-17 01:20:00 -03:00
Sally Cochenour
07d355e4d3
FIX COLOR BUG
2020-02-17 01:19:28 -03:00
James R
5df690af98
Merge branch 'fix-overtime' into 'next'
...
Fix overtime not working
See merge request STJr/SRB2!784
2020-02-16 23:15:01 -05:00
