Commit Graph

168 Commits

Author SHA1 Message Date
nev6502 9770771f5c Fixes several small issues 2020-06-28 19:50:53 -06:00
nev6502 d5612ebc2f Merge remote-tracking branch 'upstream/master' into nev6502_branch 2020-06-28 18:00:20 -06:00
nev6502 9b237d8fda Added several unit orders 2020-06-28 17:57:57 -06:00
nev6502 678d784004 Added To_Float to fixed point class. This is to help with certain house values to/from Lua but may have other uses.
Added ability to create objects out of thin air, and force factories to produce units.

Added ability to issue movement commands to units.

Updated object cache system to use an incremental UID for retrieval / passing ID back to the script, as ID collisions were occuring.
2020-06-28 15:54:47 -06:00
nev6502 19569faf2b Added ability to change attributes for buildings, units, infantry, aircraft and veseels. Values are restored to default values by cacheing values upon first usage and cleaning up with Deinit().
Revised global header to encapsulate the values within sections, drastically reducing variable counts

Mouse frequent click/drag fix
2020-06-27 18:16:29 -06:00
Justin Marshall 37b47a8cfe Missing file from previous checkin. 2020-06-26 15:04:01 -07:00
Justin Marshall 28f5f86f91 Missing file from previous checkin. 2020-06-26 15:01:11 -07:00
Justin Marshall 2e106bc809 Fixed a bug were units can't be selected in the editor. 2020-06-26 11:48:43 -07:00
nev6502 698d7ee346 Merge branch 'nev6502_branch' of https://github.com/nev6502/CnC_Remastered_Collection into nev6502_branch 2020-06-26 00:19:35 -06:00
nev6502 0ef858bf86 More scripting functions (ability to various change object / objectType attributes) and globals for use with them 2020-06-26 00:19:20 -06:00
nev6502 5be642d40b Merge remote-tracking branch 'upstream/master' into nev6502_branch 2020-06-26 00:17:33 -06:00
Justin Marshall 012a5c2d60 WWKeyboardClass::Down now goes through the SDL system for mouse up and down, needs work for other keys. 2020-06-25 17:24:06 -07:00
Justin Marshall c7e4870048 Removed blit code from gbuffer class. Fixed cmakelists for linux. 2020-06-25 14:35:47 -07:00
Justin Marshall 6bfdd6e0ce Converted cmake source file names to lower case. 2020-06-25 13:49:32 -07:00
Justin Marshall 631d332c90 Removed Tiberian Dawn folder. 2020-06-25 13:11:54 -07:00
Justin Marshall e581ffad99 Batch lowercase red alert source code. 2020-06-25 13:10:31 -07:00
Justin Marshall 995b794cd8 Terrain and classic tiles now render properly in the scenario placement dialog. 2020-06-25 09:56:40 -07:00
Justin Marshall 79036cbeff Removed assembly language requirement from cmake project. 2020-06-25 08:35:33 -07:00
nev6502 9c1fc485d8 Merge remote-tracking branch 'upstream/master' into nev6502_branch 2020-06-24 23:04:27 -06:00
Justin Marshall 84bedab275 HD Remaster Terrain tiles now go into the cache. 2020-06-24 19:53:54 -07:00
Justin Marshall e5a55f777e Removed unneeded input consume, HD remaster images now work in the placement editor. 2020-06-24 12:10:08 -07:00
Justin Marshall 4ff7c5df98 Fixed a bug were mouse clicks flags were getting stomped when more then one click event was processed. 2020-06-24 11:23:57 -07:00
Justin Marshall 1f534ed269 Moved NEWBLIT to imgui background cmdlist, console now renders again. Level now draws in editor mode dialogs. 2020-06-24 09:39:47 -07:00
Justin Marshall cc449351d2 War Factory renders more correctly. 2020-06-24 08:21:50 -07:00
Justin Marshall 61ca0cfa5a Fixed a bug were black squares would render in the world after switching to a new level. 2020-06-23 20:44:47 -07:00
Justin Marshall e76e8ed828 Right click mouse context menu in editor will close the editor menu if in root editor menu. Scenario Editor button workflow will no longer play music initially. Fixes to map placement dialog. 2020-06-23 20:31:18 -07:00
Justin Marshall 96bc8e95ff In editor builds the intro & sneak peak will open the scenario editor. 2020-06-23 19:23:21 -07:00
nev6502 f165efc388 Merge remote-tracking branch 'upstream/master' into nev6502_branch 2020-06-23 17:41:49 -06:00
Justin Marshall 6d50fb6fca Added new image cache system, 5k super ultra wide resolutions work, screen resolution set from the ini file. 2020-06-23 16:31:16 -07:00
Justin Marshall e93b511b53 Added x64 to version string. 2020-06-22 20:19:15 -07:00
nev6502 1d32cf97fd Merge remote-tracking branch 'upstream/master' into nev6502_branch 2020-06-22 19:02:05 -06:00
Justin Marshall 3ea7ac187a Updated version string number. 2020-06-22 17:53:13 -07:00
Justin Marshall 21f30aad44 Patch 1.01 Merge branch 'master' of https://github.com/electronicarts/CnC_Remastered_Collection
# Conflicts, ignored these upstream changes:
#	REDALERT/MiscAsm.cpp
#	REDALERT/WIN32LIB/DrawMisc.cpp
2020-06-22 17:19:05 -07:00
nev6502 21027f723a Merge remote-tracking branch 'upstream/master' into nev6502_branch 2020-06-22 17:16:45 -06:00
nev6502 c0c9979fbf Merge remote-tracking branch 'upstream/master' into nev6502_branch 2020-06-22 17:15:19 -06:00
Justin Marshall f53249cb24 WSA animations now work(thanks Omniblade :)). 2020-06-22 16:14:37 -07:00
Justin Marshall 9edbf56043 64bit version now works. Temp hack in for WSA x64 crash. 2020-06-22 13:22:35 -07:00
Justin Marshall e3c998fb16 ScoreScreen works again, WSA animations are fullscreen, added loading screen. 2020-06-22 12:21:13 -07:00
Justin Marshall fd24e73e0f Inline assembly is now replaced with C. 2020-06-22 09:01:10 -07:00
nev6502 b37b16f3d0 Merge remote-tracking branch 'upstream/master' into nev6502_branch 2020-06-21 20:59:03 -06:00
Justin Marshall 332c36efa3 Aircraft remaster assets now load. 2020-06-21 19:53:01 -07:00
Justin Marshall 6834288c16 Added Infantry HD textures. 2020-06-21 19:46:11 -07:00
nev6502 ccf506a68b Callback function is now an optional parameter across the various action creation functions, because some times actions are created expressely to be merged into another action to create a 2 action trigger, and thus the standalone action gets discarded. Entering a callback parameter just for the sake of requiring it is not very nice or clean. 2020-06-21 18:45:59 -06:00
Ben Lankamp fecd7f8ca0 Merge branch 'master' into BL/SDL-UserInput-plus-hotfixes 2020-06-22 00:09:24 +02:00
Ben Lankamp 55ffa4aee3 * Fix input on Add object in map editor 2020-06-22 00:08:17 +02:00
Ben Lankamp 7eff1e1f5a * Re-added Normal_Move_Point 2020-06-22 00:03:57 +02:00
jmarshall23 fa19c1361b Merge pull request #12 from benlankamp/BL/SDL-UserInput-plus-hotfixes
Input fixes for ImGui in map editor
2020-06-21 14:58:43 -07:00
jmarshall23 e4d06a99e6 Merge pull request #11 from nev6502/nev6502_branch
Nev6502 branch
2020-06-21 14:57:19 -07:00
Justin Marshall 95e0bbb3aa Added remaster units support, Image_t now supports multiple image resolutions per shape. 2020-06-21 14:56:25 -07:00
Ben Lankamp 3ced844e55 * Disable VSYNC
* Fixed input for text etc. (focus messages got lost)
2020-06-21 23:48:48 +02:00