14000 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
scrawl	58917bcca6	Minor cleanup	2015-06-04 01:24:29 +02:00
scrawl	7fe86a7fe0	Adjust travis config -ogre, -boost_wave, +osg	2015-06-04 00:08:28 +02:00
scrawl	60ad568004	Another missing include	2015-06-03 23:55:04 +02:00
scrawl	7991ea25c0	Potentially missing includes	2015-06-03 23:32:49 +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	4f0387bdb5	Fix for recent merge	2015-06-03 18:34:47 +02:00
scrawl	1ba3fa4169	Remove leftovers of the old OpenCS navigation	2015-06-03 18:11:34 +02:00
scrawl	dd23981eab	Font workaround for older MyGUI versions, works with 3.2.2 now	2015-06-03 18:00:45 +02:00
scrawl	bd0233ce68	Error handling improvement	2015-06-03 18:00: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	b978153edb	Enable VBO sharing for terrain geometry	2015-06-03 02:24:09 +02:00
scrawl	5666e02546	Fix for dark terrain in some cases	2015-06-03 02:22:04 +02:00
scrawl	cdd0623009	Terrain rendering	2015-06-03 01:35:41 +02:00
scrawl	10f938ff87	Add comment	2015-06-03 01:18:03 +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	4d5c446a44	Minor cleanup	2015-06-02 19:36:57 +02: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
Marc Zinnschlag	67f04e0ba1	Merge remote-tracking branch 'origin/master'	2015-06-02 14:44:27 +02:00
Marc Zinnschlag	ee2763f2d4	Allow 5th parameter for PlaceAtMe (numeric value, ignored) (Fixes #2591)	2015-06-02 14:43:38 +02:00
scrawl	adc8e0b93e	Merge branch 'smbas-master'	2015-06-02 14:35:45 +02:00
Stanislav Bas	6cb221f8d0	Some minor changes to MWList	2015-06-02 11:55:09 +03: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
Stanislav Bas	5350ce59ef	MWList doesn't scroll to the very bottom when it's shown for first time	2015-06-01 22:42:41 +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