ac87cda55b
Merge pull request #23 from jmarshall23/master
...
Switched new sidebar graphics to HD graphics pipeline.
2020-07-04 09:49:45 -07:00
9aefac70b6
Switched new sidebar graphics to HD graphics pipeline.
2020-07-04 09:47:42 -07:00
27b68d51f1
Merge pull request #22 from jmarshall23/master
...
Mainline to Branch Integration
2020-07-04 08:19:51 -07:00
02af11fa1a
Draw Powerbar first, buttons + addon (filler) are drawn on top of that.
2020-07-04 11:44:16 +02:00
9b8fbe098b
Last touches on power and side bar.
2020-07-04 11:24:07 +02:00
11f86ffe57
Overlays now render correctly.
2020-07-03 21:31:14 -07:00
258f81b039
Merge pull request #20 from jmarshall23/master
...
Mainline to Branch
2020-07-03 18:57:54 -07:00
4ba5c0d72c
* Added LCW_Uncomp from Chronoshift
...
* Added better sidebar tiling graphics by Thomson26
* Changed alignment of elements based on new graphics
2020-07-04 01:17:53 +02:00
27a1b43b73
Add black background
2020-07-03 23:00:57 +02:00
985e90a7e3
Fix for pixel holes in icons/sidebar.
2020-07-03 13:58:42 -07:00
44cc437ef2
Fixes for power and sidebar buttons
2020-07-03 22:57:14 +02:00
8d3b994a29
Out of bounds tiles are now darkened.
2020-07-03 13:15:08 -07:00
f4bc742cd3
Temp hack for pathfinding problems with TS assets.
2020-07-03 10:51:09 -07:00
52b5c8870f
Disabled scissor rect for tile rendering.
2020-07-03 10:11:49 -07:00
1ae367ef3b
ConvertCoordsToIsometric no longer snaps to nearest tile.
2020-07-03 09:42:46 -07:00
e2fcb059ec
Isometric tiles now render the entire screen. Off screen tiles will not be rendered.
2020-07-02 21:10:52 -07:00
a1687554cc
Prep_For_Add now checks for the hdimage.
2020-07-02 18:02:36 -07:00
61a0c58d3e
Added proad tile from Tiberian Sun.
2020-07-02 17:57:30 -07:00
212b15521d
Ensured tiles are in the right order.
2020-07-02 17:07:17 -07:00
6101c8c8f0
Terrain templates with hidden tiles now work correctly.
2020-07-02 15:23:41 -07:00
16bca743d7
Added new Tiberian Sun tiles.
2020-07-02 15:09:42 -07:00
cb69d314ca
Merge pull request #18 from jmarshall23/master
...
Revert "Merge branch 'master' into master"
2020-07-02 13:47:58 -07:00
33b9fd94bd
Revert "Merge branch 'master' into master"
...
This reverts commit b91fab347478812727c7
2020-07-02 13:42:08 -07:00
b33c844d3c
Backout previous changelist.
2020-07-02 13:00:07 -07:00
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
20a5c42f3a
Terrain data can now be placed again.
2020-07-02 12:40:46 -07:00
30efdc9689
Merge pull request #17 from jmarshall23/master
...
Mainline To Branch
2020-07-02 08:16:15 -07:00
b91fab3474
Merge branch 'master' into master
2020-07-02 09:15:30 +02:00
d141e5ee53
Fixed the lepton size being incorrect.
2020-07-01 19:17:09 -07:00
681ab2fa9c
Added missing 4 bit flag in IsoTilImageHeader, border alignment is correct.
2020-07-01 16:53:25 -07:00
510bd2ea57
Fix for text input
2020-07-01 23:29:21 +02:00
ede9d518bf
Isometric tiles will no longer render on top of each other.
2020-07-01 14:13:28 -07:00
d0440932d9
Sidebar fixes, power fix, input fixes.
2020-07-01 22:52:37 +02:00
99c7a550be
User input: casing
2020-07-01 22:23:31 +02:00
70c9b2c47e
* Updated user input handling
...
* Event Queue
2020-07-01 22:23:15 +02:00
7a18490fa2
* All lowercase
...
* Fixed radar
2020-07-01 21:40:14 +02:00
8337ad6672
User Input changes
2020-07-01 21:39:30 +02:00
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
f6beb9b4ee
Tiberian Sun Iso tiles now load into the placement dialog editor.
2020-06-30 12:17:42 -07:00
9808598a07
Tiberian Sun tiles are now loaded.
2020-06-30 11:52:05 -07:00
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
2f4eee66df
Several more small fixes; everything should be where it should be now
2020-06-28 19:56:53 -06:00
9770771f5c
Fixes several small issues
2020-06-28 19:50:53 -06:00
d5612ebc2f
Merge remote-tracking branch 'upstream/master' into nev6502_branch
2020-06-28 18:00:20 -06:00
9b237d8fda
Added several unit orders
2020-06-28 17:57:57 -06:00
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
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
37b4f227e6
Units/Objects now render correctly and are selectable.
2020-06-27 16:24:45 -07:00
db21f9ad7d
Mouse click and rubber band now work in game.
2020-06-27 15:24:29 -07:00
b474ea55b3
Object selection now works in the map editor.
2020-06-27 15:02:08 -07:00
jmarshall23
Justin Marshall
Ben Lankamp
nev6502