feedback5: merge R3 — server/sim/Battle.js split into server/sim/battle/* (prototype methods in fixed order) and content/enemies.js into content/enemies/* (same KITS order); golden unchanged
# Conflicts: # .git-blame-ignore-revs
This commit is contained in:
commit
95842cef6e
43 files changed
+5728
-5249
No files matched your search
@@ -1,7 +1,11 @@
|
||||
# Commits that only move code. Blame across them with
|
||||
# git blame -C -C --ignore-revs-file .git-blame-ignore-revs <file>
|
||||
# (or once: git config blame.ignoreRevsFile .git-blame-ignore-revs; -C -C follows lines into the new files of a split).
|
||||
# Pure moves only (0.2.0 refactor plan, rule 3): a commit listed here changes nothing but where the code lives.
|
||||
# Commits that only move code between files (0.2.0 refactor plan, rule 3: a commit listed here changes nothing but where
|
||||
# the code lives). Blame skips them when asked to:
|
||||
# git config blame.ignoreRevsFile .git-blame-ignore-revs (GitHub's blame view reads this file by itself)
|
||||
# For lines that moved into a new file, add -C -C (git blame -C -C <file>) to follow them to their old file.
|
||||
|
||||
# feedback5 R1: server/index.js top-level code → server/http/ (config, common, files, static, media, buildTag, websocket, boot)
|
||||
b48a67caec5ba0699097e21f3db4d4dbb35a2aed
|
||||
# feedback5 R3: server/sim/Battle.js → server/sim/battle/*.js (the Battle methods, verbatim)
|
||||
13224f9483d94f65089e289ff2be63f50a69b1cb
|
||||
# feedback5 R3: server/sim/content/enemies.js → server/sim/content/enemies/*.js (helpers, archetypes, kit families)
|
||||
560328cacc863c26d07780096527e255ebf62bc4
|
||||
Reference in new issue
Block a user