Skip to content

Commit

Permalink
Merge branch 'release/0.9.0.1014'
Browse files Browse the repository at this point in the history
  • Loading branch information
rm-code committed Apr 18, 2017
2 parents c99e52c + 0b76ed1 commit bc5670e
Show file tree
Hide file tree
Showing 122 changed files with 5,073 additions and 1,287 deletions.
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
# Version 0.9.0.1014 - 2017-04-18

## Additions
- Added basic base gameplay
- Base inventory can be used to store items between missions
- The inventory screen can be opened for an active character by pressing "i"
- A new combat mission can be started by pressing the "next mission" button
- All characters can be healed by pressing "Heal All"
- The health screen can be opened for an active character by pressing "h"
- Added proper saving system
- Added a menu for loading savegames
- Savegames are stored and ordered by their time of creation
- Savegames which have been created with older versions of the game are marked as incompatible
- Added footer to all menu screens
- Added randomly generated nationality and names for characters

## Removals
- Removed unused translation strings

## Other Changes
- Colors and sprites can now be entirely defined via texture packs
- Replaced randomized ASCII sprites for shotgun shots with different sprite
- Exposed "Type:" string to translation files
- Changed health screen hotkey from "q" to "h"




# Version 0.8.2.976 - 2017-04-14

## Fixes
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# On The Roadside

[![Version](https://img.shields.io/badge/Version-0.8.2.976-blue.svg)](https://github.com/rm-code/on-the-roadside/releases/latest)
[![Version](https://img.shields.io/badge/Version-0.9.0.1014-blue.svg)](https://github.com/rm-code/on-the-roadside/releases/latest)
[![LOVE](https://img.shields.io/badge/L%C3%96VE-0.10.2-EA316E.svg)](http://love2d.org/)
[![Build Status](https://travis-ci.com/rm-code/On-The-Roadside.svg?token=q3rLXeyGTBN9VB2zsWMr&branch=develop)](https://travis-ci.com/rm-code/On-The-Roadside)

Expand Down
14 changes: 11 additions & 3 deletions main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,17 @@ function love.load()
local screens = {
bootloading = require( 'src.ui.screens.BootLoadingScreen' ),
mainmenu = require( 'src.ui.screens.MainMenu' ),
ingamemenu = require( 'src.ui.screens.IngameMenu' ),
basemenu = require( 'src.ui.screens.IngameBaseMenu' ),
ingamemenu = require( 'src.ui.screens.IngameCombatMenu' ),
options = require( 'src.ui.screens.OptionsScreen' ),
gamescreen = require( 'src.ui.screens.GameScreen' ),
base = require( 'src.ui.screens.BaseScreen' ),
combat = require( 'src.ui.screens.CombatScreen' ),
inventory = require( 'src.ui.screens.InventoryScreen' ),
help = require( 'src.ui.screens.HelpScreen' ),
health = require( 'src.ui.screens.HealthScreen' ),
gameover = require( 'src.ui.screens.GameOverScreen' )
gamescreen = require( 'src.ui.screens.GameScreen' ),
gameover = require( 'src.ui.screens.GameOverScreen' ),
loadgame = require( 'src.ui.screens.SavegameScreen' )
};

ScreenManager.init( screens, 'bootloading' );
Expand Down Expand Up @@ -169,6 +173,10 @@ function love.errhand( msg )
p = string.gsub(p, "\t", "")
p = string.gsub(p, "%[string \"(.-)\"%]", "%1")

-- Open save directory where the error log is saved.
Log.error( 'You can find the error in the latest.log file in your save directory. Opening save directory now ...' );
love.system.openURL( 'file://' .. love.filesystem.getSaveDirectory() )

local function draw()
local pos = love.window.toPixels(70)
love.graphics.clear(love.graphics.getBackgroundColor())
Expand Down
Loading

0 comments on commit bc5670e

Please sign in to comment.