Permalink
Commits on Jul 29, 2012
  1. Merge branch 'lcot' into develop

    icydee committed Jul 29, 2012
  2. Merge pull request #48 from lemming552/develop

    lemming552 committed Jul 29, 2012
    LCOT changes
  3. Cleaned up regex.

    lemming552 committed Jul 29, 2012
  4. Merge branch 'develop' into lcot

    lemming552 committed Jul 29, 2012
    Conflicts:
    	var/www/public/changes.txt
  5. Merge branch 'master' into lcot

    icydee committed Jul 29, 2012
    Conflicts:
    	var/www/public/changes.txt
  6. Update changes.txt

    icydee committed Jul 29, 2012
Commits on Jul 27, 2012
  1. Merge pull request #46 from lemming552/develop

    lemming552 committed Jul 27, 2012
    Fixed an issue with stakes and asteroids.
Commits on Jul 26, 2012
  1. Stakes didn't check to see if their destination was an asteroid on ar…

    lemming552 committed Jul 26, 2012
    …rival.
  2. Merge branch 'develop' of github.com:plainblack/Lacuna-Server-Open in…

    lemming552 committed Jul 26, 2012
    …to develop
Commits on Jul 25, 2012
  1. Merge pull request #45 from lemming552/lcot

    lemming552 committed Jul 25, 2012
    Further adjustment of cost.
  2. Further adjustment of cost.

    lemming552 committed Jul 25, 2012
  3. Merge pull request #44 from lemming552/lcot

    lemming552 committed Jul 25, 2012
    Backwards match fix.
  4. Backwards match fix.

    lemming552 committed Jul 25, 2012
  5. Merge pull request #43 from lemming552/lcot

    lemming552 committed Jul 25, 2012
    Lcot changes
Commits on Jul 24, 2012
  1. Tweak.

    lemming552 committed Jul 24, 2012
  2. Modified version and changes.txt

    lemming552 committed Jul 24, 2012
  3. Some asked for changes. Test version.

    lemming552 committed Jul 24, 2012
  4. Merge branch 'develop' of github.com:plainblack/Lacuna-Server-Open in…

    lemming552 committed Jul 24, 2012
    …to develop
  5. Merge pull request #42 from lemming552/develop

    lemming552 committed Jul 24, 2012
    Make sure a quantity is put for a plan trade from the DeLambert
  6. Merge branch 'develop' of github.com:plainblack/Lacuna-Server-Open in…

    lemming552 committed Jul 24, 2012
    …to develop
Commits on Jul 23, 2012
  1. Merge pull request #40 from lemming552/develop

    lemming552 committed Jul 23, 2012
    Fixing a splice action.
  2. Fixing a splice action.

    lemming552 committed Jul 23, 2012
Commits on Jul 22, 2012
  1. Merge pull request #39 from lemming552/develop

    lemming552 committed Jul 22, 2012
    Fix for seizing stars.
  2. Fix for seizing stars.

    lemming552 committed Jul 22, 2012
  3. Merge pull request #38 from icydee/develop

    icydee committed Jul 22, 2012
    Add hysterisis to remove rounding errors and subsequent building damage
  4. Merge branch 'master' into develop

    icydee committed Jul 22, 2012
    Conflicts:
    	lib/Lacuna/DB/Result/Map/Body/Planet.pm
Commits on Jul 21, 2012
  1. Merge pull request #37 from icydee/develop

    icydee committed Jul 21, 2012
    Supply chains that stall send a message