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.

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

Adopted the changes from most up to date fork + additional fixes #45

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open

Adopted the changes from most up to date fork + additional fixes #45

wants to merge 40 commits into from

Commits on Oct 26, 2012

  1. Implemented JPEG support with two new command line options:

    -f sets the format (png, jpeg or both)
    -j sets jpeq quality
    slicedlime committed Oct 26, 2012
    Configuration menu
    Copy the full SHA
    7bc7924 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2012

  1. Configuration menu
    Copy the full SHA
    774e2ab View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8d0e490 View commit details
    Browse the repository at this point in the history
  3. - Replaced macros with inline functions for debuggability.

    - Optimized former macro functions a fair bit.
    - Use a struct with id/data to simplify code a lot.
    - Got rid of uninitialized variables by using the above struct as return value.
    - Fixed crash bug when trying to shadow the bottom block in a row (access block -1)
    - Added a few asserts to sanity check function inputs/outputs.
    slicedlime committed Oct 27, 2012
    Configuration menu
    Copy the full SHA
    fb9bd86 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    317f002 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9250091 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    784a05a View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2012

  1. new blocks in Minecraft 1.4; carrots, potatoes

    Added new blocks:
    - carrot crops
    - potato crops
    akudeukie committed Nov 4, 2012
    Configuration menu
    Copy the full SHA
    8b0febc View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2012

  1. Configuration menu
    Copy the full SHA
    eb888ff View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c271163 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2012

  1. Configuration menu
    Copy the full SHA
    c96bc5e View commit details
    Browse the repository at this point in the history
  2. Optimizations that cut away another 15-20% rendering time:

    - Simplified some access code that was doing things in over-complex ways or using needless branching.
    - Moved common early-outs earlier to avoid doing calculations.
    - Delay doing some calculations until really needed.
    - Store block data in uint16 internally, instead of doing conversion from source format (mcr/anvil). This takes up 4 bits of wasted space per block but speeds up access. Complexity of access has now been moved to load time, but we access blocks far more often than we load chunks.
    slicedlime committed Nov 18, 2012
    Configuration menu
    Copy the full SHA
    170407e View commit details
    Browse the repository at this point in the history
  3. Compile fix.

    slicedlime committed Nov 18, 2012
    Configuration menu
    Copy the full SHA
    b9b0266 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2012

  1. Configuration menu
    Copy the full SHA
    1216488 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2012

  1. new blocks in Minecraft 1.4; cobblestone walls

    Added new blocks:
    - Command Block
    - Implemented rendering of Cobblestone/Moss walls (acceptable, but with
    minor anomalies in rendered tiles in blocks-X.png)
    akudeukie committed Nov 22, 2012
    Configuration menu
    Copy the full SHA
    bd0a254 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2012

  1. new blocks in Minecraft 1.4;

    Added new blocks:
    - Anvil;
    - Beacon;
    - Wooden button.
    Improved cobblestone wall sprite generation (final).
    akudeukie committed Nov 24, 2012
    Configuration menu
    Copy the full SHA
    f9fe5b8 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2012

  1. new blocks in Minecraft 1.4;

    Cleaned up hardcoded values in Beacon drawing code;
    Added extra detail to Anvil block.
    akudeukie committed Nov 25, 2012
    Configuration menu
    Copy the full SHA
    8a6a9f2 View commit details
    Browse the repository at this point in the history
  2. Flower pots; Reworked base tile drawing code(DRY)

    - Added flower pots!
    - Made fence gate more prominent (taller);
    - Cleaned up and reworked base tile drawing code; Now it draws precise
    and correct base tiles; Also made it easier to reuse.
    akudeukie committed Nov 25, 2012
    Configuration menu
    Copy the full SHA
    1314c1a View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2012

  1. Configuration menu
    Copy the full SHA
    f9a5508 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    67d9a20 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3e903d1 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'akudeukie-master' into akudeukie-changes

    Conflicts:
    	Makefile
    	blockimages.cpp
    	blockimages.h
    	chunk.cpp
    	chunk.h
    	map.cpp
    	map.h
    	pigmap.cpp
    	region.h
    	render.cpp
    	rgba.cpp
    	rgba.h
    	tables.cpp
    	tables.h
    	template.html
    	utils.cpp
    dominickpastore committed Dec 11, 2012
    Configuration menu
    Copy the full SHA
    4f5d409 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7ab11a0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a5b6555 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a5a2ea2 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2012

  1. Configuration menu
    Copy the full SHA
    3c95d33 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2012

  1. Configuration menu
    Copy the full SHA
    969e81e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3ab6459 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2013

  1. Blocks from Minecraft 1.5 Snapshots

    Major changes:
    - Rewrote & refactored block tile generation code;
    - Block IDs are no more hard-coded (for the most part);
    - Added external block configuration files;
    - Added ability to apply few filters to textures (when generating block
    tiles);
    New blocks from upcoming Minecraft 1.5:
    - Trapped Chest;
    - Weighted pressure plates (light + heavy);
    - Redstone comparator;
    - Daylight Sensor;
    - Block of Redstone;
    - Nether Quartz Ore;
    - Hopper;
    - Block of Quartz;
    - Quartz Stairs;
    - Quartz Slab;
    - Activator Rail;
    - Dropper.
    Other changes:
    - Added few functions for manipulating RGBAImage;
    - Changed to UNIX EOL formatting in modified files.
    akudeukie committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    c46f73f View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2013

  1. Make file update

    blockimages.cpp requires c++11 standart support, since it uses
    <unordered_map>
    akudeukie committed Jan 23, 2013
    Configuration menu
    Copy the full SHA
    80ca842 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2013

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

    Conflicts:
    	Makefile
    	blockimages.cpp
    	blockimages.h
    	render.cpp
    	rgba.cpp
    	rgba.h
    
    Merged with other fork changes (JPEG support, performance improvements, usability improvements)
    akudeukie committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    f769d04 View commit details
    Browse the repository at this point in the history
  2. Post-merge fixes.

    version.h file is missing.
    akudeukie committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    a00c632 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    aa44d38 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d4e65c0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    de8c7de View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2013

  1. texture lists are now expected in image directory + fixed some docume…

    …ntation
    UniversE committed Mar 19, 2013
    Configuration menu
    Copy the full SHA
    ec64dd0 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2013

  1. Merge pull request #1 from UniversE/universe/master

    Updated documentation + blocklist location changed (by UniversE)
    akudeukie committed Apr 23, 2013
    Configuration menu
    Copy the full SHA
    3e63cc7 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2013

  1. Blocks from Minecraft 1.6 Snapshots

    New blocks from upcoming Minecraft 1.6:
    - Hay Block;
    - Carpet;
    - Hardened Clay;
    - Block of Coal.
    akudeukie committed May 9, 2013
    Configuration menu
    Copy the full SHA
    8aab297 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2013

  1. Blocks from Minecraft 1.6 Snapshots

    -Updated up to 13w19a snapshot changes;
    -Added Stained Hardened Clay block;
    -Aligned wool carpet height to 1 unit/pixel down from 2
    akudeukie committed May 10, 2013
    Configuration menu
    Copy the full SHA
    fad97aa View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2013

  1. Merge branch 'master', remote branch 'akudeukie/mc_1.6' into universe…

    …/master
    UniversE committed Jul 10, 2013
    Configuration menu
    Copy the full SHA
    cd24a44 View commit details
    Browse the repository at this point in the history