Permalink
Commits on Nov 20, 2014
  1. Merge pull request #1273 from dorkster/fixes

    stefanbeller committed Nov 20, 2014
    Compare frame counts against parent AnimationSet
Commits on Nov 19, 2014
  1. Merge pull request #1272 from dorkster/fixes

    stefanbeller committed Nov 19, 2014
    Describe return value for Animation::syncTo()
Commits on Nov 18, 2014
  1. Merge pull request #1270 from dorkster/fixes

    stefanbeller committed Nov 18, 2014
    Fix off-by-one error when adding frames to Animations
Commits on Nov 14, 2014
  1. Merge pull request #1266 from dorkster/ui

    stefanbeller committed Nov 14, 2014
    Add some interface options
  2. Merge pull request #1267 from dorkster/docs

    stefanbeller committed Nov 14, 2014
    Update README, INSTALL, and manpage
Commits on Nov 8, 2014
  1. Merge pull request #1261 from dorkster/fixes

    stefanbeller committed Nov 8, 2014
    Only check clicking on NPC when not talking to an NPC
Commits on Oct 29, 2014
  1. Merge pull request #1250 from dorkster/fixes

    stefanbeller committed Oct 29, 2014
    Fix potential NULL pointer dereference
Commits on Oct 23, 2014
  1. Merge pull request #1246 from dorkster/fixes

    stefanbeller committed Oct 23, 2014
    Convert string to C-string for logging
Commits on Oct 18, 2014
  1. .mailmap: switch to Stefan Beller's personal address

    stefanbeller committed Oct 18, 2014
    Normalize to my personal address. I can still receive email at
    the @googlemail.com address, but I tend to use @gmail.com nowadays.
    
    Also add my new corp account.
    Note that despite the private address being first,
    Google owns the copyright as long as I am employed there.
    
    Signed-off-by: Stefan Beller <sbeller@google.com>
  2. Merge pull request #1243 from dorkster/item_req

    stefanbeller committed Oct 18, 2014
    Item requirement improvements
Commits on Oct 9, 2014
  1. Merge pull request #1225 from dorkster/coverity

    stefanbeller committed Oct 9, 2014
    Fix potential invalid iterator bug
Commits on Oct 4, 2014
  1. Merge pull request #1208 from dorkster/fixes

    stefanbeller committed Oct 4, 2014
    Don't try to get back() of empty vector in LootManager
Commits on Sep 20, 2014
  1. Merge pull request #1191 from hansjoachim/unusedvariable

    stefanbeller committed Sep 20, 2014
    Removed unused variable
Commits on Aug 22, 2014
  1. Merge pull request #1162 from dorkster/fixes

    stefanbeller committed Aug 22, 2014
    InputState: Fix reorder warning and use Point for current_touch
  2. InputState: initialize all member variables.

    stefanbeller committed Aug 22, 2014
    Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
Commits on Aug 19, 2014
  1. Merge pull request #1154 from dorkster/fixes

    stefanbeller committed Aug 19, 2014
    Prevent items being equipped to wrong slots when no slot is available
  2. Merge pull request #1153 from mazayus/fixes

    stefanbeller committed Aug 19, 2014
    Remove unused code from NPC
Commits on Aug 18, 2014
  1. Merge pull request #1152 from dorkster/logging

    stefanbeller committed Aug 18, 2014
    Show filename & line number for file parsing errors
Commits on Aug 4, 2014
  1. Merge pull request #1138 from dorkster/fixes

    stefanbeller committed Aug 4, 2014
    Properly handle merge stacks in equipment inventory
Commits on Aug 2, 2014
  1. Remove unused code for partial background rendering

    stefanbeller committed Aug 2, 2014
    Once upon a time we had an 'optimisation' to render the background
    only when needed.
    
    There was still some cruft left, which is removed in this commit.
    
    Fixes #1135
Commits on Jul 15, 2014
  1. Merge pull request #1128 from dorkster/fixes

    stefanbeller committed Jul 15, 2014
    Fix uninitialized value
  2. Merge pull request #1127 from dorkster/disable_equipslots

    stefanbeller committed Jul 15, 2014
    Update disabled slots when returning an equipped item
Commits on Jul 13, 2014
  1. Merge pull request #1126 from dorkster/disable_equipslots

    stefanbeller committed Jul 13, 2014
    Allow items to disable equipment slots
Commits on Jul 6, 2014
  1. Merge pull request #1123 from dorkster/windows

    stefanbeller committed Jul 6, 2014
    Use %APPDATA% for settings/saves on Windows
  2. Merge pull request #1122 from dorkster/fixes

    stefanbeller committed Jul 6, 2014
    Fix regression in MenuInventory.cpp
  3. Merge pull request #1121 from dorkster/fixes

    stefanbeller committed Jul 6, 2014
    Various fixes
Commits on Jul 3, 2014
  1. Merge pull request #1120 from dorkster/fixes

    stefanbeller committed Jul 3, 2014
    Fix a few more Coverity defects
  2. Merge pull request #1119 from dorkster/fixes

    stefanbeller committed Jul 3, 2014
    Fix some bugs discovered with Coverity
Commits on Jun 29, 2014
  1. StatBlock: Move code from ctor to init list

    stefanbeller committed Jun 29, 2014
    activated_powerslot, on_half_dead_casted are already part of the init list,
    no need to have it twice.
  2. Fix some comments

    stefanbeller committed Jun 29, 2014
Commits on Jun 28, 2014
  1. Modmanager removing duplicates: Use a standard looping pattern.

    stefanbeller committed Jun 28, 2014
    This is hopefully easier to understand and this piece of code is not
    critical for performance, so let's just have it written as easy as possible.
  2. Fixing nearly all of the MS Visual Studio warnings

    stefanbeller committed Jun 28, 2014
    At least an attempt as I don't have that compiler available here.
    
    I have fixed everything up to
     ``` ..\engine\src\Enemy.cpp(60): warning C4355: 'this' : used in base member initializer list```
    as I don't know how to fix that compiler warning.
    
    Also I left out all of UtilsMath.hThings I did not fix:
    
    Reference #994
  3. Merge pull request #1107 from dorkster/input

    stefanbeller committed Jun 28, 2014
    Joystick & interface improvements