Commit Graph

51 Commits

Author SHA1 Message Date
James Finlay 0e24d862a9 Resolving conflict
- Cleaning up two trailing vars from Program that are no longer being used
2016-03-05 10:20:40 -08: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 ed3bf29600 A few small clean ups and removed a lot of the readme until I think of what to put there 2016-03-04 22:21:16 +00:00
ClxS b8a9f8fc88 Added event handlers for each of the level up events 2016-03-04 20:40:46 +00:00
ClxS 4712da9f2d Improved Inventory Changed command to show which items were added/removed/alteredQuantity 2016-03-04 20:20:58 +00:00
ClxS 210db71a92 Fixed bug due to accidental early commit 2016-03-04 19:14:19 +00: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 d741f46aab Added event for when item is placed on ground 2016-03-03 20:36: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
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 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
Zoryn e07a721f5a Merge pull request #3 from HandsomeMatt/steam-fix
add steam_appid.txt
2016-03-01 10:56:14 -05:00
Matt Stevens 0fcf88f285 loadFromRemoteSources=true 2016-03-01 15:31:52 +00:00
Matt Stevens e7ef1690b9 add steam_appid.txt 2016-03-01 15:21:15 +00:00
Zoryn Aaron dddb8d129b i got it to draw without crashing im going to bed. custom content is still nyi don't try it yet 2016-03-01 02:16:35 -05:00
Zoryn Aaron f511c36ad3 HandsomeMatt pull request accepted 2016-03-01 01:37:56 -05:00
Zoryn Aaron 9a32b3afdd trying to get custom content working - do NOT try to implement cc yet 2016-03-01 01:35:52 -05:00
Zoryn Aaron 54faadf7b5 updates the game's title to show version 2016-02-29 15:04:39 -05:00
Zoryn Aaron aef67f7e02 crash handling 2016-02-29 15:01:41 -05:00
Zoryn Aaron 150e2000ce error catching 2016-02-29 13:39:21 -05:00
Zoryn Aaron 9f1ecbcd27 update 2016-02-29 13:22:24 -05:00
Zoryn Aaron 57bc4aa552 commands
im tired
2016-02-29 05:21:45 -05:00
Zoryn Aaron e60ed21dc7 wow exposing private vars is annoying 2016-02-28 23:00:49 -05:00
Zoryn Aaron 524dc9e002 expose some private fields for modding 2016-02-28 22:16:32 -05:00
Zoryn Aaron cbf741d5ac updates 2016-02-28 20:26:36 -05:00
Zoryn Aaron 86b314970a update 2016-02-28 16:01:24 -05:00