10620 commits

Author	SHA1	Message	Date
scrawl	30ab15e605	Fix -Wunused-private-field clang warnings	2015-06-04 20:42:05 +02:00
scrawl	e23775e338	Fix -Woverloaded-virtual clang warnings	2015-06-04 20:31:28 +02:00
scrawl	141e9d36a4	Get rid of unused DialogueManager::mScriptVerbose	2015-06-04 20:12:39 +02:00
scrawl	78ac37b52a	Remove BOOST_STATIC_ASSERT to fix clang warnings	2015-06-04 20:11:40 +02:00
scrawl	93656aa6cf	Add a header missing from CMakeLists	2015-06-04 20:10:07 +02:00
scrawl	869f8a329a	Cloud scrolling fix	2015-06-04 20:08:44 +02:00
scrawl	ce0d93caed	Fix for "GlobalMap trying to erase an inactive camera" spam in main menu	2015-06-04 16:32:21 +02:00
scrawl	91eea1258c	doc.hpp fix	2015-06-04 01:30:16 +02:00
scrawl	4bb3cbf0fb	Remove last remains of Ogre	2015-06-03 23:04:35 +02:00
scrawl	b70383d127	Remove last remains of Ogre math	2015-06-03 21:37:21 +02:00
scrawl	364b785e8f	ESSImporter image conversions port to osg::Image	2015-06-03 21:36:46 +02:00
scrawl	2eec0caca0	Remove dependency on Ogre::StringConverter	2015-06-03 19:59:54 +02:00
scrawl	cc6d5a3ba0	Fix player setup bug	2015-06-03 19:44:21 +02:00
scrawl	7bacb9418d	Various math code ported to osg	2015-06-03 19:41:19 +02:00
scrawl	0cc9b1bb40	Remove dependency on OgrePlatform.h	2015-06-03 18:49:52 +02:00
scrawl	1ba3fa4169	Remove leftovers of the old OpenCS navigation	2015-06-03 18:11:34 +02:00
scrawl	e642f20a65	Restore screenshot key functionality	2015-06-03 17:25:18 +02:00
scrawl	2a85a22dba	Write savegame screenshot	2015-06-03 16:40:16 +02:00
scrawl	24551c7bab	Fix for savegame incompatibility with master branch	2015-06-03 14:56:57 +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	41cce5240f	Delete remaining files that won't be of any use	2015-06-03 03:29:21 +02: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	292fa0b5e3	Unify raycasting techniques for "on touch" magic ... We don't want pixel-precise raycasting here. Gets annoying when trying to hit a skeleton.	2015-06-03 03:16:26 +02:00
scrawl	cee1db532f	Improve area orb positioning for "on touch" spells	2015-06-03 03:04:39 +02:00
scrawl	cd47dff196	Minor cleanup	2015-06-03 03:03:16 +02:00
scrawl	2883ecc19a	Fix the hilarious bug of NPCs falling to their deaths in interiors	2015-06-03 02:48:45 +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
scrawl	58ebf57154	Apply a comment that got lost in the endless depths of my git stash	2015-06-02 17:13:30 +02:00
scrawl	8c50f8ed26	Fix for lights with no mesh	2015-06-02 17:06:55 +02:00
scrawl	5a7f2a4f1f	Restore light attenuation settings	2015-06-02 17:02:56 +02:00
scrawl	01944c33f5	Basic water rendering	2015-06-02 16:35:35 +02:00
scrawl	adc8e0b93e	Merge branch 'smbas-master'	2015-06-02 14:35:45 +02:00
Stanislav Bas	2c4025ec72	Rename the method isCompleterExistFor() to hasCompleterFor()	2015-06-02 00:26:31 +03:00
Stanislav Bas	959fe3eb87	Reset the scrollbar position in the topic list when DialogueWindow is closed	2015-06-01 23:49:40 +03:00
scrawl	de8e5f0db1	Restore projectiles	2015-06-01 21:41:13 +02:00
scrawl	c85764b654	Wireframe mode	2015-06-01 17:02:44 +02:00
Marc Zinnschlag	b866e11873	Merge remote-tracking branch 'cc9cii/pathgrid-check-extra'	2015-06-01 16:49:28 +02:00
scrawl	7f9f9a32d2	InitWorldSpaceParticles fix	2015-06-01 16:29:42 +02:00
scrawl	987918ca15	NpcAnimation::setAlpha	2015-06-01 16:18:57 +02:00
scrawl	bed31996c9	Camera raycast	2015-06-01 15:34:46 +02:00
scrawl	2869424847	Fix first person camera for beast races	2015-06-01 04:41:03 +02:00
scrawl	f88079fddd	Restore the isOnGround hack	2015-06-01 02:40:42 +02:00
scrawl	ccd95419e5	Restore various raycasting	2015-06-01 01:57:15 +02:00
scrawl	8e0a988289	Icon fix	2015-06-01 01:32:02 +02:00
scrawl	e306853570	Fix chargen crash	2015-06-01 00:50:55 +02:00
scrawl	84fd682e4e	Fix for unnecessary exceptions when opening sounds ... This would throw often during normal play, even though the throws are caught and ignored, can be annoying when the debugger is set to 'catch throw'.	2015-06-01 00:41:44 +02:00
Stanislav Bas	5dc6cdeb99	Scroll to the top of the topic list when dialog is started	2015-06-01 01:14:11 +03:00
scrawl	5b846ebc71	Camera precision fix	2015-05-31 23:09:37 +02:00
scrawl	ed4863ad7d	Restore ranged weapon aiming	2015-05-31 18:53:16 +02:00
scrawl	71bafcb52b	Restore head tracking	2015-05-31 18:04:14 +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
Marc Zinnschlag	9f0ccdc37a	Merge remote-tracking branch 'scrawl/master'	2015-05-31 11:05:43 +02:00
scrawl	60f55997fd	Rotate first person meshes, sneak camera offset in first person	2015-05-31 02:26:58 +02:00
scrawl	a066b24303	Restore WeaponAnimation	2015-05-31 01:07:43 +02: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
scrawl	7f2dd21c66	Fix for StartScript regression (Fixes #2590)	2015-05-30 17:20:49 +02: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
Marc Zinnschlag	d7cd4203ad	Merge remote-tracking branch 'k1ll/mingw'	2015-05-30 11:39:53 +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
scrawl	988a9cad58	getHitContact Head exception fix	2015-05-30 01:41:38 +02:00
scrawl	cc3bfe2bb2	Restore collision tracker	2015-05-30 01:32:00 +02:00
scrawl	b2fe21dd3b	Minor cleanup	2015-05-30 01:11:00 +02:00
scrawl	fd50be0fb8	Restore various gameplay	2015-05-30 01:00:24 +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
scrawl	5c7ecb9c1d	string::compare exception fix	2015-05-29 23:38:31 +02:00
scrawl	af2f26d04d	Particle fixes	2015-05-29 20:45:27 +02: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
scrawl	7e715decd3	Color fix	2015-05-29 02:26:58 +02:00
scrawl	6d3528af70	Port global map exploration	2015-05-29 01:49:52 +02: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
scrawl	7a1408cfed	Restore display of global map overlay, no exploration yet	2015-05-28 18:49:24 +02:00
scrawl	72d0a69132	Fix global map markers not being cleared on a new game	2015-05-28 18:44:34 +02:00
scrawl	9ee63dc3f4	Change stats viewer key to f3	2015-05-28 16:28:48 +02:00
scrawl	5f7a82e0da	Fog of war fix	2015-05-28 16:20:29 +02:00
scrawl	f4ee805e3b	Object animation fix	2015-05-28 15:44:58 +02:00
scrawl	c811ac6afe	Port fog of war ... Not optimized yet, need to work on fog texture's DataVariance.	2015-05-28 03:50:49 +02:00
scrawl	5628a2b823	Camera zoom fix	2015-05-28 03:47:53 +02:00
scrawl	8b3054aa8b	Fix for player collision cleanup issue	2015-05-28 02:45:38 +02:00
scrawl	6555ee8d80	Minor include cleanup	2015-05-28 02:37:35 +02:00
scrawl	025a1a7866	Restore savegame screenshot display	2015-05-28 02:34:38 +02: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
scrawl	1f00174c02	Use a btCollisionWorld instead of btDiscreteDynamicsWorld ... Slightly improves performance, since we no longer need to stepSimulation(). We don't use any Dynamics (yet).	2015-05-27 23:09:38 +02:00