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.

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

Fix #7945: Add cost of clearing the sloped tile when placing a dock #7947

Open
wants to merge 2 commits into
base: master
from

Conversation

@SamuXarick
Copy link
Contributor

SamuXarick commented Jan 17, 2020

No description provided.

@SamuXarick SamuXarick force-pushed the SamuXarick:dock-add-cost-of-clearing-sloped-tile branch from 99e8fe5 to fc2bacf Jan 17, 2020
@LordAro
Copy link
Member

LordAro commented Jan 18, 2020

I think this should be 2 commits - the first 2 - (Add cost of... + regression fix) & and the next 2 (Using "Change: Allow..." commit message). Can you squash together accordingly?

@SamuXarick SamuXarick force-pushed the SamuXarick:dock-add-cost-of-clearing-sloped-tile branch from 8f37ea1 to 3085ca8 Jan 18, 2020
Copy link
Member

LordAro left a comment

I think this is fine, but I'd like to see a review from someone else first...

SamuXarick added 2 commits Jan 17, 2020
Fix: Also add the cost of clearing objects on water
@SamuXarick SamuXarick force-pushed the SamuXarick:dock-add-cost-of-clearing-sloped-tile branch from 3085ca8 to 56dd2d5 Feb 9, 2020
@Yexo
Yexo approved these changes May 10, 2020
src/station_cmd.cpp Show resolved Hide resolved
@glx22 glx22 dismissed their stale review May 10, 2020

misreading

@nielsmh
Copy link
Contributor

nielsmh commented Jun 29, 2020

Needs conflict resolved in regression test result.txt before this can merge. (The file was moved in the CMake change.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.