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

Final pre-2.0 update #477

Merged
merged 50 commits into from
Sep 24, 2024
Merged

Final pre-2.0 update #477

merged 50 commits into from
Sep 24, 2024

Conversation

danielmartin0
Copy link
Contributor

@danielmartin0 danielmartin0 commented Sep 15, 2024 •
edited
Loading

Like the previous PR, this one has a negative LOC.

Please consult the commit history and ingame changelog for details.

All Submissions:

  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?

Tested Changes:

  1. Have you lint your code (lua lint) locally prior to submission?

Changes to Core Features:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you successfully ran tests with your changes locally?

Comments

danielmartin0 added 30 commits September 15, 2024 22:22
fix halting load when other player is waiting at sea
f78b2ff
start on the ship closest to you
0340d7f
allow editing permissions on debug mode
c998e1d
can't mark for deconstruction in restricted areas
98ab351
turn enemy expansion off
bf14c4b
scale up weapon damage upgrade cost
0cfa6e3
tweak
2637e47
fix version number
6b9313e
space out waves slightly
0957225
reset_password command
6d89f52
can only overwrite existing passwords
74a502d
autodisband 3 days -> 5 days
91834b6
fix starting multiple private runs
19f8c23
Update coredata.lua
f8d2636
don't show info window unless they click
5a974ed
dont show extra icons
6d8ee55
Revert "dont show extra icons"
d7eff59 
This reverts commit 7c6b791.
grace period to 150s, evo bump on killing nests removed
4cf8830
log
0b0a980
limit overly large wave sizes
e1e591f
revert island size increasese
753c436
fix grace period
1d6ce41
captains can no longer open red chests in restricted areas
f10ee91
fix showing time when protections unlock stuck at 24hr
6f0af64
bump private run cap to 4
45d62f7
disable blueprints setting
3c3ff9f
adjust game slowness scale
5df3144
changelog
c224527
display run conditions better
1b9d906
remove old captain's shop code
43d981d
@danielmartin0 danielmartin0 marked this pull request as ready for review September 15, 2024 21:24
@danielmartin0 danielmartin0 marked this pull request as draft September 15, 2024 21:25
@danielmartin0 danielmartin0 marked this pull request as ready for review September 15, 2024 21:30
@danielmartin0 danielmartin0 marked this pull request as draft September 15, 2024 21:43
@danielmartin0 danielmartin0 marked this pull request as ready for review September 15, 2024 21:54
@danielmartin0 danielmartin0 changed the title Further small features and code cleanup Final pre-2.0 update Sep 24, 2024
@Gerkiz Gerkiz merged commit 8d0c814 into ComfyFactory:develop Sep 24, 2024
2 checks passed
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.
2 participants
@danielmartin0 @Gerkiz