Commit Graph

467 Commits

Author SHA1 Message Date
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
PG-SteveT 93a1af2eff Create tgautil.py 2020-06-24 15:08:18 -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
Justin Marshall 61ca0cfa5a Fixed a bug were black squares would render in the world after switching to a new level. 2020-06-23 20:44:47 -07:00
Justin Marshall 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. 2020-06-23 20:31:18 -07:00
Justin Marshall 96bc8e95ff In editor builds the intro & sneak peak will open the scenario editor. 2020-06-23 19:23:21 -07:00
nev6502 f165efc388 Merge remote-tracking branch 'upstream/master' into nev6502_branch 2020-06-23 17:41:49 -06:00
Justin Marshall 6d50fb6fca Added new image cache system, 5k super ultra wide resolutions work, screen resolution set from the ini file. 2020-06-23 16:31:16 -07:00
Ben Lankamp 136b5e2c70 Start with EventQueue 2020-06-23 23:40:53 +02:00
Justin Marshall e93b511b53 Added x64 to version string. 2020-06-22 20:19:15 -07:00
nev6502 1d32cf97fd Merge remote-tracking branch 'upstream/master' into nev6502_branch 2020-06-22 19:02:05 -06:00
Justin Marshall 3ea7ac187a Updated version string number. 2020-06-22 17:53:13 -07:00
Justin Marshall 21f30aad44 Patch 1.01 Merge branch 'master' of https://github.com/electronicarts/CnC_Remastered_Collection
# Conflicts, ignored these upstream changes:
#	REDALERT/MiscAsm.cpp
#	REDALERT/WIN32LIB/DrawMisc.cpp
2020-06-22 17:19:05 -07:00
nev6502 21027f723a Merge remote-tracking branch 'upstream/master' into nev6502_branch 2020-06-22 17:16:45 -06:00
nev6502 c0c9979fbf Merge remote-tracking branch 'upstream/master' into nev6502_branch 2020-06-22 17:15:19 -06:00
Justin Marshall f53249cb24 WSA animations now work(thanks Omniblade :)). 2020-06-22 16:14:37 -07:00
Justin Marshall 9edbf56043 64bit version now works. Temp hack in for WSA x64 crash. 2020-06-22 13:22:35 -07:00
Justin Marshall e3c998fb16 ScoreScreen works again, WSA animations are fullscreen, added loading screen. 2020-06-22 12:21:13 -07:00
PG-SteveT cd8bc9228e Merge branch 'master' of https://github.com/electronicarts/CnC_Remastered_Collection 2020-06-22 09:43:46 -07:00
PG-SteveT fc5cd5a775 Command & Conquer Remastered post-launch patch
Improvements to harvester resource finding logic.

Don't allow the Advanced Comm Center to be capturable in skirmish or multiplayer.

Increased failed pathfinding fudge factor.

Buildings accept the Guard command if they can attack.

Don't allow force capturing of ally structures.

Fixes for laser Orcas in S3cr3t M1ss10n. Properly restore them after save. Reset Orcas after loads.

Fixed flag animation rendering in CTF.

Potentially fix a crash if aircraft are destroyed outside the map bounds.

Fixed legacy Obelisk line rendering.

Fix out-of-bounds crash in TD; issue was already fixed in RA.

Disable capture flag on Commandos.

Drop the flag when entering the limbo state.

Fixed end game race condition, winning team ID is always sent before individual player win/lose messages.

Fixed Chan spawn on SCB10EA.

Don't show enter cursor for enemy units on refineries and repair pads.

Changing right-click support for first put building on hold, and then subsequenct right-clicks to decrement that queue count for 1x or 5x; Then, 1x or 5x Left click will resume from hold.

Don't debug reveal legacy rendering when a player is defeated.

Fixed crash when loading saves of custom campaign maps.

Reset harvester archived target when given a direct harvest order.

Prevent NOD cargo planes from being force attacked.

Fixed unit selection on load.

Migrated queued repair pad functionality from RA to TD.

Randomly animate infantry in area guard mode.

Fixed crash accessing inactive objects.

Added some walls in SCG08EB to prevent civilians from killing themselves.

TD + RA: Audio: Overiding "Our base is under attack" cooldown timing from legacy from 2 minutes to 30 seconds, so it will be heard 4x as often.

Fixed adjacent cell out-of-bounds crash issues.

Kill player on disconnect

Fixed and improved build time calculations to be consistent between TD and RA.

Don't show health bars for cloaked Stealth Tanks in the legacy renderer.

Fix selection of individual control groups after mixed selection.

More adjustments to SCG08EB; switch C7 to C5, and add civilian AI to avoid Tiberium.

Extra safety checks for units that have no weapons and aircraft that can't hunt.

Fix loading of multiple infantry onto an APC.

Additional safety checks for invalid coordinates.

Prevent units from being instantly repaired.

Fix map passability.

Fail Allied mission 5B if the spy re-boards the starting transport (matches 5A and 5C behavior).

Fixed multiplayer formation move causing units to move at light speed.

Ignore movement destination checks if a unit is part of a mission-driven team.

Fix buffer overrun crash.

Ignore mines when determining win conditions.

Fixed river passability in Blue Lakes.
2020-06-22 09:43:21 -07:00
Justin Marshall fd24e73e0f Inline assembly is now replaced with C. 2020-06-22 09:01:10 -07:00
nev6502 b37b16f3d0 Merge remote-tracking branch 'upstream/master' into nev6502_branch 2020-06-21 20:59:03 -06:00
Justin Marshall 332c36efa3 Aircraft remaster assets now load. 2020-06-21 19:53:01 -07:00
Justin Marshall 6834288c16 Added Infantry HD textures. 2020-06-21 19:46:11 -07:00
nev6502 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. 2020-06-21 18:45:59 -06:00
jmarshall23 c4f6f664c1 Update README.md 2020-06-21 17:31:20 -07:00
jmarshall23 5899ae92e7 Merge pull request #13 from benlankamp/BL/SDL-UserInput-plus-hotfixes
Fix for turrets on destroyers + Add object in map editor
2020-06-21 15:13:20 -07:00
Ben Lankamp fecd7f8ca0 Merge branch 'master' into BL/SDL-UserInput-plus-hotfixes 2020-06-22 00:09:24 +02:00
Ben Lankamp 55ffa4aee3 * Fix input on Add object in map editor 2020-06-22 00:08:17 +02:00
Ben Lankamp 7eff1e1f5a * Re-added Normal_Move_Point 2020-06-22 00:03:57 +02:00
jmarshall23 fa19c1361b Merge pull request #12 from benlankamp/BL/SDL-UserInput-plus-hotfixes
Input fixes for ImGui in map editor
2020-06-21 14:58:43 -07:00
jmarshall23 e4d06a99e6 Merge pull request #11 from nev6502/nev6502_branch
Nev6502 branch
2020-06-21 14:57:19 -07:00
Justin Marshall 95e0bbb3aa Added remaster units support, Image_t now supports multiple image resolutions per shape. 2020-06-21 14:56:25 -07:00
Ben Lankamp 3ced844e55 * Disable VSYNC
* Fixed input for text etc. (focus messages got lost)
2020-06-21 23:48:48 +02:00
nev6502 7836514a16 Removed some commented out debug code 2020-06-21 15:17:08 -06:00
Ben Lankamp 6676b00cc5 * Remove pasted word 2020-06-21 23:05:52 +02:00
Ben Lankamp 168bd74ffc * Credits working TEMP (without pictures) 2020-06-21 23:04:20 +02:00
nev6502 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. 2020-06-21 14:51:56 -06:00
Ben Lankamp 8f8b0a7dc1 * Centering of choosing Difficulty dialog
* Centering of Counterstrike/Aftermath mission dialogs
2020-06-21 22:33:41 +02:00
Ben Lankamp bf229c1593 * Fixes for ImGui map editing dialogs 2020-06-21 22:27:25 +02:00
Justin Marshall c124589708 All building animations now work. 2020-06-21 11:55:46 -07:00
Justin Marshall 378a615ffd Fixed a bug were cache was generating bad file names(increased to v4), some building animations now work. 2020-06-21 11:37:05 -07:00
nev6502 2b0c6f4157 Further formatting and organization 2020-06-21 12:26:50 -06:00
Justin Marshall b19e278529 Remaster Building Source filenames are now sourced from the XML file. 2020-06-21 10:54:00 -07:00
nev6502 b554ba4448 Global header added
Several new utility functions
2020-06-21 05:32:19 -06:00
nev6502 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. 2020-06-21 01:10:01 -06:00