Marc Zinnschlag
|
acd63659c1
|
Merge remote-tracking branch 'scrawl/launcher'
|
2014-12-01 09:39:31 +01:00 |
|
scrawl
|
a4e32d23c6
|
Fix old profile content not being cleared correctly when saving content file selection (Fixes #2173)
|
2014-11-30 20:52:34 +01:00 |
|
Marc Zinnschlag
|
db17dbe324
|
don't store esm readers for non-base content files
|
2014-11-30 18:04:18 +01:00 |
|
Marc Zinnschlag
|
4a9d2038fa
|
load land for non-base content files immediately
|
2014-11-30 14:33:39 +01:00 |
|
Marc Zinnschlag
|
003675318d
|
Merge remote-tracking branch 'scrawl/master'
|
2014-11-29 20:54:04 +01:00 |
|
scrawl
|
5f5fcc2fef
|
Make PlayGroup use an indefinite number of loops (Fixes #2156)
|
2014-11-28 17:15:31 +01:00 |
|
scrawl
|
4fd3a994e9
|
Add model and script information to BetaComment
|
2014-11-28 16:27:18 +01:00 |
|
scrawl
|
ea8f617508
|
Add missing player control enabled checks (Fixes #2152)
|
2014-11-28 15:54:38 +01:00 |
|
scrawl
|
d7220cdc2f
|
Do not allow decrease below zero in modCurrentMagicka and modCurrentHealth (Fixes #2158)
|
2014-11-28 15:16:53 +01:00 |
|
scrawl
|
0a466ad643
|
Make recalculation of magicka less aggressive (Fixes #2155)
|
2014-11-28 14:45:35 +01:00 |
|
Marc Zinnschlag
|
dadc089ddb
|
Merge branch 'buttons'
|
2014-11-28 09:16:47 +01:00 |
|
Marc Zinnschlag
|
e177b66c1d
|
moved fog button from unpaged worldspace to worldspace
|
2014-11-28 09:16:39 +01:00 |
|
Marc Zinnschlag
|
e04ead2bd5
|
new element visibility button icons
|
2014-11-28 09:14:02 +01:00 |
|
MiroslavR
|
cb74c1c36e
|
Set health to 0 if it drops below 1 (Fixes #2163)
|
2014-11-27 20:44:41 +01:00 |
|
Marc Zinnschlag
|
50a489321f
|
updated run button
|
2014-11-27 09:27:29 +01:00 |
|
Marc Zinnschlag
|
d37ff8ec63
|
fixed missing tooltip update for toggle/mode-type buttons
|
2014-11-27 08:59:21 +01:00 |
|
Marc Zinnschlag
|
23624841e0
|
Merge remote-tracking branch 'cc9cii/editwidget-setrange'
|
2014-11-26 10:19:58 +01:00 |
|
cc9cii
|
936094ae95
|
Set range of spinbox types in dialogsubview.
|
2014-11-26 08:08:28 +11:00 |
|
Marc Zinnschlag
|
533bb3b0d5
|
Merge remote-tracking branch 'miroslavr/master'
|
2014-11-25 19:30:49 +01:00 |
|
scrawl
|
ff8bdd74ed
|
Fix strange bitflags handling
|
2014-11-25 15:54:55 +01:00 |
|
MiroslavR
|
238325455d
|
Erase effects that have expired (Fixes #2134)
|
2014-11-25 10:33:03 +01:00 |
|
scrawl
|
d36dfbe779
|
Apply the frame time cap to Ogre's ControllerManager (Fixes #2154)
This fixes particle systems getting out of whack due to a particularly long frame time, e.g. after a loading screen.
|
2014-11-25 02:44:11 +01:00 |
|
cc9cii
|
69134e3ac2
|
Add icon to windows executable.
|
2014-11-24 12:48:36 +11:00 |
|
scrawl
|
ada4e37556
|
Fix race preview texture not being destroyed properly (Fixes #2098)
|
2014-11-24 01:02:18 +01:00 |
|
scrawl
|
c1e6b8608b
|
Always create a skeleton if there's an "ArrowBone" node (Fixes #2117)
|
2014-11-23 16:37:31 +01:00 |
|
scrawl
|
4bf5c89e6f
|
Merge branch 'master' of https://github.com/OpenMW/openmw into unshield
Conflicts:
apps/wizard/CMakeLists.txt
|
2014-11-23 13:45:46 +01:00 |
|
scrawl
|
abf49267ea
|
Unshield include fix
|
2014-11-23 13:44:03 +01:00 |
|
scrawl
|
a8a2b44b0f
|
Don't require libunshield on windows
|
2014-11-23 00:51:57 +01:00 |
|
Nikolay Kasyanov
|
a0c454b01c
|
Properly add libunshiled include dir (again, for wizard this time)
|
2014-11-22 22:53:01 +02:00 |
|
scrawl
|
414f7ea02c
|
Ignore mouse movements during video playback (Fixes #2139)
|
2014-11-22 12:59:31 +01:00 |
|
Marc Zinnschlag
|
c7933dd692
|
Merge remote-tracking branch 'cc9cii/master'
|
2014-11-22 11:28:01 +01:00 |
|
cc9cii
|
31fdf49616
|
Use Qt exit function rather than system one.
|
2014-11-22 06:59:23 +11:00 |
|
scrawl
|
1e06f69d9e
|
Remove the "browse to existing installation" button, now replaced by the wizard
Clean up some debug spam
|
2014-11-20 22:39:34 +01:00 |
|
cc9cii
|
911839bb91
|
Simplify detecting whether a universal id represents a referenceable type.
|
2014-11-21 06:48:42 +11:00 |
|
scrawl
|
c6558fe487
|
Fix Ogre being initialised twice
|
2014-11-19 13:19:02 +01:00 |
|
cc9cii
|
ede1b97b46
|
Check the type of universal id before getting its id. Should resolve bug #2137
|
2014-11-19 18:10:29 +10:00 |
|
scrawl
|
4fa303d7c4
|
Merge branch 'master' into HEAD
Conflicts:
CMakeLists.txt
apps/launcher/CMakeLists.txt
|
2014-11-18 17:43:51 +01:00 |
|
scrawl
|
3028141815
|
Set up ESMReader indices in OpenCS (fixes wrong terrain textures when multiple content files are loaded)
|
2014-11-18 11:47:46 +01:00 |
|
scrawl
|
21481e8c71
|
Fix bsatool help typo
|
2014-11-18 11:18:02 +01:00 |
|
Marc Zinnschlag
|
5eb9fd81e1
|
use placeholder icons in OpenCS when no proper icon is available
|
2014-11-13 12:09:10 +01:00 |
|
Marc Zinnschlag
|
a60e4c036f
|
Merge branch 'mode'
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.hpp
|
2014-11-13 11:12:20 +01:00 |
|
Marc Zinnschlag
|
b7f8f848a8
|
added edit modes for exteriors
|
2014-11-13 10:45:59 +01:00 |
|
cc9cii
|
b86148411b
|
Fix for issue #2051. Not perfect (can get into a lock in some situations) but usable.
|
2014-11-12 14:02:08 +11:00 |
|
Marc Zinnschlag
|
2acf446f18
|
added edit mode button to scene toolbar
|
2014-11-11 15:58:22 +01:00 |
|
scrawl
|
273a80e2c0
|
Merge branch 'master' of https://github.com/OpenMW/openmw
|
2014-11-11 15:43:46 +01:00 |
|
Evgenii Babinets
|
fe385214e4
|
Added proper slow fall effect mechanics.
|
2014-11-10 02:42:44 -05:00 |
|
Marc Zinnschlag
|
b50fcd403b
|
renamed getElementMask to getVisibilityMask
|
2014-11-09 11:29:45 +01:00 |
|
Marc Zinnschlag
|
de3a26e21b
|
Merge remote-tracking branch 'miroslavr/master'
|
2014-11-08 11:00:19 +01:00 |
|
MiroslavR
|
b8d5a9486a
|
Make Restore/Damage Attribute/Skill effects continuous
|
2014-11-08 00:57:03 +01:00 |
|
Marc Zinnschlag
|
9e67a07ad4
|
allow externally supplied ModeButtons in SceneToolMode
|
2014-11-07 11:11:43 +01:00 |
|