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
Monster Iestyn
2b3034a7af
Merge branch 'master' into next
2020-02-18 17:38:05 +00:00
James R
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
Jaime Passos
369fd8e35f
Fix LUAh_SeenPlayer not working
2020-02-17 23:06:38 -03:00
Jaime Passos
b3933c7842
Fix R_CacheRotSprite not working with PNG lumps
2020-02-17 22:59:36 -03:00
Jaime Passos
bd7b2fcb93
setrenderneeded is already cleared earlier
2020-02-17 22:33:36 -03:00
Jaime Passos
d3abf5dcfa
Set the palette :)
2020-02-17 22:31:34 -03:00
James R
b78fc670d0
Don't let console open with menu keys while the menu is open
2020-02-17 17:10:29 -08:00
Jaime Passos
bef6cb532b
Fix what !785 tried to fix, but correctly
2020-02-17 21:58:32 -03:00
James R
b2733eba73
Draw console in the Record/NiGHTS Attack menus
...
(cherry picked from commit 4efd915d28d0f193528d141b04c5f88b84877f97)
2020-02-17 16:37:29 -08:00
James R
a9a0601c84
Revert "Revert "Let the console open in menus""
...
This reverts commit 705cf9fd40
2020-02-17 16:37:13 -08:00
Jaime Passos
e53a17bb52
Rename stuff around
2020-02-17 21:11:56 -03:00
Jaime Passos
cac5f9d171
add -nogl parm
2020-02-17 12:14:51 -03:00
James R
d0b9027d0a
Merge branch 'viewroll' into 'next'
...
Rolling
See merge request STJr/SRB2!690
2020-02-17 00:10:57 -05:00
James R
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
James R
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
James R
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
James R
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
James R
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
James R
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
James R
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
James R
f4c2a4551b
How many bruh moments can we have?
2020-02-16 20:45:09 -08:00
James R
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
James R
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
Jaime Passos
067a2667e3
move hw texture used to be always below.
2020-02-17 01:20:00 -03:00
Sally Cochenour
07d71778dc
FIX COLOR BUG
2020-02-17 01:19:28 -03:00
Jaime Passos
f90b6d241f
Merge branch 'setrenderneeded-fix' into fix-ogllib
2020-02-17 01:17:54 -03:00
Jaime Passos
8da832986c
Don't center the window when changing renderers
2020-02-17 01:15:18 -03:00
Jaime Passos
04ee6ca12c
Don't call HWR_Switch twice
2020-02-17 01:15:11 -03:00
Jaime Passos
7ddad9c9ec
Remove redundant check
2020-02-17 01:15:04 -03:00
James R
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
Jaime Passos
9d9de3aff6
Only set OpenGL as the target renderer if it loaded successfully
2020-02-17 01:14:48 -03:00
Jaime Passos
3fa4db891f
Always load the GL library!
2020-02-17 01:13:13 -03:00
Jaime Passos
07afd7520f
Only initialise OpenGL if you actually intend to use it.
2020-02-17 01:12:53 -03:00
Jaime Passos
6c5db5f462
Missing comment
2020-02-17 01:08:55 -03:00
Jaime Passos
cca3665525
Fallback to Software if the renderer version doesn't match
2020-02-17 01:08:41 -03:00
Jaime Passos
b6089ccdaf
Fix -OGLlib
2020-02-17 01:08:15 -03:00
Steel Titanium
0299f21dc7
Merge branch 'next' into the-colors-feel-so-right
2020-02-16 22:56:27 -05:00
Jaime Passos
ae013108ab
Merge remote-tracking branch 'origin/next' into fix-overtime
2020-02-17 00:48:42 -03:00
Jaime Passos
9e83e2751d
Clear setrenderneeded after calling VID_CheckRenderer
2020-02-17 00:36:10 -03:00
fickleheart
0fbff66e25
Let scripters see if player just launched from slope
2020-02-16 21:34:07 -06:00
fickleheart
c4b390bc76
Merge remote-tracking branch 'upstream/master' into viewroll
2020-02-16 21:32:57 -06:00
fickleheart
ae53c146e6
Allow SHOWTITLECARDFOR = NONE
2020-02-16 21:32:40 -06:00
fickleheart
187bd9ab23
Merge remote-tracking branch 'upstream/master' into titlecard-options
2020-02-16 21:32:27 -06:00
