Skip to content
Permalink

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: NebulaModTeam/nebula
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.3.1
Choose a base ref
...
head repository: NebulaModTeam/nebula
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Jul 24, 2021

  1. NameInputPacket: Fix compatibility with GS

    Assuming ids of over 100 are planets doesn't work when there are 1000 stars, so let's just send either a planetid or a starid so we can determine which it is
    PhantomGamers committed Jul 24, 2021
    Copy the full SHA
    0fe507e View commit details
  2. Copy the full SHA
    5491f42 View commit details
  3. merge statistics

    hubastard committed Jul 24, 2021
    Copy the full SHA
    7fe3196 View commit details
  4. Merge router processors

    hubastard committed Jul 24, 2021
    Copy the full SHA
    d243474 View commit details
  5. Merged player processors

    hubastard committed Jul 24, 2021
    Copy the full SHA
    43eb045 View commit details
  6. Fix null refs

    hubastard committed Jul 24, 2021
    Copy the full SHA
    a05c16e View commit details
  7. Merge trash processors

    hubastard committed Jul 24, 2021
    Copy the full SHA
    fd10654 View commit details
  8. Copy the full SHA
    9d3824b View commit details
  9. Merge Logistics Processors

    hubastard committed Jul 24, 2021
    Copy the full SHA
    f7076e6 View commit details
  10. Fix null ref

    hubastard committed Jul 24, 2021
    Copy the full SHA
    887371e View commit details

Commits on Jul 25, 2021

  1. Copy the full SHA
    8877b1e View commit details
  2. Copy the full SHA
    bea8416 View commit details

Commits on Jul 26, 2021

  1. add automatic uploading of releases to thunderstore

    requires an account token to be added to the github secrets in order for this to work
    PhantomGamers committed Jul 26, 2021
    Copy the full SHA
    01bac47 View commit details
  2. thunderstore_bundle.js fixes

    * use better zipping library
    * fix issue where the entire nebula game folder was being copied instead of just the nebula folder
    PhantomGamers committed Jul 26, 2021
    Copy the full SHA
    8f30f5d View commit details
  3. Copy the full SHA
    cedaeb8 View commit details
  4. Copy the full SHA
    80aaabb View commit details
  5. Fix merge error

    PhantomGamers committed Jul 26, 2021
    Copy the full SHA
    1b9348c View commit details
  6. Update CHANGELOG.md

    PhantomGamers committed Jul 26, 2021
    Copy the full SHA
    7ab77fb View commit details

Commits on Jul 27, 2021

  1. Copy the full SHA
    3fa23e2 View commit details
  2. Add ILLine dependency

    so that we can get IL line numbers in error reports
    PhantomGamers committed Jul 27, 2021
    Copy the full SHA
    e1f141f View commit details
  3. Update CHANGELOG.md

    Replace * with - for better thunderstore support
    PhantomGamers committed Jul 27, 2021
    Copy the full SHA
    9a2b353 View commit details
  4. Change DSP launch settings and set NebulaPatcher to default startup d…

    …irectory
    
    By launching the game through Steam we were preventing the debugger from attaching, so let's target the EXE directly.
    
    Also changes NebulaPatcher to be the first project in the solution file so that it is selected on startup and everyone sees the launch profile
    PhantomGamers committed Jul 27, 2021
    Copy the full SHA
    10ca4f2 View commit details
  5. Merge pull request #403 from PhantomGamers/patch-fix-vs-debugging

    Change DSP launch settings and set NebulaPatcher to default startup d…
    hubastard authored Jul 27, 2021
    Copy the full SHA
    09dd4c0 View commit details
  6. Copy the full SHA
    fd011e9 View commit details
  7. Copy the full SHA
    7e777a7 View commit details
  8. Copy the full SHA
    bcb69ed View commit details
  9. Merge pull request #393 from PhantomGamers/patch-nameinput-gs-compat

    NameInputPacket: Fix compatibility with GS
    hubastard authored Jul 27, 2021
    Copy the full SHA
    f153b5f View commit details
  10. merge master

    hubastard committed Jul 27, 2021
    Copy the full SHA
    59bba1e View commit details
  11. Clean up PR after merge

    hubastard committed Jul 27, 2021
    Copy the full SHA
    c1cfac4 View commit details
  12. fix nebula.sln

    hubastard committed Jul 27, 2021
    Copy the full SHA
    a7ca88a View commit details
  13. Merge pull request #394 from hubastard/network-refactor

    [Refactor] Packet Processors
    hubastard authored Jul 27, 2021
    Copy the full SHA
    c428de1 View commit details
  14. refactor cleanup

    hubastard committed Jul 27, 2021
    Copy the full SHA
    72c49a0 View commit details

Commits on Jul 28, 2021

  1. Add missing tower processor

    hubastard committed Jul 28, 2021
    Copy the full SHA
    a02f7ca View commit details
  2. clean up code

    hubastard committed Jul 28, 2021
    Copy the full SHA
    1403934 View commit details
  3. Copy the full SHA
    3f6cd9c View commit details
  4. Copy the full SHA
    ea6b80a View commit details

Commits on Jul 30, 2021

  1. Switch to using publicized stubs as references

    This will allow us to:
    
    * See private members in code directly.
    * Get notified by the IDE when a name is changed after an update.
    * Allow CI instances that do not have the game installed to build Nebula (so that we can use the Github CIs)
    
    Included is a .github\scripts\stub.js file that when ran from the project root will generate all of the references listed in references.txt.
    
    TODO:
    
    * Parse DevEnv.targets if it exists and use that for the DSP directory path.
    * Fix PlanetData.onLoaded ambiguity error in PlanetDataRequestProcessor.cs
    PhantomGamers committed Jul 30, 2021
    Copy the full SHA
    6810ceb View commit details
  2. Update stub.js

    remove unneeded code
    PhantomGamers committed Jul 30, 2021
    Copy the full SHA
    41b8932 View commit details
  3. Update stub.js

    Add logging so user knows that it is working
    PhantomGamers committed Jul 30, 2021
    Copy the full SHA
    30bad1a View commit details
  4. Switch assemblies to use MrPurple6411's latest version of AssemblyPub…

    …licizer
    
    fixes issues with events being impossible to target due to ambiguity errors
    PhantomGamers committed Jul 30, 2021
    Copy the full SHA
    d2d2af3 View commit details
  5. Remove Refasmer requirement

    MrPurple6411's fork of AssemblyPublicizer already stubs assemblies by default
    PhantomGamers committed Jul 30, 2021
    Copy the full SHA
    20e02f2 View commit details
  6. Copy the full SHA
    edd5cfb View commit details
  7. Copy the full SHA
    9ab15d4 View commit details
  8. Update SyncCompleteProcessor.cs

    I had accidentally done it so we  were sending the planet id as the star id argument, whoops.
    PhantomGamers committed Jul 30, 2021
    Copy the full SHA
    b06e2ad View commit details
  9. Merge pull request #409 from PhantomGamers/patch-namesyncfix

    Update SyncCompleteProcessor.cs
    PhantomGamers authored Jul 30, 2021
    Copy the full SHA
    241b5be View commit details

Commits on Aug 2, 2021

  1. - Fix infinite packet sending issue with NameInputPacket

    - Add some packet debugging info in debug build
    hubastard committed Aug 2, 2021
    Copy the full SHA
    4aa7b0e View commit details
  2. Copy the full SHA
    8504d70 View commit details

Commits on Aug 4, 2021

  1. Copy the full SHA
    30ec5df View commit details

Commits on Aug 7, 2021

  1. Copy the full SHA
    b661eb9 View commit details

Commits on Aug 12, 2021

  1. Copy the full SHA
    c9becb9 View commit details
Showing 1,390 changed files with 1,287,689 additions and 21,507 deletions.
Loading