Commit Graph

9698 Commits

Author SHA1 Message Date
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
James R b78fc670d0 Don't let console open with menu keys while the menu is open 2020-02-17 17:10:29 -08: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 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
Steel Titanium 7dac10f5f9
Merge branch 'master' into public_next 2020-02-16 21:00:08 -05:00
Steel Titanium 847b2bde13
Merge remote-tracking branch 'public/next' into public_next 2020-02-16 20:41:17 -05:00
James R 472d533d79 Merge remote-tracking branch 'origin/next' into public_next 2020-02-16 17:38:03 -08:00
James R e245354c80 Merge remote-tracking branch 'origin/master' into next 2020-02-16 17:35:59 -08:00
James R 753829c826 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 705cf9fd40 Revert "Let the console open in menus"
This reverts commit ef3d462eb7.
2020-02-16 17:14:54 -08:00
Steel Titanium 773ed0a056
Update credit at Rob's request 2020-02-16 20:10:30 -05:00
SteelT 18601c2e86 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 728e01e60d
Merge branch 'public_next' into mobj-shadowscale-send 2020-02-16 18:55:44 -05:00
Steel Titanium b44358df63
Update file hash yet again 2020-02-16 18:54:51 -05:00
Steel Titanium cb97aafd05
Fix object shadow not appearing for mid-joiners 2020-02-16 18:45:49 -05:00
MascaraSnake 512c6f24a9 Clean up the mess that is extracolormap_t::fog 2020-02-16 20:19:24 +01:00
Steel Titanium 3a82864ce9
Update comment 2020-02-16 11:34:02 -05:00