mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 19:53:54 +00:00
Code Issues Releases Wiki Activity
13366 commits 108 branches 66 tags 133 MiB
Commit graph

872 commits

Author SHA1 Message Date
scrawl
1699759d12 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/view/render/cell.cpp
 2015-04-19 02:29:16 +02:00
Marc Zinnschlag
38ce074a62 Merge branch 'replace' 2015-04-16 20:11:25 +02:00
Marc Zinnschlag
4951fc477c added replace function 2015-04-16 18:50:22 +02:00
Marc Zinnschlag
3f4f008c51 another fix to display type handling 2015-04-10 13:27:34 +02:00
Marc Zinnschlag
3b408b6427 sorting out some Display enum mixup 2015-04-04 19:55:53 +02:00
Marc Zinnschlag
66c866aec9 fixed search result formatting 2015-03-31 13:02:12 +02:00
Marc Zinnschlag
cb6caf5e39 added search-related user settings 2015-03-30 22:30:33 +02:00
Marc Zinnschlag
4928e3705f highlight (bold) search string in results 2015-03-30 12:52:08 +02:00
scrawl
34934f016a Remove obsoleted OpenCS settings and comment non-ported settings 2015-03-30 01:51:50 +02:00
Marc Zinnschlag
46ccd27a6d improved find result text 2015-03-29 18:16:43 +02:00
Marc Zinnschlag
e8091c4e7e added field column to report table 2015-03-29 15:28:31 +02:00
Marc Zinnschlag
416b8165cd moved getColumnId function from IdTable to IdTable base and made it virtual 2015-03-29 15:28:11 +02:00
Marc Zinnschlag
a8cdd30124 added ID column to report table 2015-03-29 13:55:31 +02:00
Marc Zinnschlag
4042b12013 changed data structure for report model 2015-03-29 13:43:11 +02:00
Marc Zinnschlag
1ec0db231c add a separate display type for ID column 2015-03-28 14:48:06 +01:00
Marc Zinnschlag
c5f1c2127d extend global search to all record and reference tables 2015-03-28 14:36:28 +01:00
Marc Zinnschlag
8e9365741f make search sub-views re-usable (clear before starting a new search) 2015-03-28 12:53:01 +01:00
Marc Zinnschlag
eaaf816dd3 simplified search rules 2015-03-28 12:05:49 +01:00
Marc Zinnschlag
128ccd8151 improved search type naming 2015-03-28 11:54:32 +01:00
Marc Zinnschlag
babefacbfa improved message text in search results 2015-03-27 19:10:45 +01:00
Marc Zinnschlag
705ee67265 fixed hints getting mixed up with message text 2015-03-27 18:55:48 +01:00
scrawl
236d628884 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/documentmanager.cpp
	components/CMakeLists.txt
	components/bsa/resources.cpp
	components/nif/data.hpp
	components/nif/node.cpp
	components/nifogre/mesh.hpp
	components/nifogre/ogrenifloader.cpp
	components/nifogre/particles.cpp
 2015-03-27 17:30:48 +01:00
Marc Zinnschlag
23cf859fee added search stages (cell table only for now) 2015-03-27 16:33:54 +01:00
scrawl
99e1720980 Add SceneManager and clone utility 2015-03-26 18:02:51 +01:00
scrawl
72400747f2 OpenCS: preliminary port of cell rendering to OSG 2015-03-25 23:35:10 +01:00
scrawl
aedafe651a OpenCS: delete physicssystem, will be replaced with OSG picking 2015-03-25 19:08:09 +01:00
Marc Zinnschlag
78c6268891 added search class and search box widget 2015-03-25 11:56:14 +01:00
scrawl
af27a10b0c OpenCS: preliminary port of PreviewWidget to OSG 2015-03-20 16:22:33 +01:00
scrawl
40fc097722 OpenCS: use the new VFS, restored resource tables 2015-03-20 16:22:33 +01:00
scrawl
49c2da27b3 OpenCS compiles and runs again (no rendering) 2015-03-19 17:21:15 +01:00
Marc Zinnschlag
d053c62032 setting up global search operation and subview 2015-03-17 12:30:47 +01:00
scrawl
4d0bb6329a Fix incorrect reference check 
This check was broken for exterior cells (empty cell id).

It was superfluous anyway. A CellRef is owned by the cell it is in, so the cell must always exist.
 2015-03-16 01:50:57 +01:00
Marc Zinnschlag
cf077dcf5d Merge remote-tracking branch 'cc9cii/fix-hide-overload-warn' 2015-03-14 14:25:49 +01:00
Marc Zinnschlag
55bd0c728e Merge branch 'threadfix' 2015-03-14 12:00:35 +01:00
Marc Zinnschlag
c0dfad23b3 Fixed editor operation multi-threading (Fixes #923) 2015-03-14 12:00:24 +01:00
cc9cii
17e6244bd6 Yet more warnings suppressed. 2015-03-14 12:42:46 +11:00
cc9cii
fd86076db3 More warning fixes. 2015-03-14 08:09:19 +11:00
cc9cii
4f6c772437 Fix more warnings. 2015-03-14 06:36:35 +11:00
cc9cii
488bc76da5 Fix saving land data. 2015-03-13 22:06:55 +11:00
cc9cii
589b0b9171 Add saving land and land textures. Should resolve Bug #2447. 2015-03-13 08:01:48 +11:00
Marc Zinnschlag
8e37e9a14a removed redundant functions 2015-03-12 10:51:50 +01:00
Marc Zinnschlag
8a8db8bc24 Merge remote-tracking branch 'cc9cii/editor-clone-fix' 2015-03-12 10:45:51 +01:00
cc9cii
dc9af19dcf Don't use C++11 features. 2015-03-12 08:28:26 +11:00
Scott Howard
e2ef8c4022 fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
cc9cii
28259f914c Remove potential memory leak. 2015-03-11 10:49:21 +11:00
cc9cii
43ec933b7b Revert to the original clone() method. Create a new copy method for modified records. 2015-03-10 09:45:35 +11:00
cc9cii
8ac7b77d36 For RefId's, modify a copy of the base record rather than modifying the record directly. 2015-03-10 06:51:54 +11:00
cc9cii
8b3adec3ec Added a missing copy constructor. 2015-03-09 21:25:41 +11:00
cc9cii
f90cdec53b Remove default parameters from the implementation. 2015-03-09 16:24:35 +11:00
cc9cii
6087a18c94 Implement clone() using a new Record constructor. 2015-03-09 14:58:07 +11:00