Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Nov 20, 2014
  1. @stefanbeller

    Merge pull request #1273 from dorkster/fixes

    stefanbeller authored
    Compare frame counts against parent AnimationSet
Commits on Nov 19, 2014
  1. @stefanbeller

    Merge pull request #1272 from dorkster/fixes

    stefanbeller authored
    Describe return value for Animation::syncTo()
Commits on Nov 18, 2014
  1. @stefanbeller

    Merge pull request #1270 from dorkster/fixes

    stefanbeller authored
    Fix off-by-one error when adding frames to Animations
Commits on Nov 14, 2014
  1. @stefanbeller

    Merge pull request #1266 from dorkster/ui

    stefanbeller authored
    Add some interface options
  2. @stefanbeller

    Merge pull request #1267 from dorkster/docs

    stefanbeller authored
    Update README, INSTALL, and manpage
Commits on Nov 8, 2014
  1. @stefanbeller

    Merge pull request #1261 from dorkster/fixes

    stefanbeller authored
    Only check clicking on NPC when not talking to an NPC
Commits on Oct 29, 2014
  1. @stefanbeller

    Merge pull request #1250 from dorkster/fixes

    stefanbeller authored
    Fix potential NULL pointer dereference
Commits on Oct 23, 2014
  1. @stefanbeller

    Merge pull request #1246 from dorkster/fixes

    stefanbeller authored
    Convert string to C-string for logging
Commits on Oct 18, 2014
  1. @stefanbeller

    .mailmap: switch to Stefan Beller's personal address

    stefanbeller authored stefanbeller committed
    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. @stefanbeller
  3. @stefanbeller
  4. @stefanbeller

    Merge pull request #1243 from dorkster/item_req

    stefanbeller authored
    Item requirement improvements
Commits on Oct 9, 2014
  1. @stefanbeller

    Merge pull request #1225 from dorkster/coverity

    stefanbeller authored
    Fix potential invalid iterator bug
Commits on Oct 4, 2014
  1. @stefanbeller

    Merge pull request #1208 from dorkster/fixes

    stefanbeller authored
    Don't try to get back() of empty vector in LootManager
Commits on Sep 20, 2014
  1. @stefanbeller

    Merge pull request #1191 from hansjoachim/unusedvariable

    stefanbeller authored
    Removed unused variable
Commits on Aug 22, 2014
  1. @stefanbeller

    Merge pull request #1162 from dorkster/fixes

    stefanbeller authored
    InputState: Fix reorder warning and use Point for current_touch
  2. @stefanbeller

    InputState: initialize all member variables.

    stefanbeller authored
    Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
Commits on Aug 19, 2014
  1. @stefanbeller

    Merge pull request #1154 from dorkster/fixes

    stefanbeller authored
    Prevent items being equipped to wrong slots when no slot is available
  2. @stefanbeller

    Merge pull request #1153 from mazayus/fixes

    stefanbeller authored
    Remove unused code from NPC
Commits on Aug 18, 2014
  1. @stefanbeller

    Merge pull request #1152 from dorkster/logging

    stefanbeller authored
    Show filename & line number for file parsing errors
Commits on Aug 4, 2014
  1. @stefanbeller

    Merge pull request #1138 from dorkster/fixes

    stefanbeller authored
    Properly handle merge stacks in equipment inventory
Commits on Aug 2, 2014
  1. @stefanbeller

    Remove unused code for partial background rendering

    stefanbeller authored
    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. @stefanbeller

    Merge pull request #1128 from dorkster/fixes

    stefanbeller authored
    Fix uninitialized value
  2. @stefanbeller

    Merge pull request #1127 from dorkster/disable_equipslots

    stefanbeller authored
    Update disabled slots when returning an equipped item
Commits on Jul 13, 2014
  1. @stefanbeller

    Merge pull request #1126 from dorkster/disable_equipslots

    stefanbeller authored
    Allow items to disable equipment slots
Commits on Jul 6, 2014
  1. @stefanbeller

    Merge pull request #1123 from dorkster/windows

    stefanbeller authored
    Use %APPDATA% for settings/saves on Windows
  2. @stefanbeller

    Merge pull request #1122 from dorkster/fixes

    stefanbeller authored
    Fix regression in MenuInventory.cpp
  3. @stefanbeller

    Merge pull request #1121 from dorkster/fixes

    stefanbeller authored
    Various fixes
Commits on Jul 3, 2014
  1. @stefanbeller

    Merge pull request #1120 from dorkster/fixes

    stefanbeller authored
    Fix a few more Coverity defects
  2. @stefanbeller

    Merge pull request #1119 from dorkster/fixes

    stefanbeller authored
    Fix some bugs discovered with Coverity
Commits on Jun 29, 2014
  1. @stefanbeller

    StatBlock: Move code from ctor to init list

    stefanbeller authored
    activated_powerslot, on_half_dead_casted are already part of the init list,
    no need to have it twice.
  2. @stefanbeller

    Fix some comments

    stefanbeller authored
Commits on Jun 28, 2014
  1. @stefanbeller

    Modmanager removing duplicates: Use a standard looping pattern.

    stefanbeller authored
    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. @stefanbeller

    Fixing nearly all of the MS Visual Studio warnings

    stefanbeller authored
    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. @stefanbeller

    Merge pull request #1107 from dorkster/input

    stefanbeller authored
    Joystick & interface improvements
Something went wrong with that request. Please try again.