Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev merge to master, PR #4085

Merged
merged 6 commits into from
Aug 16, 2016
Merged

Dev merge to master, PR #4085

merged 6 commits into from
Aug 16, 2016

Commits on Aug 16, 2016

  1. Do not spin fort on timeout when restarting the bot (#3931) 

    Fix bot stuck between forts when inventory is full
    @julienlavergne @elicwhite
    julienlavergne authored and elicwhite committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    c1743c9 View commit details
    Browse the repository at this point in the history

  2. Fixed references to self.bot.config.walk (#4046) 

    * Fixed error

* Fixed error
    @mjmadsen @elicwhite
    mjmadsen authored and elicwhite committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    ad32f1d View commit details
    Browse the repository at this point in the history

  3. Updating run.sh and install.sh (#4033) 

    * Update run.sh

* Update setup.sh

* Update setup.sh

* Update setup.sh
    @simonsmh @elicwhite
    simonsmh authored and elicwhite committed Aug 16, 2016
    3 Configuration menu
    Copy the full SHA
    6fa57fe View commit details
    Browse the repository at this point in the history

  4. Fixing typo

    @elicwhite
    elicwhite committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    7d0da5a View commit details
    Browse the repository at this point in the history

  5. Added heartbeat threshold, it's not reasonable to send heartbeat to s… 

    …erver every second. (#4058)

* Added heartbeat threshold, it's not reasonable to send heartbeat to server every second.

* Added example in config.
    @solderzzc
    solderzzc authored Aug 16, 2016
    Configuration menu
    Copy the full SHA
    91aea57 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into dev

    @solderzzc
    solderzzc authored Aug 16, 2016
    Configuration menu
    Copy the full SHA
    f2853ff View commit details
    Browse the repository at this point in the history