hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-12 08:00:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 2101728255 Hash mark cursor now render correctly in isometric. Justin Marshall 2020-06-27 14:24:23 -07:00
  • 132071e39b Placement Dialog now places objects in proper isometric space. Justin Marshall 2020-06-27 14:00:13 -07:00
  • 196decf9bd Simplifying I/O flow Ben Lankamp 2020-06-27 22:49:32 +02:00
  • 0189929957 Increased tile size. Justin Marshall 2020-06-27 10:01:29 -07:00
  • 4e1be3e1cb Isometric coordinate conversion is now only applied to rendering the tiles. Justin Marshall 2020-06-27 09:49:41 -07:00
  • 2a74c0750e Initial test code to render isometric tiles, including test art and test map. Justin Marshall 2020-06-26 20:07:36 -07:00
  • d3fca9b7d2 Empty txt Justin Marshall 2020-06-26 15:07:45 -07:00
  • 54aeb104fb Added emptytxt for cache. Justin Marshall 2020-06-26 15:07:15 -07:00
  • 960bdc5403 Missing file from previous checkin. Justin Marshall 2020-06-26 15:05:44 -07:00
  • 37b47a8cfe Missing file from previous checkin. Justin Marshall 2020-06-26 15:04:01 -07:00
  • 28f5f86f91 Missing file from previous checkin. Justin Marshall 2020-06-26 15:01:11 -07:00
  • 2e106bc809 Fixed a bug were units can't be selected in the editor. Justin Marshall 2020-06-26 11:48:43 -07:00
  • 698d7ee346 Merge branch 'nev6502_branch' of https://github.com/nev6502/CnC_Remastered_Collection into nev6502_branch nev6502 2020-06-26 00:19:35 -06:00
  • 0ef858bf86 More scripting functions (ability to various change object / objectType attributes) and globals for use with them nev6502 2020-06-26 00:19:20 -06:00
  • 5be642d40b Merge remote-tracking branch 'upstream/master' into nev6502_branch nev6502 2020-06-26 00:17:33 -06:00
  • 012a5c2d60 WWKeyboardClass::Down now goes through the SDL system for mouse up and down, needs work for other keys. Justin Marshall 2020-06-25 17:24:06 -07:00
  • c7e4870048 Removed blit code from gbuffer class. Fixed cmakelists for linux. Justin Marshall 2020-06-25 14:35:47 -07:00
  • 6bfdd6e0ce Converted cmake source file names to lower case. Justin Marshall 2020-06-25 13:49:32 -07:00
  • 8890f72a49 Added EA tgautil script. Justin Marshall 2020-06-25 13:40:55 -07:00
  • f62fe716d6 Merge branch 'master' of https://github.com/electronicarts/CnC_Remastered_Collection Justin Marshall 2020-06-25 13:22:28 -07:00
  • 631d332c90 Removed Tiberian Dawn folder. Justin Marshall 2020-06-25 13:11:54 -07:00
  • e581ffad99 Batch lowercase red alert source code. Justin Marshall 2020-06-25 13:10:31 -07:00
  • 995b794cd8 Terrain and classic tiles now render properly in the scenario placement dialog. Justin Marshall 2020-06-25 09:56:40 -07:00
  • 79036cbeff Removed assembly language requirement from cmake project. Justin Marshall 2020-06-25 08:35:33 -07:00
  • 9c1fc485d8 Merge remote-tracking branch 'upstream/master' into nev6502_branch nev6502 2020-06-24 23:04:27 -06:00
  • 84bedab275 HD Remaster Terrain tiles now go into the cache. Justin Marshall 2020-06-24 19:53:54 -07:00
  • 93a1af2eff Create tgautil.py PG-SteveT 2020-06-24 15:08:18 -07:00
  • e5a55f777e Removed unneeded input consume, HD remaster images now work in the placement editor. Justin Marshall 2020-06-24 12:10:08 -07:00
  • 4ff7c5df98 Fixed a bug were mouse clicks flags were getting stomped when more then one click event was processed. Justin Marshall 2020-06-24 11:23:57 -07:00
  • 1f534ed269 Moved NEWBLIT to imgui background cmdlist, console now renders again. Level now draws in editor mode dialogs. Justin Marshall 2020-06-24 09:39:47 -07:00
  • cc449351d2 War Factory renders more correctly. Justin Marshall 2020-06-24 08:21:50 -07:00
  • 61ca0cfa5a Fixed a bug were black squares would render in the world after switching to a new level. Justin Marshall 2020-06-23 20:44:47 -07:00
  • 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. Justin Marshall 2020-06-23 20:31:18 -07:00
  • 96bc8e95ff In editor builds the intro & sneak peak will open the scenario editor. Justin Marshall 2020-06-23 19:23:21 -07:00
  • f165efc388 Merge remote-tracking branch 'upstream/master' into nev6502_branch nev6502 2020-06-23 17:41:49 -06:00
  • 6d50fb6fca Added new image cache system, 5k super ultra wide resolutions work, screen resolution set from the ini file. Justin Marshall 2020-06-23 16:31:16 -07:00
  • 136b5e2c70 Start with EventQueue Ben Lankamp 2020-06-23 23:40:53 +02:00
  • e93b511b53 Added x64 to version string. Justin Marshall 2020-06-22 20:19:15 -07:00
  • 1d32cf97fd Merge remote-tracking branch 'upstream/master' into nev6502_branch nev6502 2020-06-22 19:02:05 -06:00
  • 3ea7ac187a Updated version string number. Justin Marshall 2020-06-22 17:53:13 -07:00
  • 21f30aad44 Patch 1.01 Merge branch 'master' of https://github.com/electronicarts/CnC_Remastered_Collection Justin Marshall 2020-06-22 17:19:05 -07:00
  • 21027f723a Merge remote-tracking branch 'upstream/master' into nev6502_branch nev6502 2020-06-22 17:16:45 -06:00
  • c0c9979fbf Merge remote-tracking branch 'upstream/master' into nev6502_branch nev6502 2020-06-22 17:15:19 -06:00
  • f53249cb24 WSA animations now work(thanks Omniblade :)). Justin Marshall 2020-06-22 16:14:37 -07:00
  • 9edbf56043 64bit version now works. Temp hack in for WSA x64 crash. Justin Marshall 2020-06-22 13:22:35 -07:00
  • e3c998fb16 ScoreScreen works again, WSA animations are fullscreen, added loading screen. Justin Marshall 2020-06-22 12:21:13 -07:00
  • cd8bc9228e Merge branch 'master' of https://github.com/electronicarts/CnC_Remastered_Collection PG-SteveT 2020-06-22 09:43:46 -07:00
  • fc5cd5a775 Command & Conquer Remastered post-launch patch PG-SteveT 2020-06-22 09:43:21 -07:00
  • fd24e73e0f Inline assembly is now replaced with C. Justin Marshall 2020-06-22 09:01:10 -07:00
  • b37b16f3d0 Merge remote-tracking branch 'upstream/master' into nev6502_branch nev6502 2020-06-21 20:59:03 -06:00
  • 332c36efa3 Aircraft remaster assets now load. Justin Marshall 2020-06-21 19:53:01 -07:00
  • 6834288c16 Added Infantry HD textures. Justin Marshall 2020-06-21 19:46:11 -07:00
  • 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. nev6502 2020-06-21 18:45:59 -06:00
  • c4f6f664c1 Update README.md jmarshall23 2020-06-21 17:31:20 -07:00
  • 5899ae92e7 Merge pull request #13 from benlankamp/BL/SDL-UserInput-plus-hotfixes jmarshall23 2020-06-21 15:13:20 -07:00
  • fecd7f8ca0 Merge branch 'master' into BL/SDL-UserInput-plus-hotfixes Ben Lankamp 2020-06-22 00:09:24 +02:00
  • 55ffa4aee3 * Fix input on Add object in map editor Ben Lankamp 2020-06-22 00:08:17 +02:00
  • 7eff1e1f5a * Re-added Normal_Move_Point Ben Lankamp 2020-06-22 00:03:57 +02:00
  • fa19c1361b Merge pull request #12 from benlankamp/BL/SDL-UserInput-plus-hotfixes jmarshall23 2020-06-21 14:58:43 -07:00
  • e4d06a99e6 Merge pull request #11 from nev6502/nev6502_branch jmarshall23 2020-06-21 14:57:19 -07:00
  • 95e0bbb3aa Added remaster units support, Image_t now supports multiple image resolutions per shape. Justin Marshall 2020-06-21 14:56:25 -07:00
  • 3ced844e55 * Disable VSYNC * Fixed input for text etc. (focus messages got lost) Ben Lankamp 2020-06-21 23:48:48 +02:00
  • 7836514a16 Removed some commented out debug code nev6502 2020-06-21 15:17:08 -06:00
  • 6676b00cc5 * Remove pasted word Ben Lankamp 2020-06-21 23:05:52 +02:00
  • 168bd74ffc * Credits working TEMP (without pictures) Ben Lankamp 2020-06-21 23:04:20 +02:00
  • 569c925c04 Added ability to fire trigger only once (VOLATILE). It's a good thing I did because it exposed an issue with the merge trigger function. The old code was allowing a trigger to exist more than once in the various lists (eg. LogicTriggers), causing major issues when a temporary (VOLATILE) trigger got sprung. This is resolved. nev6502 2020-06-21 14:51:56 -06:00
  • 8f8b0a7dc1 * Centering of choosing Difficulty dialog * Centering of Counterstrike/Aftermath mission dialogs Ben Lankamp 2020-06-21 22:33:41 +02:00
  • bf229c1593 * Fixes for ImGui map editing dialogs Ben Lankamp 2020-06-21 22:27:25 +02:00
  • c124589708 All building animations now work. Justin Marshall 2020-06-21 11:55:46 -07:00
  • 378a615ffd Fixed a bug were cache was generating bad file names(increased to v4), some building animations now work. Justin Marshall 2020-06-21 11:37:05 -07:00
  • 2b0c6f4157 Further formatting and organization nev6502 2020-06-21 12:26:50 -06:00
  • b19e278529 Remaster Building Source filenames are now sourced from the XML file. Justin Marshall 2020-06-21 10:54:00 -07:00
  • b554ba4448 Global header added Several new utility functions nev6502 2020-06-21 05:32:19 -06:00
  • 1343dcd1d5 FINALLY finished all vanilla actions and all vanilla events. Every one has been tested along the way. Up next will be utilities as well as functionality to combine 2 triggers to allow for efficient multi triggers and ways to set various trigger options after creating. nev6502 2020-06-21 01:10:01 -06:00
  • dac4c157cf Added animation support for the HD remaster assets, idle terrain animations work. Justin Marshall 2020-06-20 20:29:25 -07:00
  • cc3baa670a Update README.md jmarshall23 2020-06-20 17:03:29 -07:00
  • ae4763251c Remaster tilesets now load correctly. Justin Marshall 2020-06-20 16:59:56 -07:00
  • 2cfc369190 Merge remote-tracking branch 'upstream/master' into nev6502_branch nev6502 2020-06-20 15:48:25 -06:00
  • acc1af0c05 Fix for placement editor crash. Justin Marshall 2020-06-20 14:47:37 -07:00
  • 5d8b853436 Merge pull request #10 from benlankamp/BL/SDL-UserInput-plus-hotfixes jmarshall23 2020-06-20 14:39:07 -07:00
  • e7697aa3ac * Fixed input loops/too much callbacks. Ben Lankamp 2020-06-20 23:33:26 +02:00
  • 79b24cb81d Initial HD stamp loading code. Justin Marshall 2020-06-20 14:31:11 -07:00
  • cbf0c3cd74 Merge branch 'nev6502_branch' of https://github.com/nev6502/CnC_Remastered_Collection into nev6502_branch nev6502 2020-06-20 14:18:27 -06:00
  • f1cb462b89 Heavy work done to scripting engine nev6502 2020-06-20 14:18:19 -06:00
  • 2ba8a7a2dd Tileset stamps are now loaded before the level is rendered. Justin Marshall 2020-06-20 09:51:38 -07:00
  • 381f12b8c5 More remastered buildings should now load(temp workaround). Justin Marshall 2020-06-20 08:54:15 -07:00
  • 4abf80eb0e Merge pull request #9 from benlankamp/BL/SDL-UserInput-plus-hotfixes jmarshall23 2020-06-20 07:24:49 -07:00
  • da8d47dc66 Merge pull request #8 from nev6502/nev6502_branch jmarshall23 2020-06-20 07:23:02 -07:00
  • 09197ee12f * Added arrow keys * Fixed position of radar button Ben Lankamp 2020-06-20 11:48:49 +02:00
  • 28e98329b6 Mouse X/Y-reversal Ben Lankamp 2020-06-20 11:44:21 +02:00
  • 7962ff2124 Merge of Marshall/master into BL/master. Merge of SDL code from feature branch into BL/master. Ben Lankamp 2020-06-20 11:41:29 +02:00
  • b6dba2d563 Updated git ignore Ben Lankamp 2020-06-20 11:22:05 +02:00
  • e4da9ac861 Merge remote-tracking branch 'upstream/master' Ben Lankamp 2020-06-20 11:14:55 +02:00
  • 9d5eb0ac1e * Centering of mission accomplished * Added 8 px next to the Options bar * TEMP: everything costs $50 Ben Lankamp 2020-06-20 10:27:17 +02:00
  • ea14d1bc82 Merge remote-tracking branch 'upstream/master' into nev6502_branch nev6502 2020-06-19 23:46:11 -06:00
  • 5087eeb294 Adjusted HD colors so the they the team colors. Justin Marshall 2020-06-19 22:45:03 -07:00
  • c511b0f9bf Added image cache for remaster assets. Justin Marshall 2020-06-19 22:02:50 -07:00
  • e3c5e96c81 Removed CPU side memory buffer for textures Justin Marshall 2020-06-19 20:57:48 -07:00
  • b8a912f3a6 Remaster palettes now work correctly. Justin Marshall 2020-06-19 19:37:06 -07:00
  • 28e37d2d6e Removed bad add in remaster palette rasterization. Justin Marshall 2020-06-19 17:54:59 -07:00