scrawl
|
a8a2b44b0f
|
Don't require libunshield on windows
|
2014-11-23 00:51:57 +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 |
|
Marc Zinnschlag
|
4dd645559d
|
added ModeButton specialisation of PushButton for use in SceneToolMode
|
2014-11-06 13:26:19 +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 |
|
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 |
|
cc9cii
|
03abd69b4f
|
Include string header for gcc.
|
2014-11-05 07:20:20 +11:00 |
|
cc9cii
|
7d133d508d
|
Remove unused code. Move the cleanup of global resources used by the PhysicsEngine to PhysicsManager.
|
2014-11-05 07:10:14 +11:00 |
|
cc9cii
|
37a050873c
|
Fix crash when multiple scenewidgets were closed. BtOgre was destroying resources each time.
|
2014-11-04 21:46:35 +11:00 |
|
cc9cii
|
70b5d6857a
|
Add missing files.
|
2014-11-04 20:52:28 +11:00 |
|
cc9cii
|
0e70315f91
|
Experimental, compiles and runs but crashes in some exit scenarios.
|
2014-11-04 20:43:04 +11:00 |
|
Marc Zinnschlag
|
d48a2759f6
|
Merge remote-tracking branch 'cc9cii/mouse-picking'
|
2014-11-03 13:19:19 +01:00 |
|
Marc Zinnschlag
|
bf40a3bb5d
|
enhanced SceneToolBar tool handling (remove and insert at specific point)
|
2014-11-03 13:18:53 +01:00 |
|
cc9cii
|
bd6e54dde3
|
Add function to cancel drag by pressing ESC. Remove debug code.
|
2014-11-03 21:24:47 +11:00 |
|
cc9cii
|
092080c69c
|
Group the commands with begin/end macros.
|
2014-11-03 13:57:57 +11:00 |
|
cc9cii
|
bf5ba41223
|
Fix deleting physics object when scene nodes were still referencing it. Remove unused code from MouseState. Items that do not change are fetched only once.
|
2014-11-03 12:46:31 +11:00 |
|
cc9cii
|
4556eb74fe
|
Fix saving position and rotation.
|
2014-11-03 10:07:21 +11:00 |
|
cc9cii
|
e3a000917c
|
Minor tidy up.
|
2014-11-03 10:04:24 +11:00 |
|
cc9cii
|
358cac2f0a
|
Fix deleting object physics again.
|
2014-11-03 10:03:54 +11:00 |
|
cc9cii
|
d9755f82c3
|
Position saving - work in progress.
|
2014-11-03 08:11:15 +11:00 |
|
cc9cii
|
85ef683319
|
Fix deleting physics object when scene node is cleared.
|
2014-11-03 08:10:28 +11:00 |
|
MiroslavR
|
140013820b
|
Fix invalidated iterator
|
2014-11-02 15:40:08 +01:00 |
|
MiroslavR
|
a4d0068e29
|
Make forcegreeting no-op for disabled references (Fixes #2093)
|
2014-11-02 15:36:13 +01:00 |
|
Marc Zinnschlag
|
29c9b6bd01
|
Merge remote-tracking branch 'scrawl/master'
|
2014-11-02 10:38:42 +01:00 |
|
cc9cii
|
3796240b19
|
Refactor duplicate code sections.
|
2014-11-02 18:13:25 +11:00 |
|
cc9cii
|
49d416353e
|
Remove a redundant list.
|
2014-11-02 17:56:28 +11:00 |
|
cc9cii
|
7f54dab6ef
|
Fix issue where objects were sometimes unresponsive after dragging.
|
2014-11-02 15:34:45 +11:00 |
|