mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-01 13:45:34 +00:00
Code Issues Releases Wiki Activity
16139 commits 108 branches 66 tags 134 MiB
Commit graph

2458 commits

Author SHA1 Message Date
Rob Cutmore
a34a08c212 Render cell markers 
Adds rendering of cell markers. Markers are displayed at center of
cell and contain cell's coordinates.
 2016-02-07 13:52:18 -05:00
scrawl
d12f24c321 Fix typo 2016-02-01 21:01:11 +01:00
Rob Cutmore
d28e7db65c Fix tooltip spelling errors in WorldspaceWidget 2016-01-31 08:45:05 -05:00
Alexander "Ace" Olofsson
b3e985fca2 Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor 2016-01-30 07:31:00 +01:00
Rob Cutmore
d43315fe4e Add script editor line wrapping (Feature #2926) 
Adds line wrapping for script editor and associated entry in settings
window. No line wrapping remains the default.
 2016-01-28 06:28:31 -05:00
Rob Cutmore
4caf44f061 Remove unused code in apps/opencs/view/world/table files 2016-01-26 07:48:55 -05:00
Marc Zinnschlag
1b7a0e5d64 Merge branch 'buttons' 2016-01-26 11:32:26 +01:00
Marc Zinnschlag
1d0ef97bf6 added select all of same ID item to selection mode button menu 2016-01-26 11:31:37 +01:00
Marc Zinnschlag
d5ef40aeb7 minor improvements to wording of instance selection menu items 2016-01-26 10:51:47 +01:00
Marc Zinnschlag
39e1b06101 fixed deletion of objects that are selected (was leaving a node behind) 2016-01-25 16:18:55 +01:00
Marc Zinnschlag
790367b980 fixed object removal via setting state to delete 2016-01-25 16:12:20 +01:00
Marc Zinnschlag
c1f0aa7260 added delete selection item to selection mode button menu 2016-01-25 14:55:02 +01:00
Rob Cutmore
fbca094dda Fix input validation in StartScriptCreator 2016-01-24 20:15:27 -05:00
Rob Cutmore
b93b97575e Improve start script creation (Fixes #3024) 
Improved start script creation by updating input to be a drop target
and adding auto-completion.
 2016-01-24 11:54:53 -05:00
scrawl
b0431833a1 Fix some defects reported by Coverity CI 2016-01-21 16:08:04 +01:00
Alexander "Ace" Olofsson
338f0cf53d Merge branch 'appveyor' of github.com:ace13/openmw into appveyor 2016-01-19 22:11:46 +01:00
Marc Zinnschlag
45e6974266 added select all and clear selection features 2016-01-19 14:25:20 +01:00
Marc Zinnschlag
4a02563708 Merge branch 'master' into buttons 
Conflicts:
	apps/opencs/view/render/instancemode.cpp
 2016-01-19 13:59:24 +01:00
Marc Zinnschlag
ecbcd6b171 allow mode buttons to setup the context menu 2016-01-19 12:52:30 +01:00
Marc Zinnschlag
eee972a1a4 added scene tool mode context menu feature 2016-01-19 12:47:11 +01:00
Marc Zinnschlag
0305ae3693 added selection mode UI 2016-01-19 12:17:13 +01:00
Aesylwinn
bbda5fe634 Removed hints from error messages and fixed naming to match conventions 2016-01-18 12:34:33 -05:00
Aesylwinn
1d86f705ba gmst verifier 2016-01-17 21:55:03 -05:00
Rob Cutmore
08b469c0d0 Remove unused forward declarations in filedialog.hpp 2016-01-17 14:18:49 -05:00
scrawl
fbf07133ea Document usage of node masks 2016-01-15 16:31:24 +01:00
scrawl
18320b2cd0 Move the Button enum to WorldSpaceWidget 2016-01-15 15:49:10 +01:00
scrawl
41c571d4f4 Merge branch 'master' of https://github.com/OpenMW/openmw into lighting 
Conflicts:
	apps/opencs/view/render/instancemode.cpp
 2016-01-15 15:46:10 +01:00
Marc Zinnschlag
c1901069be added instance mode sub-modes 2016-01-15 12:07:25 +01:00
scrawl
091ca9743e Do not write LandData twice (Fixes #3140) 2016-01-14 16:41:50 +01:00
Marc Zinnschlag
55627c0853 handling drops into cells that do not exist or are not shown 2016-01-14 13:20:01 +01:00
Marc Zinnschlag
6eba647a9d added accessor function for cell selection in paged worldspace 2016-01-14 13:19:37 +01:00
scrawl
458a305bff OpenCS: add lighting mask 2016-01-11 23:14:43 +01:00
scrawl
7f967153ef OpenCS: create light sources 2016-01-11 23:10:16 +01:00
scrawl
e7bb8878f3 OpenCS: add a mask for particle systems 2016-01-11 23:10:16 +01:00
scrawl
ad2145b463 OpenCS: use a separate enum for the toggle buttons 2016-01-11 23:10:16 +01:00
scrawl
fb849014bd Pass the fallback map to CSMWorld::Data 2016-01-11 23:10:16 +01:00
scrawl
11496b8075 Read fallback settings in OpenCS 2016-01-11 23:10:16 +01:00
Marc Zinnschlag
5b9d6cce98 made drop distance configurable 2016-01-11 09:03:02 +01:00
Marc Zinnschlag
7dd7be7f0e make scenes drop target for referenceables 2016-01-10 08:56:15 +01:00
Marc Zinnschlag
466f91db67 Fixed wrong GMST name for newly created game files (Fixes #3132) 2016-01-06 13:10:09 +01:00
scrawl
daa94cc50e Fix cppcheck warnings 2016-01-03 20:19:38 +01:00
Alexander "Ace" Olofsson
fe241be26c Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor 2015-12-24 11:27:02 +01:00
Alexander "Ace" Olofsson
2142d0d2d6 Make Qt5 happy 2015-12-24 02:48:00 +01:00
Marc Zinnschlag
2162f21550 Merge branch 'drop' 2015-12-20 10:18:05 +01:00
Aesylwinn
9bd14215d7 Expanded inventory check to creatures and NPCs 2015-12-19 22:02:39 -05:00
Aesylwinn
4c14117761 Added checks to verifier for container inventories 2015-12-19 20:03:00 -05:00
Marc Zinnschlag
102397067c added interface for per edit-mode drop handling 2015-12-18 14:04:53 +01:00
Marc Zinnschlag
37a72d1ea6 reject unsuitable drops to WorldspaceWidget earlier 2015-12-18 12:38:45 +01:00
Marc Zinnschlag
6b626c2954 spelling fixes 2015-12-17 13:06:37 +01:00
scrawl
6ee7c61667 CSMPrefs: fix deadlock in toColor() 2015-12-15 19:33:28 +01:00
Marc Zinnschlag
9c7bbd667b Merge branch 'usersettings' 2015-12-15 14:58:04 +01:00
Marc Zinnschlag
be19da189a fixed user settings not being saved when last document window is closed while user settings window is still open 2015-12-15 14:56:29 +01:00
Marc Zinnschlag
d6bd2cb1f0 changed name of openmw-cs user settings file 2015-12-15 14:51:25 +01:00
Marc Zinnschlag
c646533448 removed old user settings system 2015-12-15 12:49:55 +01:00
Marc Zinnschlag
67cf260144 final batch of changing over user settings usage to the new system 2015-12-15 12:44:04 +01:00
Marc Zinnschlag
44925e9fc8 fixed records settings (Text Only wasn't updating) 2015-12-15 12:26:08 +01:00
Marc Zinnschlag
591564566c made user settings access thread-safe 2015-12-15 12:19:48 +01:00
Marc Zinnschlag
ecbd68a19b third batch of changing over user settings usage to the new system 2015-12-15 10:40:00 +01:00
Marc Zinnschlag
a3a2c2f476 second batch of changing over user settings usage to the new system 2015-12-14 17:38:33 +01:00
scrawl
fb9f5f8fe8 Fix typo 2015-12-14 01:36:53 +01:00
Marc Zinnschlag
cf9fa0e0e9 first batch of changing over user settings usage to the new system 2015-12-12 14:49:16 +01:00
Marc Zinnschlag
0ffe4290fb workaround for MOC's lack of namespace awareness 2015-12-12 12:05:56 +01:00
Marc Zinnschlag
04a11679fb added category update function 2015-12-12 11:58:53 +01:00
Marc Zinnschlag
3a5238bebc changed the settingChanged signature to accommodate queued connections 2015-12-11 12:06:20 +01:00
Marc Zinnschlag
8245b9e439 added interface for querying settings 2015-12-11 11:50:06 +01:00
Marc Zinnschlag
31b105ad9e improved settings layout 2015-12-11 11:32:55 +01:00
Marc Zinnschlag
a907b4ab15 made Setting class non-abstract 2015-12-11 11:22:15 +01:00
Marc Zinnschlag
73ffdd5ac5 added colour settings 2015-12-11 11:15:14 +01:00
Marc Zinnschlag
590d6eba9b added enum settings 2015-12-10 17:33:14 +01:00
Marc Zinnschlag
8050eba83b added a few comments 2015-12-10 13:33:44 +01:00
Marc Zinnschlag
b0fb6d56f1 added bool settings 2015-12-10 13:28:48 +01:00
Marc Zinnschlag
9ca5a1b647 added double settings 2015-12-10 10:58:38 +01:00
Marc Zinnschlag
c61d717e41 added integer settings 2015-12-08 17:21:58 +01:00
Marc Zinnschlag
c158224314 fixed a faulty include 2015-12-08 12:09:53 +01:00
Marc Zinnschlag
5e40b4d2e8 page switching mechanism 2015-12-08 12:04:45 +01:00
Marc Zinnschlag
0dc3d10112 some simplification 2015-12-08 09:56:42 +01:00
scrawl
07b064f616 Rename to lowerCaseInPlace 2015-12-07 22:49:15 +01:00
scrawl
4dd4c5394b Broken lower-casing fix 2015-12-07 22:30:37 +01:00
scrawl
42d68eb7fb Build fix 2015-12-07 22:29:57 +01:00
Marc Zinnschlag
b37a2ac09c user settings categories 2015-12-06 12:06:28 +01:00
Marc Zinnschlag
36ce8f97d7 basic framework for new user settings system 2015-12-06 11:18:31 +01:00
scrawl
f962ce0bbe Don't link against unnecessary OSG libraries 2015-11-29 19:56:43 +01:00
scrawl
35fa1f5865 Not found Land Textures are no longer a fatal error (Bug #3037) 
Log warning message and show the default texture when encountering invalid ESM::LandTexture references.
 2015-11-27 21:57:24 +01:00
Marc Zinnschlag
99500f4021 make initial size of script error panel configurable (Fixes #2996) 2015-11-21 14:28:40 +01:00
Marc Zinnschlag
f5c61ee616 remember script error panel height per scriptsubview 2015-11-21 14:19:14 +01:00
Marc Zinnschlag
26640d17eb do not adjust error panel height if panal was already open 2015-11-21 12:52:32 +01:00
Marc Zinnschlag
1093a53cf9 hide script error list when there are no errors (Fixes #2867) 2015-11-21 12:45:11 +01:00
Marc Zinnschlag
b74b274ac0 Removed validator for filenames in OpenMW-CS (Fixes #2918) 2015-11-21 12:14:57 +01:00
Marc Zinnschlag
e0e9e7f8c2 adjusted startup warning message for recent improvements regarding loading/saving 2015-11-21 11:56:24 +01:00
Marc Zinnschlag
020b3add94 Merge branch 'openmw-37' 2015-11-17 09:54:49 +01:00
scrawl
eb2f16d682 Support for loading .osg mesh format 2015-11-16 23:26:43 +01:00
scrawl
af4923577b Fix double writing of Dialogue NAME in OpenCS 2015-11-15 16:04:52 +01:00
Marc Zinnschlag
de98ee0062 Merge remote-tracking branch 'scrawl/esm_rewrite' 2015-11-14 14:25:08 +01:00
Nikolay Kasyanov
014a2fc0e9 OS X: do not override Qt plugin path 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
4e3bbe01b6 OS X: disable glTexStorage2D because of OSG/driver issue 
See http://forum.openscenegraph.org/viewtopic.php?p=65276#65276 for the details.
 2015-11-14 13:50:01 +01:00
scrawl
1402a16702 SceneWidget: change the threading model to DrawThreadPerContext 
Performs much better because we can break frame early, running cull in parallel with last frame's draw.
 2015-11-13 21:00:51 +01:00
Marc Zinnschlag
b0d79ee790 Merge branch 'tooltip' 2015-11-13 11:40:10 +01:00
Marc Zinnschlag
63ee37d914 added 3D scene tooltips 2015-11-13 11:39:57 +01:00
scrawl
b8e11cf197 Merge commit 'pull/upstream/678' into HEAD 
Conflicts:
	apps/esmtool/record.cpp
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
	apps/openmw/mwworld/store.cpp
	components/esm/loadland.cpp
	components/esm/loadland.hpp
 2015-11-13 01:34:36 +01:00
Marc Zinnschlag
8b01f1f6fb added instance tooltips 2015-11-12 15:09:43 +01:00