Sergey Shnatsel Davidoff
|
5a16420231
|
supply the correct icon (without the red line) for the default rendering state
|
2014-11-23 19:47:53 +03:00 |
|
Sergey Shnatsel Davidoff
|
c9e7a41e1a
|
Add my scene view icons: status overview icons, element toggle icons, parts from which they're assembled and the SVG master.
|
2014-11-23 17:39:01 +03: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 |
|
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 |
|
Marc Zinnschlag
|
cd5d02402f
|
Merge remote-tracking branch 'scrawl/wizard'
|
2014-11-21 09:48:57 +01: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 |
|
scrawl
|
e11bec1a37
|
Fix the launcher not properly reloading data directories
|
2014-11-20 22:36:24 +01:00 |
|
cc9cii
|
911839bb91
|
Simplify detecting whether a universal id represents a referenceable type.
|
2014-11-21 06:48:42 +11:00 |
|
scrawl
|
31fab533fe
|
OSX build fix
|
2014-11-20 18:14:49 +01:00 |
|
Marc Zinnschlag
|
86037149cd
|
add optional string argument for activate instruction (ignored)
|
2014-11-20 11:06:32 +01: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
|
e5a6049ea7
|
Improve clarity of label
|
2014-11-18 18:03:31 +01:00 |
|
scrawl
|
d4a9cf7075
|
Fix wizard install location
|
2014-11-18 17:54:37 +01:00 |
|
scrawl
|
751211351c
|
Fix multi-line comment warning
|
2014-11-18 17:54:24 +01: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
|
95dfb07816
|
make [ a whitespace character in scripts (Fixes #2126)
|
2014-11-15 09:53:08 +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 |
|
Marc Zinnschlag
|
3828e3fae5
|
updated credits file
|
2014-11-10 16:37:31 +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 |
|
scrawl
|
92ab292e18
|
Make MODL subrecord for light records optional (Fixes #2114)
|
2014-11-09 04:50:54 +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 |
|
scrawl
|
07ea352e46
|
Fix button graphics preventing mouse clicks (Fixes #2104)
|
2014-11-07 00:16:41 +01:00 |
|
hasufell
|
0fd33e3198
|
Fix morrowind data files detection for custom install locations
|
2014-11-06 22:27:35 +01:00 |
|
Marc Zinnschlag
|
4dd645559d
|
added ModeButton specialisation of PushButton for use in SceneToolMode
|
2014-11-06 13:26:19 +01:00 |
|
Lukasz Gromanowski
|
bebb59ef11
|
Removed sending of travis notifications to my email.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2014-11-06 10:51:32 +01:00 |
|
scrawl
|
d5768af952
|
Fix INT_MIN trade exploit (Fixes #2096)
|
2014-11-06 03:51:18 +01:00 |
|
cc9cii
|
a3a0682138
|
Remove files no longer used, reverting to OEngine.
|
2014-11-06 11:16:17 +11:00 |
|
cc9cii
|
bf669a51c1
|
Merge branch 'master' into mouse-picking-physics
|
2014-11-06 09:46:48 +11:00 |
|
cc9cii
|
f051fb65ff
|
Fix memory leak when multiple documents in 3D edit. Support multiple physics engine per document.
|
2014-11-06 08:35:24 +11:00 |
|
Marc Zinnschlag
|
e82e830653
|
Merge remote-tracking branch 'scrawl/master'
|
2014-11-05 21:23:07 +01:00 |
|
Marc Zinnschlag
|
45d41e22e2
|
Merge branch 'openmw-33'
|
2014-11-05 21:22:18 +01:00 |
|
Marc Zinnschlag
|
5909fa4368
|
new version number and updated changelog
|
2014-11-05 21:18:43 +01:00 |
|
scrawl
|
6b88f5f33e
|
Use Ogre::uint8, fixes a missing include for uint8_t
|
2014-11-05 20:58:49 +01:00 |
|
scrawl
|
61d4a6b344
|
Merge branch 'openmw-033'
|
2014-11-05 20:58:42 +01:00 |
|
scrawl
|
ba3d2be8e3
|
Add missing include (Fixes #2108)
|
2014-11-05 19:45:32 +01:00 |
|