Commit Graph

33 Commits

Author SHA1 Message Date
ClxS 126ce53618 Updated readme. Small change to prevent trainermod using copy-local 2016-03-06 18:01:52 +00:00
James Finlay bae7878ecd Merge branch 'master' into release 2016-03-05 10:10:35 -08:00
James Finlay 64a0552aea Merge remote-tracking branch 'upstream/master' 2016-03-05 10:08:33 -08:00
ClxS b417604466 Removed StardewInjector. That'll go in it's own testing branch when we get around trying to integrate it. 2016-03-05 12:14:53 +00:00
James Finlay a5a32e148b Pulled Logs into new Log object
- Greatly simplifies Program.cs
 - Removed the 'Colour' method so that logging is more consistent for users - willing to discuss this change. I believe it is beneficial.
 - Added uses of #DEBUG
2016-03-04 22:55:47 -08:00
James Finlay 9420dfb071 Modify default steam path
- Tries to read from ENV variable 'SteamInstallPath'.
 - We can investigate  using a choose for normal Steam installation paths, this'll be better for now than having to modify the csproj for every dev.
2016-03-04 20:17:42 -08:00
ClxS c145e5f727 Added event for Inventory change 2016-03-04 19:10:39 +00:00
ClxS afef5648ca Refactored all of the events into their own categories 2016-03-04 14:05:36 +00:00
ClxS ec81b3306e Merged Zoryn4163/master into master 2016-03-04 13:27:22 +00:00
cjones 0887a0a22a Deleted unwanted files. Ideally these would not be in source control. 2016-03-04 13:16:50 +00:00
Zoryn Aaron a2e3039c27 i can't find a way to support #14 2016-03-03 17:08:40 -05:00
ClxS c488d35b94 Merged Feature_AdditionalEventHandlers 2016-03-03 20:42:53 +00:00
ClxS f77e922ad0 Merged Zoryn4163/master into master 2016-03-03 20:17:40 +00:00
Zoryn 9a1b910ea3 resync for merge conflicts 2016-03-03 15:06:25 -05:00
ClxS 4d737740d0 Deleted bin\Debug and obj\Debug 2016-03-03 19:54:26 +00:00
ClxS ef9bb45e2d Fixed warning by TrainerMod using AnyCPU 2016-03-03 19:06:44 +00:00
Zoryn de3f161a49 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Release/StardewModdingAPI.exe
#	StardewModdingAPI/Program.cs
#	StardewModdingAPI/StardewModdingAPI.csproj

#	StardewModdingAPI/obj/x86/Debug/StardewModdingAPI.csproj.FileListAbsolute.txt
#	TrainerMod/bin/Debug/TrainerMod.dll
#	TrainerMod/obj/Debug/TrainerMod.dll
2016-03-03 14:04:29 -05:00
Zoryn eee4e9c0fe updates to change working location 2016-03-03 14:01:32 -05:00
ClxS de0cd2ac50 Forgot to remove unneeded BlankEventHandler 2016-03-03 18:55:36 +00:00
ClxS 4e26cb7abc Resolved static analysis issues
Standardised event handlers so there's less hassle with future changes
2016-03-03 18:50:22 +00:00
Zoryn 90d2cd6caf update 2016-03-03 10:04:38 -05:00
Zoryn Aaron 659825ea78 pu to work from another location 2016-03-03 09:44:10 -05:00
Zoryn Aaron 250559d227 we can have more than 2 args in a command, c'mon brain 2016-03-02 23:38:51 -05:00
Zoryn Aaron 47fecbd81e more events 2016-03-02 22:54:37 -05:00
Zoryn Aaron 10a800f456 add quality param to additem 2016-03-02 16:25:23 -05:00
Zoryn Aaron 900c804c29 update for new event and other crap 2016-03-02 12:24:15 -05:00
Zoryn Aaron 38bce33158 fxies logging breaking? 2016-03-02 08:28:20 -05:00
Zoryn Aaron c37d34a270 users shouldnt execute experimental code 2016-03-01 23:24:19 -05:00
Zoryn Aaron d12677b49c attempt to fix a few things 2016-03-01 23:12:19 -05:00
Zoryn Aaron 63392a21e4 fixes my derping 2016-03-01 19:36:12 -05:00
Zoryn Aaron 069589db98 sloppy 0.3 release for network dll loads and separation of trainer 2016-03-01 18:44:41 -05:00
Zoryn Aaron c7ecc201bb partial implement of Required event handlers 2016-03-01 17:22:19 -05:00
Zoryn Aaron ad683d0a0f export trainer to separate mod; ships with modapi in release folder 2016-03-01 16:16:51 -05:00