Merge remote-tracking branch 'mainline/master' into floatingpointmovement
Merge remote-tracking branch 'mainline/master' into floatingpointmovement
Merge remote-tracking branch 'mainline/master' into floatingpointmovement
Update some minicore menus

* Adds slot checked/selected gfx
* Adds gold icon
* Updates various widget positions in config/inventory/actionbar menus
Merge pull request #327 from dorkster/fixes

Update some minicore menus
Add desktop file and svg icon
Merge branch 'floatingpointmovement' of https://github.com/stefanbeller/flare-game into fp_movement
Merge pull request #330 from dorkster/fixes

Add desktop file and svg icon
Adding the default mod again.

We did get 4 complaints and probably a lot of problems relating to the
default mod being treated special go unreported.
Hence let's readd the default mod to the game data.

Flare originally was trying to be simple. This may not be true any more
for some parts of the code (optimizing and error-handling contradict
being simple), but it should be simple for the users to play.
Added simple setup steps
Add detailed Linux build/install instructions to README
Change "Installation" to "Building and Running" in README

The instructionsaren't limited to system-wide installation.
Merge pull request #333 from dorkster/docs

Add detailed Linux build/install instructions to README
Merge remote-tracking branch 'upstream/master' into fp_movement
Reordered Powers menu text for more intuitive keyboard nav
No visual changes
Add weapon_type keys to fantasycore and alpha_demo items
Replace weapon_type with equip_flags

In addition, the Block power now requires an equipped shield to be used.
Merge remote-tracking branch 'mainline/master' into floatingpointmovement
Added MAP_ONLY tiles to tiled_collision.png
Changed animation names so that custom animations will work without affecting sfx