cc9cii 740c8bc6f1 Merge branch 'master' into cc9cii ...

Conflicts:
	apps/opencs/model/settings/usersettings.cpp
	apps/opencs/view/world/dialoguesubview.cpp

2015-07-27 10:53:39 +10:00

..

autocalc

Address review comments.

2015-06-26 07:48:48 +10:00

bsa

Fix comparison of integers of different signs

2015-03-15 16:20:17 -07:00

compiler

Allow 5th parameter for PlaceAtMe (numeric value, ignored) (Fixes #2591)

2015-06-02 14:43:38 +02:00

config

Fix attempt to erase using a const_iterator.

2015-06-15 10:26:16 +10:00

contentselector

Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644.

2015-06-16 12:48:45 +10:00

esm

Handle encoding conversions when saving TES3 header (Fixes #2727)

2015-06-26 20:16:32 +02:00

esmterrain

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 13:07:29 +13:00

files

Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644.

2015-06-16 12:48:45 +10:00

fontloader

Rename variable to not show up in search for "TODO" comments.

2015-03-12 00:21:46 +01:00

interpreter

Silence -Wreorder warnings, and remove -Wno-reorder.

2015-05-21 22:46:44 -05:00

loadinglistener

Show wallpaper when loading a savegame

2014-06-02 23:26:43 +02:00

misc

Rewrite animated collision shape support (Fixes #2123)

2015-01-13 05:37:37 +01:00

nif

Silence -Wreorder warnings.

2015-04-28 18:48:02 -05:00

nifbullet

Revert "Use btScaledBvhTriangleMeshShape, bump required bullet version to 2.83"

2015-05-10 13:35:21 +02:00

nifcache

Moved functions from niffile.cpp to where they belong.

2014-08-24 13:45:36 -04:00

nifogre

Silence -Wreorder warnings.

2015-04-28 18:48:02 -05:00

nifoverrides

Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes

2014-01-05 18:09:50 +01:00

ogreinit

Fix Ogre being initialised twice

2014-11-19 13:19:02 +01:00

process

OSX build fix

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

settings

Rewrite game settings manager

2015-02-05 04:18:42 +01:00

terrain

Merge remote-tracking branch 'scrawl/master'

2015-05-03 09:54:32 +02:00

to_utf8

Remove some outdated todo comments

2015-03-12 00:27:01 +01:00

translation

Fix cppcheck issues

2014-09-26 17:48:14 +02:00

version

Distinguish between release and development builds

2014-01-23 13:18:05 +01:00

widgets

Some minor changes to MWList

2015-06-02 11:55:09 +03:00

CMakeLists.txt

Address review feedback.

2015-06-25 13:32:22 +10:00

doc.hpp

second set of additional doxygen comments

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