scrawl a4d8aef40d

Merge branch openmw-43 into master ...

Conflicts:
	CMakeLists.txt
	README.md
	files/mygui/openmw_trade_window.layout

2017-11-29 22:37:50 +00:00

..

bsa

purge unnecessary imports

2017-06-09 19:08:53 +02:00

compiler

Add explicit variant of 'OnActivate'

2017-10-23 23:33:06 +00:00

config

Fix assert with empty setting value

2017-10-22 10:10:04 +02:00

contentselector

purge the rest of boost::shared and any other boost related things that no longer are required

2017-06-09 19:08:53 +02:00

esm

Merge remote-tracking branch 'aesylwinn/LLmerge'

2017-10-19 14:24:58 +02:00

esmterrain

Cast LAND_SIZE to integer to avoid linking error

2017-03-28 01:57:31 +09:00

fallback

be explicit about what we are trying to catch instead of catching everything and fixed up formatting

2017-06-12 00:32:29 +02:00

files

Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all

2017-11-11 22:58:02 +00:00

fontloader

Fix shadowing warnings

2016-08-29 12:38:24 +02:00

interpreter

More consistent wording of errors/warnings

2017-03-04 21:48:31 +01:00

loadinglistener

LoadingScreen: add support for important labels

2015-12-15 21:16:20 +01:00

misc

Move toUpper() from StringUtils to the JournalViewModel

2017-11-23 19:37:45 +04:00

myguiplatform

purge unnecessary imports

2017-06-09 19:08:53 +02:00

nif

removed an iostream include used for debug prints from nifstream.hpp

2017-09-23 11:10:05 -05:00

nifbullet

Fix some style issues flagged by cppcheck

2017-10-15 17:06:58 +02:00

nifosg

Fix some style issues flagged by cppcheck

2017-10-15 17:06:58 +02:00

process

OSX build fix

2014-11-20 18:14:49 +01:00

resource

Add NPC base skeleton files to the optimizer blacklist (Fixes #4159)

2017-11-10 22:51:32 +00:00

sceneutil

Fix some style issues flagged by cppcheck

2017-10-15 17:06:58 +02:00

sdlutil

Pass repeat key events to the GUI

2017-09-24 19:08:11 +02:00

settings

Update Links to Documentation in settings.cfg files (#1523)

2017-10-28 16:05:30 +00:00

shader

Reduce error spam

2017-11-08 00:24:03 +00:00

terrain

Fall back to non-shader material if creating the shader fails

2017-11-08 00:24:03 +00:00

to_utf8

Fix typo in a comment

2015-12-10 00:15:55 +01:00

translation

purge unnecessary imports

2017-06-09 19:08:53 +02:00

version

Allow getting available version information even when clone is shallow

2017-03-07 21:53:49 +01:00

vfs

Fix seg fault, undo changes BsaArchive

2017-08-22 15:06:56 -04:00

widgets

Fix NumericEditBox behavior broken by switch to std::stoi

2017-11-20 23:20:03 +00:00

CMakeLists.txt

Make indentation consistent.

2017-10-24 23:31:40 +01:00

doc.hpp

second set of additional doxygen comments

2010-09-25 20:15:05 +02:00