8000 Comparing dev...main · ScavStation/ScavStation · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
Permalink
< 8000 h1 data-view-component="true" class="Subhead-heading Subhead-heading--large">Comparing changes
Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ScavStation/ScavStation
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dev
Choose a base ref
...
head repository: ScavStation/ScavStation
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 19 commits
  • 59 files changed
  • 4 contributors

Commits on Oct 27, 2024

  1. fix merge conflict

    @Qumefox
    Qumefox committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    0d7c5c0 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2024

  1. Loadout tweak 

    Consensus was reached and tweaks of one of the loadout items will be implemented. Check your loadouts and points
    @OlyMoley7
    OlyMoley7 committed Nov 2, 2024
    Configuration menu
    Copy the full SHA
    0773c40 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2024

  1. Fix ration repath due to nebula changes

    @Qumefox
    Qumefox committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    0c2422f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1104 from Qumefox/nebulaupdate 

    Nebulaupdate
    @Qumefox
    Qumefox authored Nov 3, 2024
    Configuration menu
    Copy the full SHA
    7a9dea2 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1106 from OlyMoley7/Dev-Oly 

    Loadout tweak
    @Qumefox
    Qumefox authored Nov 3, 2024
    Configuration menu
    Copy the full SHA
    eba636f View commit details
    Browse the repository at this point in the history

  4. edited mobs, removed drones 

    yep
    @Mairujyat
    Mairujyat committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    025030c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'ScavStation:main' into main

    @Mairujyat
    Mairujyat authored Nov 3, 2024
    Configuration menu
    Copy the full SHA
    d9fa9eb View commit details
    Browse the repository at this point in the history

  6. trying something out as a fix 

    swapped one mob in one spot near an exosuit for another
    @Mairujyat
    Mairujyat committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    c75eeb1 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' of https://github.com/Mairujyat/ScavStation

    @Mairujyat
    Mairujyat committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    89765d7 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2024

  1. trying another alternate mob arrangement on map 

    LET's SEEE IF IT WORKS
    @Mairujyat
    Mairujyat committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    223d3f8 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. added two drones 

    i hope the enemies ignore the exosuits now
    @Mairujyat
    Mairujyat committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    a0ef50e View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2024

  1. Merge pull request #1107 from Mairujyat/main 

    Update to the Overrun Colony map
    @Qumefox
    Qumefox authored Nov 8, 2024
    Configuration menu
    Copy the full SHA
    cd6051e View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2024

  1. lowered the cost of 'hateville' to 1.5

    @Mairujyat
    Mairujyat committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    998de93 View commit details
    Browse the repository at this point in the history

  2. lowered cost

    @Mairujyat
    Mairujyat committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    0123cbb View commit details
    Browse the repository at this point in the history

  3. away site updates 

    - lowered fountain cost to 1 to allow a bit more site generation flexibility (may lower it to 0.5)
- eased restrictions on overrun colony spawn template, lowered cost to 1
- thinned some enemy types in overrun colony map
    @Mairujyat
    Mairujyat committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    88b8aff View commit details
    Browse the repository at this point in the history

  4. another tweak, moved an exosuit

    @Mairujyat
    Mairujyat committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    ab529ff View commit details
    Browse the repository at this point in the history

  5. ditto

    @Mairujyat
    Mairujyat committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    e06e52d View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2024

  1. Merge pull request #1123 from Mairujyat/main 

    Adjustments to Overrun Colony; lowered cost of Fountain of Youth
    @Qumefox
    Qumefox authored Nov 17, 2024
    Configuration menu
    Copy the full SHA
    c5a4b2b View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2025

  1. Update issue templates

    @Qumefox
    Qumefox authored Jan 31, 2025
    Configuration menu
    Copy the full SHA
    f296569 View commit details
    Browse the repository at this point in the history
Loading
0