2694 commits

Author	SHA1	Message	Date
scrawl	3663511cdb	Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/opencs/CMakeLists.txt extern/ogre-ffmpeg-videoplayer/CMakeLists.txt	2015-06-16 19:53:41 +02:00
Stanislav Bas	2c1ca33a20	Refactor Enum- and DataDisplayDelegate code	2015-06-16 15:39:54 +03:00
Stanislav Bas	0ffb2bc6bc	Proper size hint for EnumDelegate	2015-06-16 14:18:47 +03:00
Marc Zinnschlag	62c5f185d7	Merge remote-tracking branch 'cc9cii/master'	2015-06-16 12:30:21 +02:00
cc9cii	6a47ea9a67	fix typo	2015-06-16 13:09:44 +10:00
cc9cii	cccf6c6bdd	Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644.	2015-06-16 12:48:45 +10:00
Stanislav Bas	d906a9d7d1	DataDisplayDelegate doesn't draw a text outside a table cell	2015-06-16 00:19:51 +03:00
scrawl	609e146a22	Build fixes for windows	2015-06-15 16:48:18 +02:00
Marc Zinnschlag	675884ba30	Merge remote-tracking branch 'smbas/feature-soundgen-verifier'	2015-06-15 16:25:11 +02:00
scrawl	412e001edb	Fix simulation time reset in OpenCS when opening a new view	2015-06-14 19:19:23 +02:00
scrawl	cad18969e3	Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/openmw/mwmechanics/aicombat.cpp apps/openmw/mwmechanics/aitravel.cpp	2015-06-14 16:32:13 +02:00
Marc Zinnschlag	e17f7ac81a	Merge remote-tracking branch 'cc9cii/master'	2015-06-14 12:50:10 +02:00
scrawl	f70250a296	Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/launcher/CMakeLists.txt apps/opencs/CMakeLists.txt apps/opencs/view/render/worldspacewidget.cpp apps/openmw/CMakeLists.txt components/CMakeLists.txt extern/osg-ffmpeg-videoplayer/CMakeLists.txt	2015-06-13 21:11:24 +02:00
Stanislav Bas	281088c93b	Add check for an empty sound field to SoundGens verifier	2015-06-13 19:47:39 +03:00
Stanislav Bas	2c15ad5e0c	Add SoundGens verifier	2015-06-13 19:08:31 +03:00
cc9cii	5b6984d8d8	Set modified flag in setData() operations, without which the changes weren't being saved. Should resolve Bug #2656.	2015-06-13 22:24:22 +10:00
Marc Zinnschlag	c560f8b8a2	Merge remote-tracking branch 'smbas/fix-regionmap-colors'	2015-06-13 11:33:12 +02:00
cc9cii	b81454d226	Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668.	2015-06-13 14:37:47 +10:00
Stanislav Bas	a294e24a85	Reset ColorEditor checked state after the popup is hidden	2015-06-13 00:37:10 +03:00
Stanislav Bas	b06d1f008f	Redraw the color editor immediately after the color is updated	2015-06-12 23:34:08 +03:00
Stanislav Bas	f19d07b404	Rename ColorPickerDelegate to ColorDelegate	2015-06-12 23:09:31 +03:00
Stanislav Bas	650e37dba1	RegionMap uses proper colors	2015-06-12 22:31:12 +03:00
Stanislav Bas	e516d37cbf	MapColourColumn::set() uses the correct color value	2015-06-12 22:03:47 +03:00
Stanislav Bas	caeba1b887	Draw the frame around rect in ColorEditor and ColorPickerDelegate	2015-06-12 20:34:35 +03:00
Stanislav Bas	eb5180ba86	Save selected color in a model when picking is finished	2015-06-12 18:33:55 +03:00
scrawl	e13a938896	Add support to build with Qt5 (Task #2665) ... Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.	2015-06-12 15:13:42 +02:00
Stanislav Bas	4096d2851c	Remove outdated ColorEditButton files	2015-06-12 14:09:25 +03:00
scrawl	cf95d3fc35	Refactor cmake scripts, reducing the amount of find_package(Boost)	2015-06-12 01:45:19 +02:00
scrawl	fc5176dc38	Refactor cmake scripts, reducing the amount of find_package(Qt4)	2015-06-11 23:38:08 +02:00
scrawl	d03880fbf0	Compile fix for old boost versions	2015-06-11 23:25:26 +02:00
Stanislav Bas	e257c915bf	Add color picker popup to choose color	2015-06-12 00:00:23 +03:00
scrawl	6051c47eef	Fix for incorrect QString -> path conversion	2015-06-11 22:36:19 +02:00
Marc Zinnschlag	8d22d26669	Merge remote-tracking branch 'cc9cii/scrollbar-fix'	2015-06-10 18:51:14 +02:00
Stanislav Bas	ef88b28c26	Create a custom item editor for color columns	2015-06-09 15:20:50 +03:00
Stanislav Bas	d7fb497255	Color values are displayed as colored rectangles in tables	2015-06-08 21:33:23 +03:00
Alexander "Ace" Olofsson	cd42448cd6	Windows build fixes and CMakeLists cleanup ... Adds some flags necessary to build and link with OSG. This also moves LTO and MP switches to user-accessible options, and actually applies the generated CXXFLAGS to the project. Since the generation happens after the subdirectories are added.	2015-06-08 15:41:39 +02:00
cc9cii	893ad11be1	Fix missing columns in tables. Should resolve Bug #2624. ... - Using Flag_Table in filterAcceptsColumn() does not work. - Workaround by not allowing nested columns in sorting and filtering.	2015-06-08 08:04:18 +10:00
scrawl	e66e9916db	Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/opencs/CMakeLists.txt apps/opencs/model/doc/document.cpp apps/opencs/model/doc/document.hpp	2015-06-07 15:23:54 +02:00
Marc Zinnschlag	d90aff4303	Merge remote-tracking branch 'smbas/feature-id-completion'	2015-06-07 08:52:44 +02:00
Stanislav Bas	d63b01dde3	Checkboxes in the table view use a combobox editor	2015-06-06 15:41:25 +03:00
cc9cii	5c37079f0c	Include only the columns that are visible for sorting. Should resolve Bug #2611.	2015-06-05 12:19:21 +10:00
scrawl	958b34771a	Fix clang warnings about 'typename' outside of a template	2015-06-04 20:42:05 +02:00
scrawl	4bb3cbf0fb	Remove last remains of Ogre	2015-06-03 23:04:35 +02:00
scrawl	1ba3fa4169	Remove leftovers of the old OpenCS navigation	2015-06-03 18:11:34 +02:00
Stanislav Bas	bd46ddcf47	Correct the return type in IdTree::data() for Display_Role	2015-06-03 15:51:34 +03:00
Stanislav Bas	b25cc6bc55	IdCompletionManager uses Display type instread of ColumnId for creating completers	2015-06-03 12:01:13 +03:00
scrawl	974fda5bde	Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: extern/sdl4ogre/sdlwindowhelper.cpp	2015-06-03 03:18:29 +02:00
scrawl	cd47dff196	Minor cleanup	2015-06-03 03:03:16 +02:00
scrawl	cdd0623009	Terrain rendering	2015-06-03 01:35:41 +02:00
Stanislav Bas	4e759370de	Change Display_String to the proper display type where appropriate	2015-06-03 00:02:53 +03:00
Stanislav Bas	f84c36b500	CommandDelegate: extract a display type from a model if it isn't specified	2015-06-03 00:00:39 +03:00
Stanislav Bas	2c4025ec72	Rename the method isCompleterExistFor() to hasCompleterFor()	2015-06-02 00:26:31 +03:00
Marc Zinnschlag	b866e11873	Merge remote-tracking branch 'cc9cii/pathgrid-check-extra'	2015-06-01 16:49:28 +02:00
Stanislav Bas	dbe61115b2	Fix the mistyping header guard in the idcompletiondelegate.hpp	2015-05-31 18:22:43 +03:00
Stanislav Bas	e636101725	Add missing new lines at the ends of files	2015-05-31 18:18:49 +03:00
Stanislav Bas	9e405b69fa	Create the custom completer popup to avoid the problem with the wrong height of the default popup	2015-05-31 16:43:28 +03:00
Stanislav Bas	994c6833bc	Add missing columns for the ID completion	2015-05-30 23:54:16 +03:00
Stanislav Bas	e943d17b29	Check for invalid index in IdTable::flags(). This prevents QCompleter from crashes	2015-05-30 22:01:21 +03:00
Stanislav Bas	602f33bd91	Add ColumnId role to the IdTree data methods	2015-05-30 21:30:25 +03:00
Stanislav Bas	5e8718d8b2	Add the ID completion delegate factory to the delegate factory collection	2015-05-30 18:37:13 +03:00
Stanislav Bas	33e36ee922	Add the ID completion delegate	2015-05-30 15:51:33 +03:00
Stanislav Bas	19cc6b83e5	Integrate the Id completion manager into the Document class	2015-05-30 15:40:23 +03:00
Stanislav Bas	87a1f9f9aa	Add ID completion manager	2015-05-30 15:31:44 +03:00
cc9cii	c4aa3d3ee3	Revert user preference setting checks until a thread safe method is worked out. The OSX namespace issue is retained.	2015-05-30 21:12:47 +10:00
Marc Zinnschlag	88d5aed62d	removed code that interfered with the default window size on Linux (Fixes #2568)	2015-05-30 12:05:35 +02:00
cc9cii	01eba7b721	Extra check for thread affinity.	2015-05-30 19:17:42 +10:00
cc9cii	76196d815d	Update user preference setting value via an event message queue.	2015-05-30 18:58:33 +10:00
Marc Zinnschlag	17747a2dd9	Merge remote-tracking branch 'cc9cii/highlight-colours'	2015-05-30 10:23:27 +02:00
cc9cii	0aaac59cc3	Return to startup dialog when the open/create action is cancelled. Should resolve Bug #2588.	2015-05-30 08:37:58 +10:00
cc9cii	9cbda0ffad	Allow users to select syntax highlighting colours. Should resolve Feature #2507.	2015-05-29 22:20:43 +10:00
cc9cii	393cee406f	Use signals for user preference setting updates.	2015-05-29 19:28:25 +10:00
cc9cii	ce421b230b	Move scrollbar to newly opened subview. Should resolve Bug #2576.	2015-05-29 14:07:41 +10:00
cc9cii	734e52d1c8	Move the user preference check to the preparation step before the running of the operation.	2015-05-29 06:40:40 +10:00
cc9cii	9ad69d9085	Allow wheel events in dialogue spin box types only when they have focus. Should resolve Feature #2585.	2015-05-29 05:44:35 +10:00
cc9cii	6821cb4133	Use the tree model rather than a nested proxy for the dialogue only listing (i.e. non table) items. Should resolve Bug #2586. ... - QDataWidgetMapper requires the rootindex to be set, which was not possible with the nested proxy model.	2015-05-29 05:40:20 +10:00
cc9cii	00c165d3a5	Add user preference option to check unused or redundant pathgrid points. Also resolve namespace clash issue in osx.	2015-05-28 08:44:17 +10:00
Marc Zinnschlag	baaf801521	Merge remote-tracking branch 'cc9cii/loadcell-fix'	2015-05-27 19:31:25 +02:00
cc9cii	674a124bc6	Don't use local type as a template parameter.	2015-05-27 22:27:32 +10:00
cc9cii	3a31468af0	Pathgrid record verifier. Feature #2000.	2015-05-27 22:12:11 +10:00
cc9cii	6966555377	Object verifier check to see if the script used by that object actually exists. Should resolve Bug #2582.	2015-05-27 15:55:00 +10:00
cc9cii	b7044ac119	Fix crash loading some addon files. Should resolve Bug #2583. ... - This may be a bug within QSortFilterProxyModel - It isn't 100% clear what aspects of these addon files cause the issue, but something about them causes Qt to lose track of its internal row numbers.	2015-05-27 10:27:57 +10:00
Marc Zinnschlag	99dbd82a44	Merge remote-tracking branch 'cc9cii/fix-dialogue-subview-crash'	2015-05-26 14:37:50 +02:00
Marc Zinnschlag	ae1a606876	Merge remote-tracking branch 'cc9cii/selective-refresh'	2015-05-26 14:32:03 +02:00
cc9cii	f06ddd47c4	Return the correct range for a given topic. Should resolve Bug #2569.	2015-05-26 17:38:22 +10:00
cc9cii	aafcaf32c5	Qualify the scope of Flag_Dialogue. (another one)	2015-05-26 16:12:54 +10:00
cc9cii	2f29c2c077	Qualify the scope of Flag_Dialogue.	2015-05-26 13:58:58 +10:00
cc9cii	ec808843c3	Do not rebuild the dialogue subview unless required. Should resolve Bug #2581. ... The loss of focus was caused by each text change (i.e. character entry) to a QPlainTextEdit resulting in dataChanged() signal which in turn rebuilt the dialogue subview. Changes in this commit include: - Do not send signal to update entire row if only a single item has changed. - Do not rebuild the dialogue subview unless the data item that triggers a conditional display is changed. - Add column flags to indicate whether the data in this column should rebuild the dialogue subview. - Return the correct flags for nested columns - Disable, rather than grey out, checkbox that does not apply to creature levelled list	2015-05-26 13:35:10 +10:00
cc9cii	95f740ec40	Give CSVWorld::EditWidget::mMainWidget a chance to clean up its children. Should resolve Bug #2578.	2015-05-25 22:28:41 +10:00
Marc Zinnschlag	5f41ef4809	Merge remote-tracking branch 'cc9cii/master'	2015-05-25 11:10:17 +02:00
cc9cii	3c82e6d034	Retrieve the correct index for the type of record being un-deleted.	2015-05-25 16:36:42 +10:00
cc9cii	e6d2821b78	Refresh table filters when the model is updated. Should resolve Bug #2579.	2015-05-25 09:15:07 +10:00
Marc Zinnschlag	6402b82823	Merge remote-tracking branch 'cc9cii/master'	2015-05-24 21:15:36 +02:00
Marc Zinnschlag	07ce7b95cf	Merge remote-tracking branch 'cc9cii/npc-additional-data'	2015-05-24 21:15:26 +02:00
cc9cii	22420c3a83	Close DialogueSubView if the corresponding record is deleted. Should resolve Bug #2575. ... - ToDo: Doesn't seem to shrink the widget width properly (when horizontal scrollbar is active)	2015-05-24 23:19:06 +10:00
cc9cii	c721e340d8	Merge branch 'master' into npc-additional-data ... Conflicts: apps/opencs/view/world/dialoguesubview.cpp	2015-05-24 19:24:27 +10:00
cc9cii	21af1913e1	Ensure ColumnId names are unique.	2015-05-24 19:18:54 +10:00
scrawl	da24e298ee	Fix -Wreorder warnings	2015-05-23 22:44:00 +02:00
scrawl	22f01b1232	Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/launcher/graphicspage.cpp apps/opencs/editor.cpp apps/opencs/model/doc/document.cpp apps/opencs/view/render/cell.cpp apps/opencs/view/render/mousestate.cpp apps/opencs/view/render/textoverlay.cpp apps/opencs/view/render/worldspacewidget.cpp apps/openmw/mwclass/creature.cpp apps/openmw/mwclass/npc.cpp apps/openmw/mwgui/inventorywindow.cpp apps/openmw/mwgui/loadingscreen.cpp apps/openmw/mwgui/mapwindow.cpp apps/openmw/mwgui/pickpocketitemmodel.cpp apps/openmw/mwgui/waitdialog.cpp apps/openmw/mwmechanics/combat.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwrender/globalmap.cpp apps/openmw/mwworld/physicssystem.cpp apps/openmw/mwworld/refdata.cpp apps/openmw/mwworld/scene.cpp apps/openmw/mwworld/worldimp.cpp components/sdlutil/sdlinputwrapper.cpp extern/shiny/Main/Factory.cpp extern/shiny/Main/MaterialInstance.cpp extern/shiny/Main/Platform.cpp extern/shiny/Main/ShaderSet.cpp	2015-05-23 20:33:44 +02:00
Marc Zinnschlag	53b4c15d85	Merge remote-tracking branch 'smbas/master'	2015-05-23 16:02:09 +02:00
Marc Zinnschlag	b58b7a89ed	Merge remote-tracking branch 'rohit-n/reorder2'	2015-05-23 09:19:03 +02:00
Stanislav Bas	a5183aefbe	Add record state tracking to the ModifyCommand (Fix #2555)	2015-05-22 23:53:25 +03:00
Rohit Nirmal	396fba7fa9	Silence -Wreorder warnings, and remove -Wno-reorder.	2015-05-21 22:46:44 -05:00
Stanislav Bas	d27b92e9f1	Avoid gaps between local indexes in RefIdData after removal of records (Fix #2545)	2015-05-22 00:57:47 +03:00
cc9cii	aecd9a275e	Remove debugging comments.	2015-05-22 06:09:55 +10:00
cc9cii	2fc964ca73	Grey out disabled entries rather than hiding them.	2015-05-21 13:11:07 +10:00
cc9cii	1d0b8587a1	Use HasWater bit flag rather than mWaterInt bool.	2015-05-20 21:14:17 +10:00
scrawl	820f4a2688	Fix light direction	2015-05-20 02:07:18 +02:00
cc9cii	b27a879352	Add the remaining Cell data for editing with dialogue subview. Should resolve Bug #2551. ... - NOTE: the interior water flag and water level logic needs reviewing - does not automatically disable region names for interiors without mQuasiEx flag - Colour values can't be entered as RGB - Region names are not drop down menus	2015-05-19 22:01:40 +10:00
cc9cii	aeec1be8b3	Fix occasional crash with DialogueSubView, e.g. when deleting a row of a subtable.	2015-05-19 19:19:52 +10:00
cc9cii	0ecfd9119f	Add the remaining Race data for editing with dialogue subview. Should resolve Bug #2546.	2015-05-19 06:56:38 +10:00
Marc Zinnschlag	5176e3d84b	Merge remote-tracking branch 'cc9cii/mainwindow-scrollbar'	2015-05-18 16:46:03 +02:00
cc9cii	7494340b66	Add the remaining NPC data for editing with dialogue subview. Should resolve Bug #2547.	2015-05-18 22:08:36 +10:00
cc9cii	cfcfb17320	Updates to optional horizontal scrollbar. ... - move SizeHintWidget out to separate files - remove redundant logic in view.cpp - remove sizehint from dialogue subview - add tooltip hints in user preferences	2015-05-18 07:12:02 +10:00
Marc Zinnschlag	7b207a7954	added shortcut for closing subviews (Fixes #2558)	2015-05-17 14:31:53 +02:00
Marc Zinnschlag	93c3bb3716	fixed subview-closing related crash (Fixes #2564)	2015-05-17 14:27:17 +02:00
cc9cii	e9ca022162	Add an optional horizontal scrollbar to the main view window. Should resolve Feature #2549. ... - TableSubviews and DialogueSubviews now provide size hints - Option to stop the growth of the window at the screen boundary for multi-monitor setup with different resolution. - Three options: Grow Only: No change to current, except the use of size hints Scrollbar Only: Simple addition of a scrollbar, the view window does not grow Grow then Scroll: Window grows as per current behaviour. The scrollbar appears once it cannot grow any further.	2015-05-17 20:45:13 +10:00
Marc Zinnschlag	60a835c16d	stop script editor from eating undo/redo shortcuts (Fixes #2506)	2015-05-16 10:18:11 +02:00
Marc Zinnschlag	27000fb36b	don't reject single precision float values in value filters (Fixes #2533)	2015-05-15 14:09:35 +02:00
cc9cii	28617c8beb	Update table size status for removed rows.	2015-05-15 12:33:31 +10:00
cc9cii	f92d801faf	Jump to the added/cloned record (or undeleted record in case of undo). Should resolve Feature #2541. Controlled by radio buttons on user preferences settings.	2015-05-15 12:32:29 +10:00
Marc Zinnschlag	c9d519f36c	focus search input field when opening search subview (Fixes #2534)	2015-05-14 14:48:29 +02:00
cc9cii	538e550b2b	Fix for Bug #2543. Spells magic effect id typo.	2015-05-13 10:30:44 +10:00
scrawl	47758c11cd	Readded collision objects and movement physics	2015-05-12 03:02:15 +02:00
cc9cii	2b84598e85	Remove duplicated but reversed map.	2015-05-10 20:52:29 +10:00
cc9cii	ab21c0551c	Provide a default encoding when changing to "Function".	2015-05-10 13:34:45 +10:00
scrawl	c31b416ba1	Move physicssystem to a new mwphysics module	2015-05-10 01:09:00 +02:00
cc9cii	587efcfe9d	Use better initial value type. Fix exception while saving values.	2015-05-10 07:49:18 +10:00
cc9cii	5fb269336f	Don't use initializer list	2015-05-10 07:02:08 +10:00
cc9cii	d6ecc64168	Aggregate types can't be static - osx compiler appears to be more strict.	2015-05-10 06:17:57 +10:00
cc9cii	69317095be	For compiling with osx - try using a different syntax for initializing the static maps.	2015-05-10 05:55:50 +10:00
cc9cii	0c461f4424	Add TopicInfos special conditions table.	2015-05-09 21:21:16 +10:00
Marc Zinnschlag	1c334a01ce	one more referenceable that escaped the change into object	2015-05-04 19:04:06 +02:00
scrawl	c1edc30ad7	Dead code removal	2015-05-04 03:29:12 +02:00
scrawl	e1f4a7f647	Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/openmw/engine.cpp apps/openmw/mwgui/mainmenu.cpp apps/openmw/mwgui/windowmanagerimp.cpp apps/openmw/mwinput/inputmanagerimp.cpp apps/openmw/mwrender/animation.cpp apps/openmw/mwrender/debugging.cpp apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/sky.cpp components/nif/nifkey.hpp components/nif/nifstream.hpp components/nifbullet/bulletnifloader.cpp components/nifogre/ogrenifloader.hpp libs/openengine/bullet/physic.cpp libs/openengine/gui/manager.cpp	2015-05-04 02:41:50 +02:00
scrawl	5a759f8b0d	GUI cleanup fix	2015-05-03 18:35:29 +02:00
Marc Zinnschlag	048d7be87c	Adjusted terminology for references/referenceables in OpenMW-CS user-interface (Fixes #2516)	2015-05-03 16:35:10 +02:00
Marc Zinnschlag	d873c2c603	focus main input widget when bringing up creator bar (Fixes #2514)	2015-05-02 13:20:42 +02:00
Marc Zinnschlag	0bf28a6eab	Merge remote-tracking branch 'cc9cii/leveled-list-edit'	2015-05-01 18:44:14 +02:00
Marc Zinnschlag	efde061c7c	Merge remote-tracking branch 'cc9cii/script-dialog'	2015-05-01 09:12:39 +02:00
cc9cii	b04aeb6aad	Fixed levelled lists flags - now bit masks represented by tick boxes in the dialogue subview.	2015-05-01 12:14:09 +10:00
cc9cii	081f3ed263	Make font setting selection immediate.	2015-05-01 06:08:04 +10:00
cc9cii	7b4a9f1ea1	Moved script editor settings to its own section.	2015-04-30 06:32:03 +10:00
cc9cii	8e49ccc2f4	Added user setting options.	2015-04-29 20:24:17 +10:00
cc9cii	7f2bd01f79	Handle plugins that has 0x00 for levelled list types, for example Ravenloft v5.02d, to use 0x01.	2015-04-29 12:08:11 +10:00
Rohit Nirmal	997347b01e	Silence -Wreorder warnings.	2015-04-28 18:48:02 -05:00
cc9cii	28048c0bf3	Simple line numbering and fixed-width fonts for the script dialogue. Based on Qt examples. Should resolve Bugs #2505 and #2512.	2015-04-28 23:07:42 +10:00
Marc Zinnschlag	f1c0847897	Merge remote-tracking branch 'cc9cii/moveref'	2015-04-28 14:07:18 +02:00
cc9cii	49884f54f7	Fix loading moved references.	2015-04-28 08:07:01 +10:00
Marc Zinnschlag	ae5de0cb2b	implemented additional check before performing replace (make sure data hasn't been changed since the search)	2015-04-27 22:43:09 +02:00
Marc Zinnschlag	6fac4c5dd9	made user settings handling in search sub view more consistent	2015-04-26 13:31:35 +02:00
Marc Zinnschlag	dab650a3d5	remove rows from result table after a successful replace (configurable via user settings)	2015-04-26 13:26:20 +02:00
cc9cii	33a8cd245a	Fix crash with gcc/linux.	2015-04-26 21:02:50 +10:00
Marc Zinnschlag	2ef8103cc7	fixed ReportModel::RemoveRows view updates	2015-04-26 12:36:05 +02:00
cc9cii	889749a493	Allow non-empty mOriginalCell (case where a moved ref is moved again)	2015-04-26 15:44:40 +10:00
cc9cii	b54e5714c9	Revert rebasing the moved refs to the new cell, because the original ref may still be referred by a mod.	2015-04-26 14:55:40 +10:00
cc9cii	e0d061c37b	Implemented a workaround for saving moved refs.	2015-04-26 12:32:07 +10:00
cc9cii	7673be6d0f	Loading of moved refs complete.	2015-04-26 12:18:23 +10:00
cc9cii	74b98f7178	Fixed initial loading of moved refs.	2015-04-26 11:35:46 +10:00
cc9cii	2e2d6e04fe	gcc friendly version.	2015-04-25 17:43:29 +10:00
cc9cii	dcce59f76c	Pass MovedCellRef info to RefCollection. Still has debugging code.	2015-04-25 17:20:02 +10:00
cc9cii	932f1f9fbd	Alternative way of finding UniversalId without bloating IdTree.	2015-04-25 15:26:32 +10:00
cc9cii	acb800b8f9	Resolve merge issues and fix typos.	2015-04-25 09:39:37 +10:00
cc9cii	f1a58994c6	Merge branch 'master' into moveref ... Conflicts: apps/opencs/model/world/columns.hpp apps/opencs/model/world/commands.cpp apps/opencs/model/world/commands.hpp apps/opencs/model/world/ref.cpp apps/opencs/view/world/dialoguesubview.cpp apps/opencs/view/world/dialoguesubview.hpp apps/opencs/view/world/util.cpp components/esm/cellref.hpp	2015-04-25 06:52:53 +10:00
cc9cii	8aaa74a983	Undo for delete operation in referenceables table. Implemented by saving UniversalId::Type in DeleteCommand.	2015-04-25 06:06:11 +10:00
cc9cii	a6925683c6	Off by one error - can't delete the last element of a refid collection.	2015-04-25 06:04:39 +10:00
Marc Zinnschlag	6fcf4ea9e3	In ModifyCommand replace proxy model with the source model (Fixes #2498)	2015-04-23 14:24:43 +02:00
cc9cii	82bc666e00	Make AI package items to be editable when a new row is added.	2015-04-22 09:25:55 +10:00
Marc Zinnschlag	f7c7aeecb3	fixed missing state update when starting a global search	2015-04-21 14:44:51 +02:00
cc9cii	f326b14604	Allow Qt to cleanup its signals.	2015-04-21 10:25:19 +10:00
cc9cii	a836446d22	Fix assert() triggering due to bad index being passed.	2015-04-19 21:07:45 +10:00
cc9cii	18162557b0	TopicInfos result script are now displayed in dialogue subviews.	2015-04-19 13:31:16 +10:00
cc9cii	cb3396643b	Back to the old layout of dialoguesubview.	2015-04-19 10:32:06 +10:00
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
cc9cii	8b1ac451ac	More warning fixes.	2015-04-19 09:42:44 +10:00
cc9cii	dd1e4e8b69	Remove gcc/clang warnings.	2015-04-19 08:58:52 +10:00
cc9cii	7561b195ab	Revert auto expansion of enums as it was interfering with row based operations. Fix default values of magic effect skill & attributes.	2015-04-18 15:28:34 +10:00
cc9cii	48a6006202	Prevent enum delegates from auto expanding when opening a dialogue subview.	2015-04-18 14:16:55 +10:00
cc9cii	5e84858c0b	Change the cell edit selection behaviour of the nested tables. Also auto-expand the enum delegate selections (both main table as well as nested table in the dialogue subview)	2015-04-18 10:07:53 +10:00
cc9cii	f88be67556	Convert AI package type and AI wander repeat columns in the nested tables to use enum delegate	2015-04-18 09:37:19 +10:00
cc9cii	e241fb0104	Convert clothing/armour part reference type column in the nested tables to use enum delegates.	2015-04-18 08:31:08 +10:00
cc9cii	e00d7f72ac	Convert magic effects ID and Range columns in the nested tables to use enum delegate	2015-04-18 08:09:14 +10:00
cc9cii	befd6fe658	Convert magic effects Skills column in the nested tables to use enum delegates.	2015-04-18 07:15:40 +10:00
cc9cii	0aff188d8d	Fix enum delegate from adding a command to the undo stack when the value has not changed.	2015-04-18 07:13:02 +10:00
cc9cii	d6c2cff381	Convert magic effects Attribute column in the nested tables to use enum delegates.	2015-04-17 21:33:25 +10:00
cc9cii	c41b4b84a6	Cleanup post merge.	2015-04-17 13:45:45 +10:00
cc9cii	47d5eac290	Merge branch 'master' into NonTableFields ... Conflicts: apps/opencs/model/world/columnbase.cpp apps/opencs/model/world/columnbase.hpp apps/opencs/model/world/idtable.hpp	2015-04-17 12:37:34 +10:00
cc9cii	32e73c3deb	Add creature/item levelled lists (non table items) to dialogue subview.	2015-04-17 11:50:19 +10: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
cc9cii	a2d824bfa6	Changes to support dialogue only items but in a list view via QDataWidgetMapper.	2015-04-17 01:27:36 +10:00
cc9cii	1c7ed795c2	Add creature/item levelled lists to dialogue subview.	2015-04-13 22:21:27 +10:00
cc9cii	513c3a47cb	Add clothing/armor part reference table to dialogue subview.	2015-04-13 21:08:23 +10:00
cc9cii	526b53fce0	Add AI packages table to dialogue subview. Also minor bug fixes.	2015-04-13 14:14:00 +10:00
cc9cii	60e5ff8811	Remove duplicated checks and exceptions.	2015-04-13 08:03:30 +10:00
cc9cii	221c57adee	Fix template syntax and travis warnings.	2015-04-13 07:05:06 +10:00
cc9cii	a976dca27b	Changed over the remaining RefId adapters. Fixed issue where map entries were overwriting the same key...	2015-04-13 06:39:38 +10:00
cc9cii	7ccf53e750	Changed over inventory adapters. Fixed a few places where modified records were not set properly.	2015-04-12 20:03:55 +10:00
cc9cii	25261a60e5	Add potion magic effects table to dialogue subview. Integration of the adapters to RefIdCollection is incomplete.	2015-04-12 18:29:42 +10:00
cc9cii	ef84e553be	Renamed some stuff.	2015-04-12 13:48:23 +10:00
cc9cii	41b368a759	Moved templated code around a bit.	2015-04-12 10:52:01 +10:00
cc9cii	4b9c9bf095	Simplify and relocate nested column definitions.	2015-04-12 08:52:09 +10:00
cc9cii	8dab2f9b14	Use human friendly strings in magic effects subtable.	2015-04-12 07:46:32 +10:00
scrawl	b0ea51a5c8	Colour conversion utility	2015-04-11 20:09:40 +02:00
cc9cii	a460409555	Add Spells and Enchantment magic effects table to dialogue subview. The numbers are not yet converted to strings.	2015-04-11 21:43:25 +10:00
cc9cii	49fd5afdf6	Add birthsign spells table to dialogue subview.	2015-04-11 19:17:17 +10:00
cc9cii	f939648736	Add race spells table to dialogue subview.	2015-04-11 19:05:03 +10:00
cc9cii	9c75dad1ac	Why is gcc so unkind?	2015-04-11 18:21:08 +10:00
cc9cii	ea9563ad92	Add faction reactions table to dialogue subview. Fix gcc compile issues. Change nested columns to generic ones where possible.	2015-04-11 17:51:30 +10:00
cc9cii	88bc62e054	Add Region sounds table to dialogue subview.	2015-04-11 15:55:26 +10:00
cc9cii	5da2f53bec	Code reorganisation to prepare for nested sound table in regions.	2015-04-11 13:54:05 +10:00
cc9cii	ce7e2e06c1	Fix editor being created for a non-editable item.	2015-04-11 13:11:20 +10:00
cc9cii	a632b2cfeb	Fix editing "ID" column within nested tables in dialogue subview.	2015-04-11 11:27:48 +10:00
cc9cii	1220369da3	Changes as per feedback comments.	2015-04-11 11:26:29 +10:00
Marc Zinnschlag	3f4f008c51	another fix to display type handling	2015-04-10 13:27:34 +02:00
cc9cii	7990fab708	Fix crash when exiting via window manager on some systems.	2015-04-10 18:09:33 +10:00
cc9cii	9a564f5062	Fix undo for pathgrid points add/remove.	2015-04-10 15:28:09 +10:00
cc9cii	bc9dad3ff2	Add index columns and fix edge indexing for point deletion.	2015-04-10 07:31:01 +10:00
cc9cii	330920daa8	Fix off by one error(s).	2015-04-09 21:41:46 +10:00
cc9cii	be9f94b766	Adjust edge indexes when adding/removing points. Fix some travis warnings.	2015-04-09 21:23:02 +10:00
cc9cii	23db79ebab	Fix for more gcc differences.	2015-04-09 20:53:41 +10:00
cc9cii	3a46512b7f	Attempt to account for gcc differences.	2015-04-09 20:15:38 +10:00
cc9cii	787cef1386	DialogueSubView layout update for dialogues with nested tables only.	2015-04-09 19:39:09 +10:00
cc9cii	860754e460	Minor formatting cleanup and comments.	2015-04-09 19:33:42 +10:00
cc9cii	05210d7f21	Nested table support for Pathgrids.	2015-04-09 19:29:03 +10:00
cc9cii	bdf0d8db22	Re-organise the inheritance structure once more in preparation for adding Pathgrid tables.	2015-04-09 19:11:19 +10:00
Marc Zinnschlag	3b408b6427	sorting out some Display enum mixup	2015-04-04 19:55:53 +02:00
cc9cii	745eae9c10	Tweak DialogueSubView layout for nested tables.	2015-04-03 12:44:32 +11:00
cc9cii	8eaf6b068c	Adding missing file.	2015-04-02 21:02:17 +11:00
cc9cii	851effb0e3	Merge branch 'master' into NonTableFields	2015-04-02 20:43:48 +11:00
cc9cii	83bcc8d451	Reorganised class inheritance structure of collections, columns and idtable model.	2015-04-02 20:19:15 +11: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
cc9cii	ece34a1baa	Workaround for crash while exiting the application.	2015-03-30 18:14:07 +11:00
cc9cii	619b5206cd	More consistency nit pick.	2015-03-30 16:41:55 +11:00
cc9cii	29ef08bb75	Spelling and other consistencies nit pick.	2015-03-30 11:53:33 +11:00
cc9cii	3d280a6ba5	Fixed the display issues of the nested tables in the dialogue subview. Needs further work but usable for now.	2015-03-30 11:19:37 +11: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
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	19e8280f45	OpenCS window title unicode fixes	2015-03-16 15:45:41 +01:00
Marc Zinnschlag	fc6c9d7ff2	Merge remote-tracking branch 'scrawl/opencs-hint-fix'	2015-03-16 08:41:36 +01:00
Marc Zinnschlag	79339ebff1	Merge remote-tracking branch 'scrawl/opencs-crashfix'	2015-03-16 08:40:02 +01:00
cc9cii	76adb64e20	Compilation fix after merging commt e30f24	2015-03-16 13:21:02 +11:00
scrawl	6ff2523d8a	Fix for line focus when clicking on a verifier script error ... - setFocus() on the script editor, otherwise setting the text cursor has no effect. - setFocus() must be done after the widgets are created/shown, or the newly created widgets will "steal" the focus again. - Missing useHint in case subviews are reused.	2015-03-16 03:07:37 +01:00
scrawl	295ca86ac1	OpenCS FileDialog crash fix ... The file dialog would crash when no game file is selected and an addon file with no dependency is checked, then unchecked.	2015-03-16 02:43:02 +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
cc9cii	5eefcd862f	Merge branch 'master' into NonTableFields ... Conflicts: apps/opencs/model/tools/tools.cpp apps/opencs/model/world/columnbase.cpp apps/opencs/model/world/commands.cpp apps/opencs/model/world/commands.hpp apps/opencs/model/world/idtable.hpp apps/opencs/model/world/refidadapter.cpp apps/opencs/model/world/refidadapter.hpp apps/opencs/view/world/dialoguesubview.hpp	2015-03-16 10:30:54 +11: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	15b9a628ac	Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods.	2015-03-14 19:41:55 +11: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
Marc Zinnschlag	26955dc6d3	Merge remote-tracking branch 'cc9cii/editor-var-edit'	2015-03-12 10:44:55 +01:00
cc9cii	418025e0a2	Add missing editor type to the dialogue. Should resolve Bug #2437.	2015-03-12 13:10:25 +11: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
cc9cii	128371c902	Copy base data to modified.	2015-03-08 15:50:50 +11:00
cc9cii	a54ab153b0	Cloned references should be considered "Base" rather than "Modified". Should fix bug #2429.	2015-03-08 10:05:10 +11:00
cc9cii	ca21181483	Fix typo to get table display working.	2015-03-07 11:42:50 +11:00
Marc Zinnschlag	907ac5ef7f	Merge remote-tracking branch 'scrawl/master'	2015-03-06 19:24:15 +01:00
cc9cii	727b68dd15	Reduce difference with the master branch where possible.	2015-03-06 19:20:50 +11:00
cc9cii	6d6ff8c6a4	Resolved compile issues, but not fully working.	2015-03-06 14:36:13 +11:00
scrawl	0fda1cdd53	Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs	2015-03-06 02:36:12 +01:00
Marc Zinnschlag	0b70fdac57	added start script verifier	2015-03-05 11:24:01 +01:00
cc9cii	fb2ba7610c	Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields ... Conflicts: apps/opencs/CMakeLists.txt apps/opencs/model/doc/document.cpp apps/opencs/model/world/columnbase.hpp apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/commands.cpp apps/opencs/model/world/idtable.cpp apps/opencs/view/world/dialoguesubview.cpp apps/opencs/view/world/dialoguesubview.hpp apps/opencs/view/world/util.cpp	2015-03-04 11:22:42 +11:00
Marc Zinnschlag	1ed606065c	save start script records	2015-03-03 16:11:00 +01:00
Marc Zinnschlag	a148b851c0	added start script table	2015-03-03 14:32:12 +01:00
Marc Zinnschlag	4e1c086d6a	load start up script records	2015-03-03 14:31:59 +01:00
Marc Zinnschlag	455684981c	Merge remote-tracking branch 'scrawl/master'	2015-03-03 11:08:15 +01:00
cc9cii	66ef9d237c	Another try to make it work with gcc/travis.	2015-03-03 10:12:40 +11:00
cc9cii	7c0f5b72c5	Add enum namespace to workaround travis.	2015-03-03 08:31:06 +11:00
scrawl	f6509fe53e	Another crash fix for land record without data	2015-03-02 22:23:00 +01:00
cc9cii	a8427c2efb	Do not add NAME subrecords while saving magic effects or scripts.	2015-03-03 07:36:11 +11:00
Marc Zinnschlag	928bb234ce	Merge remote-tracking branch 'cc9cii/editor-gamefiles'	2015-03-02 19:57:46 +01:00
cc9cii	1ee6153940	Remove unnecessary boolean passing between objects.	2015-03-02 06:51:31 +11:00
Marc Zinnschlag	64938b3796	Merge remote-tracking branch 'cc9cii/saving-skil'	2015-03-01 10:36:26 +01:00
Marc Zinnschlag	59c7fe28d9	Merge remote-tracking branch 'naclander/master'	2015-03-01 10:23:08 +01:00
cc9cii	5ff66ad40b	Fix Bug #2402. SKIL records should not have NAME subrecord.	2015-03-01 13:09:23 +11:00
cc9cii	c4625b94e5	Fix OpenCS crashing since commit 9d6145 by showing gamefiles if the content selector was created from OpenCS.	2015-03-01 12:52:43 +11:00
scrawl	3158d34abb	Fix for incorrect OpenCS verifier warning: pcvampire and pcwerewolf are not required, pcyear does not exist at all.	2015-02-25 20:25:41 +01:00
Bret Curtis	5672c86924	Rename window title for OpenMW-CS	2015-02-24 23:37:53 +01:00
Nathan Aclander	6d7e1242cc	Fixed incorrect casting ... Only cast to strings things that are ints. Also I missed an mFactionRank to cast.	2015-02-20 20:18:31 -08:00
Nathan Aclander	539e8276c8	Silenced clang warning by converting int to string	2015-02-19 19:05:19 -08:00
cc9cii	e5c1c31648	Ignore case when detecting legacy extensions (.esm or .exp). Should resolve bug #2227.	2015-02-16 14:27:25 +11:00
Marc Zinnschlag	6cc9fa2b3f	Merge remote-tracking branch 'slothlife/cmake-release-build-fix'	2015-02-15 09:52:13 +01:00
Alexander "Ace" Olofsson	a61019dfa8	Update referencecheck.cpp ... MSVC does not allow for the usage of 'and' or 'or' literals	2015-02-15 04:47:25 +01:00
Kamil Bar	3b7a23aa72	Fixed charge checks for light and other objects, corrected CellRef charge union comments	2015-02-13 13:11:10 +01:00
Kamil Bar	9628415e21	Missing change & changed comments to represent actual code	2015-02-13 12:16:46 +01:00
Kamil Bar	52a064afc3	Fixed charges checking	2015-02-13 12:13:40 +01:00
Kamil Bar	e1314d6211	Implement OpenCS reference validation (Feature #831)	2015-02-13 04:45:18 +01:00
slothlife	cfe81bafe8	Remove setting CMAKE_BUILD_TYPE to Debug ... Setting was causing single-target configurations (ninja, make) to incorrectly link vs debug runtimes on Windows.	2015-02-11 21:46:00 -06:00
Alexander "Ace" Olofsson	b714e5211d	Redefinition of default template argument ... Sometimes it's annoying how MSVC casually allows you to break C++ standards	2015-02-09 17:25:55 +01:00
Alexander "Ace" Olofsson	f77ae711e4	Fix template closer	2015-02-09 17:10:09 +01:00
Alexander "Ace" Olofsson	cfcaf4528f	Some more forward-declaring for OpenMW-CS	2015-02-09 16:50:34 +01:00
Nikolay Kasyanov	5534306eb3	Few rename fixes	2015-02-06 08:59:00 +02:00
scrawl	0b7b627443	CMake fix for opencs rename	2015-02-03 13:57:40 +01:00
Marc Zinnschlag	0557d45bd1	renamed opencs into openmw-cs	2015-02-03 13:18:03 +01:00
Alexander "Ace" Olofsson	62acb03735	More Ogre + recent Boost build fixes	2015-01-27 21:07:26 +01:00
Marc Zinnschlag	7f905470fa	fixed moved reference loading	2015-01-24 15:01:38 +01:00
Marc Zinnschlag	89998a6a03	save MVRF subrecords	2015-01-24 14:22:29 +01:00
scrawl	c7d15e6f74	Revert "Revert "Light charge handling fix"" ... This reverts commit b95748d044.	2015-01-23 15:33:39 +01:00
scrawl	b95748d044	Revert "Light charge handling fix" ... This reverts commit 5e0428243b.	2015-01-23 02:32:38 +01:00
Marc Zinnschlag	a97f599e65	fixed ref num saving in non-wide format	2015-01-22 13:41:09 +01:00
Marc Zinnschlag	fa4718283d	Merge remote-tracking branch 'scrawl/contentselector'	2015-01-21 15:23:38 +01:00
Marc Zinnschlag	cd62dbc5b7	Merge remote-tracking branch 'scrawl/essimporter'	2015-01-21 15:12:04 +01:00
scrawl	5e0428243b	Light charge handling fix	2015-01-21 01:59:45 +01:00
Marc Zinnschlag	9670e0881d	update reference's current cell when x/y-coordinates are modified	2015-01-16 15:17:52 +01:00
Marc Zinnschlag	561ddfa0c5	make column type accessable via the regular table model	2015-01-16 11:29:44 +01:00
Marc Zinnschlag	9603325b99	Merge remote-tracking branch 'origin/master'	2015-01-15 17:33:20 +01:00
Marc Zinnschlag	640d473866	Merge remote-tracking branch 'scrawl/master'	2015-01-15 17:33:08 +01:00
scrawl	6146a3843c	Merge remote-tracking branch 'upstream/coverity_scan' into HEAD	2015-01-15 15:59:57 +01:00
Marc Zinnschlag	c55e9b9c58	one more potential 0-pointer fix	2015-01-15 15:00:16 +01:00
Marc Zinnschlag	7615cbafce	create modify commands through command dispatcher	2015-01-15 14:24:33 +01:00
Marc Zinnschlag	706df3f881	silenced a coverity warning	2015-01-15 12:13:53 +01:00
Marc Zinnschlag	7b8e6f9dda	addressed potential 0-pointer issue	2015-01-15 12:04:23 +01:00
Marc Zinnschlag	f3c7532660	cleaned up some enum confusion	2015-01-15 12:01:59 +01:00
scrawl	b39cc0c8c8	Fix OpenCS window opening issue when config file doesn't exist ... It would attempt to create a zero-sized window (or even negative-sized, after subtracting the frame dimensions).	2015-01-15 02:49:54 +01:00
scrawl	f11ec653d0	Add setting for showing MRK nodes to NIF loaders ... This makes marker objects show up in OpenCS.	2015-01-13 17:29:25 +01:00
Marc Zinnschlag	320b994aef	keep original cell field empty, if reference is in modified	2015-01-10 12:35:59 +01:00
Marc Zinnschlag	e32402a040	handle moved references on load	2015-01-09 12:05:53 +01:00
Marc Zinnschlag	ba7b74217b	added original cell column to reference table	2015-01-05 15:20:47 +01:00
Marc Zinnschlag	3b534326ff	forbid manual editing of the cell field in reference records	2015-01-05 15:04:11 +01:00
Marc Zinnschlag	9f6a2d00e8	Merge remote-tracking branch 'thoronador/fix-uninitialized-members'	2015-01-02 18:17:25 +01:00
Marc Zinnschlag	bdc28c0523	Merge remote-tracking branch 'maqifrnswa/feature1325'	2015-01-02 18:14:42 +01:00
Scott Howard	f24c1845b6	remove pop-up message on load failure	2015-01-02 10:42:09 -05:00
Scott Howard	dece4e2640	remove unneeded includes	2015-01-01 22:54:32 -05:00
Scott Howard	03b39435f8	place user settings window at same location as mouse pointer	2015-01-01 22:50:35 -05:00
Scott Howard	ce7cef924e	when loading a file fails, pop-up critical window and highlight error text	2015-01-01 22:27:08 -05:00
Thoronador	44e01d0eaa	remove redundant initialization statement ... See https://github.com/OpenMW/openmw/pull/423#discussion_r22403388	2015-01-02 02:23:10 +01:00
Thoronador	91ff536460	fix uninit, #2	2015-01-02 00:26:45 +01:00
Thoronador	17fb7aa598	uninitialized stuff	2015-01-01 23:18:30 +01:00
scrawl	f931ba2efc	Fix some static analysis issues (coverity)	2014-12-24 15:45:12 +01:00
Marc Zinnschlag	e6307a5151	move cursor in scripteditor to position of error	2014-12-08 12:29:23 +01:00
Marc Zinnschlag	a64b741af2	store hints from operations in report model	2014-12-07 20:53:09 +01:00
Marc Zinnschlag	3a847732b4	abstracted message collection into a class	2014-12-07 18:57:47 +01:00
Marc Zinnschlag	6a67aba336	added double click with modifier actions in report table	2014-12-06 15:08:51 +01:00
Marc Zinnschlag	58f4cc882f	added remove action to report table context menu	2014-12-06 14:30:40 +01:00
Marc Zinnschlag	f2fc693325	added context menu to report table	2014-12-06 14:17:56 +01:00
Marc Zinnschlag	350b0cb93c	added hidden hint column to report model	2014-12-06 13:45:47 +01:00
Marc Zinnschlag	6c18a3b0b5	allow drags from report table	2014-12-06 13:19:43 +01:00
Marc Zinnschlag	7c59ea6296	added specialised report table	2014-12-06 13:01:55 +01:00
cc9cii	ab693f1f64	Workaround file lock being lost if the same file is closed elsewhere in the program (see https://svn.boost.org/trac/boost/ticket/3582)	2014-12-05 07:50:03 +11:00
cc9cii	8d0cca6cfc	Merge remote-tracking branch 'remotes/upstream/master' into single-instance ... Conflicts: apps/opencs/editor.cpp	2014-12-05 07:38:33 +11:00
Marc Zinnschlag	f771b95a15	Merge remote-tracking branch 'cc9cii/master'	2014-12-04 20:04:19 +01:00
cc9cii	6731afc79c	Use float for setting skill use values. Should resolve bug #2183.	2014-12-05 03:59:16 +11:00
cc9cii	07f10a0140	Use append syntax compatible with older versions of boost.	2014-12-05 01:32:20 +11:00
cc9cii	e67cf96250	Allow only one instance of OpenCS. Only tested on windows x64.	2014-12-05 01:09:42 +11:00
Marc Zinnschlag	f2d991505e	handle other Windows-specific path issues regarding OpenCS resources handling	2014-12-03 15:31:00 +01:00
Marc Zinnschlag	58b6e757e3	fixed another case folding problem regarding OpenCS resources handling	2014-12-03 15:24:37 +01:00
Marc Zinnschlag	406cf2b981	disable element visibility buttons that do not apply to the respective cell type	2014-12-02 11:17:39 +01:00
Marc Zinnschlag	cbcd6a26d5	memory leak fix	2014-12-01 22:57:32 +01:00
cc9cii	3b5cd286f6	Do not destroy overlay if it was never created (e.g. due to an Ogre exception).	2014-12-01 14:09:22 +11:00
cc9cii	64e1594b41	Move the destruction of global resources, being used by multiple documents, to the editor.	2014-12-01 14:08:27 +11:00
cc9cii	44b11163d1	Do not delete physics objects if it was never created (e.g. preview window)	2014-12-01 10:07:02 +11:00
cc9cii	2d229c70cb	Another missed null shared_ptr conversion for gcc.	2014-12-01 09:41:03 +11:00
cc9cii	9fb4b1f499	Initialise null shared_ptr	2014-12-01 08:15:17 +11:00
cc9cii	2720e5ea9d	Remove PhysicsManager singleton and use shared_ptr instead. Resolves the issue where sometimes destructors were called in an unexpected sequence resulting in a crash while exiting the application.	2014-12-01 06:44:12 +11:00
Marc Zinnschlag	db17dbe324	don't store esm readers for non-base content files	2014-11-30 18:04:18 +01:00
Marc Zinnschlag	4a9d2038fa	load land for non-base content files immediately	2014-11-30 14:33:39 +01:00
Marc Zinnschlag	e177b66c1d	moved fog button from unpaged worldspace to worldspace	2014-11-28 09:16:39 +01:00
Marc Zinnschlag	e04ead2bd5	new element visibility button icons	2014-11-28 09:14:02 +01:00
Marc Zinnschlag	50a489321f	updated run button	2014-11-27 09:27:29 +01:00
Marc Zinnschlag	d37ff8ec63	fixed missing tooltip update for toggle/mode-type buttons	2014-11-27 08:59:21 +01:00
cc9cii	936094ae95	Set range of spinbox types in dialogsubview.	2014-11-26 08:08:28 +11:00
cc9cii	31fdf49616	Use Qt exit function rather than system one.	2014-11-22 06:59:23 +11:00
cc9cii	911839bb91	Simplify detecting whether a universal id represents a referenceable type.	2014-11-21 06:48:42 +11: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	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
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
Marc Zinnschlag	b50fcd403b	renamed getElementMask to getVisibilityMask	2014-11-09 11:29:45 +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
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	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
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
cc9cii	e174428cc5	Minor tweaks.	2014-11-02 15:03:26 +11:00
cc9cii	1eed180a5c	Fix Gcc/MSVC differences with friend class. Invert camera derived direction.	2014-11-02 11:41:11 +11:00
cc9cii	a21958d007	Add option to move the mouse against the screen frame of reference.	2014-11-02 10:30:44 +11:00
cc9cii	89bb616cbc	Remove debugging code.	2014-11-02 08:33:32 +11:00
cc9cii	8b4651f055	Move mouse related functions and states out of WorldspaceWidget.	2014-11-02 08:22:27 +11:00
cc9cii	998982b16a	Keep physics engines until physics code is moved out of OEngine.	2014-11-01 21:04:53 +11:00
cc9cii	c6a2461fbd	Delay removing physics until the document is closed. Also other general cleanup.	2014-11-01 20:51:04 +11:00
cc9cii	1ee64c7087	Add missing files for multi-document support.	2014-11-01 19:12:22 +11:00
cc9cii	b328aa1fb9	Multiple document support.	2014-11-01 18:57:39 +11:00
cc9cii	057982b1f8	Fix Subview interface clutter by keeping a map of Scenewidgets.	2014-11-01 08:29:08 +11:00
cc9cii	e51d532795	Show drag movements of objects in multiple scene managers.	2014-11-01 07:39:58 +11:00
cc9cii	d6e67b248f	Fix deleting objects and scenewidgets.	2014-11-01 07:29:16 +11:00
cc9cii	ade7f09203	Keep track of terrain in physics engine. Should resolve crash exiting after opening multiple subviews of the same cell.	2014-11-01 00:03:09 +11:00
cc9cii	ac7acb2c22	Disable more debug code.	2014-10-31 22:21:24 +11:00
cc9cii	4f685092fb	Merge remote-tracking branch 'remotes/upstream/master' into mouse-picking	2014-10-31 22:05:24 +11:00
cc9cii	aa7b693a13	Remove debug settings and minor cleanup.	2014-10-31 22:04:10 +11:00
cc9cii	fbadaf55ee	Multiple SceneManagers per physics engine now working.	2014-10-31 21:50:57 +11:00
cc9cii	a2ac4c7650	Allow multiple scene managers per physics engine. Compiles but does not work properly.	2014-10-31 08:18:15 +11:00
cc9cii	0515159b74	Fix typo.	2014-10-29 23:38:19 +11:00
cc9cii	1741043f20	Revert to storing Scene Node names as the key in RigidBody. Allow moving objects up/down using scroll wheel or touchpad while dragging. Cleanup code a little.	2014-10-29 23:02:38 +11:00
Alexander "Ace" Olofsson	c1ce570e37	Use the enum value from Qt::KeyboardModifiers ... This fixes the windows build at least	2014-10-29 04:55:06 +01:00
cc9cii	792fbd119f	Resolve incorrect merge issues.	2014-10-29 10:43:55 +11:00
cc9cii	c990ed4335	Merge branch 'mouse-picking-state' into mouse-picking ... Conflicts: apps/opencs/view/render/pagedworldspacewidget.cpp apps/opencs/view/render/pagedworldspacewidget.hpp	2014-10-29 09:33:48 +11:00
cc9cii	6ca88dc541	Merge branch 'master' into mouse-picking ... Conflicts: apps/opencs/model/settings/usersettings.cpp	2014-10-29 09:28:23 +11:00
cc9cii	8e2a0ea90a	Implemented moving objects around x-y plane.	2014-10-29 08:13:13 +11:00
cc9cii	68b7532383	Move code to WorldspaceWidget so that UnpagedWorldspaceWidget can be supported.	2014-10-29 00:50:48 +11:00
cc9cii	5afaa0083f	Minimise false detection of grab & drag operation.	2014-10-28 06:42:33 +11:00
cc9cii	a01a921644	Experimental mouse event state machine for 3d editing, starting with drag & drop objects.	2014-10-28 06:01:19 +11:00
Marc Zinnschlag	e604fcf282	Merge branch 'double'	2014-10-27 09:56:52 +01:00
Marc Zinnschlag	6f4b753750	replaced regular function call from SubView to View with signal-slot-connection	2014-10-27 09:51:55 +01:00
Marc Zinnschlag	1aef9304e9	replaced the signal/slot user settings update with a regular function call	2014-10-27 09:44:18 +01:00
Marc Zinnschlag	b0a7b457f7	made double click actions in tables configurable	2014-10-27 09:32:02 +01:00
cc9cii	815e832dbb	Merge branch 'master' into mouse-picking-state	2014-10-27 18:57:42 +11:00
Marc Zinnschlag	275bf854ed	added new user setting: window/hide-subview (hide subview titlebar if there is only one subview in the window)	2014-10-27 08:57:18 +01:00
cc9cii	6c8320a638	More cleanup.	2014-10-27 12:09:20 +11:00
cc9cii	c2c33eac0f	Minor cleanup.	2014-10-27 08:26:01 +11:00
cc9cii	0b63ba5727	Move debug rendering code out of PhysicsSystem.	2014-10-27 08:08:33 +11:00
cc9cii	dd2c067e17	Cleanup for better legibility.	2014-10-27 06:50:51 +11:00
cc9cii	fb0f85c8db	Report terrain position on cursor position.	2014-10-26 21:15:47 +11:00
cc9cii	95683bc8c3	Add user interface for top level window status-bar setting (implementation already existed). For feature #854.	2014-10-26 15:04:52 +10:00
cc9cii	8b0dc88db8	Use the correct name for deleting objects.	2014-10-26 08:15:18 +11:00
cc9cii	b46df4034d	Cleanup bullet objects in the destructors.	2014-10-26 07:56:51 +11:00
Marc Zinnschlag	aad13e6bff	close view when closing last sub-view unless this view is the last view	2014-10-25 18:13:56 +02:00
Marc Zinnschlag	a9f5632afd	extended double click functionality in tables	2014-10-25 16:27:36 +02:00
cc9cii	9337d6533a	Add terrain collision. Support visibility mask for objects and terrain.	2014-10-25 22:09:19 +11:00
cc9cii	cc0acec64c	Add settings to enable/disable debug rendering of mouse picking.	2014-10-25 21:02:40 +11:00
cc9cii	dd9208afeb	Merge remote-tracking branch 'upstream/master' into mouse-picking	2014-10-25 10:59:17 +01:00
cc9cii	54a6897df8	Use QString rather than std::to_string	2014-10-24 20:43:29 +10:00
cc9cii	e5dd8d06a0	Store object reference id to RigidBody instead of scene node handles.	2014-10-24 21:18:29 +11:00
cc9cii	cb53e714f7	Convert PhysicsSystem to a singleton.	2014-10-24 19:14:02 +10:00
cc9cii	98ff3e7307	No physics or mouse picking for object preview.	2014-10-24 07:57:29 +11:00
Marc Zinnschlag	6ff41c6a00	intercept shift/ctrl double-clicks in tables	2014-10-23 11:28:58 +02:00
cc9cii	2f26fc1188	Avoid Ogre exceptions and null pointers.	2014-10-23 20:14:01 +11:00
cc9cii	39cd89a9af	Make gcc happy.	2014-10-23 18:51:31 +11:00
cc9cii	4d86371ca3	Minor refactoring and cleanup.	2014-10-23 15:35:01 +11:00
cc9cii	cca6d0a024	Fixed issue with mouse picking accuracy.	2014-10-23 12:43:06 +11:00
cc9cii	fdee3fd919	Added debug lines to show ray hit position. Added highlighting the Entity hit by the ray. Incorporated user setting far clip distance.	2014-10-23 06:59:14 +11:00
cc9cii	4b53b8658b	Debug rendering toggled by double clicking the right mouse button. Raycasting works, but inaccurate.	2014-10-22 07:11:04 +11:00
Marc Zinnschlag	843493e90a	fixed case-problem in OpenCS script compiler	2014-10-21 12:38:18 +02:00
Marc Zinnschlag	94ae222f0e	Merge branch 'settings'	2014-10-19 13:44:15 +02:00
Marc Zinnschlag	a5bbfff9e2	another layout correction	2014-10-19 13:43:40 +02:00
Marc Zinnschlag	5a1ce4943e	added advance 3D rendering user settings section	2014-10-19 13:41:56 +02:00
cc9cii	8bcd415cca	Fix duplicate calls to OEngine. Use correct position, rotation and scale. Debug draw not working.	2014-10-19 07:25:54 +11:00
cc9cii	03a30c3f1d	Experimental, compiles but does not work.	2014-10-18 06:16:48 +11:00
Marc Zinnschlag	2106893563	silenced a compiler warning regarding null pointer dereferencing	2014-10-17 15:47:31 +02:00
Marc Zinnschlag	49938182e8	silenced a compiler warning regarding null pointer dereferencing	2014-10-17 15:46:07 +02:00
Marc Zinnschlag	a3c894c1e2	Merge branch 'cellmarker'	2014-10-17 14:26:16 +02:00
Marc Zinnschlag	994159fafd	fixed broken iterator	2014-10-17 14:23:37 +02:00
Marc Zinnschlag	8a05c0e5c0	fixed overlay singleton	2014-10-17 14:23:27 +02:00
Marc Zinnschlag	ba46bcad40	Revert "Don't allow viewing non-existent cells from the regionmap." ... This reverts commit 7cdab41501.	2014-10-17 13:52:21 +02:00
Marc Zinnschlag	4b921c3876	user settings cleanup	2014-10-17 13:49:33 +02:00
Marc Zinnschlag	ed44f3ec7d	added tooltip support to user settings UI	2014-10-16 16:22:36 +02:00
scrawl	e413bebe99	Toggle addon files when activated or clicked on checkbox rather than clicked (Fixes #1980)	2014-10-16 15:07:51 +02:00
Marc Zinnschlag	f4894deff1	removed special value text from spin boxes (broken feature, not used anyway)	2014-10-16 14:47:55 +02:00
Marc Zinnschlag	dddd20ba1e	added default values for display format settings	2014-10-16 14:31:13 +02:00
Marc Zinnschlag	799cd87b52	name convention and spelling fixes	2014-10-16 14:24:17 +02:00
Marc Zinnschlag	e27da6a0d4	removed settings file mixup	2014-10-16 13:59:34 +02:00
Marc Zinnschlag	c94c1adaf3	split off settings page label from internal section name	2014-10-16 13:48:07 +02:00
cc9cii	7cdab41501	Don't allow viewing non-existent cells from the regionmap.	2014-10-16 07:36:47 +11:00
cc9cii	094f046087	Convert OverlaySystem to a OpenCS style singleton.	2014-10-16 07:29:46 +11:00
Marc Zinnschlag	720ba2c0d8	split off settings label from internal settings name	2014-10-15 13:39:53 +02:00
Marc Zinnschlag	daf7cab416	refactored section handling	2014-10-15 12:38:17 +02:00
Marc Zinnschlag	219fbd427f	unclutter user settings declarations	2014-10-15 12:13:22 +02:00
Marc Zinnschlag	868fdfba51	reclaiming some unused space	2014-10-15 11:07:40 +02:00
Marc Zinnschlag	e20fa209cc	user settings UI layout improvements	2014-10-15 11:02:41 +02:00
cc9cii	aff6f6fdb2	Setup OverlaySystem after Ogre::Root but before initialisation as per the API documentation.	2014-10-15 18:48:01 +11:00
cc9cii	1d0ac3b4df	Delete Ogre::OverlaySystem before Ogre::Root	2014-10-15 07:02:19 +11:00
cc9cii	8cebfc411b	Minor visual improvements.	2014-10-14 17:34:10 +11:00
cc9cii	994420aa57	Singleton wrapper for Ogre OverlaySystem.	2014-10-14 13:21:43 +11:00
cc9cii	57b337d368	Fix corruption issue when the initial scenewidget is closed before subsequent ones. Also place the label closer to the terrain height at the center of the cell, should reduce the perception of the label jumping around too much.	2014-10-14 11:43:56 +11:00
Marc Zinnschlag	e23a32c44f	some cleanup	2014-10-13 15:26:47 +02:00
Marc Zinnschlag	8062faa51a	fixed member variable access in OpenCS script compiler (Fixes #2011)	2014-10-13 15:25:27 +02:00
Marc Zinnschlag	02acf60c0b	added tooltips for scopes in creator bar	2014-10-13 14:24:27 +02:00
cc9cii	961867e39f	Hide overlay if off screen.	2014-10-13 20:58:07 +11:00
cc9cii	313aed078e	Merge remote-tracking branch 'remotes/upstream/master' into QtOgre ... Conflicts: apps/opencs/CMakeLists.txt	2014-10-13 20:45:30 +11:00
Marc Zinnschlag	eb45793eab	Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage'	2014-10-13 11:03:03 +02:00
cc9cii	43838ccf01	Remove override (c++11)	2014-10-13 16:42:50 +11:00
cc9cii	e58e5c2bf5	Update overlays independently from multiple viewports.	2014-10-13 15:57:01 +11:00
Thoronador	46496a35a1	fix uninitialized pointer variable in CSVDoc::SubView class	2014-10-12 23:42:44 +02:00
cc9cii	47c5bc9a19	Set bounding box on manual objects rather than creating meshes.	2014-10-13 07:42:43 +11:00
scrawl	9323f96211	Move terrainstorage to opencs_units_noqt	2014-10-12 17:18:27 +02:00
cc9cii	758ce0ed98	Various fixes as per feedback comments.	2014-10-12 21:15:50 +11:00
cc9cii	809b8c6d5b	Conflicts: ... apps/opencs/view/render/pagedworldspacewidget.cpp	2014-10-12 05:54:21 +11:00
Thoronador	ab364c9440	fix some more uninitialized class member fields	2014-10-11 00:50:32 +02:00
Thoronador	51cd2bb5d9	remove unused/double variable from CSMWorld::Column class	2014-10-11 00:15:36 +02:00
Thoronador	a799353f60	fix uninitialized fields in CSMDoc::Operation class	2014-10-11 00:06:50 +02:00
Thoronador	deb6452e0d	fix uninitialized pointer fields in CS::Editor class	2014-10-10 23:57:10 +02:00
Marc Zinnschlag	21b16f8425	Merge branch 'tables' ... Conflicts: apps/opencs/CMakeLists.txt apps/opencs/model/world/data.cpp apps/opencs/model/world/data.hpp	2014-10-10 16:11:54 +02:00
Marc Zinnschlag	23e969eae7	fixed pathgrid saving again (previous fix was incomplete)	2014-10-10 15:29:21 +02:00
cc9cii	3e5027abbb	Incorporate terrain height to labels and camera.	2014-10-10 13:36:16 +11:00
cc9cii	bfd10a03c0	User configuration manager's resource directory.	2014-10-10 13:35:14 +11:00
cc9cii	406135ee96	Merge remote-tracking branch 'upstream/master' into terrain	2014-10-09 23:47:30 +01:00
Marc Zinnschlag	c85735abed	Merge remote-tracking branch 'scrawl/terrain'	2014-10-09 12:56:42 +02:00
cc9cii	13f028e27b	Avoid out of range exceptions.	2014-10-09 07:01:18 +11:00
cc9cii	b3ef7a71e2	Different implementation of update overlay fix.	2014-10-09 05:56:44 +11:00
scrawl	8786fb639f	Implement terrain rendering in OpenCS (Fixes #1597)	2014-10-08 17:17:31 +02:00
cc9cii	5d8022bdc5	Update overlay upon control elements button signal.	2014-10-08 21:22:12 +11:00
cc9cii	e2560de05a	Don't use windows path separator.	2014-10-08 08:08:03 +11:00
cc9cii	4fd7537155	Use default sort until a more generic sort that uses numeric order can be implemented.	2014-10-08 07:59:21 +11:00
cc9cii	e1197e75bc	Handle change of names or regions to dynamically update the overlay.	2014-10-08 07:54:22 +11:00
cc9cii	7836ee9ab6	Fixed crash exiting internal cells. Better starting camera position for external cells.	2014-10-07 21:18:32 +11:00
cc9cii	a161ad3cd5	Sort cell id column by numerical order.	2014-10-07 20:11:44 +11:00
cc9cii	0cccdfd114	Added description below the cell id (name if exists, or region)	2014-10-07 19:35:28 +11:00
cc9cii	7640875f9d	More cleanup.	2014-10-07 10:34:30 +11:00
cc9cii	f48f841d31	Add full path for Ogre Overlay headers (workaround for osx).	2014-10-07 06:40:28 +11:00
cc9cii	0197f7088f	Remove extra frame rendering after enabling/disabling the label.	2014-10-07 06:04:13 +11:00
cc9cii	b3e09cce00	Remove mouse picking code.	2014-10-06 22:29:45 +11:00
cc9cii	972c789060	Add Ogre Overlay path to cmake.	2014-10-06 20:25:09 +11:00
cc9cii	cc6153eb8e	Removed temporary key bindings.	2014-10-06 14:21:44 +11:00
cc9cii	6d687993b8	Remove C++11 stuff.	2014-10-06 14:08:35 +11:00
cc9cii	e38417e662	Visibility mask implemented. For testing rigged up 'M' and 'N' keys for show/hide. ... The scenewidget doesn't receive any mouse events for about a second after toggling the visibility flag. No idea what is causing this.	2014-10-06 13:55:36 +11:00
cc9cii	dbb2781817	Mouse click on text overlay implemented. Removed 'm' keybinding for overlay toggle. White lines not visible by default.	2014-10-06 08:20:09 +11:00
Marc Zinnschlag	2d3ffc4483	fixed pathgrid saving	2014-10-05 15:12:12 +02:00
cc9cii	85d93807c5	Working version. White lines still present. Marker toggle hard-coded to 'm' key. Mouse events not implemented.	2014-10-05 19:25:37 +11:00
Marc Zinnschlag	be3b229a5f	fixed pathgrid loading	2014-10-04 15:36:52 +02:00
cc9cii	c9e054cdd7	Merge remote-tracking branch 'remotes/upstream/master' into QtOgre ... This reverts commit 0b133d5c2e0d258274ef5f272d7c1a185225673a, reversing changes made to 3aea1bf5f9.	2014-10-04 06:20:10 +10:00
cc9cii	3aea1bf5f9	CMake changes for using Ogre Overlay.	2014-10-04 05:48:56 +10:00
Marc Zinnschlag	9fd82212b3	Merge remote-tracking branch 'cc9cii/opencs-settings'	2014-10-03 13:11:05 +02:00
cc9cii	115841d31d	Do not save window size on exit.	2014-10-03 05:59:24 +10:00
Marc Zinnschlag	f4c9897bbd	Merge branch 'master' into tables	2014-10-02 15:49:36 +02:00
Marc Zinnschlag	00073694c6	added pathgrid subview	2014-10-02 15:16:19 +02:00
Marc Zinnschlag	d64127106b	load and save pathgrid records	2014-10-02 12:30:15 +02:00
Marc Zinnschlag	ce52735df6	Merge remote-tracking branch 'cc9cii/Bug-No-1750'	2014-10-02 08:43:59 +02:00
cc9cii	517a797a3e	Remove seemingly unnecessary clearFocus() call (thanks scrawl for help). Fix saving window size on linux.	2014-10-02 07:00:15 +10:00
cc9cii	5ffb740120	Fix silly mistake (thanks scrawl for picking that up)	2014-10-01 07:19:15 +10:00
Marc Zinnschlag	850a40d4e2	fixed resources table drag source problem	2014-09-30 13:15:15 +02:00
cc9cii	a9745cce1e	Suppress some compiler warnings.	2014-09-30 21:02:31 +10:00
Marc Zinnschlag	ff530a2e19	added missing magic effect table columns	2014-09-30 12:33:48 +02:00
cc9cii	dee090355f	Changes to compile on Ubuntu 14.04.	2014-09-30 19:23:19 +10:00
cc9cii	687b62dfd3	Revert some changes (mostly iostream adds)	2014-09-30 18:46:26 +10:00
cc9cii	312b7cd571	Merge branch 'master' into QtOGre ... Conflicts: apps/opencs/model/doc/document.cpp apps/opencs/view/render/pagedworldspacewidget.cpp apps/opencs/view/render/pagedworldspacewidget.hpp components/nif/niffile.hpp libs/openengine/bullet/physic.hpp	2014-09-30 10:52:04 +10:00
cc9cii	7675df60ba	Fix far clip distance (again), workaround for broken settings minimum value.	2014-09-29 08:17:51 +10:00
cc9cii	54c77cf875	Silence clang warnings.	2014-09-29 06:39:44 +10:00
cc9cii	f0c739b763	Apply camera setting changes immediately. Remove current value check for shader setting changes.	2014-09-29 06:27:54 +10:00
cc9cii	6e8977348a	Check the FSAA setting of windows rather than system value.	2014-09-28 19:43:26 +10:00
cc9cii	303b0ee8c6	Update scenewidget when antialiasing settings change.	2014-09-28 15:43:33 +10:00
cc9cii	8a0ff17c22	Update SceneWidget when relevant user settings change.	2014-09-28 14:08:14 +10:00
cc9cii	9902e08773	Apply sh::Factory settings immediately.	2014-09-28 11:05:27 +10:00
cc9cii	a25cffc242	Fixed default value not being set for spinbox. Changed the default value of max subviews to 256. Simplified the call signature to get settings & set an initial value. Fixed missing settings for num_lights.	2014-09-28 10:17:54 +10:00
cc9cii	d790b8edfa	Revert old fix.	2014-09-27 23:39:22 +10:00
cc9cii	a2d043f43a	Re-check unknown record id after loading.	2014-09-27 23:36:27 +10:00
Marc Zinnschlag	e47f9c7268	added first batch of magic effect columns (re-using existing columns)	2014-09-27 12:51:46 +02:00
Marc Zinnschlag	aa89370db6	make sure magic effects added by expansions are available	2014-09-27 12:38:42 +02:00
Marc Zinnschlag	25a1112627	add magic effect records for newly created games	2014-09-27 12:26:25 +02:00
cc9cii	810ba61909	While loading overwrite records with the same id. Should resolve bug #1750.	2014-09-27 17:46:48 +10:00
scrawl	7252cb63a6	Fix cppcheck issues	2014-09-26 17:48:14 +02:00
Marc Zinnschlag	23fd314294	added magic effects table	2014-09-26 13:12:17 +02:00
Marc Zinnschlag	c321f2c252	load and save magic effect records	2014-09-26 13:05:51 +02:00
cc9cii	8e71f092c5	Comment out setMinimum which is broken.	2014-09-26 12:36:55 +10:00
cc9cii	a1c0ec2feb	Repair collateral damage from a purging session gone out of control.	2014-09-26 11:26:33 +10:00
cc9cii	111a35bc38	More strip back.	2014-09-26 07:16:34 +10:00
Marc Zinnschlag	33cd04b37d	added missing sound gen table columns	2014-09-25 11:40:45 +02:00
cc9cii	d5c8ff7d73	More removal.	2014-09-25 18:15:34 +10:00
cc9cii	127f9bb30d	Fix reverting to wrong version.	2014-09-25 09:16:10 +10:00
cc9cii	61bab6b1f1	Sanitised version. Some settings are only accessible via manually editing the config file.	2014-09-25 08:15:07 +10:00
cc9cii	31fb160376	More cleanup.	2014-09-25 06:59:04 +10:00
cc9cii	66852d5392	Code cleanup and revert incorrect settings.	2014-09-24 22:41:49 +10:00
cc9cii	fdf375fb4d	Reusing subviews implemented.	2014-09-24 13:49:19 +10:00
cc9cii	3f9b73812b	Minor fixes and workarounds.	2014-09-24 11:55:22 +10:00
cc9cii	970f3609c9	Fixed spinbox issue with integer entry via keyboard. Removed shader settings as per feedback comments.	2014-09-24 09:33:19 +10:00
cc9cii	67503c93b2	Added some scenewidget user settings but noticed during testing that the spinbox view resets the value if enter key is pressed.	2014-09-23 22:33:49 +10:00
Marc Zinnschlag	7ab4881661	added sound gen table	2014-09-23 13:21:54 +02:00
cc9cii	d41230a0c5	Tweak the look of the recordfilterbox. Keep titlebar if floating.	2014-09-23 20:51:14 +10:00
Marc Zinnschlag	02247fe712	load and save sound gen records	2014-09-23 12:20:02 +02:00
cc9cii	ffae816aab	Max subviews setting working. However there is no way to remove the last subview once the title bar is removed and the look of the filter box is broken without the title bar.	2014-09-23 17:01:08 +10:00
cc9cii	62406d5322	Use reasonable values for the spinbox.	2014-09-23 07:28:55 +10:00
cc9cii	437fb774c5	Re-implemented subview minimum size setting.	2014-09-23 07:16:07 +10:00
cc9cii	c8ae8f4a6d	Added minimum width setting for subviews - regionmap, table, scene, preview and dialogue. It should be noted that the setting is not the starting minimum width, i.e. it won't be possible to reduce the width of the subview after the creation. Also, one setting applies to all subviews. It may be desirable to have individual settings.	2014-09-23 06:30:41 +10:00
cc9cii	c4f11785ec	Added a window size change easter egg.	2014-09-22 21:12:26 +10:00
cc9cii	48f96df29d	Fixed checkboxes saving invalid values.	2014-09-22 18:50:48 +10:00
Marc Zinnschlag	5c8ef842b6	Merge branch 'edit'	2014-09-22 09:54:44 +02:00
Marc Zinnschlag	51151bc43e	minor fix	2014-09-22 09:53:07 +02:00
cc9cii	fc8d6da6a2	Added more shader settings.	2014-09-22 16:24:06 +10:00
cc9cii	71a3880884	Added workarounds to add QLabel. Add stylesheet option to apply to View's QGroupBox. RangeViews are now right aligned. Added content margins to the page/tab's layout.	2014-09-22 12:19:18 +10:00
cc9cii	02f8f54192	Fixed checkbox behaviour. Added some shader settings.	2014-09-22 07:50:35 +10:00
cc9cii	17a74da650	Cleaned up comments and dead code.	2014-09-21 21:10:18 +10:00
cc9cii	dbd1ab05d3	Integrated into the original settings design, except using tabs rather than list & stacked widgets. Works but visuals need updating.	2014-09-21 20:55:52 +10:00
Marc Zinnschlag	cf5c5cbce7	Merge remote-tracking branch 'corristo/osx-openmw-launch-fix'	2014-09-20 14:13:42 +02:00
Marc Zinnschlag	9d316a8745	Merge branch 'records'	2014-09-20 13:59:45 +02:00
Marc Zinnschlag	8499ceb35d	set default value for topic when cloning info records	2014-09-20 13:30:36 +02:00
Marc Zinnschlag	8ce87803c4	set default value for cell when cloning references	2014-09-20 12:54:25 +02:00
Marc Zinnschlag	b39cdb7645	fixed referenceable cloning (and as a side-effect enabled showing the type of the refereceable in the clone UI)	2014-09-20 12:48:51 +02:00
Marc Zinnschlag	90ad3f332a	extending refnum functionality to cloning (and also enable cloning of references to a different cell)	2014-09-20 12:37:25 +02:00
Nikolay Kasyanov	9f7a8462d8	Fix build & OpenCS game runner code on OS X	2014-09-20 13:42:11 +04:00
Marc Zinnschlag	7733df239e	made CloneCommand a subclass of CreateCommand	2014-09-20 10:36:43 +02:00
cc9cii	5dfcd2ed01	Removed standard window size combobox. Rearranged widgets.	2014-09-19 08:29:06 +10:00
cc9cii	52354b14fc	Fixed compilation issue on linux. Updated shader mode selection logic (thanks scrawl). Cleaned up a little but needs more once things are settled.	2014-09-18 22:17:37 +10:00
Marc Zinnschlag	3add4bdf35	rewrote refnum handling code (fixes broken reference creation, but not reference cloning yet)	2014-09-18 13:41:29 +02:00
Marc Zinnschlag	6fbffdb98f	fixed reference creator error handling	2014-09-18 12:39:29 +02:00
Marc Zinnschlag	e93ab383ea	set refnum and increment refnum counter when creating a new reference	2014-09-18 12:25:17 +02:00
Marc Zinnschlag	33243c8c16	move code for storing old value from ModifyCommand constructor to redo function (allows use of the command on records that haven't been created at the time of construction)	2014-09-18 11:37:23 +02:00
cc9cii	575780ec0d	Display format settings working.	2014-09-18 17:13:53 +10:00
cc9cii	d9b0c81299	Show status bar setting working (feature #854). Turns out signals were not needed, may need to clean up later.	2014-09-18 16:05:32 +10:00
Stanislav	313bdf4e78	fix	2014-09-18 10:25:33 +06:00
cc9cii	86636bd960	Mouse events to disabled objects implemented via a signal filter.	2014-09-18 12:23:41 +10:00
cc9cii	62d2811285	Window size improvements. Added promoted widgets but seems to be require signal filters for disabled widgets to receive mouse events.	2014-09-18 07:52:54 +10:00
U-NSFW-50TH\cc9c	ca80a2b856	Merge remote-tracking branch 'upstream/master' into opencs-settings	2014-09-17 21:00:22 +10:00
Marc Zinnschlag	41275b0af3	Merge remote-tracking branch 'cc9cii/Bug-No-1869'	2014-09-17 09:20:59 +02:00
cc9cii	9dc4af69c6	Got window size to work correctly. Started to incorporate parts of previous settings implementation where possible.	2014-09-17 17:13:21 +10:00
Stanislav	ebb223b2d3	Feature #1226: fixes	2014-09-17 09:03:02 +06:00
cc9cii	cb15750e40	Removed fullscreen checkbox and associated code. Doesn't really make sense for opencs and a fullscreen windowed mode is just a click or keyboard shortcut away, anyway.	2014-09-17 06:29:11 +10:00
cc9cii	e3da37567b	Cleaned up and got some signals going.	2014-09-17 06:11:41 +10:00
Marc Zinnschlag	70275350de	rewrote command generation in GenericCreator	2014-09-16 13:28:11 +02:00
Marc Zinnschlag	b31c4e2bcd	Merge remote-tracking branch 'cc9cii/Bug-No-1301'	2014-09-16 12:52:12 +02:00
Marc Zinnschlag	90b45e09f7	added refnum column to references tables	2014-09-16 12:48:10 +02:00
Marc Zinnschlag	f5483e76cf	added refnum counter column to cells table	2014-09-16 12:30:17 +02:00
cc9cii	d679e0e012	Made more progress. Grey out disabled settings.	2014-09-16 19:50:25 +10:00
cc9cii	ffaca7a875	GUI added, but not yet functional.	2014-09-16 07:44:07 +10:00
Stanislav	8574d2330c	Feature #1226: Request UniversalId editing from table column	2014-09-16 00:00:34 +06:00
cc9cii	ecb4154ac0	Fixed default settings logic and cleaned up comments.	2014-09-15 19:33:38 +10:00
Marc Zinnschlag	3d8216ee17	fixed broken content file list in case of newly created addons	2014-09-15 09:51:39 +02:00
cc9cii	e4b836608c	Partially address feature #854 by reading the status bar setting from opencs.ini. Missing GUI update that will affect new top level windows.	2014-09-15 06:08:56 +10:00
cc9cii	0ec20b23aa	Initial working version. Video/rendering options supported. No GUI yet.	2014-09-15 06:08:55 +10:00
Marc Zinnschlag	d1d861e1be	Merge branch 'run' ... Conflicts: apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/CMakeLists.txt	2014-09-14 11:59:54 +02:00
Marc Zinnschlag	bf6150d009	allow project scope scripts	2014-09-14 11:41:28 +02:00
Marc Zinnschlag	081588f484	add project file to content file list when running OpenMW from OpenCS	2014-09-13 20:48:24 +02:00
Marc Zinnschlag	10fa205ced	fixed --data switch (was missing composing option)	2014-09-13 20:41:57 +02:00
Marc Zinnschlag	1254198d90	add debug profiles to scene subviews view drag and drop	2014-09-13 18:54:29 +02:00
Marc Zinnschlag	3ed2edb7cb	rewrote run tool profile management	2014-09-13 18:53:35 +02:00
Marco Melletti	f212f0e4d2	subviews now get destroyed on close	2014-09-12 16:45:21 +02:00
Marc Zinnschlag	70ee899691	Merge remote-tracking branch 'cc9cii/Bug-No-1725' ... Conflicts: apps/opencs/model/tools/bodypartcheck.cpp	2014-09-12 14:37:26 +02:00
Marc Zinnschlag	b8fdccdbff	Merge remote-tracking branch 'cc9cii/Bug-No-1864'	2014-09-12 14:33:17 +02:00
Marc Zinnschlag	b29d1d452f	removed some redundant checks	2014-09-11 14:19:18 +02:00
Marc Zinnschlag	5dd424b6c6	Merge remote-tracking branch 'cc9cii/Bug-No-1655'	2014-09-11 14:14:02 +02:00
Marc Zinnschlag	717c1b15f5	fixed drop implementation for unpaged worldspace (wasn't updating cell object)	2014-09-11 13:08:30 +02:00
Marc Zinnschlag	0db288ce07	generalising and cleaning up drop implementation of worldspace widget	2014-09-11 13:04:20 +02:00
Marc Zinnschlag	5a9376450b	some cleanup of the scene view drop code	2014-09-11 11:27:56 +02:00
cc9cii	88cf2bd597	Deal with signal source being overloaded. Clear filename after creating a new addon. Enable "Open" button if a game file is already selected.	2014-09-11 07:27:48 +10:00
cc9cii	faac91472c	Allow '-' and '_' in new addon name. Resolves Bug #1789.	2014-09-10 23:30:42 +10:00
cc9cii	85596322f3	Update status bar when record filter is changed. Should resolve Bug #1290.	2014-09-10 23:13:56 +10:00
cc9cii	ae0fb77e30	Move recordfilterbox label 2 pixels to right. Resolves Bug #1839.	2014-09-10 21:23:38 +10:00
cc9cii	227eb12295	Added document name to showModifiedDocumentMessageBox.	2014-09-10 20:29:47 +10:00
cc9cii	f7c1b169b3	Place the settings window on the center of window with keyboard focus. Should resolve Bug #1838.	2014-09-10 20:00:07 +10:00
cc9cii	89f7608022	Refactor for better legibility.	2014-09-10 14:40:41 +10:00
cc9cii	77171b788b	Made popup messagebox non-modal.	2014-09-10 14:03:25 +10:00
cc9cii	f0e0494f03	Since commit 8bce460f34 negative value checks no longer make sense. Not sure what to do about Vampire flag, however.	2014-09-10 08:13:10 +10:00
cc9cii	3a5ed9c5bb	Build objects and connections only once.	2014-09-10 07:14:01 +10:00
cc9cii	fdc20c595d	Fix gcc compile error.	2014-09-09 21:24:54 +10:00
cc9cii	4471fe771e	Fix logic errors.	2014-09-09 21:09:37 +10:00
cc9cii	84f5784575	Remove document when closing the last view. Should resolve Bug #1292.	2014-09-09 13:04:48 +10:00
cc9cii	ad8d722763	Close documents rather than views.	2014-09-09 10:05:06 +10:00
cc9cii	5675626482	Cleanup signals when finished.	2014-09-09 07:24:18 +10:00
Marc Zinnschlag	77e9ac8975	Merge remote-tracking branch 'cc9cii/Bug-No-1710'	2014-09-08 16:38:25 +02:00
cc9cii	724ed807c8	Let the filterbox of the receiving side of the drag&drop to decide whether to add referenceable type. Only added if the table has "Referenceable ID" column AND the UniversalId type is referenceable.	2014-09-08 23:14:04 +10:00
cc9cii	988c8f9ebe	Ignore duplicate connections.	2014-09-08 16:18:31 +10:00
Marc Zinnschlag	3f24593dba	added profile selection panel	2014-09-07 14:40:50 +02:00
Marc Zinnschlag	4337d05126	added right-click handling support to SceneTool class	2014-09-07 13:35:30 +02:00
Marc Zinnschlag	f913d51e35	remove deleted debug profiles from run tool	2014-09-07 12:55:52 +02:00
cc9cii	cedf1171e3	Cleanup comments.	2014-09-07 18:37:33 +10:00
cc9cii	dba352fd6f	Check all views before exiting.	2014-09-07 18:35:50 +10:00
Marc Zinnschlag	d4c27d4ce0	Merge remote-tracking branch 'mellotanica/master'	2014-09-07 10:10:54 +02:00
cc9cii	4a8fe39b2c	For bug #1710. Change the ID type of mime data for filterbox drop events to Referenceable rather than using the ID's native type.	2014-09-07 06:29:09 +10:00
Rohit Nirmal	e315a72582	Remove extra semicolons at the end of some lines.	2014-09-06 13:04:52 -05:00
Marc Zinnschlag	51128d2d57	added run button to scene subview toolbar	2014-09-06 16:11:06 +02:00
cc9cii	c78ac391a0	Made the Region field for Cell record in dialogue subview editable but not sure if this is the wanted behaviour. ... Also removed a duplicate UniversalId::Type_Class mappin in tablemimedata.cpp.	2014-09-06 20:24:34 +10:00
Marc Zinnschlag	64cf0870c6	set content files when running OpenMW from OpenCS	2014-09-06 12:24:09 +02:00
cc9cii	ab8403192c	Fix typo.	2014-09-06 08:00:48 +10:00
cc9cii	6d12374ace	Move windows platform specific files into a common directory.	2014-09-05 22:36:33 +10:00
Marc Zinnschlag	cf05d3c69f	added run log	2014-09-05 13:49:34 +02:00
cc9cii	fa0b3eb298	Add an icon to opencs.exe as well	2014-09-05 20:30:50 +10:00
Marc Zinnschlag	5e022195b8	create startup script when running from OpenCS	2014-09-05 11:40:01 +02:00
Marc Zinnschlag	61a92da374	use --new-game/--skip-menu switches when running from OpenCS	2014-09-05 11:03:16 +02:00
Marc Zinnschlag	a728d6d77a	full implementation of global run menu item (replaces earlier placeholder implementation)	2014-09-04 17:45:43 +02:00
Marc Zinnschlag	67dfaa7f35	update actions in main menu when creating a new view	2014-09-04 10:47:30 +02:00
Marc Zinnschlag	431abcb63a	handle shutdown of OpenMW processes when shutting down OpenCS	2014-09-03 20:06:49 +02:00
Marc Zinnschlag	3fec253409	save first (if document was modified) before running OpenMW	2014-09-03 19:56:52 +02:00
Marc Zinnschlag	a06133a50e	added failed flag to operation done signal	2014-09-03 19:14:27 +02:00
Marco Melletti	8bce460f34	loadnpc is still unfinished, bodypartcheck.cpp mFlags check fix	2014-09-03 14:40:32 +02:00
cc9cii	fd5f814218	Trivial change from "Musics" to "Music Files"	2014-09-03 20:06:43 +10:00
Marc Zinnschlag	bee36c9167	block saving while OpenMW process is running	2014-09-02 11:59:04 +02:00
Marc Zinnschlag	c88b3a1520	track state of OpenMW process and enable/disable run/stop actions accordingly	2014-09-02 11:56:35 +02:00
Marc Zinnschlag	1b4ab6e130	added OpenMW runner	2014-09-02 10:21:17 +02:00
Marc Zinnschlag	96cd46568b	some cleanup	2014-09-01 11:15:59 +02:00
Marc Zinnschlag	bec6c4e726	fixed editor creation for Display_LongString	2014-09-01 10:56:38 +02:00
Marc Zinnschlag	7e653cebdf	implement script editor via QPlainTextEdit instead of QTextEdit	2014-09-01 10:52:10 +02:00
Marc Zinnschlag	03c0cbc65a	added owner global column to references table (Fixes #1695)	2014-08-30 10:13:34 +02:00
Marc Zinnschlag	0dff1fb816	fix for previous commit (was using wrong destination path)	2014-08-28 13:25:56 +02:00
Marek Kochanowicz	ea2feb0aa9	fix for bug 1672	2014-08-28 12:51:49 +02:00