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

TurtleShroom Productions VII #198

Closed
wants to merge 22 commits into from
Closed

TurtleShroom Productions VII #198

wants to merge 22 commits into from

Commits on Dec 19, 2016

  1. Merge remote-tracking branch 'refs/remotes/loup99/master'

    TurtleShroom committed Dec 19, 2016
    Configuration menu
    Copy the full SHA
    8801ad1 View commit details
    Browse the repository at this point in the history
  2. TurtleShroom Productions VI - Reinstatement

    Test import of former TSP6. This is a working draft and attempt to
    reincorporate the files by hand. Some formatting (but not coding, like
    forced-enter strokes) is broken due to the limited abilities I have to
    restore the files.
    TurtleShroom committed Dec 19, 2016
    Configuration menu
    Copy the full SHA
    242e8f1 View commit details
    Browse the repository at this point in the history
  3. Revert "TurtleShroom Productions VI - Reinstatement"

    This reverts commit 242e8f1.
    TurtleShroom committed Dec 19, 2016
    Configuration menu
    Copy the full SHA
    e375ae7 View commit details
    Browse the repository at this point in the history
  4. TurtleShroom Productions VI - Reinstatement

    Test import of former TSP6. This is a working draft and attempt to
    reincorporate the files by hand. I looked through each one, one by one,
    but I may have missed something.
    TurtleShroom committed Dec 19, 2016
    Configuration menu
    Copy the full SHA
    a7c407c View commit details
    Browse the repository at this point in the history
  5. Hot Fix

    Fixed issue where Religions did not show up.
    TurtleShroom committed Dec 19, 2016
    Configuration menu
    Copy the full SHA
    7c2e5e1 View commit details
    Browse the repository at this point in the history
  6. Hot Fix

    Crud. I accidently pressed the button before this one was put into the
    console.
    TurtleShroom committed Dec 19, 2016
    Configuration menu
    Copy the full SHA
    d9e891e View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2016

  1. oh come on

    DAGGUM THIS STUPID "NORELIGION" GLITCH
    TurtleShroom committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    7d8607d View commit details
    Browse the repository at this point in the history
  2. Hot Fix!

    Aha! This should work!! I saved the file in Unicode instead of ANSI
    Code! This should fix the problem.
    TurtleShroom committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    d27c216 View commit details
    Browse the repository at this point in the history
  3. Missing Borborites (TSP6)

    Fixed missing Borborite Trait from TSP6
    TurtleShroom committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    18d2fa6 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2016

  1. Merge remote-tracking branch 'refs/remotes/loup99/master'

    # Conflicts:
    #	WTWSMS/common/landed_titles/landed_titles.txt
    #	WTWSMS/common/religions/00_religions.txt
    TurtleShroom committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    e61753d View commit details
    Browse the repository at this point in the history
  2. Ordered Reversions

    Reverted items requested by Loup.
    TurtleShroom committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    ebfade5 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2017

  1. Merge remote-tracking branch 'refs/remotes/loup99/master'

    # Conflicts:
    #	WTWSMS/common/objectives/00_focuses.txt
    #	WTWSMS/common/religions/00_religions.txt
    TurtleShroom committed Jan 7, 2017
    Configuration menu
    Copy the full SHA
    3a44048 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2017

  1. Reversions

    Per Loup's request
    TurtleShroom committed Jan 10, 2017
    Configuration menu
    Copy the full SHA
    5c649dc View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'refs/remotes/loup99/master'

    TurtleShroom committed Jan 10, 2017
    Configuration menu
    Copy the full SHA
    cf65651 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2017

  1. Nickname Reversion

    Per Loup's request:
    
    1. The Black now only applies to clergymen.
    
    2.  Animal Protector no longer applies to Priscillians.
    
    3. Porphyrogenitos, being a Greek name, only applies to Byzantines.
    
    4. A new nickname for foreign characters that were Born In the Purple
    but are not traditionally Byzantine characters has been added to take
    its place.
    TurtleShroom committed Jan 11, 2017
    Configuration menu
    Copy the full SHA
    d496eee View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2017

  1. * violently slams desk again and again *

    No, I'm not using your Shell faggotry just because you won't commit
    TurtleShroom committed Feb 28, 2017
    Configuration menu
    Copy the full SHA
    e0b9252 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'refs/remotes/loup99/master'

    # Conflicts:
    #	WTWSMS/decisions/VIET_PB_employment_decisions.txt
    #	WTWSMS/decisions/VIET_West_Africa_decisions.txt
    #	WTWSMS/decisions/WtWSMS_realm_decisions.txt
    #	WTWSMS/events/WtWSMS_religious.txt
    #	WTWSMS/localisation/WtWSMS_decisions.csv
    #	WTWSMS/localisation/WtWSMS_religions.csv
    TurtleShroom committed Feb 28, 2017
    Configuration menu
    Copy the full SHA
    1e05d3c View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'refs/remotes/loup99/master'

    # Conflicts:
    #	WTWSMS/decisions/VIET_PB_employment_decisions.txt
    #	WTWSMS/decisions/VIET_West_Africa_decisions.txt
    #	WTWSMS/decisions/WtWSMS_realm_decisions.txt
    #	WTWSMS/localisation/WtWSMS_decisions.csv
    #	WTWSMS/localisation/WtWSMS_religions.csv
    TurtleShroom committed Feb 28, 2017
    Configuration menu
    Copy the full SHA
    b659eaa View commit details
    Browse the repository at this point in the history
  4. Final Reversion of Nicknames

    TurtleShroom committed Feb 28, 2017
    Configuration menu
    Copy the full SHA
    5a077a8 View commit details
    Browse the repository at this point in the history
  5. Finalized Rectification

    TurtleShroom committed Feb 28, 2017
    Configuration menu
    Copy the full SHA
    19f8bc4 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2017

  1. Pound Signs for the Filthy Ones

    Loup wisely pointed out that this would make the Validator spit out
    false positives, so per his request, I placed pound signs on every
    instance of the Borborite code, and files deciated solely to the
    Borborites have been disabled.
    TurtleShroom committed Mar 1, 2017
    Configuration menu
    Copy the full SHA
    c08883d View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2017

  1. Disabled Triggered Modifiers

    The alleged performance drop does not exist, at least not on my PC.
    TurtleShroom committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    fb9efba View commit details
    Browse the repository at this point in the history