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
b939fd440e
added replace all button
2015-04-16 20:11:14 +02:00
Marc Zinnschlag
36ce2d61f4
consider lock mode when replacing
2015-04-16 19:02:03 +02:00
Marc Zinnschlag
4951fc477c
added replace function
2015-04-16 18:50:22 +02:00
scrawl
b0ea51a5c8
Colour conversion utility
2015-04-11 20:09:40 +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
scrawl
af67de73a5
Delete shiny
2015-04-01 17:06:31 +02:00
Marc Zinnschlag
a9a8b5ad47
improved performance of CSVRender::Cell::addObjects by bypassing Qt model
2015-03-31 14:25:27 +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
6d165dabb6
improved layout of report table
2015-03-29 18:21:18 +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
scrawl
00deacc27e
OpenCS: lighting modes
2015-03-28 21:26:16 +01:00
scrawl
232e34bddd
OpenCS: port lighting toolbar, fix multiple context GL objects issue
2015-03-28 20:15:17 +01: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
13a4fb3fdc
make return key press in search input trigger a new search
2015-03-28 13:05:18 +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
scrawl
bb32c761df
*very* early texture manager, need a lot more thought to design this properly
2015-03-28 02:27:59 +01:00
scrawl
322fcdc2d3
Transform world space particles when attaching to a node
2015-03-28 00:30:49 +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
e3bfbcb44b
OpenCS: connect navigation button to OSG camera manipulators
2015-03-26 00:55:58 +01:00
scrawl
1edccdbe55
OpenCS: apply visibility flags to osg node
2015-03-26 00:27:39 +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
scrawl
46cbec9a4a
Add skinning auto-detection in nifosg loader
2015-03-25 15:39:41 +01:00
Marc Zinnschlag
78c6268891
added search class and search box widget
2015-03-25 11:56:14 +01:00
scrawl
36ad40827b
Move parent node attachment out of nifloader
2015-03-23 16:17:40 +01:00
scrawl
d6dea31b88
OpenCS: Use a CompositeViewer with multiple views instead of multiple viewers
...
Fixes the rendering glitches, turns out that multiple osgViewers were never an intended use case.
2015-03-23 15:55:57 +01:00
scrawl
5a582e7eb7
Reintroduce showMarkers flag
2015-03-23 01:57:14 +01:00
scrawl
15f9c1ddcf
NiBSPArrayController works
2015-03-21 23:10:52 +01:00
scrawl
4957ceeb1d
Refactor controllers, now part of the scene graph as UpdateCallbacks
...
Practical benefits:
- The controller update is now run automatically
- Creating an instance of a scene graph should now work properly using the defined copy constructors
2015-03-20 19:51:54 +01:00
scrawl
af27a10b0c
OpenCS: preliminary port of PreviewWidget to OSG
2015-03-20 16:22:33 +01:00
scrawl
34d503017a
OpenCS: Set up an osgQt GraphicsWindow in SceneWidget
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
Marc Zinnschlag
413b35de6c
moved search menu item from view to edit
2015-03-19 21:03:24 +01:00