Commit Graph

27 Commits

Author SHA1 Message Date
Justin Marshall e54d35c735 In Game Load/Save will no longer display the title screen. 2020-06-14 15:46:01 -07:00
Justin Marshall b97ed837bf Added red variant of background(needs art pass), fixed bug were g_inMainMenu wasn't updated on map restart. 2020-06-14 15:24:44 -07:00
Justin Marshall 0d4ead749f Load Mission now works with the new renderer. 2020-06-14 15:02:20 -07:00
Justin Marshall efd9ee934c Switched menu render over to OGL. 2020-06-14 14:56:34 -07:00
Justin Marshall 26845809da Switched to Arial font to match font used in the original game. 2020-06-14 10:03:36 -07:00
Justin Marshall e8c09e7b36 Font color now uses g_ColorXlat 2020-06-14 10:00:41 -07:00
Justin Marshall 7f00bc46d4 Removed old wndproc code which fixes ESP crash. 2020-06-14 09:25:28 -07:00
Justin Marshall 0a1ef9aa84 Initial checkin of the new UI blit code(there are issues and will be fixed one by one). 2020-06-14 09:20:39 -07:00
Justin Marshall 2b84397244 Revert "Merge branch 'master' into jm-linux"
This reverts commit bbfefbf9ab, reversing
changes made to 48ba992ee7.
2020-06-14 08:40:03 -07:00
jmarshall23 bbfefbf9ab Merge branch 'master' into jm-linux 2020-06-14 08:23:26 -07:00
nev6502 c8d084c4f1 Merge remote-tracking branch 'upstream/master' into nev6502_branch 2020-06-14 00:14:32 -06:00
Justin Marshall 41691916b3 MouseHotX/Y now used with new mouse code. 2020-06-13 21:39:32 -07:00
nev6502 ccbdfd163d Merge remote-tracking branch 'upstream/master' into nev6502_branch 2020-06-13 21:29:31 -06:00
Justin Marshall c43b0dd047 Hack for new cursor code to be in the right spot. 2020-06-13 19:14:58 -07:00
Justin Marshall e7f1372fdd Cursor now renders in OpenGL. 2020-06-13 18:57:47 -07:00
nev6502 25f220ec74 First draft for completion of Lua implementation of all vanilla trigger actions 2020-06-13 19:15:38 -06:00
nev6502 a30d5e8243 Revert "First draft for completion of Lua implementation of all vanilla actions within Red Alert"
This reverts commit 8f5da5531e.
2020-06-13 19:05:13 -06:00
nev6502 8f5da5531e First draft for completion of Lua implementation of all vanilla actions within Red Alert 2020-06-13 18:47:27 -06:00
Justin Marshall fb58966e1b Cleaned up imgui integration. 2020-06-13 15:52:07 -07:00
Diego Iastrubni 80b6038cb7 Fix CMake 2020-06-14 00:36:52 +03:00
Diego Iastrubni 8483eed94f Merge remote-tracking branch 'jmarshall23/master' into jm-linux 2020-06-14 00:31:05 +03:00
nev6502 eb7ddd289c Work done on the scripting engine
Probably going to need some discussion
2020-06-12 20:44:44 -06:00
Justin Marshall 7994e304bf Removed some left over ddraw code and used proper linear_blit* bits from Chronoshift. 2020-06-12 17:32:11 -07:00
Justin Marshall 712a5e519d Map command can now be called from anywhere in the main menu UI 2020-06-12 14:03:10 -07:00
Justin Marshall f261a00a0a Initial Developer Console code. 2020-06-12 13:16:21 -07:00
Justin Marshall ea55bbdb4c Moved readme to root folder. 2020-06-12 08:26:25 -07:00
Justin Marshall ba0c51a7f2 Moved code into the code folder. 2020-06-12 08:15:26 -07:00