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

1.3 fixing #303

Merged
merged 73 commits into from
May 27, 2023
Merged

1.3 fixing #303

merged 73 commits into from
May 27, 2023

Conversation

Arcadyi
Copy link
Member

@Arcadyi Arcadyi commented May 26, 2023

No description provided.

JackEPepper and others added 30 commits May 22, 2023 11:53
@JackEPepper
chore: add character interactions
26579e3
@JackEPepper
chore: strategy updates
4305af3
@JackEPepper
chore: removed vanilla files
2990f3b
@JackEPepper
chore: add agitator slots
f4a8103
@Arcadyi
feat: 1.3 ai strategies compatibility
ef36d2c
@Arcadyi
feat: 1.3 industry compatibility
beff68a
@Arcadyi
feat: 1.3 character template compatch
0fde7e6
@Arcadyi
feat: 1.3 decrees compatibility
ea69445
@Arcadyi
feat: 1.3 defines compatibility
fdd9ccd
@Arcadyi
feat: 1.3 diplomatic actions compatibility
1f4c09f
@Arcadyi
feat: 1.3 government types patch
55f44d4
@Arcadyi
feat: 1.3 ideologies compatibility
b649f64
@Arcadyi
feat: 1.3 interest group patch
c185da7
@Arcadyi
feat: 1.3 laws compatibility
2b5ef52
@Arcadyi
feat: 1.3 modifiers compatibility
6efb1a5
@Arcadyi
feat: initial shader rework, still buggy but functional
89fb514
fix: typo
63feb71
@JackEPepper
chore: removed unused tech
47256cd
@Max200012
fix: got the fr*nch buildings so it stops throwing errors
e4a68b2
@Arcadyi
feat: 1.3 map modes patch
aaab355
@Arcadyi
Merge branch '1.3-fixing' of https://github.com/Cold-War-Project/CWP-…
476a0a3 
…Main into 1.3-fixing
@Arcadyi
feat: 1.3 map objects & data patch
480368a
@Arcadyi
feat: 1.3 gfx models patch
49f1320
@JackEPepper
feat: adding vanilla events first pass
3b33ec9
@JackEPepper
feat: nuke outdated ideologies
bbb4165
@Arcadyi
feat: 1.3 gui compatibility & patch
a2a8934
@Arcadyi
Merge branch '1.3-fixing' of https://github.com/Cold-War-Project/CWP-…
0f1d829 
…Main into 1.3-fixing
@Arcadyi
feat: loc patch & metadata updated
19aa43b
@JackEPepper
chore: events pruning
1531d47
@JackEPepper
Merge branch '1.3-fixing' of https://github.com/Cold-War-Project/CWP-…
7bb9a7e 
…Main into 1.3-fixing
@github-actions github-actions bot requested review from DZappala and JackEPepper May 26, 2023 13:14
DZappala
DZappala requested changes May 26, 2023
View reviewed changes
common/ai_strategies/03_political_strategies.txt Outdated Show resolved Hide resolved
common/buildings/01_industry.txt Outdated Show resolved Hide resolved
common/buildings/01_industry.txt Show resolved Hide resolved
common/buildings/06_urban_center.txt Outdated Show resolved Hide resolved
common/character_traits/skill_traits.txt Outdated Show resolved Hide resolved
common/character_traits/skill_traits.txt Outdated Show resolved Hide resolved
common/character_traits/skill_traits.txt Outdated Show resolved Hide resolved
common/character_traits/skill_traits.txt Outdated Show resolved Hide resolved
common/character_traits/skill_traits.txt Outdated Show resolved Hide resolved
common/character_traits/skill_traits.txt Show resolved Hide resolved
@Arcadyi Arcadyi merged commit 2c975c8 into dev May 27, 2023
@Max200012 Max200012 deleted the 1.3-fixing branch May 27, 2023 19:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DZappala DZappala DZappala requested changes

@JackEPepper JackEPepper JackEPepper approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Arcadyi @DZappala @JackEPepper @Max200012