summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-03-31fixed conflictMaurício Gomes
2016-03-31Merge remote-tracking branch 'origin/master'Maurício Gomes
2016-03-31Merge pull request #89 from CJBok/masterCarl
2016-03-31Added SDV and SMAPI version information at beginning of logfile.CJB
2016-03-31Merge remote-tracking branch 'refs/remotes/ClxS/master'CJB
2016-03-30Merge pull request #87 from Zoryn4163/masterZoryn
2016-03-30ticks up version. changes build path to be just /bin/[debug|release]Zoryn Aaron
2016-03-30Merge pull request #85 from speeder/bugfix_guievents_on_bgCarl
2016-03-30Merge pull request #86 from CJBok/masterCarl
2016-03-30Freeze fix when booting up Journey of the Prairie kingCJB
2016-03-29made gui render events work when background is onMaurício Gomes
2016-03-29Merge pull request #84 from Zoryn4163/readmeCarl
2016-03-29change 'Mapping' to 'Modding'?Zoryn Aaron
2016-03-29Merge pull request #83 from Zoryn4163/masterZoryn
2016-03-29Merge branch 'master' of https://github.com/ClxS/SMAPIZoryn Aaron
2016-03-29cleanup a little. left some commented code for reference though.Zoryn Aaron
2016-03-29Merge pull request #82 from Zoryn4163/masterZoryn
2016-03-29Merge pull request #1 from CJBok/masterZoryn
2016-03-29bug fix according to @CJBok on 07a0b94Zoryn Aaron
2016-03-29Revert "Revert "Crash fix""CJB
2016-03-29Revert "Crash fix"CJB
2016-03-29Crash fixCJB
2016-03-28Some fixes I guessZoryn Aaron
2016-03-28optimize reflection a littleZoryn Aaron
2016-03-28Correct fix for https://github.com/ClxS/SMAPI/issues/74Maurício Gomes
2016-03-28Merge pull request #79 from Zoryn4163/masterZoryn
2016-03-28i dont even know why that was thereZoryn Aaron
2016-03-28Merge pull request #78 from Zoryn4163/masterZoryn
2016-03-28Merge branch 'master' of https://github.com/ClxS/SMAPIZoryn Aaron
2016-03-28fixes obsolete draw event invocationsZoryn Aaron
2016-03-29Merge pull request #77 from tstaples/masterCarl
2016-03-28Merge remote-tracking branch 'upstream/master'tyler staples
2016-03-28Logger now creates the errorlogs dir if it doesn't exist, fixing issue #76tyler staples
2016-03-28Merge pull request #72 from tstaples/masterCarl
2016-03-28Added MenuClosed event which fires when the current menu is closed.tyler staples
2016-03-27Merge pull request #71 from Zoryn4163/masterZoryn
2016-03-27loggingZoryn Aaron
2016-03-27loggingZoryn Aaron
2016-03-27Merge pull request #70 from Zoryn4163/masterZoryn
2016-03-27loggingZoryn Aaron
2016-03-27updates?Zoryn Aaron
2016-03-27updatesZoryn Aaron
2016-03-27Cleanup.ClxS
2016-03-27Merge pull request #69 from Zoryn4163/masterZoryn
2016-03-27speeder needs to fuck offZoryn Aaron
2016-03-27bug fixZoryn Aaron
2016-03-27updatesZoryn Aaron
2016-03-27invocations are now internalZoryn Aaron
2016-03-27fuck you @CJBokZoryn Aaron
2016-03-27holy fucking shit fuck my lifeZoryn Aaron