Commit Graph

1263 Commits

Author SHA1 Message Date
Carl e67288113c Merge pull request #89 from CJBok/master
Added SDV and SMAPI version information at beginning of logfile
2016-03-31 21:49:22 +01:00
CJB a879733ed0 Added SDV and SMAPI version information at beginning of logfile. 2016-03-31 22:47:19 +02:00
CJB eda32ed558 Merge remote-tracking branch 'refs/remotes/ClxS/master' 2016-03-31 22:29:26 +02:00
Zoryn 2b48048a71 Merge pull request #87 from Zoryn4163/master
ticks up version. changes build path to be just /bin/[debug|release]
2016-03-30 18:38:31 -04:00
Zoryn Aaron 49ebb5175b ticks up version. changes build path to be just /bin/[debug|release] 2016-03-30 18:37:53 -04:00
Carl d38e8ac422 Merge pull request #85 from speeder/bugfix_guievents_on_bg
made gui render events work when background is on
2016-03-30 20:16:31 +01:00
Carl 5975bbc3c2 Merge pull request #86 from CJBok/master
Freeze fix when booting up Journey of the Prairie king
2016-03-30 19:41:00 +01:00
CJB 9f0210a255 Freeze fix when booting up Journey of the Prairie king 2016-03-30 20:39:40 +02:00
Maurício Gomes 9e1c1253d4 made gui render events work when background is on 2016-03-29 09:29:08 -03:00
Carl 2b247c05ae Merge pull request #84 from Zoryn4163/readme
change 'Mapping' to 'Modding'?
2016-03-29 13:03:24 +01:00
Zoryn Aaron 9325ad0950 change 'Mapping' to 'Modding'? 2016-03-29 06:44:26 -04:00
Zoryn 3c3338125c Merge pull request #83 from Zoryn4163/master
small cleanup
2016-03-29 06:29:04 -04:00
Zoryn Aaron 979bb4668b Merge branch 'master' of https://github.com/ClxS/SMAPI 2016-03-29 06:28:34 -04:00
Zoryn Aaron 5754736e29 cleanup a little. left some commented code for reference though. 2016-03-29 06:28:11 -04:00
Zoryn 7988687d10 Merge pull request #82 from Zoryn4163/master
redoes some reflection and undoes the commenting of base.Draw().
2016-03-29 06:24:54 -04:00
Zoryn 8295be0fb8 Merge pull request #1 from CJBok/master
Crashfix
2016-03-29 06:24:14 -04:00
Zoryn Aaron 56bc5b8ba0 bug fix according to @CJBok on 07a0b94 2016-03-29 06:23:42 -04:00
CJB feb837d516 Revert "Revert "Crash fix""
This reverts commit ce260ef82d.
2016-03-29 08:18:18 +02:00
CJB ce260ef82d Revert "Crash fix"
This reverts commit ffa7938107.
2016-03-29 08:17:30 +02:00
CJB ffa7938107 Crash fix 2016-03-29 08:11:32 +02:00
Zoryn Aaron d952f83643 Some fixes I guess 2016-03-28 23:23:09 -04:00
Zoryn Aaron c94b51cd22 optimize reflection a little 2016-03-28 22:57:05 -04:00
Maurício Gomes 950754c253 Correct fix for https://github.com/ClxS/SMAPI/issues/74 2016-03-28 23:48:37 -03:00
Zoryn d681cfd54d Merge pull request #79 from Zoryn4163/master
i dont even know why that was there
2016-03-28 22:19:29 -04:00
Zoryn Aaron 07a0b94e55 i dont even know why that was there 2016-03-28 22:18:44 -04:00
Zoryn a0e1695525 Merge pull request #78 from Zoryn4163/master
fixes obsolete draw event invocations
2016-03-28 22:14:57 -04:00
Zoryn Aaron 91c156678c Merge branch 'master' of https://github.com/ClxS/SMAPI 2016-03-28 22:13:59 -04:00
Zoryn Aaron 2175ec4953 fixes obsolete draw event invocations 2016-03-28 22:13:52 -04:00
Carl 26b914d61d Merge pull request #77 from tstaples/master
Fixed issue #76: Logger would throw an exception when LogDir didn't exist.
2016-03-29 01:42:27 +01:00
tyler staples d2e909fa02 Merge remote-tracking branch 'upstream/master' 2016-03-28 16:14:53 -07:00
tyler staples 07396adb55 Logger now creates the errorlogs dir if it doesn't exist, fixing issue #76 2016-03-28 16:12:26 -07:00
Carl 4496766996 Merge pull request #72 from tstaples/master
Added MenuClosed event which fires when the current menu is closed.
2016-03-28 09:20:17 +01:00
tyler staples 6da92c08b9 Added MenuClosed event which fires when the current menu is closed. 2016-03-28 01:13:40 -07:00
Zoryn e6f2825929 Merge pull request #71 from Zoryn4163/master
logging
2016-03-27 19:25:06 -04:00
Zoryn Aaron a5667d31cc logging 2016-03-27 19:24:59 -04:00
Zoryn Aaron 12e03654fc logging 2016-03-27 19:24:29 -04:00
Zoryn 5c158db4de Merge pull request #70 from Zoryn4163/master
updates
2016-03-27 19:22:38 -04:00
Zoryn Aaron 106ccd0d87 logging 2016-03-27 19:22:26 -04:00
Zoryn Aaron bcaa3fc7a4 updates? 2016-03-27 19:18:49 -04:00
Zoryn Aaron 1debeb8eff updates 2016-03-27 16:53:47 -04:00
ClxS c8965e1591 Cleanup. 2016-03-27 16:13:58 +01:00
Zoryn 8c2c3b6d03 Merge pull request #69 from Zoryn4163/master
lots of things
2016-03-27 07:15:17 -04:00
Zoryn Aaron 36a3401e14 speeder needs to fuck off 2016-03-27 07:13:34 -04:00
Zoryn Aaron fac89e4c26 bug fix 2016-03-27 06:47:13 -04:00
Zoryn Aaron a387d024f0 updates 2016-03-27 06:40:09 -04:00
Zoryn Aaron 2cce7c2d27 invocations are now internal 2016-03-27 05:05:36 -04:00
Zoryn Aaron 668b6b10b5 fuck you @CJBok 2016-03-27 04:30:17 -04:00
Zoryn Aaron 863b6cb044 holy fucking shit fuck my life 2016-03-27 03:52:43 -04:00
Zoryn 11ed5a612b Merge pull request #68 from Zoryn4163/master
fixes bugs
2016-03-27 01:32:42 -04:00
Zoryn Aaron d127436533 fixes bugs 2016-03-27 01:32:15 -04:00