• This project
    • Loading...
  • Sign in

tome / Tales of MajEyal · Merge Requests

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Graphs
  • Milestones
  • Merge Requests 55
  • Labels
  • Forks
  • Snippets
  • Network
Merged
MR Merge Request !723 opened
2021-05-22 15:30:39 UTC by Otowa Kotori @otowakotori

Misc 1.7.4

Edited 2021-06-10 14:24:36 UTC
Request to merge otowakotori:misc174 into master
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://git.net-core.org/otowakotori/t-engine4.git misc174
git checkout -b otowakotori/t-engine4-misc174 FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff otowakotori/t-engine4-misc174

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines

CI build passed for d51ef9de. View details
CI build skipped for d51ef9de. View details
CI build canceled for d51ef9de. View details
CI build failed for d51ef9de. View details
CI build running for d51ef9de. View details
CI build pending for d51ef9de. View details

Merged by DarkGod 2021-06-10 14:24:36 UTC

  • Discussion 2
  • Commits 28
  • Builds 0
  • Changes 17
  • Otowa Kotori
    @otowakotori commented 2021-05-23 08:54:00 UTC

    Added 1 commit:

    • 9934282a - Let T_RETCH heal necrotic minions
  • Otowa Kotori
    @otowakotori commented 2021-05-23 09:11:36 UTC

    Added 1 commit:

    • 2a3532f9 - Fix bonus damage against Dazzled enemies
  • Otowa Kotori
    @otowakotori commented 2021-05-23 13:23:06 UTC

    Added 1 commit:

    • ae77b14e - Fix extending ego
  • Otowa Kotori
    @otowakotori commented 2021-05-23 15:58:48 UTC

    Added 1 commit:

    • efaa2adf - Fix Stoning Poison not learnable
  • Otowa Kotori
    @otowakotori commented 2021-05-24 09:11:31 UTC

    Added 1 commit:

    • e4172e36 - Remove character sheet debug code
  • Otowa Kotori
    @otowakotori commented 2021-05-24 09:35:21 UTC

    Added 1 commit:

    • f4be0903 - Fix Doomed Shadows not using Fade
  • Otowa Kotori
    @otowakotori commented 2021-05-26 04:49:05 UTC

    Added 2 commits:

    • e4a78567 - Fix arkul's siege arrow
    • 996c3743 - Make living weapons support whips better
  • Otowa Kotori
    @otowakotori commented 2021-05-27 09:34:59 UTC

    Added 10 commits:

    • 996c3743...48c18b71 - 9 commits from branch tome:master
    • 37803ad3 - Merge remote-tracking branch 'upstream/master' into misc174
  • Otowa Kotori
    @otowakotori commented 2021-05-27 09:44:34 UTC

    Added 1 commit:

    • 08822eb3 - Let Attune Mindstar take a turn
  • Otowa Kotori
    @otowakotori commented 2021-05-27 13:34:39 UTC

    Added 8 commits:

    • 08822eb3...a65ba931 - 7 commits from branch tome:master
    • f3564402 - Merge remote-tracking branch 'upstream/master' into misc174
  • Otowa Kotori
    @otowakotori commented 2021-05-27 13:43:58 UTC

    Added 1 commit:

    • 623b690c - Fix trap noun sub
  • E45573bfa3cad0567c4dd6a1048c8a04?s=80&d=identicon
    K'van
    @nsrr started a discussion on commit 2a3532f9
    Show/hide discussion
    last updated by K'van 2021-05-27 15:33:27 UTC
  • K'van
    @nsrr commented 2021-05-27 14:13:58 UTC

    I believe this is just a relic of the Phantasm rework process. I think a very early revision of Phantasmal Shield had the Dazzle effect increase damage, but it was soon changed to reduced damage output instead.

    At any rate, Phantasmal Shield makes no reference to Dazzled enemies taking more damage, so I don't think this is a bug or requires any action.

  • K'van
    @nsrr commented 2021-05-27 15:33:27 UTC

    Disregard. I missed that Invisibility applies this bonus.

  • Otowa Kotori
    @otowakotori commented 2021-05-28 06:07:52 UTC

    Added 1 commit:

    • 1d8a60af - Fix Hymn Nocturnalist description
  • Otowa Kotori
    @otowakotori commented 2021-05-29 07:20:07 UTC

    Added 1 commit:

    • 368aa7a4 - funcional tactical value will not get cached
  • Otowa Kotori
    @otowakotori commented 2021-05-29 07:32:11 UTC

    Added 1 commit:

    • 6441537b - remove Dart Launcher checking "living" tag
  • Otowa Kotori
    @otowakotori commented 2021-05-29 12:35:34 UTC

    Added 2 commits:

    • 01e5acce - remove living check for Dart Launcher
    • 8e4452a5 - Fix Cleansing Flames's tactical table
  • Otowa Kotori
    @otowakotori commented 2021-06-01 15:08:19 UTC

    Added 47 commits:

    • 8e4452a5...a22f7184 - 46 commits from branch tome:master
    • 838be98c - Merge remote-tracking branch 'upstream/master' into misc174
  • Otowa Kotori
    @otowakotori commented 2021-06-02 14:09:00 UTC

    Unmarked this merge request as a Work In Progress

  • Otowa Kotori
    @otowakotori commented 2021-06-02 14:13:55 UTC

    Added 12 commits:

    • 838be98c...b739184a - 11 commits from branch tome:master
    • b368c30b - Merge remote-tracking branch 'upstream/master' into misc174
  • 8c6558a2861cdc2aebaab5dc9cdd9998?s=80&d=identicon
    Otowa Kotori
    @otowakotori started a discussion on commit 368aa7a4
    Show/hide discussion
    last updated by Otowa Kotori 2021-06-03 11:35:49 UTC
  • Otowa Kotori
    @otowakotori commented 2021-06-03 11:35:49 UTC

    mentioned in commit 711e657b

  • Otowa Kotori
    @otowakotori commented 2021-06-03 11:35:51 UTC

    Added 1 commit:

    • 711e657b - Revert "funcional tactical value will not get cached"
  • Otowa Kotori
    @otowakotori commented 2021-06-05 15:39:16 UTC

    Added 3 commits:

    • ed83108f - fix T_DEMON_PLANE deactivate position & cast out of LoS
    • c3e39e0b - add a check for savefile compatibility
    • 114f2c8a - Remove no_worldport for Temporal Rift
  • Otowa Kotori
    @otowakotori commented 2021-06-05 15:57:11 UTC

    Added 1 commit:

    • 65c9cb94 - Sorry for the poor bandit who had been used as the debug actor for long, requiescat in pace
  • Otowa Kotori
    @otowakotori commented 2021-06-05 16:15:04 UTC

    Added 1 commit:

    • 65dd0bea - Fix Minotaur's Grand Arrival
  • Otowa Kotori
    @otowakotori commented 2021-06-05 16:40:11 UTC

    Added 1 commit:

    • d51ef9de - Whenever #GOLD#Sun's Vengeance#LAST# triggers the remaining cooldown of Judgement is reduced by 6.
  • DarkGod
    @darkgod commented 2021-06-10 14:24:35 UTC

    mentioned in commit ec68643a

  • DarkGod
    @darkgod commented 2021-06-10 14:24:36 UTC

    Status changed to merged

  • Please register or login to post a comment
723 of 849
Prev Next
Assignee
No assignee
Assign to
No
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
2
2 participants
Reference: tome/t-engine4!723
×

Revert this merge request

Cancel
A new branch will be created in your fork and a new merge request will be started.