11340 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	f142d82b3a	Merge remote-tracking branch 'ace/win-package-fix'	2014-09-12 14:28:46 +02:00
Marc Zinnschlag	2397a87330	Merge remote-tracking branch 'scrawl/bsatool'	2014-09-12 14:27:00 +02:00
Marc Zinnschlag	560eae3f4d	Merge remote-tracking branch 'ragora/conjuredequipmentrmvalfix'	2014-09-12 14:22:24 +02:00
Ragora	58d70c2895	Removed Unused includes from experimentation	2014-09-12 05:20:03 -04:00
Ragora	4ecac31752	Map keeps focus on wherever it was last moved when resizing map window	2014-09-12 05:16:33 -04:00
scrawl	33636e218b	Remove unneeded dummies	2014-09-12 07:17:14 +02:00
scrawl	a413e91442	ImageButton: get texture size from MyGUI, rather than from Ogre	2014-09-12 05:17:45 +02:00
scrawl	c6bcd75058	Add various custom widgets used in OpenMW to the MyGUI plugin	2014-09-12 05:14:21 +02:00
Ragora	e105202ee2	Use std::set instead of std::map	2014-09-11 22:45:30 -04:00
Alexander "Ace" Olofsson	dd3d7ba474	Update NSIS to use the new icon path	2014-09-12 04:32:53 +02:00
scrawl	ee3b1e800c	Add FontLoader and transparent BG texture to the MyGUI plugin	2014-09-12 04:27:23 +02:00
Ragora	f9e2fd0f3d	Also forgot to remove a now unused variable I introduced	2014-09-11 20:47:14 -04:00
Ragora	efaa820ee2	Managed to forget the itemmodel.cpp code	2014-09-11 20:46:21 -04:00
Ragora	ea43a23505	All GMST logic is done in itemmodel.cpp now with usage of a static cache std::map	2014-09-11 20:45:22 -04:00
Ragora	83868bca23	Removed unused include left over from experimentation	2014-09-11 19:37:00 -04:00
Ragora	ee6298f520	Added Flag_Bound flag for ItemStack to check against but the system behind it is probably not the best	2014-09-11 19:33:45 -04:00
scrawl	ecfc2ff5d0	Add a MyGUI plugin to register OpenMW resources, to use with MyGUI's standalone tools	2014-09-11 23:33:54 +02:00
scrawl	1bb9359b4c	Fix a typo	2014-09-11 21:52:57 +02:00
scrawl	fca8dc9674	Enable bsatool build by default	2014-09-11 21:48:24 +02:00
Marc Zinnschlag	9ae9104a45	Merge branch 'openmw-32'	2014-09-11 14:22:07 +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
Marc Zinnschlag	b5d5eadf79	Merge remote-tracking branch 'scrawl/master'	2014-09-11 09:01:21 +02:00
Ragora	74e1db3ac8	Minor Correction to existing conjured item logic	2014-09-11 01:00:39 -04:00
scrawl	f3d4b63aaf	Fix AI moving load doors and throw an exception when trying to do this (Fixes #1907)	2014-09-11 05:53:56 +02:00
Ragora	69dbd6b30f	Added checks for different bound item situations	2014-09-10 23:38:38 -04:00
scrawl	36a90198e2	Add option to change screenshot image format	2014-09-11 04:32:31 +02:00
Ragora	141755b473	Appears to have resolved the issue with unequipping conjured items and all possible error conditions deriving from being able to unequip them	2014-09-10 21:34:17 -04:00
scrawl	7fa3100993	Refactor TradeWindow balance buttons to use ControllerRepeatClick	2014-09-11 00:25:09 +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
scrawl	ebab911e44	Add a hack to support binding the console to a printable key (Fixes #371) and change default console key to morrowind default (GRAVE)	2014-09-10 18:13:39 +02:00
scrawl	cf355d0fcb	Change Always Run key default to Caps Lock, as in vanilla ... A poor choice, but it's still what players coming from vanilla MW will expect.	2014-09-10 18:09:05 +02:00
MiroslavR	d64be1c092	Use CellId::mWorldspace to find out whether objects are in the same worldspace	2014-09-10 02:49:57 +02:00
MiroslavR	621e81fa7d	Make getdistance return maximum value only if the given objects are in different worldspaces (Fixes #1895)	2014-09-10 01:40:33 +02: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
scrawl	616148e168	Fix "failed to open file" error when no startup script is given	2014-09-09 18:28:49 +02:00
MiroslavR	45c90bdcb5	Call getPtrViaHandle instead of searchPtrViaHandle for faced handle	2014-09-09 18:10:34 +02:00
MiroslavR	7e6e248511	Don't cache faced handle, as its context may have been changed during the frame by input events	2014-09-09 17:50:56 +02:00
MiroslavR	86c286c24e	Fix werewolf globals	2014-09-09 15:12:42 +02:00
Marc Zinnschlag	14f32563e7	fixed script compiler code ordering issue	2014-09-09 13:55:10 +02:00
scrawl	dd5f4947d7	Add a TODO comment	2014-09-09 05:05:20 +02:00
scrawl	56cd0da522	Fix potential infinite recursion when an area effect spell is reflected (Fixes #1896)	2014-09-09 04:44:14 +02:00
MiroslavR	5ac2788a15	Feature #1545: Allow to select the player in the console	2014-09-09 04:36:17 +02:00
MiroslavR	21eb25706c	Don't pursue the player for their crimes when they are a werewolf	2014-09-09 04:15:54 +02:00