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

Power Cells and Power Cell Press #370

Merged
merged 18 commits into from
Aug 22, 2016
Merged

Power Cells and Power Cell Press #370

merged 18 commits into from
Aug 22, 2016

Commits on Aug 20, 2016

  1. [WIP] Power Cells 

    *added textures for press and cells
*added xml for press and cells
*rendering of press does not work properly don't know why
*Press job is at the moment just a dummy, have to find out why the job breaks the game
    @Xeni91
    Xeni91 committed Aug 20, 2016
    Configuration menu
    Copy the full SHA
    681bc13 View commit details
    Browse the repository at this point in the history

  2. [WIP] Power Cells 

    *added textures for press and cells
*added xml for press and cells
*rendering of press does not work properly don't know why
*Press job is at the moment just a dummy, have to find out why the job breaks the game
    @Xeni91
    Xeni91 committed Aug 20, 2016
    Configuration menu
    Copy the full SHA
    d986de7 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'refs/remotes/origin/FuelingSystem' 

    Conflicts:
	Assets/Scripts/Controllers/JobSpriteController.cs
    @Xeni91
    Xeni91 committed Aug 20, 2016
    Configuration menu
    Copy the full SHA
    1513a3e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' 

    Conflicts:
	Assets/StreamingAssets/Localization/no-BM.lang.meta
    @Xeni91
    Xeni91 committed Aug 20, 2016
    Configuration menu
    Copy the full SHA
    56245b8 View commit details
    Browse the repository at this point in the history

  5. Update JobSpriteController.cs 

    Don't know why it was there
    @Xeni91
    Xeni91 authored Aug 20, 2016
    Configuration menu
    Copy the full SHA
    724c7c8 View commit details
    Browse the repository at this point in the history

  6. Updated Power Cell 

    * Sprite of press is loaded
* added job for press
* press takes steel and outputs power cells
    @Xeni91
    Xeni91 committed Aug 20, 2016
    Configuration menu
    Copy the full SHA
    368ff68 View commit details
    Browse the repository at this point in the history

  7. Merged branch master into FuelingSystem

    @Xeni91
    Xeni91 committed Aug 20, 2016
    Configuration menu
    Copy the full SHA
    e1eb29c View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' 

    Conflicts:
	Assets/StreamingAssets/LUA/Furniture.lua
    @Xeni91
    Xeni91 committed Aug 20, 2016
    Configuration menu
    Copy the full SHA
    cf6001b View commit details
    Browse the repository at this point in the history

  9. Localisation 

    * added Localisation for en_US
    @Xeni91
    Xeni91 committed Aug 20, 2016
    Configuration menu
    Copy the full SHA
    8103ee4 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2016

  1. Merge remote-tracking branch 'refs/remotes/origin/master' 

    Conflicts:
	Assets/StreamingAssets/Localization/en_US.lang
    @Xeni91
    Xeni91 committed Aug 21, 2016
    Configuration menu
    Copy the full SHA
    334c7d7 View commit details
    Browse the repository at this point in the history

  2. Revert "Update JobSpriteController.cs" 

    This reverts commit 724c7c8.
    @Xeni91
    Xeni91 committed Aug 21, 2016
    Configuration menu
    Copy the full SHA
    3be55fe View commit details
    Browse the repository at this point in the history

  3. Added the right param 

    * Added the right param in funiture.lua
* fixed the indention from furniture.xml
    @Xeni91
    Xeni91 committed Aug 21, 2016
    Configuration menu
    Copy the full SHA
    8ea66ed View commit details
    Browse the repository at this point in the history

  4. Added the right param 

    * Added the right param in funiture.lua
* fixed the indention from furniture.xml
    @Xeni91
    Xeni91 committed Aug 21, 2016
    Configuration menu
    Copy the full SHA
    8ce021d View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'refs/remotes/origin/FuelingSystem' 

    Conflicts:
	Assets/StreamingAssets/Data/Furniture.xml
    @Xeni91
    Xeni91 committed Aug 21, 2016
    Configuration menu
    Copy the full SHA
    67f27d1 View commit details
    Browse the repository at this point in the history

  6. Idention Fix 

    * indention fix for Furniture.xml
    @Xeni91
    Xeni91 committed Aug 21, 2016
    Configuration menu
    Copy the full SHA
    2a4fa56 View commit details
    Browse the repository at this point in the history

  7. Idention Fix 

    * indention fix for Furniture.xml
    @Xeni91
    Xeni91 committed Aug 21, 2016
    Configuration menu
    Copy the full SHA
    665a3ab View commit details
    Browse the repository at this point in the history

  8. Merged branch FuelingSystem into FuelingSystem

    @Xeni91
    Xeni91 committed Aug 21, 2016
    Configuration menu
    Copy the full SHA
    3b41d42 View commit details
    Browse the repository at this point in the history

  9. Update JobSpriteController.cs

    @Xeni91
    Xeni91 authored Aug 21, 2016
    Configuration menu
    Copy the full SHA
    e9206c1 View commit details
    Browse the repository at this point in the history