Commits on Apr 11, 2013

  1. Fix masterserver javascript: adjustable output id

    @proller
    proller committed Apr 11, 2013
    Configuration menu
    Copy the full SHA
    15056d6 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master'

    @proller
    proller committed Apr 11, 2013
    Configuration menu
    Copy the full SHA
    55ec874 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2013

  1. Merge remote-tracking branch 'upstream/master'

    @proller
    proller committed Apr 12, 2013
    Configuration menu
    Copy the full SHA
    1be6a5a View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2013

  1. Merge remote-tracking branch 'upstream/master'

    @proller
    proller committed Apr 13, 2013
    Configuration menu
    Copy the full SHA
    098dca0 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2013

  1. Merge remote-tracking branch 'upstream/master'

    @proller
    proller committed Apr 14, 2013
    Configuration menu
    Copy the full SHA
    6c8c848 View commit details
    Browse the repository at this point in the history

  2. New math mapgen

    @proller
    proller committed Apr 14, 2013
    Configuration menu
    Copy the full SHA
    723fcf9 View commit details
    Browse the repository at this point in the history

  3. water in air underground tune

    @proller
    proller committed Apr 14, 2013
    Configuration menu
    Copy the full SHA
    e4da757 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2013

  1. Merge remote-tracking branch 'upstream/master' into math2

    @proller
    proller committed Apr 21, 2013
    Configuration menu
    Copy the full SHA
    6bb7b9b View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2013

  1. Merge remote-tracking branch 'upstream/master' into math2

    @proller
    proller committed Apr 22, 2013
    Configuration menu
    Copy the full SHA
    15188ff View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2013

  1. Merge remote-tracking branch 'upstream/master' into math2 

    Conflicts:
	src/map.cpp
    @proller
    proller committed Apr 27, 2013
    Configuration menu
    Copy the full SHA
    07e418d View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into math2

    @proller
    proller committed Apr 27, 2013
    Configuration menu
    Copy the full SHA
    e6e8708 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2013

  1. Merge remote-tracking branch 'upstream/master' into math2

    @proller
    proller committed Jun 20, 2013
    Configuration menu
    Copy the full SHA
    f615d29 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2013

  1. Merge remote-tracking branch 'upstream/master' into math2 

    Conflicts:
	minetest.conf.example
	src/defaultsettings.cpp
    @proller
    proller committed Jun 23, 2013
    Configuration menu
    Copy the full SHA
    c2f20f7 View commit details
    Browse the repository at this point in the history

  2. based on v7

    @proller
    proller committed Jun 23, 2013
    Configuration menu
    Copy the full SHA
    5909504 View commit details
    Browse the repository at this point in the history

  3. tuning math

    @proller
    proller committed Jun 23, 2013
    Configuration menu
    Copy the full SHA
    b90ef11 View commit details
    Browse the repository at this point in the history

  4. remove json config

    @proller
    proller committed Jun 23, 2013
    Configuration menu
    Copy the full SHA
    5aaf875 View commit details
    Browse the repository at this point in the history

  5. ready to merge

    @proller
    proller committed Jun 23, 2013
    Configuration menu
    Copy the full SHA
    2c9caa0 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'upstream/master' into math2

    @proller
    proller committed Jun 23, 2013
    Configuration menu
    Copy the full SHA
    1dfc7b2 View commit details
    Browse the repository at this point in the history

  7. Math mapgen fix, ip show on connect, pathfinder segfault fix

    @proller
    proller committed Jun 23, 2013
    Configuration menu
    Copy the full SHA
    8c37364 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2013

  1. Merge remote-tracking branch 'upstream/master' into math2

    @proller
    proller committed Jun 24, 2013
    Configuration menu
    Copy the full SHA
    ba3a103 View commit details
    Browse the repository at this point in the history

  2. Fix ipv6 on windows

    @proller
    proller committed Jun 24, 2013
    Configuration menu
    Copy the full SHA
    b9e836d View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into math2

    @proller
    proller committed Jun 24, 2013
    Configuration menu
    Copy the full SHA
    7a744cb View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2013

  1. Revert "remove json config" 

    This reverts commit 5aaf875.

Conflicts:
	minetest.conf.example
	src/defaultsettings.cpp
	src/mapgen_math.cpp
    @proller
    proller committed Aug 6, 2013
    Configuration menu
    Copy the full SHA
    e747c2b View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into math2 

    Conflicts:
	src/defaultsettings.cpp
    @proller
    proller committed Aug 6, 2013
    Configuration menu
    Copy the full SHA
    ef8df43 View commit details
    Browse the repository at this point in the history

  3. continue work

    @proller
    proller committed Aug 6, 2013
    Configuration menu
    Copy the full SHA
    15b5551 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2013

  1. Merge remote-tracking branch 'upstream/master' into math2

    @proller
    proller committed Sep 10, 2013
    Configuration menu
    Copy the full SHA
    d826a0f View commit details
    Browse the repository at this point in the history

  2. mistake

    @proller
    proller committed Sep 10, 2013
    Configuration menu
    Copy the full SHA
    0573d61 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2013

  1. Merge remote-tracking branch 'upstream/master' into math2

    @proller
    proller committed Sep 12, 2013
    Configuration menu
    Copy the full SHA
    3aca924 View commit details
    Browse the repository at this point in the history

  2. process.....

    @proller
    proller committed Sep 12, 2013
    Configuration menu
    Copy the full SHA
    cc4901c View commit details
    Browse the repository at this point in the history