Permalink
Commits on Sep 7, 2012
Commits on Sep 6, 2012
  1. Merge pull request #938 from hean01/lighting

    Added initial version of GameTime object to keep track
    committed Sep 6, 2012
  2. Merge pull request #937 from dorkster/bugfixes

    Fix fps display mistakes
    igorko committed Sep 6, 2012
  3. Fix fps display mistakes

    dorkster committed Sep 6, 2012
  4. Merge pull request #936 from dorkster/bugfixes

    Add 'Show FPS' to video settings
    committed Sep 6, 2012
  5. Added initial version of GameTime object to keep track

    of in game times and time spent on playing the game.
    
    In game times are scaled by time_factor so an actual day
    in game is shorter then real day, eg. time_factor of 10
    makes a 24hour period in game actual 2.4hours in game play.
    
    Conflicts:
    
    	src/Settings.cpp
    	src/Settings.h
    hean01 committed Sep 5, 2012
  6. Merge pull request #934 from igorko/master

    Show FPS value in game window
    committed Sep 6, 2012
  7. Merge pull request #930 from dorkster/bugfixes

    Add CombatText to potions and tweak some colors/text
    committed Sep 6, 2012
  8. Merge pull request #929 from igorko/master

    Check savegame file for consistency
    committed Sep 6, 2012
  9. Merge pull request #928 from igorko/master

    Update Copyrights
    committed Sep 6, 2012
  10. Update Copyrights

    igorko committed Sep 6, 2012
  11. Merge pull request #927 from ChrisOelmueller/i18n-de

    * [German translation] Minor typo and grammar fixes
    committed Sep 6, 2012
Commits on Sep 5, 2012
  1. Merge pull request #923 from basdoodeman/germanlang

    Germanlang
    committed Sep 5, 2012
  2. Merge pull request #921 from igorko/master

    Don't use 0 for power indexes. Remove useless checks for input data.
    committed Sep 5, 2012
  3. Don't crash with old savegames

    igorko committed Sep 5, 2012
  4. Merge pull request #920 from dorkster/instant

     Add instant power state and check for cooldown when using consumables from inventory
    committed Sep 5, 2012
Commits on Sep 4, 2012
  1. Merge pull request #919 from hean01/master

    Change the logic if a talker dialog should be shown or not depending
    committed Sep 4, 2012
  2. Change the logic if a talker dialog should be shown or not depending

    if NPC have anything to say or not, this is very neat if a NPC is both
    vendor and talker, if he has nothing to say you get into shop without
    a talker dialog.
    
    This fixes a bug were the last dialog node 0 always is choosen to be
    displayed (chooseDialogNode()) if no other dialogs matches. Also if
    dialog index 0 have requires_not which evaluates false it will be
    chown anyway.
    hean01 committed Sep 4, 2012