13426 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
cc9cii	c8d3968107	Merge pull request #2 from cc9cii/save-window-state ... Feature #2533.	2015-05-12 08:29:38 +10:00
cc9cii	680e46441d	Feature #2533. Similar but less complete implementation PR was not accepted (see https://github.com/OpenMW/openmw/pull/276#issuecomment-57612802). ... - User preferences setting to save the window state (position, geometry, etc) at the time of exit. - User preferences setting to workaround some X window managers not keeping pre-maximised state. - Uses opencs.ini to store window states between sessions.	2015-05-12 08:21:05 +10:00
Marc Zinnschlag	6803f95398	Merge branch 'openmw-36'	2015-05-10 15:13:25 +02:00
Marc Zinnschlag	73e01b0520	Merge remote-tracking branch 'cc9cii/topicinfos-conditions'	2015-05-10 13:35:39 +02:00
Marc Zinnschlag	107bf818e7	Revert "Use btScaledBvhTriangleMeshShape, bump required bullet version to 2.83" ... This reverts commit 27751db99a. Conflicts: libs/openengine/bullet/physic.cpp	2015-05-10 13:35:21 +02:00
Marc Zinnschlag	e4ffb985a1	Revert "Collision fix" ... This reverts commit 60fffec345.	2015-05-10 13:32:01 +02:00
cc9cii	2b84598e85	Remove duplicated but reversed map.	2015-05-10 20:52:29 +10:00
Marc Zinnschlag	53c3df16e5	Merge remote-tracking branch 'origin/master'	2015-05-10 11:50:59 +02:00
Marc Zinnschlag	8e35ad54bd	temporarily remove the test for bullet version	2015-05-10 11:17:52 +02:00
cc9cii	ab21c0551c	Provide a default encoding when changing to "Function".	2015-05-10 13:34:45 +10: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
scrawl	60fffec345	Collision fix	2015-05-05 16:08:01 +02:00
Marc Zinnschlag	0c27869089	Merge remote-tracking branch 'scrawl/bullet283'	2015-05-05 10:52:18 +02:00
Marc Zinnschlag	e9ef9eedae	updated changelog	2015-05-05 10:51:48 +02:00
Marc Zinnschlag	9f6bc1b3a9	increased version number	2015-05-04 19:06:02 +02:00
Marc Zinnschlag	1c334a01ce	one more referenceable that escaped the change into object	2015-05-04 19:04:06 +02:00
scrawl	27751db99a	Use btScaledBvhTriangleMeshShape, bump required bullet version to 2.83	2015-05-04 16:23:33 +02:00
dteviot	b0c4be2316	Multi-select + context menu. (Fixes #2480) ... Content selector, added multi-select + context menu to allow check/uncheck the multi-selected items.	2015-05-04 14:52:47 +12: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	83a7eea2a9	Merge remote-tracking branch 'scrawl/master'	2015-05-03 09:54:32 +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
Marc Zinnschlag	ba57a648db	Merge remote-tracking branch 'rohit-n/reorder'	2015-04-29 12:09:55 +02:00
Marc Zinnschlag	607a16eb01	removed leftover ignoreRefNum argument	2015-04-29 12:09:30 +02: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
Marc Zinnschlag	e69687b0f2	silenced a warning (potentially unintialised variable)	2015-04-28 14:06:52 +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	e668b35b02	Fix typo.	2015-04-25 17:51:31 +10:00