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

Culture elemental effects #1342

Open
wants to merge 65 commits into
base: magic-2024
Choose a base branch
from
Open

Culture elemental effects #1342

wants to merge 65 commits into from

Commits on Dec 27, 2021

  1. Gui optimization 

    GDC
    @MemeWizard
    MemeWizard committed Dec 27, 2021
    Configuration menu
    Copy the full SHA
    20574e9 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2021

  1. reworked mana regeneration 

    GDC
    @MemeWizard
    MemeWizard committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    8864b99 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2021

  1. Create icon_spellbook.dds 

    GDC
    @MemeWizard
    MemeWizard committed Dec 31, 2021
    Configuration menu
    Copy the full SHA
    162ec38 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2022

  1. added spell categories 

    GDC
    @MemeWizard
    MemeWizard committed Jan 1, 2022
    Configuration menu
    Copy the full SHA
    a90a83d View commit details
    Browse the repository at this point in the history

  2. Update wc_texticons.gui 

    GDC
    @MemeWizard
    MemeWizard committed Jan 1, 2022
    Configuration menu
    Copy the full SHA
    c870af4 View commit details
    Browse the repository at this point in the history

  3. mana localization updated 

    GDC
    @MemeWizard
    MemeWizard committed Jan 1, 2022
    Configuration menu
    Copy the full SHA
    a8abc42 View commit details
    Browse the repository at this point in the history

  4. fixed prowess flickering 

    GDC
    @MemeWizard
    MemeWizard committed Jan 1, 2022
    Configuration menu
    Copy the full SHA
    df8f932 View commit details
    Browse the repository at this point in the history

  5. Fixed wrong localization in lifestyles window 

    GDC
    @MemeWizard
    MemeWizard committed Jan 1, 2022
    Configuration menu
    Copy the full SHA
    2b9bd37 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2022

  1. Fixed landless characters not regenerating mana 

    GDC
    @MemeWizard
    MemeWizard committed Jan 2, 2022
    Configuration menu
    Copy the full SHA
    4bddaea View commit details
    Browse the repository at this point in the history

  2. Added an effect that spends mana

    @MemeWizard
    MemeWizard committed Jan 2, 2022
    Configuration menu
    Copy the full SHA
    c1780d5 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2022

  1. Gui optimization 

    GDC
    @MemeWizard
    MemeWizard committed Jan 4, 2022
    Configuration menu
    Copy the full SHA
    5b40b22 View commit details
    Browse the repository at this point in the history

  2. interaction localization upd 

    GDC
    @MemeWizard
    MemeWizard committed Jan 4, 2022
    Configuration menu
    Copy the full SHA
    646cdf0 View commit details
    Browse the repository at this point in the history

  3. Update wc_lifestyle_traits_effects.txt 

    Fixed physical lifestyle not giving you knowledge overflow immediately after spending perk
GDC
    @MemeWizard
    MemeWizard committed Jan 4, 2022
    Configuration menu
    Copy the full SHA
    6ab864f View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2022

  1. mana to prowess text update 

    GDC
    @MemeWizard
    MemeWizard committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    97a8d06 View commit details
    Browse the repository at this point in the history

  2. Created arcane intellect dds 

    GDC

GDC
    @MemeWizard
    MemeWizard committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    5c491b0 View commit details
    Browse the repository at this point in the history

  3. monthly spell cost effect 

    GDC
    @MemeWizard
    MemeWizard committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    613ebab View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2022

  1. renamed file 

    GDC
    @MemeWizard
    MemeWizard committed Feb 1, 2022
    Configuration menu
    Copy the full SHA
    971cb9a View commit details
    Browse the repository at this point in the history

  2. Fixed gui bug 

    GDC
    @MemeWizard
    MemeWizard committed Feb 1, 2022
    Configuration menu
    Copy the full SHA
    aa4cd52 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2022

  1. First spell test 

    GDC
    @MemeWizard
    MemeWizard committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    9e59707 View commit details
    Browse the repository at this point in the history

  2. Update wc_modifiers_mana_l_english.yml 

    GDC
    @MemeWizard
    MemeWizard committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    3f12713 View commit details
    Browse the repository at this point in the history

  3. renamed file 

    GDC
    @MemeWizard
    MemeWizard committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    00eebd5 View commit details
    Browse the repository at this point in the history

  4. Update wc_modifiers_mana_l_english.yml 

    GDC
    @MemeWizard
    MemeWizard committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    3860bc0 View commit details
    Browse the repository at this point in the history

  5. Update wc_magic_values.txt 

    GDC
    @MemeWizard
    MemeWizard committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    eebf7e4 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2022

  1. Update magic modifiers files 

    GDC
    @MemeWizard
    MemeWizard committed Feb 4, 2022
    Configuration menu
    Copy the full SHA
    8046396 View commit details
    Browse the repository at this point in the history

  2. spell ranks 

    GDC
    @MemeWizard
    MemeWizard committed Feb 4, 2022
    Configuration menu
    Copy the full SHA
    1e38406 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2022

  1. accidentally pushed commits, oops 

    GDC
    @MemeWizard
    MemeWizard committed Feb 5, 2022
    Configuration menu
    Copy the full SHA
    b826587 View commit details
    Browse the repository at this point in the history

  2. upgrading spells 

    GDC
    @MemeWizard
    MemeWizard committed Feb 5, 2022
    Configuration menu
    Copy the full SHA
    3528035 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2022

  1. channeling effect updates as you rank up your spells 

    GDC
    @MemeWizard
    MemeWizard committed Feb 10, 2022
    Configuration menu
    Copy the full SHA
    61ff82e View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2022

  1. Stop channeling spell interaction 

    GDC
    @MemeWizard
    MemeWizard committed Feb 11, 2022
    Configuration menu
    Copy the full SHA
    eacd149 View commit details
    Browse the repository at this point in the history

  2. has mana trigger tooltip localized 

    GDC
    @MemeWizard
    MemeWizard committed Feb 11, 2022
    Configuration menu
    Copy the full SHA
    04d8da8 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2022

  1. Merge branch 'top-to-bottom-trees' into fire-lifestyle 

    # Conflicts:
#	common/decisions/test_decision.txt
#	localization/english/modifiers/wc_modifiers_l_english.yml
    @MemeWizard
    MemeWizard committed Feb 15, 2022
    Configuration menu
    Copy the full SHA
    8939b21 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'memefixes-3' into fire-lifestyle 

    # Conflicts:
#	localization/english/gui/wc_gui_l_english.yml
#	localization/english/modifiers/wc_modifiers_l_english.yml
#	localization/english/wc_game_concepts_l_english.yml
#	localization/french/wc_game_concepts_l_french.yml
#	localization/german/gui/wc_gui_l_german.yml
#	localization/german/wc_game_concepts_l_german.yml
    @MemeWizard
    MemeWizard committed Feb 15, 2022
    Configuration menu
    Copy the full SHA
    6e5e83e View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2022

  1. Merge branch 'magic-trees-new-doctrines-adaptation' into top-to-botto… 

    …m-trees
    @MemeWizard
    MemeWizard committed Feb 19, 2022
    Configuration menu
    Copy the full SHA
    f932fc1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'top-to-bottom-trees' into fire-lifestyle

    @MemeWizard
    MemeWizard committed Feb 19, 2022
    Configuration menu
    Copy the full SHA
    7a814f8 View commit details
    Browse the repository at this point in the history

  3. Updated doctrines localization 

    GDC
    @MemeWizard
    MemeWizard committed Feb 19, 2022
    Configuration menu
    Copy the full SHA
    06b0850 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2022

  1. Merge branch 'top-to-bottom-trees' into fire-lifestyle

    @MemeWizard
    MemeWizard committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    9089335 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'top-to-bottom-trees' into fire-lifestyle 

    # Conflicts:
#	common/modifiers/wc_magic_modifiers.txt
#	common/script_values/wc_magic_values.txt
#	localization/english/wc_effects_magic_spells_l_english.yml
#	localization/english/wc_game_concepts_magic_l_english.yml
    @MemeWizard
    MemeWizard committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    ec7fd0b View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2022

  1. Merge branch 'top-to-bottom-trees' into fire-lifestyle 

    # Conflicts:
#	gui/wc_texticons.gui
    @MemeWizard
    MemeWizard committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    4e009fe View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2024

  1. Merge branch 'magic-2024' into fire-lifestyle

    @helloruhe
    helloruhe authored Jan 3, 2024
    Configuration menu
    Copy the full SHA
    c9e9d1b View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. fix interactions

    @helloruhe
    helloruhe committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    5ac79f2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'magic-2024' into fire-lifestyle

    @helloruhe
    helloruhe authored Jan 10, 2024
    Configuration menu
    Copy the full SHA
    d0b554e View commit details
    Browse the repository at this point in the history

  3. basic spell framework

    @helloruhe
    helloruhe committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    a19215d View commit details
    Browse the repository at this point in the history

  4. base gui + more spell system stuff

    @helloruhe
    helloruhe committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    9b9ab78 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. base spell gui

    @helloruhe
    helloruhe committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    ec4b152 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'magic-2024' into fire-lifestyle

    @helloruhe
    helloruhe authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    98f8bce View commit details
    Browse the repository at this point in the history

  3. remove some interpolation and notes

    @helloruhe
    helloruhe committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    31f2cdc View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. spell framework updates

    @helloruhe
    helloruhe committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    761b86b View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2024

  1. starting on spell changes

    @helloruhe
    helloruhe committed Jan 13, 2024
    Configuration menu
    Copy the full SHA
    f37b3d5 View commit details
    Browse the repository at this point in the history

  2. spell cd and cast time

    @helloruhe
    helloruhe committed Jan 13, 2024
    Configuration menu
    Copy the full SHA
    20d9566 View commit details
    Browse the repository at this point in the history

  3. add some loc

    @edmund-h
    edmund-h committed Jan 13, 2024
    Configuration menu
    Copy the full SHA
    1b4c479 View commit details
    Browse the repository at this point in the history

  4. finish unfinished loc (whoops)

    @edmund-h
    edmund-h committed Jan 13, 2024
    Configuration menu
    Copy the full SHA
    135b4c7 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. more localization for spell schools

    @edmund-h
    edmund-h committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    714454c View commit details
    Browse the repository at this point in the history

  2. gui additions

    @helloruhe
    helloruhe committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    a7a8579 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fire-lifestyle' of https://github.com/Warcraft-GoA-Deve… 

    …lopment-Team/Warcraft-Guardians-of-Azeroth-2 into fire-lifestyle
    @helloruhe
    helloruhe committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    01ed985 View commit details
    Browse the repository at this point in the history

  4. change favoUr on spellcast

    @edmund-h
    edmund-h committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    1ad92e3 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'fire-lifestyle' of https://github.com/Warcraft-GoA-Deve… 

    …lopment-Team/Warcraft-Guardians-of-Azeroth-2 into fire-lifestyle
    @edmund-h
    edmund-h committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    b990d72 View commit details
    Browse the repository at this point in the history

  6. mark location for future secrets if needed

    @edmund-h
    edmund-h committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    f35c89e View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. gui

    @helloruhe
    helloruhe committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    f1770d9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fire-lifestyle' of https://github.com/Warcraft-GoA-Deve… 

    …lopment-Team/Warcraft-Guardians-of-Azeroth-2 into fire-lifestyle
    @helloruhe
    helloruhe committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    1701170 View commit details
    Browse the repository at this point in the history

  3. gui 2

    @helloruhe
    helloruhe committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    763113f View commit details
    Browse the repository at this point in the history

  4. commit before work

    @helloruhe
    helloruhe committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    07ca62b View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. innovation penalty for spirit shamans

    @edmund-h
    edmund-h committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    5eeb174 View commit details
    Browse the repository at this point in the history

  2. Update wc_lifestyle_traits_effects.txt

    @edmund-h
    edmund-h committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    582bbce View commit details
    Browse the repository at this point in the history

  3. test

    @helloruhe
    helloruhe committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    0be8983 View commit details
    Browse the repository at this point in the history

  4. e

    @helloruhe
    helloruhe committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    a9d9853 View commit details
    Browse the repository at this point in the history