1c1163bd0f
Update version number to 2.2.2
2020-02-22 16:37:13 -05:00
af12f26f37
Merge remote-tracking branch 'origin/master' into next
2020-02-21 21:06:27 -08:00
f6df71ba54
Fix NOMD5 compiling
2020-02-21 21:06:04 -08:00
76f26cda24
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
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
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
93046c5e59
Merge remote-tracking branch 'origin/master' into next
2020-02-20 17:30:50 -08:00
08627752b2
Fix NOPNG compiling
2020-02-20 17:30:32 -08:00
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
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
5c33ff0458
clarify the situation a bit more in the comments
2020-02-20 20:38:01 +00:00
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
54794f325d
:)
2020-02-19 14:44:22 -08:00
61470201f9
Regex bruh moment
2020-02-19 14:37:42 -08:00
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
281d40d6d2
Merge branch 'master' into next
2020-02-18 22:03:08 -05:00
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
92f65fd822
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
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
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
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
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
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
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
4a8de7cb55
Enough
2020-02-18 22:55:40 -03:00
ec67e776dc
Standards 2
2020-02-18 22:50:22 -03:00
c76a8e8a58
Standards
2020-02-18 22:46:16 -03:00
da15c92568
Merge branch 'master' into next
2020-02-18 17:41:13 -05:00
1dc080e8cd
Merge remote-tracking branch 'origin/master' into rscache
2020-02-18 19:38:19 -03:00
72edf514c2
Merge remote-tracking branch 'origin/master' into seenames-fix
2020-02-18 19:37:55 -03:00
802bd4040f
Merge branch 'ftrim-tweak-2' into 'master'
...
M_Ftrim
See merge request STJr/SRB2!798
2020-02-18 17:24:05 -05:00
f0e2ba9e6a
Merge branch 'next' into the-colors-feel-so-right
2020-02-18 14:29:50 -05:00
2b3034a7af
Merge branch 'master' into next
2020-02-18 17:38:05 +00:00
e3ba369ae4
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
369fd8e35f
Fix LUAh_SeenPlayer not working
2020-02-17 23:06:38 -03:00
b3933c7842
Fix R_CacheRotSprite not working with PNG lumps
2020-02-17 22:59:36 -03:00
d0b9027d0a
Merge branch 'viewroll' into 'next'
...
Rolling
See merge request STJr/SRB2!690
2020-02-17 00:10:57 -05:00
9bd9e667c5
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
3ea51c943a
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
8e4cb953c8
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
132e8f82d5
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
af14166730
Merge branch 'stoppedclock-exposed' into 'next'
...
Expose stoppedclock to Lua
See merge request STJr/SRB2!771
2020-02-16 23:55:33 -05:00
7ed7e53c81
Merge branch 'tolfix' into 'master'
...
Don't freeslot TOL_ twice
See merge request STJr/SRB2!779
2020-02-16 23:52:45 -05:00
11a1ce6df9
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
f4c2a4551b
How many bruh moments can we have?
2020-02-16 20:45:09 -08:00
fb66691991
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
94aec0101f
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
067a2667e3
move hw texture used to be always below.
2020-02-17 01:20:00 -03:00
07d71778dc
FIX COLOR BUG
2020-02-17 01:19:28 -03:00
d4e80ddc8f
Merge branch 'fix-overtime' into 'next'
...
Fix overtime not working
See merge request STJr/SRB2!784
2020-02-16 23:15:01 -05:00
Steel Titanium