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

Feature/103676 difficulty adj phase1 #99

Open
wants to merge 36 commits into
base: master
Choose a base branch
from

Commits on Jul 13, 2020

  1. Configuration menu
    Copy the full SHA
    1221fe1 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1 from kronosaur/master

    Updating master
    FlufflesTheMicrosaur authored Jul 13, 2020
    Configuration menu
    Copy the full SHA
    5865355 View commit details
    Browse the repository at this point in the history
  3. feat: base wreck/abandoned colors on new colors, adjust angered color…

    … to be more orange less brown
    FlufflesTheMicrosaur committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    7344503 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    19a566c View commit details
    Browse the repository at this point in the history
  5. Merge branch 'master' of https://github.com/FlufflesTheMicrosaur/Tran…

    …scendenceDev into feature/91216-relation_specific_HUD_colors_config_colorblind_shapes
    FlufflesTheMicrosaur committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    969fd04 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2020

  1. feat: make station coloring consistent, grey out explored wrecked sta…

    …tions and ship wrecks, add small cross to unexplored wrecked stations and ships
    FlufflesTheMicrosaur committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    fc7e91f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ed30b85 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    459346f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6235368 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    65e700c View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5e84d94 View commit details
    Browse the repository at this point in the history
  7. feat: add icons for ships and small stations, simplify logic for hand…

    …ling abandoned stations and wrecks
    FlufflesTheMicrosaur committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    72ee842 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2020

  1. feat: make all IFF color types and projectiles/area damage recolorabl…

    …e via settings for users with different types of colorblindness
    FlufflesTheMicrosaur committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    e644c1e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    167092b View commit details
    Browse the repository at this point in the history
  3. Merge pull request #2 from kronosaur/master

    Add new auton images (kronosaur#52)
    FlufflesTheMicrosaur authored Jul 15, 2020
    Configuration menu
    Copy the full SHA
    d117495 View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'origin/master' into feature/91216-relat…

    …ion_specific_HUD_colors_config_colorblind_shapes
    FlufflesTheMicrosaur committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    ec4798d View commit details
    Browse the repository at this point in the history
  5. refactor: use C++11 enum class for IFFType, reset some indents to mai…

    …n style, switch accessibility colors to an array, use IFFType enum class in function calls
    FlufflesTheMicrosaur committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    0d760cd View commit details
    Browse the repository at this point in the history
  6. refactor: rename member variable of CAccessibilitySettings to indicat…

    …e what the colors are used for (IFF)
    FlufflesTheMicrosaur committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    226642b View commit details
    Browse the repository at this point in the history
  7. refactor: add 0xAABBCC style hexidecimal color parsing to LoadRGBColo…

    …r, use that function call in CAccessibilitySettings::SetIFFColor
    FlufflesTheMicrosaur committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    4731470 View commit details
    Browse the repository at this point in the history
  8. refactor: use photoshop/image editor style hex color codes (#FF00FF v…

    …s 0xFF00FF) for settings to make it more apparent that its color codes, add comment that the parsing for it is also caps-safe too
    FlufflesTheMicrosaur committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    feaf01a View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    258d517 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    5e9e197 View commit details
    Browse the repository at this point in the history
  11. feat: increase size of the up and down medium triangles to better vis…

    …ually distinguish them and make their actual visual area closer to that of the squares and diamonds.
    FlufflesTheMicrosaur committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    62fd89a View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    b7db1f7 View commit details
    Browse the repository at this point in the history
  13. Merge pull request #3 from kronosaur/master

    merge from kronosaur/TranscendenceDev master
    FlufflesTheMicrosaur authored Jul 15, 2020
    Configuration menu
    Copy the full SHA
    c1e56a6 View commit details
    Browse the repository at this point in the history
  14. Merge remote-tracking branch 'origin/master' into feature/91216-relat…

    …ion_specific_HUD_colors_config_colorblind_shapes
    
    # Conflicts:
    #	Mammoth/Include/TSEAccessibilitySettings.h
    #	Mammoth/Include/TSEUniverse.h
    #	Mammoth/TSE/CAccessibilitySettings.cpp
    #	Mammoth/TSE/CAreaDamage.cpp
    #	Mammoth/TSE/CShip.cpp
    #	Mammoth/TSE/CSovereign.cpp
    #	Mammoth/TSE/CSpaceObject.cpp
    #	Mammoth/TSE/CStation.cpp
    FlufflesTheMicrosaur committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    a1c837f View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2020

  1. Merge pull request #4 from kronosaur/master

    Update fork
    FlufflesTheMicrosaur authored Jul 24, 2020
    Configuration menu
    Copy the full SHA
    c581c1b View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2020

  1. Merge pull request #5 from kronosaur/master

    update fork
    FlufflesTheMicrosaur authored Oct 24, 2020
    Configuration menu
    Copy the full SHA
    7704d38 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2020

  1. Merge pull request #6 from kronosaur/master

    update master
    FlufflesTheMicrosaur authored Oct 26, 2020
    Configuration menu
    Copy the full SHA
    7ff95ee View commit details
    Browse the repository at this point in the history

Commits on May 16, 2021

  1. Merge pull request #7 from kronosaur/master

    Update master
    FlufflesTheMicrosaur authored May 16, 2021
    Configuration menu
    Copy the full SHA
    fea73d3 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2021

  1. Merge pull request #8 from kronosaur/master

    updating to latest
    FlufflesTheMicrosaur authored Nov 13, 2021
    Configuration menu
    Copy the full SHA
    8c55ac9 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2021

  1. Merge pull request #9 from kronosaur/master

    update to 1.91
    FlufflesTheMicrosaur authored Dec 5, 2021
    Configuration menu
    Copy the full SHA
    0e23216 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2022

  1. Merge pull request #10 from kronosaur/master

    merge latest
    FlufflesTheMicrosaur authored Mar 5, 2022
    Configuration menu
    Copy the full SHA
    5826f7f View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Merge pull request #11 from kronosaur/master

    update to latest
    FlufflesTheMicrosaur authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    35fa879 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2024

  1. feat: 103673: add "Debug For Contributors" configuration so that manu…

    …ally editing TSUI to exclude hexarcServices.cpp and include hexarcServicesStub is nolonger necessary
    FlufflesTheMicrosaur committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    5f25741 View commit details
    Browse the repository at this point in the history
  2. feat: 103676: phase 1 of difficulty adjustments - phase 1 is to accou…

    …nt for 'too easy/boring' complaints and confusion over 'story mode' & not being a narrative game, as well as confusion over what the original classic difficulty was - remove the outgoing damage bonus, story/easy now takes 25% instead of 10% incoming damage. Story is renamed to easy, normal to medium, and challenge to classic. Easy is still so easy that I was able to play through all of eridani including doing the tutorial successfully (saving the freighter) with nearly 1000ms latency with keyboard-only controls over a laggy remote VM connection, but it makes your choice of weapon actually matter, and eventually the 0.25 damageAdj will fall off and require better defenses.
    FlufflesTheMicrosaur committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    6befc6b View commit details
    Browse the repository at this point in the history