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

skinning festival #1575

Draft
wants to merge 17 commits into
base: master
Choose a base branch
from
Draft

skinning festival #1575

wants to merge 17 commits into from

Commits on May 11, 2020

  1. Merge remote-tracking branch 'origin/small-improvments-20'

    @5sanon
    5sanon committed May 11, 2020
    Configuration menu
    Copy the full SHA
    754f3dc View commit details
    Browse the repository at this point in the history

Commits on May 18, 2020

  1. skinning festival

    @5sanon
    5sanon committed May 18, 2020
    Configuration menu
    Copy the full SHA
    0b8a726 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2020

  1. localisations 

    added loc and changed events
    @5sanon
    5sanon committed May 19, 2020
    Configuration menu
    Copy the full SHA
    39aa0ba View commit details
    Browse the repository at this point in the history

  2. added more loc 

    added loc and changed events
    @5sanon
    5sanon committed May 19, 2020
    Configuration menu
    Copy the full SHA
    cb7f140 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2020

  1. finished loc, pictures, modifiers 

    i did not completely change the copy paste yet, but most of the stuff is done
probably will change pictures
    @5sanon
    5sanon committed May 20, 2020
    Configuration menu
    Copy the full SHA
    947db4a View commit details
    Browse the repository at this point in the history

  2. Update 00_fives_united_localisation.csv

    @5sanon
    5sanon committed May 20, 2020
    Configuration menu
    Copy the full SHA
    6a92b0d View commit details
    Browse the repository at this point in the history

Commits on May 29, 2020

  1. deleted most of the event and redoing it on my own

    @5sanon
    5sanon committed May 29, 2020
    Configuration menu
    Copy the full SHA
    464c44c View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2020

  1. not tested

    @5sanon
    5sanon committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    f53011d View commit details
    Browse the repository at this point in the history

  2. added more stuff but event doesnt work at all 

    probably a small mistake i did. been like this on previous commit also
    @5sanon
    5sanon committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    de1f92d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into skinning-festival

    @5sanon
    5sanon committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    68fed69 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'remotes/origin/master' into pr/1575 

    # Conflicts:
#	common/event_modifiers/wc_cooldown_modifiers.txt
#	common/modifier_definitions/wc_opinion_modifier_definitions.txt
#	common/on_actions/00_on_actions.txt
#	common/scripted_effects/wc_scripted_effects.txt
#	common/scripted_triggers/wc_scripted_triggers.txt
#	common/scripted_triggers/wcsp_scripted_triggers.txt
#	interface/wc_decision_icons.gfx
#	interface/wc_event_pictures.gfx
#	localisation/00_zuwc_united_localisation.csv
    @zumbak04
    zumbak04 committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    adabac5 View commit details
    Browse the repository at this point in the history

  5. Sorted HF_realm_decisions.txt 

    (GDC)
    @zumbak04
    zumbak04 committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    ec9c072 View commit details
    Browse the repository at this point in the history

  6. Update events/wc_gnoll_events.txt 

    Co-authored-by: zumbak04 <[email protected]>
    @zumbak04
    fivesanon and zumbak04 authored Jun 6, 2020
    Configuration menu
    Copy the full SHA
    7d347df View commit details
    Browse the repository at this point in the history

  7. Update events/wc_gnoll_events.txt 

    Co-authored-by: zumbak04 <[email protected]>
    @zumbak04
    fivesanon and zumbak04 authored Jun 6, 2020
    Configuration menu
    Copy the full SHA
    14f7a8d View commit details
    Browse the repository at this point in the history

  8. Update wc_gnoll_events.txt

    @5sanon
    5sanon committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    962340c View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2020

  1. expanded upon current events and added one

    @5sanon
    5sanon committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    50c70ce View commit details
    Browse the repository at this point in the history

  2. Update wc_gnoll_events.txt

    @5sanon
    5sanon committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    df0a54d View commit details
    Browse the repository at this point in the history