Commit Graph

207 Commits

Author SHA1 Message Date
Justin Marshall 1ae367ef3b ConvertCoordsToIsometric no longer snaps to nearest tile. 2020-07-03 09:42:46 -07:00
Justin Marshall e2fcb059ec Isometric tiles now render the entire screen. Off screen tiles will not be rendered. 2020-07-02 21:10:52 -07:00
Justin Marshall a1687554cc Prep_For_Add now checks for the hdimage. 2020-07-02 18:02:36 -07:00
Justin Marshall 61a0c58d3e Added proad tile from Tiberian Sun. 2020-07-02 17:57:30 -07:00
Justin Marshall 212b15521d Ensured tiles are in the right order. 2020-07-02 17:07:17 -07:00
Justin Marshall 6101c8c8f0 Terrain templates with hidden tiles now work correctly. 2020-07-02 15:23:41 -07:00
Justin Marshall 16bca743d7 Added new Tiberian Sun tiles. 2020-07-02 15:09:42 -07:00
jmarshall23 cb69d314ca Merge pull request #18 from jmarshall23/master
Revert "Merge branch 'master' into master"
2020-07-02 13:47:58 -07:00
Justin Marshall 33b9fd94bd Revert "Merge branch 'master' into master"
This reverts commit b91fab3474, reversing
changes made to 78812727c7.
2020-07-02 13:42:08 -07:00
Justin Marshall b33c844d3c Backout previous changelist. 2020-07-02 13:00:07 -07:00
Justin Marshall f1b5269d73 keydown/mousedown events that get processed by imgui will no longer be processed by the engine. 2020-07-02 12:51:08 -07:00
Justin Marshall 20a5c42f3a Terrain data can now be placed again. 2020-07-02 12:40:46 -07:00
jmarshall23 30efdc9689 Merge pull request #17 from jmarshall23/master
Mainline To Branch
2020-07-02 08:16:15 -07:00
Ben Lankamp b91fab3474 Merge branch 'master' into master 2020-07-02 09:15:30 +02:00
Justin Marshall d141e5ee53 Fixed the lepton size being incorrect. 2020-07-01 19:17:09 -07:00
Justin Marshall 681ab2fa9c Added missing 4 bit flag in IsoTilImageHeader, border alignment is correct. 2020-07-01 16:53:25 -07:00
Ben Lankamp 510bd2ea57 Fix for text input 2020-07-01 23:29:21 +02:00
Justin Marshall ede9d518bf Isometric tiles will no longer render on top of each other. 2020-07-01 14:13:28 -07:00
Ben Lankamp d0440932d9 Sidebar fixes, power fix, input fixes. 2020-07-01 22:52:37 +02:00
Ben Lankamp 99c7a550be User input: casing 2020-07-01 22:23:31 +02:00
Ben Lankamp 70c9b2c47e * Updated user input handling
* Event Queue
2020-07-01 22:23:15 +02:00
Ben Lankamp 7a18490fa2 * All lowercase
* Fixed radar
2020-07-01 21:40:14 +02:00
Ben Lankamp 8337ad6672 User Input changes 2020-07-01 21:39:30 +02:00
Justin Marshall c7748a616d Fixed templatetypeclass land_type. Template's can be placed but only the first tile seems to work. 2020-07-01 11:14:03 -07:00
Justin Marshall f6beb9b4ee Tiberian Sun Iso tiles now load into the placement dialog editor. 2020-06-30 12:17:42 -07:00
Justin Marshall 9808598a07 Tiberian Sun tiles are now loaded. 2020-06-30 11:52:05 -07:00
Justin Marshall 4844f4eaa7 Added tiberian sun mix file support, can't play game until iconset format is ironed yet. 2020-06-29 15:22:06 -07:00
nev6502 2f4eee66df Several more small fixes; everything should be where it should be now 2020-06-28 19:56:53 -06:00
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 37b4f227e6 Units/Objects now render correctly and are selectable. 2020-06-27 16:24:45 -07:00
Justin Marshall db21f9ad7d Mouse click and rubber band now work in game. 2020-06-27 15:24:29 -07:00
Justin Marshall b474ea55b3 Object selection now works in the map editor. 2020-06-27 15:02:08 -07:00
Justin Marshall 2101728255 Hash mark cursor now render correctly in isometric. 2020-06-27 14:24:23 -07:00
Justin Marshall 132071e39b Placement Dialog now places objects in proper isometric space. 2020-06-27 14:00:13 -07:00
Ben Lankamp 196decf9bd Simplifying I/O flow 2020-06-27 22:49:32 +02:00
Justin Marshall 0189929957 Increased tile size. 2020-06-27 10:01:29 -07:00
Justin Marshall 4e1be3e1cb Isometric coordinate conversion is now only applied to rendering the tiles. 2020-06-27 09:49:41 -07:00
Justin Marshall 2a74c0750e Initial test code to render isometric tiles, including test art and test map. 2020-06-26 20:07:36 -07:00
Justin Marshall 960bdc5403 Missing file from previous checkin. 2020-06-26 15:05:44 -07: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