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
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