 jmarshall23
|
c8c5ef4e34
|
Merge branch 'master' into master
|
2020-06-15 11:07:10 -07:00 |
|
 Ben Lankamp
|
47894bc6d4
|
* Proper fix for Window padding in ImGui.
|
2020-06-15 19:59:17 +02:00 |
|
|
Ben Lankamp
|
d21592d73b
|
No briefing in Skirmish
|
2020-06-15 18:34:02 +02:00 |
|
|
Ben Lankamp
|
2f7e6dbcaa
|
Menus all centered
|
2020-06-15 18:20:13 +02:00 |
|
|
Ben Lankamp
|
1c1737e10d
|
* Main menu now properly aligned.
|
2020-06-15 17:49:18 +02:00 |
|
 Justin Marshall
|
393bc868f6
|
Fixed scorescreen page flip issue.
|
2020-06-14 18:58:32 -07:00 |
|
|
Justin Marshall
|
c9e027e1a0
|
Scorescreen no longer crashes but page flips all over the place. Disable color clear each frame.
|
2020-06-14 18:28:42 -07:00 |
|
|
Justin Marshall
|
5b3f63b4e4
|
Team colors are now on the skirmish screen.
|
2020-06-14 17:19:57 -07:00 |
|
|
Justin Marshall
|
3247be0d33
|
Added title screen to skirmish screen.
|
2020-06-14 17:16:36 -07:00 |
|
|
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 |
|
|
Ben Lankamp
|
105fde711a
|
* Remove unneeded code in game exit
|
2020-06-14 22:18:34 +02:00 |
|
|
Ben Lankamp
|
83e331b9ab
|
* Remove old WinPrc code, proper shutdown in SDL events.
|
2020-06-14 22:05:12 +02:00 |
|
|
Ben Lankamp
|
c412287a3e
|
* Fixes for power, sidebar, etc.
* Padding on display?
|
2020-06-14 21:39:40 +02: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 |
|
|
Ben Lankamp
|
a47304608b
|
* Mouse cursor working properly on mouse move
* Tooltip over undiscovered terrain
|
2020-06-14 17:02:03 +02:00 |
|
|
Ben Lankamp
|
054394ecea
|
* Show version number
|
2020-06-14 16:47:31 +02:00 |
|
|
Ben Lankamp
|
ef38daafef
|
* Cleanup of COORD.cpp
* Show Credits and move tab in the right place
|
2020-06-14 16:11:07 +02:00 |
|
|
Ben Lankamp
|
8e573d5db8
|
* Proper shutdown of mouse on exit
* Moved DevIL.dll inside external/devil folder
|
2020-06-14 15:25:18 +02:00 |
|
|
Ben Lankamp
|
52f249f2c0
|
Merge from Marshall
|
2020-06-14 15:06:07 +02:00 |
|
|
Ben Lankamp
|
7fb577abf7
|
Restructuring of code
|
2020-06-14 15:03:29 +02: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
|
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
|
ba0c51a7f2
|
Moved code into the code folder.
|
2020-06-12 08:15:26 -07:00 |
|