Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge #25

Merged
merged 674 commits into from
Jun 13, 2021
Merged

Merge #25

merged 674 commits into from
Jun 13, 2021

Conversation

dsmabell
Copy link
Owner

No description provided.

raxo2222 and others added 30 commits May 14, 2021 19:23
@raxo2222
This was already moved to unloaded module
8c5a2ef
@raxo2222
Merge pull request #986 from caveman2cosmos/Merge-conflict-fix
4903ff7 
Merge conflict fix
@MattOttawa
CyArea loops (#973)
ae4c56e
@raxo2222
Game options shouldn't be changeable by default in midgame.
2dae9c3
@raxo2222
Merge pull request #983 from caveman2cosmos/Module-Cleanup
1c002af 
Module cleanup
@MattOttawa
tweak to GameOptionsTab init
ef6dd10
@MattOttawa
Merge pull request #146 from caveman2cosmos/master
6a50240 
merge master
@flabbert
add bonustype to plotinfo
614f6f4
@flabbert
Merge pull request #988 from caveman2cosmos/add_bonus_to_evaluation
f319068 
add bonustype to plotinfo
@MattOttawa
deleted GameOptionsTab
1e1bcdf
@MattOttawa
deleted GameOptionsTab (#989)
6c8e46e
@MattOttawa
moved info type caching earlier
7a1e6d5
@MattOttawa
Merge branch 'delete_GameOptionsTab'
aa24f39
@MattOttawa
Merge pull request #147 from caveman2cosmos/master
357d97b 
merge master
@MattOttawa
delete line
25e79fe
@MattOttawa
Merge branch 'master' of https://github.com/MattOttawa/Caveman2Cosmos
d4a502a
@MattOttawa
moved info type caching earlier (#990)
d270856
@raxo2222
All starter civics now have strong repulsive flavor to force off AI A…
39561a4 
…SAP other civic is available in category.
@raxo2222
This is used by green button in globe view over minimap
a4c37f6
@raxo2222
Removed useless debug globe layer
6985e99
@raxo2222
Infotype text and code text shouldn't share name for clarity.
3ffeff0 
X infotype
XHELP - code only stuff.
@raxo2222
BUILD -> BUILDHELP
b0ee00f
@raxo2222
FEATURE -> FEATUREHELP
cb46a55
@raxo2222
TERRAIN -> TERRAINHELP
7d2bb61
@raxo2222
BONUS -> BONUSHELP
fd08eb9
@raxo2222
SPECIALIST -> SPECIALISTHELP
36788dd
@raxo2222
TECH -> TECHHELP
a4880ec
@raxo2222
PROJECT -> PROJECTHELP
4b765e9
@raxo2222
IMPROVEMENT -> IMPROVEMENTHELP
da0d938
@raxo2222
TRAIT -> TRAITHELP
0fc53bd
MattOttawa and others added 29 commits June 10, 2021 17:59
@MattOttawa
added delete for UnitComponent and added to vs files (#1024)
b594f0f
@Toffer90
Misc refactor, isolated a function so that only exe ever calls it; us…
4c37d18 
…eful for analyzing exe behavior and logic.
@Toffer90
Further CvUnit refactoring.
9d75670
@Toffer90
Last CvUnit refactor for the time being.
319075d
@raxo2222
No boosts to improvement before it is unlocked
4b425d0
@raxo2222
Ensured, that tech yield boosts aren't lost on improvement upgrade
0d71402
@raxo2222
Increased yields of upgrades, as only one yield at most can decrease …
70e7b31 
…on upgrade.
@Toffer90
Switched unitinfo build list from array to vector
c024714
@Toffer90
Basic setup for new "Worker" unit-component
5e44fd5
@Toffer90
Small addition to the basic setup of "worker" unit-component.
5683b3a
@Toffer90
Tweked constructor and init of "commander unit-comp."
44a9fb4
@Toffer90
Minor addition to the "worker" unit-component
b8588b1
@Toffer90
Exported some content from CvUnit to the Worker unit-component.
16d14b3
@Toffer90
Removed duplicate promo and unitCombat tag, misc cleanup.
87c2f7c
@raxo2222
Fixed typo in pedia
2d66134
@raxo2222
Civics now simply say that they sped up or slow down improvement growth
6a3101a
@Toffer90
Fixed pedia assert for units when browsing pedia from Main menu befor…
ae88ea3 
…e playing any game. Fix changed function slightly.
@Toffer90
Added a build list for worker unit pedia pages.
dc30c5f
@Toffer90
If unit start with free promotion that adds anew build type capabilit…
07891b1 
…y to the unit, that new build type will be listed in the units pedia page among its normal build capabilities.
@raxo2222
Cleared up building overrides - they seem to stack in pedia
64ce81c
@Toffer90
Features with bNoImp can now have exceptions if improvement has the f…
552a561 
…eature as featureMakesValid.
@raxo2222
Fix hill issue in improvement pedia
7720573
@MattOttawa
switched a loop for unit build types to foreach_ (#1026)
37f8f96
@Toffer90
Fixed mouse unresponsive bug from city screen interface code.
b869d3c
@Toffer90
fixed dll error when creating "alt" tooltip for units
de672f4
@Toffer90
Minor tweaks and safety code.
af540a1
@raxo2222
Added back core tech to buildable stories/storys, so they aren't grey…
1616c0a 
…ed out in city screen at game start
@Toffer90
Fixed python bug for pedia and WB.
d4f376f
@Toffer90
Semi-reverted change that caused CTD; the change wasn't bugged, it on…
0f3913a 
…ly revealed a bigger bug.
@dsmabell dsmabell merged commit 48c8755 into dsmabell:master Jun 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
8 participants
@dsmabell @Toffer90 @raxo2222 @MattOttawa @flabbert @Thunderbrd @Whisperrr666 @SannitaSSJ