Miloslav Číž 477e1437d2 Resolve conflicts

2018-06-14 15:30:28 +02:00

..

bsa

http to https for supported urls (#1625)

2018-03-08 21:23:24 +01:00

compiler

Resolve merge conflicts

2018-06-13 08:22:37 +02:00

config

Make hasMaster() behavior consistent with isGameFile() (fixes #3618)

2018-03-28 15:43:51 +03:00

contentselector

Merged pull request #1623

2018-06-09 10:49:04 +02:00

esm

Store previous items in the savegame

2018-06-10 16:21:19 +04:00

esmterrain

remove indentation from blank lines

2018-06-09 10:31:51 -04:00

fallback

Revert log spam

2018-04-22 15:41:25 +00:00

files

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

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

fontloader

[Fix] Some PVS-Studio and cppcheck fixes

2018-04-18 12:36:10 +00:00

interpreter

More consistent wording of errors/warnings

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

loadinglistener

use loading screen to freeze the screen

2017-11-16 22:08:33 +01:00

misc

Revert "Don't force DDS file usage (fixes #1392)"

2018-06-04 17:08:09 +02:00

myguiplatform

purge unnecessary imports

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

nif

Fix assertion fail related to NiLookAtController

2018-06-09 17:07:38 +04:00

nifbullet

removed the unnecessary comment

2018-02-09 16:34:55 +01:00

nifosg

Improve MRK NiStringExtraData handling (bug #4419)

2018-06-08 15:44:35 +04: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

Add an empty compileGLObjects implementation to Rig/MorphGeometry to avoid unnecessary creation of display list done by osg

2018-04-18 12:36:08 +00:00

sdlutil

remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb

2018-03-27 20:20:40 +02:00

settings

http to https for supported urls (#1625)

2018-03-08 21:23:24 +01:00

shader

Reduce error spam

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

terrain

Set node mask to cell borders

2018-06-14 13:18:37 +02: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

Ignore duplicate data directories to work around the fallout of (Fixes #3557)

2018-01-14 00:25:20 +00:00

widgets

Fix warnings: catching polymorphic type by value

2018-06-02 14:28:46 +03:00

CMakeLists.txt

Resolve merge conflicts

2018-06-13 08:22:37 +02:00

doc.hpp

second set of additional doxygen comments

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