cc9cii
|
6e334064d3
|
Merge branch 'master' into pathgrid-edit
|
2014-11-23 06:43:16 +11: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 |
|
cc9cii
|
9703fd95ac
|
Merge branch 'master' into pathgrid-edit
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
|
2014-11-14 18:03:53 +11: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
|
0a66877cf1
|
Remove no longer needed code.
|
2014-11-13 07:47:32 +11:00 |
|
cc9cii
|
ba1a42ec05
|
Don't delete physics object if it was never created.
|
2014-11-13 07:41:31 +11:00 |
|
cc9cii
|
0e0ad97a91
|
Pathgrid edge resource management for editing multiple cells or multiple documents.
|
2014-11-13 06:36:47 +11:00 |
|
cc9cii
|
e430dcfd8a
|
Check the resource group's existence before destroying it.
|
2014-11-13 05:59:04 +11:00 |
|
cc9cii
|
12511778d1
|
Remove duplicate parameter.
|
2014-11-12 22:43:22 +11:00 |
|
cc9cii
|
8c6890c682
|
Move element filtering back out of castRay().
|
2014-11-12 22:28:41 +11:00 |
|
cc9cii
|
d65adc4376
|
Reduce code duplication.
|
2014-11-12 22:04:48 +11: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 |
|
cc9cii
|
3eb556ff8a
|
Enhanced snap functionality for pathgrid points.
|
2014-11-11 19:40:04 +11:00 |
|
cc9cii
|
407edc770c
|
Added a simplistic snap to closest object or terrain.
|
2014-11-11 07:47:35 +11:00 |
|
cc9cii
|
1504119da7
|
Increase the sensitivity of the wheel movement.
|
2014-11-11 06:07:52 +11:00 |
|
cc9cii
|
48ecea7103
|
Simplistic drop-to-ground functionality for pathgrid points.
|
2014-11-10 22:38:29 +11:00 |
|
cc9cii
|
2412d127b0
|
Fix saving pathgrid positions when adding or moving.
|
2014-11-10 22:29:01 +11:00 |
|
cc9cii
|
d7804974e8
|
Better mouse cursor tracking for the third axis.
|
2014-11-10 20:37:07 +11: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 |
|
cc9cii
|
1f73fae6ef
|
Allow adding or dragging pathgrid points over objects as well as terrain.
|
2014-11-09 20:03:29 +11:00 |
|
cc9cii
|
89eb30054b
|
Fix deleting physic objects.
|
2014-11-09 18:37:04 +11:00 |
|
cc9cii
|
f5ba74cd10
|
Suppress warnings.
|
2014-11-09 18:10:44 +11:00 |
|
cc9cii
|
895739d6bb
|
Visibility mask working correctly.
|
2014-11-09 17:53:54 +11:00 |
|
cc9cii
|
a5a76cadca
|
Adding, deleting and moving pathgrid points work. However still not saving to the document.
|
2014-11-09 14:36:58 +11:00 |
|
cc9cii
|
2c09b9ba21
|
Fix scene node being erased in the object reference map.
|
2014-11-09 12:34:26 +11:00 |
|
Marc Zinnschlag
|
de3a26e21b
|
Merge remote-tracking branch 'miroslavr/master'
|
2014-11-08 11:00:19 +01:00 |
|
cc9cii
|
f2ff2f2988
|
Render pathgrid points and edges. Can move the points but the edges are not updated. Visibility mask does not work properly because pathgrid points are considered as objects by the physics engine.
|
2014-11-08 15:51:45 +11: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 |
|