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

Ship support #31

Merged
merged 65 commits into from
Nov 4, 2024
Merged

Ship support #31

merged 65 commits into from
Nov 4, 2024

Conversation

TheGiraffe3
Copy link
Owner

No description provided.

@TheGiraffe3 TheGiraffe3 marked this pull request as draft November 2, 2024 14:18
@TheGiraffe3 TheGiraffe3 marked this pull request as ready for review November 2, 2024 15:27
@TheGiraffe3 TheGiraffe3 marked this pull request as draft November 2, 2024 15:35
@TheGiraffe3
Copy link
Owner Author

TheGiraffe3 commented Nov 2, 2024 •
edited
Loading

So the problem is the fact that I'm re-declaring the same attribute in the same file.
Not 100% sure that moving files will work though...

@TheGiraffe3 TheGiraffe3 mentioned this pull request Nov 2, 2024
Open
@TheGiraffe3
Copy link
Owner Author

Working on file moving.

@TheGiraffe3
Update source/CustomShipSale.cpp
54f0e15
@TheGiraffe3
Update CustomShipSale.cpp
79df36f
@TheGiraffe3
Update CustomShipSale.h
9b25cc5
@TheGiraffe3
Update CustomShipSale.cpp
907ef04
@TheGiraffe3
Update CustomSaleManager.cpp
12e80da
@TheGiraffe3
Update Depreciation.cpp
de065cd
@TheGiraffe3
Update CustomSaleManager.cpp
0c0c4e8
@TheGiraffe3
Update source/CustomSaleManager.cpp
d9b38c3
@TheGiraffe3
Update source/CustomSaleManager.cpp
642ad7d
@TheGiraffe3
Update source/CustomSaleManager.cpp
2cf0ace
@TheGiraffe3
Update source/CustomSaleManager.cpp
984d31e
@TheGiraffe3
Update source/CustomSaleManager.cpp
b50337c
@TheGiraffe3
Update CustomSaleManager.cpp
d76bfaf
@TheGiraffe3
Update CustomSaleManager.cpp
3347167
@TheGiraffe3
suggestion
e9f6a96 
We'll see if GitHub Actions' idea works.
@TheGiraffe3
maybe
6821a54
@TheGiraffe3
possible
b32e8b6
@TheGiraffe3
Update source/GameData.cpp
335705f
@TheGiraffe3
Update source/MapSalesPanel.cpp
77ca672
@TheGiraffe3
Update source/MapSalesPanel.cpp
11c49c6
@TheGiraffe3
Update MapSalesPanel.cpp
0308e58
@TheGiraffe3
Update source/MapSalesPanel.cpp
dbda898
@TheGiraffe3
Update source/MapSalesPanel.cpp
ea4a2d6
@TheGiraffe3
Update source/MapSalesPanel.cpp
04842c5
@TheGiraffe3
Apply suggestions from code review
1ad7573
@TheGiraffe3
Update source/CustomSaleManager.cpp
2aa19d9
@TheGiraffe3
Update source/CustomSaleManager.cpp
35b6cfb
@TheGiraffe3
Update source/GameData.cpp
16b640c
@TheGiraffe3 TheGiraffe3 merged commit 6eb5d7d into f(c)-customizable-sales Nov 4, 2024
10 of 22 checks passed
@TheGiraffe3 TheGiraffe3 deleted the more-sales-changes-in-the-Delta-branch branch November 4, 2024 10:53
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
Development

Successfully merging this pull request may close these issues.
1 participant
@TheGiraffe3