Commit Graph

384 Commits

Author SHA1 Message Date
Justin Marshall dc20ebb4c0 Added more data, fixed abandoned buildings not being assigned to neutral. 2020-07-12 13:00:51 -07:00
Justin Marshall a33f7bfa25 Added new blend types, added lighting to first soviet mission. 2020-07-12 09:01:36 -07:00
Justin Marshall 52869ac0e9 Initial light rendering code, doesn't render correct in all situations yet. 2020-07-11 22:24:19 -07:00
Justin Marshall 98ff70f6ef Added new rendertexture class for FBO's. 2020-07-11 19:35:18 -07:00
Justin Marshall 3185e48ccd Added the ability to place new light objects in the world, lights don't work yet. 2020-07-11 14:19:34 -07:00
Justin Marshall 37b8b475c9 Fixed a bug were isometric units were placed at the wrong coords in the editor. 2020-07-11 12:58:18 -07:00
Justin Marshall 289e319db9 Centered Add Object dialog. 2020-07-09 09:54:41 -07:00
Justin Marshall c7ba544c94 Disabled scroll in editor when user is interacting with the top menu. 2020-07-09 08:46:17 -07:00
jmarshall23 31e868bb54 Merge pull request #29 from jmarshall23/master
Internal Editor: Right click main menu moved to top down main menu.
2020-07-08 17:32:36 -07:00
Justin Marshall a2e06b5c48 Internal Editor: Right click main menu moved to top down main menu. 0.01 IsoBuild2 2020-07-08 17:30:49 -07:00
jmarshall23 771ba7b87a Merge pull request #28 from nev6502/Nev6502_Isometric
Nev6502 isometric
2020-07-08 08:24:09 -07:00
nev6502 a2e4e7a8f1 Improved adjustment of scrolling direction with emphasis on cardinal directions like the original. 2020-07-08 01:56:21 -06:00
nev6502 f362bda53a Merge branch 'Isometric-Dev' into Nev6502_Isometric 2020-07-08 00:58:34 -06:00
nev6502 cd6446d58a Improved Scrolling, Large Map Handling
- Bugfix in MapClass::Overpass when placing objects while scrolled all the way up / left on a larger map
- Disabled a check in DisplayClass::Set_Cursor_Pos preventing mouse cell coordinates from being updated while scrolled all the way up / left on a larger map
- Added (disabled) function to display mouse/cell position
- Improved mouse scroll region (but still work to be done)
2020-07-08 00:58:13 -06:00
Justin Marshall ace3df0d94 Added two more abandoned buildings from Tiberian Sun(restricted assets). 2020-07-07 16:46:05 -07:00
Justin Marshall 44e16fb0d8 Damaged version of ABAN04 works. 2020-07-07 14:19:07 -07:00
Justin Marshall 8a04d5fca9 Added first enviro prop building(restricted asset from Tiberian Sun). 2020-07-07 13:53:42 -07:00
Justin Marshall 9d3525aa71 Added isotemp support from Tiberian Sun 2020-07-07 09:29:52 -07:00
jmarshall23 6944eb0b86 Merge pull request #27 from nev6502/Nev6502_Isometric
Realigned Facing32 lookup table to better orientate units
2020-07-06 22:09:34 -07:00
nev6502 c3ba2033ca Realigned Facing16 lookup table to better orientate 16 direction units 2020-07-06 23:01:45 -06:00
nev6502 7a67674d42 Realigned Facing32 lookup table to better orientate units 2020-07-06 22:33:20 -06:00
Justin Marshall 8f08fd61ce Removed accidental check in of debug print. 2020-07-06 16:27:35 -07:00
Justin Marshall f4964c83e9 Ruberband selection now works better. 2020-07-06 16:20:36 -07:00
Justin Marshall f1e75e4a63 Added missing files from previous CL. 2020-07-05 20:26:23 -07:00
Justin Marshall 318cfe0cfc Iso tiles now render into the radar view. 2020-07-05 19:55:03 -07:00
Justin Marshall 226ce77ee2 Fixed incorrect credit settings. 2020-07-05 16:58:58 -07:00
jmarshall23 4e637bfbb3 Merge pull request #26 from jmarshall23/master
Mainline to Branch
2020-07-05 14:34:18 -07:00
Justin Marshall 2fba63254c Removed 50 cost for buildings developer checkin. 2020-07-05 14:32:56 -07:00
Justin Marshall f8e30d6e0d Water and road is properly marked. 2020-07-05 10:19:33 -07:00
Justin Marshall 4b8349de33 Moved tesla coils to front of base. 2020-07-05 09:39:41 -07:00
Justin Marshall 6b6db0c6e4 Removed legacy cdcheck for Read_Scenario_INI. 2020-07-05 09:30:00 -07:00
Justin Marshall b3bc7ae3f0 If IQ is too high it no longer sets to 1, instead IQ gets set to max IQ. 2020-07-05 09:23:55 -07:00
Justin Marshall e298a30992 Shroud now renders with a circle alpha image, shrouded terrain no longer renders and is no longer simply covered with a black rectangle. Creating skirmish maps in multiplayer no longer causes a crash. 2020-07-04 22:10:04 -07:00
jmarshall23 80f19de543 Merge pull request #24 from jmarshall23/master
Fix for crash related to the power bar rendering with the fading table.
2020-07-04 20:07:36 -07:00
Justin Marshall 58d354ea6e Fix for crash related to the power bar rendering with the fading table. 2020-07-04 20:04:48 -07:00
Justin Marshall df725471d5 Moved trans hash mark icons to PNG's and now render properly. 2020-07-04 17:29:28 -07:00
Justin Marshall 0384e3fd42 Setup shroud isometric coordinates. 2020-07-04 14:49:40 -07:00
jmarshall23 ac87cda55b Merge pull request #23 from jmarshall23/master
Switched new sidebar graphics to HD graphics pipeline.
2020-07-04 09:49:45 -07:00
Justin Marshall 9aefac70b6 Switched new sidebar graphics to HD graphics pipeline. 2020-07-04 09:47:42 -07:00
jmarshall23 27b68d51f1 Merge pull request #22 from jmarshall23/master
Mainline to Branch Integration
2020-07-04 08:19:51 -07:00
jmarshall23 1520761764 Merge pull request #21 from benlankamp/master
Power bar and sidebar graphics improved, including better tiled graphics
2020-07-04 08:17:38 -07:00
Ben Lankamp 02af11fa1a Draw Powerbar first, buttons + addon (filler) are drawn on top of that. 2020-07-04 11:44:16 +02:00
Ben Lankamp 9b8fbe098b Last touches on power and side bar. 2020-07-04 11:24:07 +02:00
Justin Marshall 11f86ffe57 Overlays now render correctly. 2020-07-03 21:31:14 -07:00
Justin Marshall b8547b0519 Added 2nd iso test map(Soviet 2) 2020-07-03 21:19:32 -07:00
jmarshall23 258f81b039 Merge pull request #20 from jmarshall23/master
Mainline to Branch
2020-07-03 18:57:54 -07:00
Ben Lankamp 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
jmarshall23 37585a56f2 Merge pull request #19 from benlankamp/master
Power meter and sidebar scaling
2020-07-03 14:31:25 -07:00
Ben Lankamp 27a1b43b73 Add black background 2020-07-03 23:00:57 +02:00
Justin Marshall 985e90a7e3 Fix for pixel holes in icons/sidebar. 2020-07-03 13:58:42 -07:00