Commit Graph

120 Commits

Author SHA1 Message Date
Ben Lankamp 2007adbda3 * Change font to Arial
* Load/save dialog in proper place
2020-06-15 21:31:03 +02:00
Ben Lankamp 4d5babd812 * Mission Timer at proper place
* Map view dimensions fixed
2020-06-15 21:20:57 +02: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
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
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
Justin Marshall 41691916b3 MouseHotX/Y now used with new mouse code. 2020-06-13 21:39:32 -07: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
Justin Marshall fb58966e1b Cleaned up imgui integration. 2020-06-13 15:52:07 -07:00
Ben Lankamp e6b928dcd2 Removed calls to CalcX/CalcX functions in ASM. 2020-06-13 23:18:31 +02:00
jmarshall23 507079c455 Merge pull request #4 from nev6502/nev6502_branch
Work done on the scripting engine
2020-06-12 20:01:21 -07: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
Ben Lankamp fc3d06aa21 Re-introduce credits 2020-06-13 00:13:40 +02: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
Ben Lankamp 3d995ad22e * Re-enable scrolling
* Re-enable ending of game
2020-06-12 17:35:39 +02: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
jmarshall23 18edb80aac Merge pull request #2 from benlankamp/master
Getting to cleaner code base
2020-06-12 08:01:32 -07:00
Ben Lankamp f8e5b57f7d Include actual changes :\ 2020-06-12 16:55:53 +02:00
Ben Lankamp 66b80220cc * Remove all DirectX remnants.
* Added copying of DLLs to Binary folder
* Handle system events through SDL
2020-06-12 16:52:26 +02:00
Justin Marshall 8cbbaa12b0 Added Release config. 2020-06-12 07:50:12 -07:00
Justin Marshall 482d5c0722 Disabled scroll bar on framebuffer window. 2020-06-11 19:39:31 -07:00
Justin Marshall 0a26a05572 GBuffer video mem now blit directly to the backbuffer cpu array. 2020-06-11 19:35:27 -07:00
Justin Marshall f289eca079 Unit health now works again. 2020-06-11 19:23:52 -07:00
Justin Marshall ed18ca9a37 Complete removal of directdraw and replaced with OpenGL. Has some bugs, movies disabled. 2020-06-11 17:59:36 -07:00
Justin Marshall a7fdd19b5a ASM files removed, functions replaced with bits from Chronoshift. 2020-06-11 13:28:41 -07:00
Justin Marshall 04b14ea4a2 Fixed font and render bug from TXTPRNT integration. 2020-06-11 08:53:09 -07:00
Justin Marshall b6d525a5cd Removed font.cpp. 2020-06-11 05:58:03 -07:00
Justin Marshall b64c955970 Replaced TXTPRNT.ASM with TXTPRNT.CPP from Chronoshift. 2020-06-11 05:47:59 -07:00
Justin Marshall cc6c6092c7 Added more scripting functions. 2020-06-10 20:13:22 -07:00
Justin Marshall 0b23dd5223 Initial Lua Script implementation. Credit/Timer now renders. 2020-06-10 17:50:06 -07:00
Justin Marshall f230b5bd0f Alt key now functions properly, fixed a-z and f1-f12 scancodes. 2020-06-10 14:32:01 -07:00
Justin Marshall 96c214819f Removed unneeded file from CMakeLists.txt 2020-06-10 13:50:54 -07:00
Justin Marshall 45bcd847f9 CMake Projects, temp disabled MMX line blit. 2020-06-10 13:34:18 -07:00
Justin Marshall baeaf6c807 New triggers work properly. 2020-06-09 21:54:06 -07:00
Justin Marshall 6fcd7a484e Triggers should now be save and load able. 2020-06-09 21:40:10 -07:00
Justin Marshall 17464353dd Initial edit trigger and trigger list screens. Trigger List screen complete, edit trigger screen needs some more work. 2020-06-09 20:05:14 -07:00
Justin Marshall b777f2bd5c Changing Theater now works. 2020-06-08 20:23:03 -07:00