Pulling in changes from the expansion2 branch #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Merged citypanel.lua and xml (changes to the food data that are not in the data object anymore for the "currentfood/requiredfood") - Merged citybannermanager.lua and xml - Modified the mod info to only launch what's "fixed"
- Merged citypaneloverview and supportfunctions - Removed civilopediasupport because base game now remember the last page openned
- Completely changed the production panel file, now it works as an extension of the existing one - Removed the Production Queue mod integration as the base game now have a one - WIP
- CQUI now uses the build-in production queue and manager
- Added new Expansion2 files - Added Expansion2 in .modinfo
- Added a custom CQUI Lense for Citizen Management, removed that code from the citybannermanager
* updated actionpanel.lua from Patch 1.0.0.290 (GS) * updated citysupport.lua from Patch 1.0.0.290 (GS) * updated diplomacyactionview.lua from Patch 1.0.0.290 (GS) * updated diplomacyactionview.xml from Patch 1.0.0.290 (GS) * fixed some indentation in citysupport.lua * updated diplomacyribbon.lua from Patch 1.0.0.290 (GS) * updated diplomacyribbon.xml from Patch 1.0.0.290 (GS) * updated ingame.lua from Patch 1.0.0.290 (GS) * fixed some mistakes and indenting * updated leadericon.lua from Patch 1.0.0.290 (GS) * updated leadericon.xml from Patch 1.0.0.290 (GS) * updated launchbar.lua from Patch 1.0.0.290 (GS) * updated launchbar.xml from Patch 1.0.0.290 (GS) * updated notificationpanel.lua from Patch 1.0.0.290 (GS) * updated unitpanel.lua from Patch 1.0.0.290 (GS)
- DiplomacyActionView, UnitPanel, NotificationPanel now use the ReplaceUiScript to be more maintainable in the future - Fixes some typo in LeaderIcon, InGame and DiplomacyActionView.xml - UnitPanel : the bigger XP bar is now done in Code, no need to copy the xml file
* Import changes from 1.0.0.290 * Updates following comments * worldinput.lua, worldtracker.lua/xml * Further merges * Further merges * Merging two popups and screens/civicstree.lua
- the updated files should be easier to update now - Replaced worldviewiconsmanager, unitflagmanager, toppanel, plotinfo, plottooltip, techtree, civicstree, governmentscreen, wonderbuiltpopup - No need for strategicview_mapplacement anymore
- Removed boostunlockedpopup, the issue is fixed no need for this file - More rewrite for partialscreenhooks - Changed Icon Texture function in the map pins
- The only uses for AffectsSavedGames is to save the user settings, so that you don't have when you load the game, to check back everything - You can disable the AffectsSavedGames is you want easily in the mod info file, it'll not break anything
- Fixed the visual bug of the range attack lens - Now when you click on the range attack button of a district, the camera looks at the plot - Fix vanilla bug which prevented the district range attack to be unselected when selecting an unit - Fix the range attack lens and the city management lens to be reset on hover of a unit that have a path
- Complete rework on the diplomacy deal view, not an integration anymore
…middle of nowhere - my mistake
Should fix #403
- Reverted the greatpeoplepopup files to the base game version (so the next diff will be easier to read)
- The popup now adapts its height (new textures) - We show the remaining turns and point per turn instead of the amount of point (which is now in the tooltip)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.