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: X-Hax/sa_tools
base: df243052948e
Choose a base ref
...
head repository: X-Hax/sa_tools
compare: 7d0533258a81
Choose a head ref
  • 10 commits
  • 54 files changed
  • 2 contributors

Commits on Feb 15, 2015

  1. Spline drawing

    - Fixed spline drawing
    - simplified if/else to ternary
    jcorvinus committed Feb 15, 2015
    Copy the full SHA
    75cbd91 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/master'

    Conflicts:
    	SADXLVL2/MainForm.cs
    - holding off on spline fix until next commit
    jcorvinus committed Feb 15, 2015
    Copy the full SHA
    0905166 View commit details
    Browse the repository at this point in the history
  3. Undoing a faulty merge

    Thankfully I figured that out.
    jcorvinus committed Feb 15, 2015
    Copy the full SHA
    efc08a1 View commit details
    Browse the repository at this point in the history
  4. Spline render order

    Fixing the spline render order - they should always draw now.
    jcorvinus committed Feb 15, 2015
    Copy the full SHA
    77ac640 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2015

  1. PVMEditSharp: When importing over an existing texture, put its name i…

    …nto the open file dialog.
    michael-fadely committed Feb 20, 2015
    Copy the full SHA
    2ce6a8c View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    b0cc0ff View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    1650a5f View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    51d7cfc View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2015

  1. SADXLVL2: Added boolean indicating whether or not mouse wrapping shou…

    …ld be in the scene's client area or screenspace.
    michael-fadely committed Feb 21, 2015
    Copy the full SHA
    186c173 View commit details
    Browse the repository at this point in the history
  2. PVMEditSharp: Make my life easy by selecting the list of textures aft…

    …er clicking on import or export.
    michael-fadely committed Feb 21, 2015
    Copy the full SHA
    7d05332 View commit details
    Browse the repository at this point in the history