Commit Graph

3138 Commits

Author SHA1 Message Date
Michael Sincavage 293280e5e0 Update Item List - ObjectInformation.xnb [v1.07] 2016-05-20 21:06:23 -04:00
Carl bb3d6ba2c7 Update README.md 2016-04-26 12:56:36 +01:00
Zoryn 920f0280f5 Merge pull request #104 from Zoryn4163/master
remove 'UpgradeLog'
2016-04-07 18:12:20 -04:00
Zoryn Aaron 5d1f5a9322 remove 'UpgradeLog' 2016-04-07 18:11:52 -04:00
Zoryn 411b17d14e Merge pull request #103 from Glorylives/master
Update README.md
2016-04-07 18:03:43 -04:00
Glorylives 0a9058e2e0 Update README.md
Added shortcut to open the %appdata% directory for those who cannot locate the directory.
2016-04-07 22:35:50 +01:00
Carl 23395b00e5 Update README.md 2016-04-06 11:16:42 +01:00
Carl 2dcc34b60d Merge pull request #101 from Zoryn4163/master
license change. GPL to LGPL.
2016-04-06 11:14:54 +01:00
Zoryn Aaron a9d01bcf40 license change. GPL to LGPL. 2016-04-06 06:08:32 -04:00
CJB c0b99e43dd Version 0.40.0 2016-04-05 15:34:26 +02:00
CJBok 46621d5eee Merge pull request #100 from CJBok/master
Crashfix minigame SDV 1.07
2016-04-05 13:45:29 +02:00
CJB c7201d83eb Crashfix mnigames 2016-04-05 13:43:57 +02:00
CJB 22ede82e89 Merge remote-tracking branch 'refs/remotes/ClxS/master' 2016-04-05 13:41:04 +02:00
Zoryn 06e5fcb1df Merge pull request #98 from Zoryn4163/master
i hate ticking versions i always forget
2016-04-04 06:26:58 -04:00
Zoryn Aaron 65b798d5f5 i hate ticking versions i always forget 2016-04-04 06:26:41 -04:00
Zoryn 0b1fdc9b84 Merge pull request #97 from Zoryn4163/master
graphics events for rendering
2016-04-04 06:25:44 -04:00
Zoryn Aaron d5322bc1bb graphics events for rendering 2016-04-04 06:25:09 -04:00
ClxS af37ad15f4 updated version string 2016-04-01 20:23:07 +01:00
ClxS 77a73f7985 Revert "Updated version string"
This reverts commit 3d726b57fc.
2016-04-01 20:22:28 +01:00
ClxS 3d726b57fc Updated version string 2016-04-01 20:20:27 +01:00
Carl 108f14993d Merge pull request #92 from speeder/master
moved back a function that probably was in the right place last time
2016-04-01 19:36:41 +01:00
Maurício Gomes ae7eb92dc6 moved back a function that probably was in the right place last time 2016-04-01 15:34:01 -03:00
Zoryn b565ce31e6 Merge pull request #81 from speeder/master
Correct fix for https://github.com/ClxS/SMAPI/issues/74
2016-03-31 20:03:16 -04:00
Maurício Gomes 7930d532d5 fixed conflict 2016-03-31 20:18:18 -03:00
Maurício Gomes 8177e65a49 Merge remote-tracking branch 'origin/master' 2016-03-31 20:17:21 -03:00
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