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
b9c2cab265
Don't let console open with menu keys while the menu is open
2020-02-17 17:10:29 -08:00
James R
c77e444df9
Draw console in the Record/NiGHTS Attack menus
...
(cherry picked from commit 4efd915d28d0f193528d141b04c5f88b84877f97)
2020-02-17 16:37:29 -08:00
James R
2d98b3f9eb
Revert "Revert "Let the console open in menus""
...
This reverts commit 73368b0c9a
2020-02-17 16:37:13 -08:00
Jaime Passos
f189e0425f
add -nogl parm
2020-02-17 12:14:51 -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
Jaime Passos
bc2b4d2cd8
Merge branch 'setrenderneeded-fix' into fix-ogllib
2020-02-17 01:17:54 -03:00
Jaime Passos
abd7c3e503
Don't center the window when changing renderers
2020-02-17 01:15:18 -03:00
Jaime Passos
21cdca5d6d
Don't call HWR_Switch twice
2020-02-17 01:15:11 -03:00
Jaime Passos
df19b64edd
Remove redundant check
2020-02-17 01:15:04 -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
Jaime Passos
cc14910896
Only set OpenGL as the target renderer if it loaded successfully
2020-02-17 01:14:48 -03:00
Jaime Passos
e16173a82d
Always load the GL library!
2020-02-17 01:13:13 -03:00
Jaime Passos
88e99fed57
Only initialise OpenGL if you actually intend to use it.
2020-02-17 01:12:53 -03:00
Jaime Passos
edb7d20290
Missing comment
2020-02-17 01:08:55 -03:00
Jaime Passos
1d92fa38f6
Fallback to Software if the renderer version doesn't match
2020-02-17 01:08:41 -03:00
Jaime Passos
5c1b3baf18
Fix -OGLlib
2020-02-17 01:08:15 -03:00
Steel Titanium
299d8b2772
Merge branch 'next' into the-colors-feel-so-right
2020-02-16 22:56:27 -05:00
Jaime Passos
2a0495f11b
Merge remote-tracking branch 'origin/next' into fix-overtime
2020-02-17 00:48:42 -03:00
Jaime Passos
1c48480944
Clear setrenderneeded after calling VID_CheckRenderer
2020-02-17 00:36:10 -03:00
fickleheart
598f66a997
Let scripters see if player just launched from slope
2020-02-16 21:34:07 -06:00
fickleheart
51ef6b3684
Merge remote-tracking branch 'upstream/master' into viewroll
2020-02-16 21:32:57 -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
a6f8db2d44
Merge branch 'master' into public_next
2020-02-16 21:00:08 -05:00
Steel Titanium
c234d8765d
Merge remote-tracking branch 'public/next' into public_next
2020-02-16 20:41:17 -05:00
James R
fe43dd8306
Merge remote-tracking branch 'origin/next' into public_next
2020-02-16 17:38:03 -08:00
James R
39a0e8b3e1
Merge remote-tracking branch 'origin/master' into next
2020-02-16 17:35:59 -08:00
James R
920a2d51e0
Merge branch 'revert-console-in-menus' into 'master'
...
No more console in menus because codebase sucks xd
See merge request STJr/SRB2!791
2020-02-16 20:33:52 -05:00
James R
73368b0c9a
Revert "Let the console open in menus"
...
This reverts commit 3a9cc8db92
2020-02-16 17:14:54 -08:00
Steel Titanium
e6f6024828
Update credit at Rob's request
2020-02-16 20:10:30 -05:00
SteelT
7ed75dfcbe
Merge branch 'mobj-shadowscale-send' into 'public_next'
...
Fix object shadow not appearing for mid-joiners
See merge request STJr/SRB2Internal!627
2020-02-16 20:05:59 -05:00
Steel Titanium
a7f8ee9dd1
Merge branch 'public_next' into mobj-shadowscale-send
2020-02-16 18:55:44 -05:00
Steel Titanium
6eff91c4fc
Update file hash yet again
2020-02-16 18:54:51 -05:00
