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

Capping shakes effect #51250

Merged
merged 21 commits into from
Sep 3, 2021
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7b651f0
Merge pull request #1 from CleverRaven/master
jim-huynh Jun 14, 2020
53d687e
Merge branch 'CleverRaven:master' into master
jim-huynh Aug 3, 2021
428ce89
Merge branch 'CleverRaven:master' into master
jim-huynh Aug 21, 2021
ee9de23
Merge branch 'CleverRaven:master' into master
jim-huynh Aug 21, 2021
61a8500
Merge branch 'CleverRaven:master' into master
jim-huynh Aug 21, 2021
c0377b0
Merge branch 'CleverRaven:master' into master
jim-huynh Aug 22, 2021
6054266
Merge branch 'CleverRaven:master' into master
jim-huynh Aug 23, 2021
406d7c9
Merge branch 'CleverRaven:master' into master
jim-huynh Aug 24, 2021
b016ee0
Merge branch 'CleverRaven:master' into master
jim-huynh Aug 24, 2021
e59baab
Merge branch 'CleverRaven:master' into master
jim-huynh Aug 25, 2021
a91f157
Merge branch 'CleverRaven:master' into master
jim-huynh Aug 26, 2021
e599222
Merge branch 'CleverRaven:master' into master
jim-huynh Aug 27, 2021
e361a93
Switch check to check the surrounding points rather than the current …
jim-huynh Aug 27, 2021
7cbd6e4
Check that the layer below the one being turned into open air isn't a…
jim-huynh Aug 27, 2021
d04f435
Merge branch 'CleverRaven:master' into master
jim-huynh Aug 27, 2021
cb8b506
PR51114 - Astyle fixes
jim-huynh Aug 28, 2021
54a69b1
Merge branch 'CleverRaven:master' into master
jim-huynh Aug 28, 2021
b3ba881
Update src/map.cpp
jim-huynh Aug 28, 2021
a03f650
Merge branch 'CleverRaven:master' into master
jim-huynh Aug 29, 2021
03098b7
Merge branch 'CleverRaven:master' into master
jim-huynh Aug 29, 2021
bc0ddc4
Capping shakes effect at 2 hour to prevent month long shakes after wi…
jim-huynh Aug 31, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'CleverRaven:master' into master
  • Loading branch information
jim-huynh authored Aug 27, 2021
commit d04f4356e1fb7b8813fbf97423e1401b4d08608f

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.