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

oi #93

Open
wants to merge 63 commits into
base: rooms
Choose a base branch
from
Open

oi #93

wants to merge 63 commits into from

Commits on Feb 15, 2012

  1. Update README

    Michael Fogleman committed Feb 15, 2012
    Configuration menu
    Copy the full SHA
    886f772 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2012

  1. Jump height and mouse sensitivity in main.py 

    Changed the jump height to 0.65. This makes it a whole lot easier to jump onto blocks.

Changed the mouse sensitivity to 0.15. Having the mouse sensitivity too much higher than this is frustrating for the user, because the view window moves too quickly.
    @alexjmu
    alexjmu committed Oct 23, 2012
    Configuration menu
    Copy the full SHA
    a81e11a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from H34l0r/master 

    Improved jumping height and mouse sensitivity.
    @fogleman
    fogleman committed Oct 23, 2012
    Configuration menu
    Copy the full SHA
    4751efc View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2013

  1. added LICENSE

    @fogleman
    fogleman committed Feb 3, 2013
    1 Configuration menu
    Copy the full SHA
    9235631 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/fogleman/Minecraft

    @fogleman
    fogleman committed Feb 3, 2013
    Configuration menu
    Copy the full SHA
    fb1d8b9 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2013

  1. Fixed ctypes error and load directly from PNG 

    Added ctypes import to fix an error on my machine. Texture is now imported directly from PNG (removed base64 string code, included encode.py as it is not needed).
    @BlainMaguire
    BlainMaguire committed Mar 5, 2013
    Configuration menu
    Copy the full SHA
    6e7f962 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2013

  1. A more majestic jump/gravity combination 

    Minecraft jumps are a little slower.
    @ubershmekel
    ubershmekel committed Mar 29, 2013
    Configuration menu
    Copy the full SHA
    5024739 View commit details
    Browse the repository at this point in the history

  2. removed TEXTURE_DATA, just load it from file

    @fogleman
    fogleman committed Mar 29, 2013
    Configuration menu
    Copy the full SHA
    06133b0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'patch-1' of https://github.com/ubershmekel/Minecraft

    @fogleman
    fogleman committed Mar 29, 2013
    Configuration menu
    Copy the full SHA
    b313ff1 View commit details
    Browse the repository at this point in the history

  4. TextureGroup path argument

    @fogleman
    fogleman committed Mar 29, 2013
    Configuration menu
    Copy the full SHA
    ffdd542 View commit details
    Browse the repository at this point in the history

  5. added draw_focused_block

    @fogleman
    fogleman committed Mar 29, 2013
    Configuration menu
    Copy the full SHA
    7106671 View commit details
    Browse the repository at this point in the history

  6. markdown readme

    @fogleman
    fogleman committed Mar 29, 2013
    Configuration menu
    Copy the full SHA
    c7fe87c View commit details
    Browse the repository at this point in the history

  7. Update README.md

    @fogleman
    fogleman committed Mar 29, 2013
    Configuration menu
    Copy the full SHA
    915700d View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2013

  1. pep8

    jminardi committed Mar 30, 2013
    Configuration menu
    Copy the full SHA
    818cc44 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2013

  1. use GLfloat instead of c_float

    @fogleman
    fogleman committed Mar 31, 2013
    Configuration menu
    Copy the full SHA
    7042d8c View commit details
    Browse the repository at this point in the history

  2. Added support for creating all types of breakable blocks.

    @geppettodivacin
    geppettodivacin committed Mar 31, 2013
    Configuration menu
    Copy the full SHA
    e825d87 View commit details
    Browse the repository at this point in the history

  3. Use Pyglet 1.2 for OS X

    @silent1mezzo
    silent1mezzo committed Mar 31, 2013
    Configuration menu
    Copy the full SHA
    6c348ae View commit details
    Browse the repository at this point in the history

  4. Tweaked textures to be more vibrant and simillar to original Minecraft 

    I've tweaked textures to be more contrast and better-looking with fog.
Sand texture is now more vibrant and distinguishable from far. Sky
color and textures are more realistic and similar to original Minecraft.
    Piotr Grabowski committed Mar 31, 2013
    Configuration menu
    Copy the full SHA
    f582704 View commit details
    Browse the repository at this point in the history

  5. Suggest multiple ways to run in OS X

    @silent1mezzo
    silent1mezzo committed Mar 31, 2013
    Configuration menu
    Copy the full SHA
    84e6e2e View commit details
    Browse the repository at this point in the history

  6. Merge from upstream. 

    Merge branch 'master' into blocks
    @geppettodivacin
    geppettodivacin committed Mar 31, 2013
    Configuration menu
    Copy the full SHA
    1b39e03 View commit details
    Browse the repository at this point in the history

  7. keys 1 - 0, not 0 - 9

    @fogleman
    fogleman committed Mar 31, 2013
    1 Configuration menu
    Copy the full SHA
    5d6190b View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2013

  1. How to play instructions in README 

    Key bindings and mouse actions
    richvel committed Apr 1, 2013
    Configuration menu
    Copy the full SHA
    8bc3605 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #18 from RichVel/master 

    "How to play" instructions in README
    @fogleman
    fogleman committed Apr 1, 2013
    Configuration menu
    Copy the full SHA
    0d77539 View commit details
    Browse the repository at this point in the history

  3. Update README.md

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

  4. Merge branch 'osx-readme' of https://github.com/silent1mezzo/Minecraft 

    Conflicts:
	README.md
    @fogleman
    fogleman committed Apr 1, 2013
    Configuration menu
    Copy the full SHA
    95bf6cb View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2013

  1. README update for Mac 32-bit issue #7, and installing git+pip on vari… 

    …ous platforms
    richvel committed Apr 2, 2013
    Configuration menu
    Copy the full SHA
    e1dd181 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #22 from RichVel/master 

    README update for Mac 32-bit issue #7, and installing git+pip on various platforms
    @fogleman
    fogleman committed Apr 2, 2013
    Configuration menu
    Copy the full SHA
    3b989d8 View commit details
    Browse the repository at this point in the history

  3. fixed link in README

    richvel committed Apr 2, 2013
    Configuration menu
    Copy the full SHA
    77560c5 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #24 from RichVel/master 

    fixed link in README
    @fogleman
    fogleman committed Apr 2, 2013
    Configuration menu
    Copy the full SHA
    14f6f6f View commit details
    Browse the repository at this point in the history

  5. another README link fix ...

    richvel committed Apr 2, 2013
    Configuration menu
    Copy the full SHA
    56a0e28 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #25 from RichVel/master 

    Another README link fix ...
    @fogleman
    fogleman committed Apr 2, 2013
    Configuration menu
    Copy the full SHA
    0c4c4f9 View commit details
    Browse the repository at this point in the history

  7. Update README.md

    @fogleman
    fogleman committed Apr 2, 2013
    Configuration menu
    Copy the full SHA
    92723e7 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2013

  1. pep8 and add doc strings

    jminardi committed Apr 3, 2013
    Configuration menu
    Copy the full SHA
    07d069e View commit details
    Browse the repository at this point in the history

  2. merge with upstream master

    jminardi committed Apr 3, 2013
    Configuration menu
    Copy the full SHA
    a02cd4f View commit details
    Browse the repository at this point in the history

  3. remove TextureGroup definition

    jminardi committed Apr 3, 2013
    Configuration menu
    Copy the full SHA
    059b80a View commit details
    Browse the repository at this point in the history

  4. Fix jump 

    Jumping sometimes fails to bring you up enough to climb a block. Increasing slightly the jump speed fixes this.
    @progval
    progval committed Apr 3, 2013
    Configuration menu
    Copy the full SHA
    df11777 View commit details
    Browse the repository at this point in the history

  5. Fix Python 3 compatibility.

    @progval
    progval committed Apr 3, 2013
    Configuration menu
    Copy the full SHA
    a595b40 View commit details
    Browse the repository at this point in the history

  6. more docstrings

    jminardi committed Apr 3, 2013
    Configuration menu
    Copy the full SHA
    0fd908f View commit details
    Browse the repository at this point in the history

  7. Merge branch 'patch-1' of https://github.com/ProgVal/Minecraft 

    Conflicts:
	main.py
    @fogleman
    fogleman committed Apr 3, 2013
    Configuration menu
    Copy the full SHA
    2da9daf View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2013

  1. add more documentation

    jminardi committed Apr 5, 2013
    Configuration menu
    Copy the full SHA
    f2e7549 View commit details
    Browse the repository at this point in the history

  2. removed unused code

    jminardi committed Apr 5, 2013
    Configuration menu
    Copy the full SHA
    1f9a8f7 View commit details
    Browse the repository at this point in the history

  3. change kwargs to be more self consistent

    jminardi committed Apr 5, 2013
    Configuration menu
    Copy the full SHA
    9adeeb8 View commit details
    Browse the repository at this point in the history

  4. remove init_block() method

    jminardi committed Apr 5, 2013
    Configuration menu
    Copy the full SHA
    f0686c6 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2013

  1. use deque

    @fogleman
    fogleman committed Apr 6, 2013
    Configuration menu
    Copy the full SHA
    87d3b48 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2013

  1. Document setup work.

    @jesstess
    jesstess committed Apr 28, 2013
    Configuration menu
    Copy the full SHA
    ae4c321 View commit details
    Browse the repository at this point in the history

  2. Remove GL_FOG_DENSITY, which is unused when using the GL_LINEAR fog m… 

    …ode.
    @jesstess
    jesstess committed Apr 28, 2013
    Configuration menu
    Copy the full SHA
    8737ad9 View commit details
    Browse the repository at this point in the history

  3. Document motion and line of sight calculations.

    @jesstess
    jesstess committed Apr 28, 2013
    Configuration menu
    Copy the full SHA
    e6cc7ef View commit details
    Browse the repository at this point in the history

  4. Turn magic movement numbers into constants and compute jump speed ins… 

    …tead of hard-coding it.
    @jesstess
    jesstess committed Apr 28, 2013
    Configuration menu
    Copy the full SHA
    c2f6028 View commit details
    Browse the repository at this point in the history

  5. Pull out ticks per second into a constant.

    @jesstess
    jesstess committed Apr 28, 2013
    Configuration menu
    Copy the full SHA
    6ebbad3 View commit details
    Browse the repository at this point in the history

  6. Document collision detection.

    @jesstess
    jesstess committed Apr 28, 2013
    Configuration menu
    Copy the full SHA
    a76ca15 View commit details
    Browse the repository at this point in the history

  7. Make adding blocks work on OSX.

    @jesstess
    jesstess committed Apr 28, 2013
    Configuration menu
    Copy the full SHA
    eeaaba3 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2013

  1. Merge pull request #43 from jesstess/jesstess 

    Add some documentation and make adding blocks work on OSX
    @fogleman
    fogleman committed May 1, 2013
    Configuration menu
    Copy the full SHA
    75e3bb7 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2013

  1. added link to my other minecraft clone

    @fogleman
    fogleman committed Nov 25, 2013
    Configuration menu
    Copy the full SHA
    d02cd72 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2016

  1. Syntax highlighting added ✨

    @rmariuzzo
    rmariuzzo authored Jul 27, 2016
    Configuration menu
    Copy the full SHA
    a084614 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #76 from rmariuzzo/patch-1 

    Syntax highlighting added ✨
    @fogleman
    fogleman authored Jul 27, 2016
    Configuration menu
    Copy the full SHA
    50c6dd2 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2017

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

    @progval
    progval committed Jan 8, 2017
    Configuration menu
    Copy the full SHA
    d7b32d5 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2017

  1. Merge pull request #34 from ProgVal/python3 

    Fix Python 3 compatibility.
    @fogleman
    fogleman authored Jan 9, 2017
    Configuration menu
    Copy the full SHA
    43cdaad View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2019

  1. Add files via upload 

    Adds support for HiDPI (Retina Macs)
    @OneSharpAce
    OneSharpAce authored Feb 16, 2019
    2 Configuration menu
    Copy the full SHA
    ea8f5e5 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2019

  1. Merge pull request #94 from OneSharpAce/master 

    Display Glitch Fix
    @fogleman
    fogleman authored Feb 17, 2019
    Configuration menu
    Copy the full SHA
    38a98d4 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2020

  1. [Fix] time.clock() deprecated in Python 3.8 

    Replaced all calls to time.clock() with time.perf_counter().

time.clock() has been removed from the time module in Python 3.8.
    @marco97pa
    marco97pa committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    b0d6b70 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #123 from marco97pa/master 

    [Fix] time.clock() deprecated in Python 3.8
    @fogleman
    fogleman authored Dec 14, 2020
    Configuration menu
    Copy the full SHA
    e311522 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2020

  1. docs: fix simple typo, lenth -> length 

    There is a small typo in main.py.

Should read `length` rather than `lenth`.
    @timgates42
    timgates42 committed Dec 23, 2020
    Configuration menu
    Copy the full SHA
    de42fe0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #126 from timgates42/bugfix_typo_length 

    docs: fix simple typo, lenth -> length
    @fogleman
    fogleman authored Dec 23, 2020
    Configuration menu
    Copy the full SHA
    65c759c View commit details
    Browse the repository at this point in the history