11945 commits

Author	SHA1	Message	Date
Marc Zinnschlag	729e079b0b	Merge remote-tracking branch 'scrawl/master'	2014-05-06 20:18:19 +02:00
scrawl	1c8c26072d	Crime and self defense fixes ... - NPCs should still shout messages such as "thief" even if they did not report the crime - Fixed self defense for NPCs (they no longer attack the player when they were attacked by a non-player actor) - Fixed self defense for creatures (Fixes #1203)	2014-05-06 19:15:43 +02:00
scrawl	d2beb814e7	Remove superfluous attack phrases (already done by startCombat)	2014-05-06 18:05:53 +02:00
graffy76	a17cb1f389	Fixed opencs.ini formatting	2014-05-06 07:37:52 -05:00
Marc Zinnschlag	a30d816982	fixed a mixup in CSMTools::Tools constructor/destructor	2014-05-06 11:44:20 +02:00
Marc Zinnschlag	492620c8cf	handle exceptions thrown during loading and report them to the user	2014-05-06 09:39:39 +02:00
scrawl	dd9117809d	Say an attack phrase when combat starts ... Move combat start to a helper method Added some todo comments	2014-05-06 00:13:31 +02:00
scrawl	d4492b56db	Added header file missing from CMakeLists	2014-05-05 23:52:09 +02:00
scrawl	536fc5e192	Fix autosaves	2014-05-05 22:38:08 +02:00
graffy76	5cba828cc9	Removed unneeded code from setting manager. Moved some code to user ... settings	2014-05-05 06:26:00 -05:00
graffy76	74fa115d20	fixed check for missing ini files	2014-05-05 06:07:41 -05:00
graffy76	475214ab62	Implmented QSettings for loading / saving file definitions. Also ... renamed opencs.cfg to opencs.ini to follow Ini format standards	2014-05-05 05:56:03 -05:00
Jeffrey Haines	d4812c3af9	fixed placement of else statement	2014-05-04 17:54:33 -04:00
Jeffrey Haines	78f76842a6	Added else statement ... Its still dodgy though	2014-05-04 16:56:30 -04:00
Jeffrey Haines	7d5dab214c	#58 - Sneak Skill: functional sneaking ... Removed sneak checking from individual actor update. Added sneak checking to Actors::update()	2014-05-04 16:20:09 -04:00
Jeffrey Haines	a65e8393bb	Merged files	2014-05-04 11:33:27 -04:00
Marc Zinnschlag	df97a1b57f	Merge remote-tracking branch 'sirherrbatka/Feature#1274'	2014-05-04 17:11:43 +02:00
mrcheko	f596b698d9	fixes to slow-down at jump startup and infinite air intertia growth	2014-05-04 18:15:07 +04:00
Marek Kochanowicz	f51f826dad	fixed compilation	2014-05-04 15:13:03 +02:00
Jeffrey Haines	a469444e53	Player can't detect self	2014-05-04 08:05:32 -04:00
Marc Zinnschlag	7f78c29bb5	Merge remote-tracking branch 'sirherrbatka/Feature#1274' ... Conflicts: apps/opencs/view/world/table.cpp	2014-05-04 14:03:56 +02:00
Marek Kochanowicz	4a502226e6	added flag to distingiush widgets	2014-05-04 12:41:06 +02:00
Marc Zinnschlag	e43913e7c2	Merge remote-tracking branch 'graffy76/master'	2014-05-04 12:17:44 +02:00
Thomas	dbf06d8c8b	Merge remote-tracking branch 'upstream/master' ... Conflicts: apps/openmw/mwmechanics/aipursue.hpp apps/openmw/mwmechanics/aisequence.hpp	2014-05-04 02:06:43 -04:00
graffy76	3f737bbb44	implemented QDial into RangeView class	2014-05-03 22:02:16 -05:00
graffy76	4f876574c1	Implemented slider widget in rangeView class	2014-05-03 21:50:08 -05:00
graffy76	0a3ab3dcd1	Commented out "proxy selection test" demo page in user settings	2014-05-03 19:48:04 -05:00
graffy76	35d1502308	Merge branch 'master' of https://github.com/OpenMW/openmw ... merge	2014-05-03 19:16:42 -05:00
graffy76	1c26741c56	Implemented rangeview with spinbox as only control. Simplified setting ... class constructor.	2014-05-03 18:58:43 -05:00
graffy76	bc6197c552	Added custom spin box class	2014-05-03 18:57:34 -05:00
Thoronador	be89654eef	remove audiere_decoder + mpgsnd_decoder from CMake file for openmw	2014-05-03 22:05:21 +02:00
Thoronador	620a8ccaf3	remove Audiere and MPG123+Sndfile decoder sources	2014-05-03 21:49:57 +02:00
Marek Kochanowicz	00b21449a2	replaced type_cell with type_scene	2014-05-03 19:47:13 +02:00
Jeffrey Haines	e1e23447f2	Removed initial check form setSneak ... It wasn’t needed.	2014-05-03 13:16:07 -04:00
Jeffrey Haines	05e326bdc3	Added update sneak to actors ... Intends to check the state of a players sneak by asking the question if each npc can see the player.	2014-05-03 12:48:07 -04:00
scrawl	658c37a299	AiPursue: If we reached the path end, that does not mean we reached the target. Rebuild the path if the target has moved in the meantime. ... Fixes guards in pursuit activating the dialogue too early. Also tweaked the activation distance.	2014-05-03 17:17:00 +02:00
Marc Zinnschlag	e9c2f24faa	intercept close button clicks in loading window	2014-05-03 17:14:17 +02:00
Marc Zinnschlag	3fdd72f204	added cancel button to loading window	2014-05-03 16:44:50 +02:00
Marc Zinnschlag	6bc5869222	record loading progress bar	2014-05-03 15:33:35 +02:00
Marc Zinnschlag	6692d2dc72	split up load function in a start and continue part	2014-05-03 15:05:02 +02:00
Marc Zinnschlag	0b309d9ef4	Merge branch 'master' into load ... Conflicts: apps/opencs/view/doc/viewmanager.cpp	2014-05-03 14:36:06 +02:00
Marek Kochanowicz	5e99381019	Drag and drop works.	2014-05-03 14:00:30 +02:00
Marc Zinnschlag	e0e2ad8316	content file loading progress bar	2014-05-03 13:01:29 +02:00
scrawl	7bddfc0025	Fix some spelling mistakes.	2014-05-03 12:23:22 +02:00
scrawl	122e606e30	Crime: improvement to arrest on sight for large bounties ... iCrimeThreshold controls the needed bounty to have guards run to the player and force dialogue. In vanilla, the greeting dialogue is scripted to either arrest the player (< 5000 bounty) or present a death sentence and attack (>= 5000 bounty).	2014-05-03 12:17:44 +02:00
Marc Zinnschlag	e09218f164	moved load code from Document to Loader class	2014-05-03 12:07:05 +02:00
scrawl	7331a64e34	Restore fix for Bug #875 (commit 602be9bbe7, was broken by 43757efdc4)	2014-05-03 11:33:20 +02:00
scrawl	1b074e5524	Call setAttacked even if the attack missed. Unsuccessful hits should also evoke a response.	2014-05-02 22:38:39 +02:00
scrawl	df1694c27b	Console autocompletion: List candidates when repeatedly pressing tab (bash-style)	2014-05-02 22:19:02 +02:00
scrawl	92467ba6bc	Fix sunlight for interiors	2014-05-02 21:20:27 +02:00
Marek Kochanowicz	7f1df878f6	make getDropType static and public.	2014-05-02 20:28:28 +02:00
scrawl	8560b43464	Move to esm component	2014-05-02 12:48:07 +02:00
scrawl	f8cc328b5e	Slightly prettier backdrop when loading game from main menu.	2014-05-02 12:48:01 +02:00
scrawl	6381b1e938	Fixes #1309: Do not allow saving while dialogs are opened, just like vanilla ... This limitation could be removed post-1.0 by serializing the state of open windows.	2014-05-02 11:20:43 +02:00
scrawl	17bb8d7f9a	Fixes #1252: Add item/magic keybindings to savegame	2014-05-01 21:16:32 +02:00
Marek Kochanowicz	c2b070f097	trying to do it right.	2014-05-01 19:17:33 +02:00
Marek Kochanowicz	ea1aaef8ca	replace paged with unpaged (and vice versa)	2014-05-01 18:25:28 +02:00
scrawl	fc7e79027a	Fixes #1144: Don't refreshCurrentAnims when adding already dead actors	2014-05-01 16:55:16 +02:00
scrawl	64a30ad182	Fix another leak	2014-05-01 16:55:16 +02:00
scrawl	6f7fbc867f	Fix several leaks	2014-05-01 16:55:15 +02:00
scrawl	f99eda1a54	Fixes #1302: Do not attempt to set OnPcAdd before the script has been added	2014-05-01 16:55:15 +02:00
scrawl	5415ca6a63	Fix exception when shift+click on empty space in save dialog	2014-05-01 16:55:15 +02:00
Marek Kochanowicz	d00dbf47d5	working on worldspace drops	2014-05-01 15:09:47 +02:00
Marc Zinnschlag	ab94e70724	more cleanup of document setup	2014-05-01 13:04:48 +02:00
Marek Kochanowicz	57131332f4	fixing minor issues	2014-05-01 12:34:54 +02:00
Marc Zinnschlag	6a809064df	Merge remote-tracking branch 'mrcheko/master'	2014-05-01 10:07:43 +02:00
mrcheko	9e79fb5b87	fix to broken aiwander logic	2014-05-01 11:41:25 +04:00
Marc Zinnschlag	634311c86c	Merge remote-tracking branch 'mrcheko/master'	2014-04-30 22:45:26 +02:00
mrcheko	e8f7d12c01	uninit bool and invalid iterator bugs fixes	2014-04-30 23:57:19 +04:00
Marek Kochanowicz	9e01a54d72	minor correction	2014-04-30 15:17:20 +02:00
Marek Kochanowicz	6aaa15b2e8	paged worldspace drop	2014-04-30 15:03:46 +02:00
Marek Kochanowicz	19dac9dc86	that would be it	2014-04-30 14:27:11 +02:00
Jeffrey Haines	5c9c467b26	Improved sneak.	2014-04-30 08:06:36 -04:00
Jeffrey Haines	14ebd8b110	Fixed logic in commit crime	2014-04-30 07:44:29 -04:00
Marek Kochanowicz	4d79f00e28	enable dragging on the region map cells	2014-04-30 13:32:54 +02:00
Thomas	10a5bb9464	Made code a bit more standardized and added a good bit of documentation.	2014-04-29 23:40:59 -04:00
Marek Kochanowicz	eeb18b533e	moved editlock to the dragrecordtable	2014-04-29 21:41:57 +02:00
Marc Zinnschlag	0c2843b0f7	some missing cleanup	2014-04-29 19:56:33 +02:00
Marek Kochanowicz	d376efe30b	handle dragging not-existing records	2014-04-29 19:34:06 +02:00
Marc Zinnschlag	9a1b5dc1c6	a bit of cleanup	2014-04-29 15:32:00 +02:00
Marc Zinnschlag	f6a876bc3d	added actor ID	2014-04-29 15:27:49 +02:00
cc9cii	7d990abd37	OpenCS changes to allow compilation with MSVC 11.0.	2014-04-29 22:46:55 +10:00
Marc Zinnschlag	8dc6ad5059	moved new flag from setupData function to Document constructor	2014-04-29 14:27:44 +02:00
Marc Zinnschlag	5f1d2f72f6	added basic loading GUI	2014-04-29 14:17:25 +02:00
Marc Zinnschlag	2906ade531	string fix	2014-04-29 13:16:58 +02:00
Marc Zinnschlag	4eeed4e2c7	Merge remote-tracking branch 'scrawl/return'	2014-04-29 12:27:27 +02:00
Marek Kochanowicz	18fc8acc71	able to drag existing cells from the regionmap	2014-04-29 12:27:26 +02:00
Marek Kochanowicz	853abb65c3	added new, later common, base for the regionmap and the table	2014-04-29 11:44:21 +02:00
scrawl	28ef236f0e	Don't allow setting a new return position if there already is one and we haven't reached it yet	2014-04-29 11:17:07 +02:00
Marc Zinnschlag	8fea2cfa2a	Merge remote-tracking branch 'mrcheko/master'	2014-04-29 10:03:29 +02:00
scrawl	1fd7a07b5e	Merge branch 'master' of https://github.com/OpenMW/openmw into return ... Conflicts: apps/openmw/mwmechanics/aisequence.cpp apps/openmw/mwmechanics/aiwander.cpp	2014-04-29 09:14:13 +02:00
scrawl	9b36a13821	Feature #1289: NPCs return to default position ... Make stationary NPCs return to their previous position once combat/crime AI finishes.	2014-04-29 09:09:51 +02:00
scrawl	3780503275	Removed quicksave/quickload message boxes, now that the same text is shown in the progress bar	2014-04-29 07:07:03 +02:00
Marc Zinnschlag	3013c34d9b	Merge remote-tracking branch 'scrawl/master'	2014-04-28 21:46:05 +02:00
scrawl	7a0aeeaa38	Allow to delete savegames (shift + click)	2014-04-28 20:57:45 +02:00
scrawl	7f37f2c2be	Fixes #1187: Make GetDistance handle actors in remote cells gracefully	2014-04-28 19:23:25 +02:00
Marc Zinnschlag	2e7b4e798e	Merge remote-tracking branch 'digmaster/master'	2014-04-28 19:22:54 +02:00
scrawl	a35f7c73ae	Fixes #1286 (Dialogue topic list clips with window frame) ... The first problem was with the ScrollView skin, which had a full-sized client area. Since the scrollbar starts out visible, MyGUI expects the client area to be smaller to accomodate for the scrollbar width. As a result, the starting canvas size becomes bigger than the view size. Another bug was with the MWList code: reducing the canvas size for the scrollbar is not needed, since MyGUI is already doing that, and attempting to do it manually interferes with the view offset.	2014-04-28 18:40:29 +02:00
scrawl	518a32c19d	Fixes #1195: Make NPCs equip torches in interiors under certain conditions	2014-04-28 18:33:42 +02:00
Thomas	885228ec02	Merge remote-tracking branch 'upstream/master' ... Conflicts: apps/openmw/mwmechanics/actors.cpp	2014-04-28 12:27:57 -04:00
Lars Söderberg	04e5b9c72c	Right aligned version/revision ... I've always felt that having the version/revision text at the bottom center in the main menu was a bit out of place. A more common place for this kind of thing is in one of the corners. I chose bottom right. Aditionally I right aligned it and changed the v and r in version and revision to capital letters. Comments?	2014-04-28 16:23:07 +02:00
scrawl	84961d7843	Fixes #1254: PcRank should return first rank if not in the faction	2014-04-28 15:31:18 +02:00
scrawl	b2119441b9	Fix bug in PcRank / PcNextRank ... It was using the first faction instead of the actor's faction.	2014-04-28 15:26:40 +02:00
Marc Zinnschlag	421679b319	Merge remote-tracking branch 'scrawl/master'	2014-04-28 15:13:09 +02:00
scrawl	7e4a0c2478	Removed asserts	2014-04-28 15:00:52 +02:00
mrcheko	35c1724d39	unblock vertical aiming for combatants	2014-04-28 16:34:49 +04:00
scrawl	0796815da0	Ignore dead actors in getActorsFollowing/Fighting ... Prevents dead enemies from disallowing resting near them	2014-04-28 11:44:56 +02:00
scrawl	27a05027f4	Fixes #1172: Added basic loading/saving progress bar ... The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.	2014-04-28 11:29:57 +02:00
Marc Zinnschlag	0b2371a05d	Merge remote-tracking branch 'thoronador/fix-minor-stuff'	2014-04-28 10:59:34 +02:00
Marc Zinnschlag	af322a9f77	Merge remote-tracking branch 'scrawl/master'	2014-04-28 10:48:57 +02:00
scrawl	1da99d9fc7	Remove unused variable	2014-04-28 10:26:24 +02:00
scrawl	b89463db09	Fix #1207: Remember previous choice in class creation dialog	2014-04-28 09:12:03 +02:00
scrawl	1da19585dc	Remove some unneeded includes	2014-04-28 07:49:08 +02:00
Thomas	dc54bd5a5f	Merge remote-tracking branch 'upstream/master'	2014-04-27 20:56:45 -04:00
Thomas	c2127845af	Added onKnockdown command	2014-04-27 20:54:22 -04:00
Thoronador	f69d61976e	minor performance improvements in other apps subdirectories	2014-04-27 23:25:02 +02:00
mrcheko	22cdb166f2	warning fix, vars renaming	2014-04-27 22:38:04 +04:00
Thoronador	1b8c975d5b	minor performance improvements in apps/openmw ... Checking for emptiness using size() might be inefficient, because it can take linear time, while empty() is guaranteed to take only constant time. For non-primitive types, postfix ++ operators are inefficient compared to prefix ++ operators, because post-increment usually involves keeping a copy of the previous value around.	2014-04-27 19:10:23 +02:00
Marc Zinnschlag	ca097e146b	Merge remote-tracking branch 'jeffreyhaines/master'	2014-04-27 17:35:10 +02:00
Jeffrey Haines	edbc319c42	fixed logic. ||	2014-04-27 10:05:34 -04:00
Jeffrey Haines	52bb7c3f69	fixed logic. !	2014-04-27 09:55:38 -04:00
Jeffrey Haines	7599b26d30	Fixed: creatures won't witness crimes ... and potential crash.	2014-04-27 09:37:43 -04:00
Jeffrey Haines	0409e18a0e	revert	2014-04-27 09:35:49 -04:00
Jeffrey Haines	b9bd4bc126	broken	2014-04-27 09:34:59 -04:00
Jeffrey Haines	ce106d3bec	Revert "NPCs detect crime exclusively" ... This reverts commit 54d9615d85ae856ad4fdd2c130ac9cb0cd847c72. Conflicts: apps/openmw/mwmechanics/mechanicsmanagerimp.cpp	2014-04-27 09:34:33 -04:00
mrcheko	82121e0401	some checks reworked	2014-04-27 16:59:21 +04:00
scrawl	e42855d522	Minor fix for spell icon	2014-04-27 12:54:18 +02:00
mrcheko	6a3dddfb9a	merge master	2014-04-27 13:49:31 +04:00
Marc Zinnschlag	85dbf393d2	Merge remote-tracking branch 'graffy76/master'	2014-04-27 11:44:15 +02:00
scrawl	3eb1e4e117	Fixes #1241: Removed disposition-based combat conditions ... The information for this code came from UESP, which in turn cites a (extremely vague) section from the TES-CS help text, so no surprise that it wasn't accurate. The guard on the boat has a fight rating of 70, so with the old code it would attack on sight if the disposition is low enough. BTB-Character.esp includes something (not sure what) that drops his disposition to 35 when playing as a Khajiit, making him attack. Testing in Vanilla it appears that disposition has no effect on combat engagement at all. Even with disposition 0 and fight 70 the NPCs don't attack. Setting an NPCs fight rating to 70 or less still has a meaning, because the higher it is, the easier it becomes to raise the fight rating to 80 (by taunting, for example).	2014-04-27 09:43:54 +02:00
scrawl	dac0b7090a	Get rid of bigbars.png and smallbars.png ... Changed loading bar colour to match vanilla	2014-04-27 09:43:48 +02:00
scrawl	3161647809	Fix for not being able to pick up scrolls during combat ... This is the behaviour I observed in vanilla morrowind.	2014-04-27 09:15:37 +02:00
scrawl	d92f95f5bf	Fix a stacking issue	2014-04-27 06:08:15 +02:00
scrawl	93b76a603b	Fixes #1100: Looting a corpse is no longer considered stealing	2014-04-27 06:08:08 +02:00
graffy76	985af15a12	removed qdebug references	2014-04-26 21:43:59 -05:00
graffy76	0d711e51b0	Converted SettingType enums to indicate widget type.	2014-04-26 21:32:36 -05:00
scrawl	e8210c92c6	Fixes #1240: Don't hardcode drowning time	2014-04-27 04:27:26 +02:00
graffy76	b94466dbb4	Merge branch 'master' of https://github.com/OpenMW/openmw ... merge	2014-04-26 21:24:02 -05:00
cc9cii	1fb2c8d87b	NPC turning is less hacky but still not perfect. NPC's should walk away after a period of non-action by the player (vanilla behaviour) - not yet implemented.	2014-04-27 07:38:31 +10:00
Thomas	c2b692e124	getActorsFollowing/Fighting no longer returns dead actors	2014-04-26 17:21:53 -04:00
mrcheko	dbe1307de0	code refining + minor fixes	2014-04-26 22:21:20 +04:00
Marc Zinnschlag	5e7cd806c4	Merge remote-tracking branch 'scrawl/master'	2014-04-26 18:05:04 +02:00
scrawl	04964595ef	Fixes #1270, Fixes #1201: Update active weapon/spell icons every frame	2014-04-26 16:44:20 +02:00
graffy76	ab33e78b67	Added RangeView class files	2014-04-26 09:40:58 -05:00
scrawl	d5dd864404	Fixes #1236: Disable all controls while playing movie	2014-04-26 14:33:45 +02:00
scrawl	30666f2cce	Fixes #1297: Store global map markers in savegame	2014-04-26 13:42:32 +02:00
Marc Zinnschlag	ddb0496dca	replaced return value of removeDocument with a signal	2014-04-26 13:11:27 +02:00
scrawl	f921f2e7db	Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last. ... This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame.	2014-04-26 12:04:37 +02:00
scrawl	ef39b0f6ab	Fixes #1291: Faction rank saving issue ... A value of 0 is the first rank, -1 means not a member	2014-04-26 11:41:44 +02:00
scrawl	45d2a00717	Fixes #1293: Allow interpolation type 0 in case of 0 keys	2014-04-26 11:36:27 +02:00
scrawl	b13b25dd1b	Fixes #1295: Support partial matches in Cell filter	2014-04-26 11:03:17 +02:00
scrawl	6eca5ac4bb	Fixes #1296: Streamlined cellChanged detection	2014-04-26 07:46:19 +02:00
scrawl	cd1b4218e7	Fix dynamically placed objects being discarded when loading game	2014-04-26 05:01:26 +02:00
scrawl	f05606657c	Correctly insert pasted text at cursor position	2014-04-26 05:01:26 +02:00
scrawl	91e50585ff	AiWander: make sure to walk, not run	2014-04-26 05:01:26 +02:00
scrawl	5b011e43a7	Fix a crash after loading game	2014-04-26 05:01:26 +02:00
mrcheko	f3626adc86	remake of z-moving in combat for flying/swimming enemies	2014-04-26 00:20:55 +04:00
Marc Zinnschlag	42b332775a	removed some debug statements	2014-04-25 15:30:46 +02:00
Marc Zinnschlag	c63d6437c0	Merge remote-tracking branch 'jeffreyhaines/master' ... Conflicts: apps/openmw/mwbase/mechanicsmanager.hpp	2014-04-25 15:29:23 +02:00
Marc Zinnschlag	837fd2a4c6	Merge remote-tracking branch 'graffy76/master'	2014-04-25 15:11:19 +02:00
graffy76	2e06414b43	Fixed broken delegate display modes (Display Format settings). Moved ... UserSetting update functions to DataDisplayDelegate.	2014-04-25 07:16:40 -05:00
Marc Zinnschlag	1f6ed584c2	Merge remote-tracking branch 'digmaster/master' ... Conflicts: apps/openmw/mwstate/statemanagerimp.cpp	2014-04-25 08:39:40 +02:00
Jeffrey Haines	4a4c08946c	Checks the state of the passed sneak variable	2014-04-24 23:02:11 -04:00
Thomas	f3272c941f	Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat. ... The radius for being in combat with the player is fAlarmDistance, which looked like the only pertinent thing.	2014-04-24 22:47:45 -04:00
Jeffrey Haines	42b879a9a5	Reworked the accusation of actors	2014-04-24 22:41:05 -04:00
Jeffrey Haines	c3e08916da	Sneak: Added support for state checking ... I need advice one what I should do in order to pass mActors over to the player. Particularly line 139 in player.cpp	2014-04-24 20:40:17 -04:00
graffy76	3f2ae950f5	Disabled view resize for open views when user setting changes. Fixed ... new view size issue to match existing user settings.	2014-04-24 12:50:10 -05:00
Marc Zinnschlag	dbb192f084	moved loading to a separate thread	2014-04-24 15:09:25 +02:00
Marc Zinnschlag	9db9ad410d	fixed checks for allowing load/save and some general cleanup	2014-04-24 10:14:17 +02:00
Marc Zinnschlag	760c8c7214	removed a redundant include	2014-04-24 09:56:51 +02:00
Marc Zinnschlag	42b3233bda	removed a redundant check	2014-04-24 09:54:47 +02:00
Thomas	5b681e2199	Moved quickload to statemanager for consistency's sake, as well as make autosave only occur on sleep, not wait.	2014-04-24 03:14:47 -04:00
Thomas	05b21c92af	Moved quick save into statemanager class. Kept loader as is as it's rather specalized.	2014-04-24 03:06:36 -04:00
Thomas	6a8bf71c4c	Moved autosave to before you rest, not after it.	2014-04-23 23:33:57 -04:00
Thomas	a598060071	Added autosave on rest, as well as an option in the settings menu	2014-04-23 23:12:30 -04:00
Thomas	682c395488	Apparently a normal save must exist for some reason, calling for a character to be made doesn't cause the signature to be created, and I don't know how to force create the signature (It's kinda driving me nuts)	2014-04-23 21:39:25 -04:00
Thomas	49620968b9	Disallowed quicksave/load in character creation	2014-04-23 21:21:11 -04:00
Thomas	e873135da7	Missed a debug message	2014-04-23 21:04:52 -04:00
Thomas	f90810223a	Added quicksave and quickload	2014-04-23 21:02:09 -04:00
graffy76	ce56669339	Fixed failed signal/slot connection between UserSettings and ... CSVWorld::SubView	2014-04-23 17:02:37 -05:00
Thomas	ee581f593b	Fixed issue which may occur if there's no evidence chest nearby	2014-04-23 13:20:43 -04:00
Thomas	f6deca7c80	Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors	2014-04-23 13:02:51 -04:00
Thomas	61341d4206	Removed mLocked, kept it as "Negative lock level means unlocked"	2014-04-23 10:00:18 -04:00
graffy76	8c6c70ee9c	Merge branch 'master' of https://github.com/graffy76/openmw	2014-04-23 07:05:34 -05:00
Thomas	6022ffbd1f	Evidence chest now locks when new evidence is added to it	2014-04-23 05:54:18 -04:00
Thomas	420163d35f	Small changes to lock command (If no valid lockLevel exists, defaults to 100)	2014-04-23 05:19:34 -04:00
Thomas	cac8e52154	Seperated locked and lock level, to allow for relocking doors to previous lock level. ... The data is stored in the esm as -lockLevel if unlocked; lockLevel if locked. While not tested, it should not present any problems.	2014-04-23 05:12:07 -04:00
Thomas	e71a119c23	Made aifollowers run when long distances (800 or 10000, depending) from what they're following.	2014-04-23 02:57:48 -04:00
graffy76	4b607d658f	Re-link user settings to editor main application	2014-04-22 22:19:53 -05:00
graffy76	e3384e3999	relocate support.hpp / remove support.cpp	2014-04-22 22:19:03 -05:00
graffy76	331df17b48	Added new framework files	2014-04-22 22:17:19 -05:00
graffy76	d3148555fa	Delete old framework files	2014-04-22 22:16:14 -05:00
mrcheko	fbd0ffe86f	enable z-moving for flying/water combatants	2014-04-22 22:59:39 +04:00
scrawl	9998c2783e	Fix travis ... Why again do we need a unit test for something that was never used?	2014-04-21 17:37:06 +02:00
Marc Zinnschlag	e324450118	replaced return value of DocumentManager::addDocument with a signal	2014-04-21 09:02:58 +02:00
mrcheko	f811abb752	pathgrid shortcutting extended	2014-04-20 20:35:07 +04:00
Marc Zinnschlag	86bd2f48dc	removed an unused function	2014-04-20 17:28:10 +02:00
Marc Zinnschlag	0eed697f9a	Merge remote-tracking branch 'digmaster/master'	2014-04-20 13:36:39 +02:00
Marc Zinnschlag	a91b386381	Merge remote-tracking branch 'jeffreyhaines/master'	2014-04-20 13:34:58 +02:00
cc9cii	6a1435c49e	Remove rotation check that was freezing NPC's.	2014-04-20 17:59:08 +10:00
cc9cii	e17fab891d	Suppress travis warning and one more tweak.	2014-04-20 16:49:57 +10:00
Thomas Luppi	d6f1f129eb	Forgot to capitalize something. whooooops ... dat y do	2014-04-20 00:39:50 -04:00
Thomas Luppi	95ef874205	Gets default keybindings from scancode, not keyvalue. ... Gives keyboard set-up independant default keybindings; useful for international keyboards or dvorak users	2014-04-20 00:34:58 -04:00
cc9cii	2b544d550b	Fixed the rotation animation glitch.	2014-04-20 14:27:18 +10:00
cc9cii	000afa48b7	An attempt at making turning animation smoother. Copied some code from AiCombat for rotation.	2014-04-20 11:59:47 +10:00
cc9cii	3d26702f5e	Make idle actors face the player. Turning animation is not smooth.	2014-04-20 10:36:01 +10:00
cc9cii	9bd31b6236	Added reaction time and moved game setting variables init to the constructor.	2014-04-20 10:06:03 +10:00
Jeffrey Haines	3484df0743	Fixed garage value found in beta's static analysis ... Source: https://forum.openmw.org/viewtopic.php?f=6&t=2059#p23844	2014-04-19 19:42:49 -04:00
Jeffrey Haines	6733a1541e	Fixes to Crime System ... Victimless crimes were removed because victims may not exist in the case of stealing items. Is class now uses case insensitive comparison. Fixed issue with confiscation of stolen items.	2014-04-19 19:03:31 -04:00
cc9cii	3dfd08cf2d	Cleanup and little tweaking.	2014-04-20 08:31:02 +10:00
cc9cii	479a94b35d	Backing off closed doors working, needs cleanup and tweaking.	2014-04-20 08:14:54 +10:00
Marc Zinnschlag	7eb6a2e52d	Merge remote-tracking branch 'scrawl/alarm'	2014-04-18 16:19:28 +02:00
Marc Zinnschlag	34092f9f5d	Merge remote-tracking branch 'scrawl/master'	2014-04-18 15:08:30 +02:00
scrawl	b3916e7744	Crime: mark witnesses as alarmed. ... Fixes guard dialogue to properly detect if the player turned himself in.	2014-04-18 13:44:09 +02:00
pvdk	aa07a33906	Fixed most of the memory leaks and started working on correctly exiting the thread	2014-04-18 13:17:37 +02:00
scrawl	4625adfb7f	Fix typo in a condition.	2014-04-18 11:43:37 +02:00
cc9cii	7437647f70	Forgot to add a guard :-(	2014-04-18 16:45:31 +10:00
cc9cii	a0fc514df7	Suppress compiler warning.	2014-04-18 15:45:39 +10:00
cc9cii	c652cb1568	More cleaning up.	2014-04-18 15:19:22 +10:00
cc9cii	2447f0f4aa	Cleaned up logging statements.	2014-04-18 14:41:44 +10:00
cc9cii	aad13d315c	Fixed issue where allowed nodes were being erased. PathFinder was returning an empty path if the closest pathgrid point to the start was also the closest pathgrid point to the goal. Still need to clean up and remove logging statements.	2014-04-18 14:41:44 +10:00
cc9cii	d3be725ee7	Actors are moved on if idling near a closed interior door. Unreachable pathgrid points due to a closed door are removed from the allowed set of points.	2014-04-18 14:41:43 +10:00
cc9cii	1ceeeb4a22	Fix movement glitches for actors with low speeds (e.g. a rat). Was caused by false detection of being stuck.	2014-04-18 14:41:43 +10:00
pvdk	af883991e2	Reimplemented the old new profile dialog behaviour	2014-04-17 02:17:18 +02:00
pvdk	5d94cb112f	Fixed segfault bug due to accessing members of unitialized struct	2014-04-17 02:16:41 +02:00
pvdk	30c3c3e245	Working on importing content lists in the launcher	2014-04-17 00:01:19 +02:00
pvdk	6ed76858d9	Fixed some minor problems with the wizard	2014-04-16 23:59:25 +02:00
pvdk	f8bb797b8a	Settings tab is fully functional now	2014-04-16 18:34:24 +02:00
pvdk	a2c129f655	Merge remote-tracking branch 'upstream/master' into wizard	2014-04-16 16:57:53 +02:00
pvdk	21c406316f	Working on the Settings tab: start the importer/wizard	2014-04-16 16:54:55 +02:00
Marc Zinnschlag	65161c3e24	Merge remote-tracking branch 'sirherrbatka/less-signals'	2014-04-16 10:22:20 +02:00
Marc Zinnschlag	ce33912980	Merge remote-tracking branch 'sirherrbatka/AngryFix'	2014-04-16 10:21:59 +02:00
Marc Zinnschlag	a7cece3d30	do not generate modfiy commands on edits to change a cell to a value equal its original value before the edit	2014-04-15 22:34:15 +02:00
Marek Kochanowicz	8fba71101c	removed signals	2014-04-15 20:39:19 +02:00
Marek Kochanowicz	fc1837e2ed	fixed bug: regions can be dragged ... ps fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu	2014-04-15 19:26:43 +02:00
Marc Zinnschlag	30d5040f2f	Merge remote-tracking branch 'cc9cii/Bug-No-1260'	2014-04-15 15:26:58 +02:00
cc9cii	1fc030653f	Avoid hard coding "thief.dds" string.	2014-04-15 22:30:41 +10:00
Marc Zinnschlag	86e65944b8	Merge remote-tracking branch 'jeffreyhaines/master' ... Conflicts: apps/openmw/CMakeLists.txt	2014-04-15 11:31:48 +02:00
Jeffrey Haines	e2fab228f9	Save state is handled correctly now.	2014-04-14 18:11:04 -04:00
mrcheko	4e7ee97050	fix for windows builds	2014-04-14 17:18:29 +04:00
cc9cii	89be1069a7	Bug #1260: show thief.dds image for a custom class level up menu	2014-04-14 18:31:46 +10:00
Marc Zinnschlag	71068ae3ad	Merge branch 'regionmap'	2014-04-13 17:24:08 +02:00
Marc Zinnschlag	d188e68227	added f-type hint to TableSubView	2014-04-13 16:40:41 +02:00
Marc Zinnschlag	097c063b8a	added 'view in table' action to region map	2014-04-13 16:40:16 +02:00
Marc Zinnschlag	2eca9e72fd	added view action to region map	2014-04-13 15:46:31 +02:00
Marc Zinnschlag	1892550833	added set/unset region actions to region map	2014-04-13 15:32:49 +02:00
Marc Zinnschlag	fc4195a88f	added create cell menu item to regionmap	2014-04-13 14:17:18 +02:00
Marc Zinnschlag	19b31c4146	always use the cell ID instead of the exterior coordinate fields from the original cell struct	2014-04-13 14:16:59 +02:00
Marc Zinnschlag	decd4270d9	added CellId role to RegionMap model	2014-04-13 13:59:27 +02:00
cc9cii	966ed46870	Better performance but less tolerant of collision induced glitches. Also had to use const_cast to cache on ground status.	2014-04-13 18:34:08 +10:00
cc9cii	3e6e325e5b	Instead of hacking character.cpp, provide a more reliable check for world->isOnGround(mPtr).	2014-04-13 14:53:36 +10:00
cc9cii	e9be6d3f42	Fix falling animation where vec.z is set to zero.	2014-04-13 11:34:59 +10:00
cc9cii	0bef754873	Fix jumping animation glitches caused by minor vertical movements. Should resolve Bug #1271.	2014-04-13 08:46:02 +10:00
Marc Zinnschlag	2f63eb7ca4	added missing edit lock for record reordering	2014-04-12 20:07:09 +02:00
cc9cii	d2a41167d0	Allow flying and swimming creatures to step inclines. Should have listen to Chris in the first place, see https://forum.openmw.org/viewtopic.php?f=6&t=2075	2014-04-11 21:24:00 +10:00
Marc Zinnschlag	d0ea23431c	replaced CellIndex typedef with new CellCoordinates class	2014-04-11 10:06:16 +02:00
Marc Zinnschlag	0516d95253	added context menu with selection functions to region map	2014-04-10 22:12:09 +02:00
Marc Zinnschlag	7f12733463	Merge remote-tracking branch 'potatoesmaster/1071'	2014-04-08 21:08:59 +02:00
Emanuel Guevel	09bd0324c9	Fail properly when a content file is not found	2014-04-08 20:19:09 +02:00
Marc Zinnschlag	d205d5f0af	Merge branch 'cellselect'	2014-04-08 09:58:00 +02:00
Marc Zinnschlag	e0550ba336	allow multiple cell coordinates in c-type hint for scene subviews	2014-04-07 15:23:14 +02:00
Marc Zinnschlag	0d352cb883	replaced rectangular cell selection with a CellSelection object	2014-04-07 14:16:02 +02:00
Marc Zinnschlag	67965ec10c	added CellCoordinates and CellSelection classes	2014-04-07 13:44:43 +02:00
Marc Zinnschlag	324b2743d4	removed grid button (discarding the first attempt at a cell selector)	2014-04-07 10:21:26 +02:00
Marc Zinnschlag	03b3487f1b	minor cleanup	2014-04-07 09:56:36 +02:00
Marc Zinnschlag	fafb7501e3	Merge remote-tracking branch 'cc9cii/PathFinder-split'	2014-04-07 09:48:15 +02:00
Emanuel Guevel	ce7aa96371	Fix visual glitch happening when closing inventory while sneaking ... (bug #1255)	2014-04-06 22:21:28 +02:00
Marc Zinnschlag	c7f2cfeca0	Merge remote-tracking branch 'gus/AIFix2'	2014-04-06 15:13:30 +02:00
Jeffrey Haines	a274b48f2f	States are saved. Crime is reacted to. ... Issues where some crime is ignored. Needs a lot more work	2014-04-05 22:45:40 -04:00
Jeffrey Haines	940c88d2ec	Cleaned up code, implemented crime ids ... There is a problem with my game freezing. ToggleAi stops my character	2014-04-05 10:26:14 -04:00
Marc Zinnschlag	0fe67b586a	increased scene toolbar button size	2014-04-05 13:16:13 +02:00
Jeffrey Haines	df5cbe5dec	Minor changes	2014-04-04 08:10:35 -04:00
cc9cii	28f7c42fb7	One more comment fix.	2014-04-04 18:17:42 +11:00
cc9cii	f59226265a	Remove redundant parameter from aStarSearch. Also update some comments.	2014-04-04 18:10:06 +11:00
Jeffrey Haines	70919ba60a	Removed witnesses and minor changes	2014-04-03 16:13:14 -04:00
cc9cii	5cf8e7e933	Remove logging.	2014-04-04 06:16:26 +11:00
cc9cii	040d4f8fc4	Move PathgridGraph into separate files.	2014-04-04 06:13:47 +11:00
Jeffrey Haines	0c957a3cde	Added witnesses to the mix	2014-04-03 14:53:31 -04:00
Marc Zinnschlag	baf30ba292	added grid tool (does not work yet)	2014-04-03 14:44:48 +02:00
cc9cii	a8b2eb1fe9	Make Travis happy.	2014-04-03 22:49:22 +11:00
Marc Zinnschlag	3a58da9ad7	size adjustment	2014-04-03 13:30:22 +02:00
cc9cii	325d0616bb	Cleanup debug statements.	2014-04-03 22:17:45 +11:00
Marc Zinnschlag	5d422fec8a	fixed scene toolbar layout problems	2014-04-03 13:00:19 +02:00
cc9cii	98f77714ce	Per-cell pathgrid data and calculation moved off PathFinder. Now the edge cost calculations and strongly connected component searches are done only once per cell. Per-actor data and methods still remain with PathFinder. ... This version still has debugging statements and needs cleaning up.	2014-04-03 21:43:44 +11:00
Jeffrey Haines	b1abef7a38	Cleaned up code	2014-04-03 01:07:56 -04:00
Jeffrey Haines	58b135a2be	Crime is now checked every frame call	2014-04-03 00:50:09 -04:00
cc9cii	f597d3e88b	Use duration rather than frame counts. Stops false detection of being "stuck" with high frame rates (e.g. indoors).	2014-04-03 07:46:26 +11:00
Jeffrey Haines	510f2d10ac	Replaces broken code with todo	2014-04-02 14:20:33 -04:00
Jeffrey Haines	6f1211dd8d	Moved mWitnesses into Player. resetCrime for paying fine.	2014-04-02 12:23:38 -04:00
Jeffrey Haines	7c0b51fb7e	Ai pursue now controls guards pursuit of crimes ... Should extend AiActivate in the future	2014-04-02 00:18:22 -04:00
Jeffrey Haines	50dac98a2b	Feature 1154 & 73: Crime and NPC reactions	2014-04-01 20:24:25 -04:00
Jeffrey Haines	4037f3705e	Feature 1154 & 73: NPCs react to crime	2014-04-01 14:15:55 -04:00
Marc Zinnschlag	5b5069535e	keep track of active cells in PagedWorldspaceWidget and update SubView title accordingly	2014-04-01 10:04:14 +02:00
Marc Zinnschlag	12e46c5dc7	Merge remote-tracking branch 'megaton/master'	2014-03-31 10:24:12 +02:00
Marc Zinnschlag	4ee1069baa	Merge remote-tracking branch 'scrawl/master'	2014-03-31 10:11:54 +02:00
pvdk	cfe66abbc5	Started working on the settings tab	2014-03-30 23:57:30 +02:00
pvdk	bf6103a3a4	Merge branch 'wizardtab' into wizard ... Conflicts: files/ui/mainwindow.ui	2014-03-30 23:16:48 +02:00
pvdk	14b164a03d	Reverted an unneeded fix	2014-03-30 23:11:38 +02:00
scrawl	f5810b8e1c	Consider aspect ratio for loading screen background ... More consistent with the main menu.	2014-03-30 23:07:49 +02:00
pvdk	10d2ca82f7	Implemented a simple logger	2014-03-30 22:58:50 +02:00
scrawl	1265131203	Set the selected index after all items are added (workaround for MyGUI bug)	2014-03-30 20:07:43 +02:00
megaton	50af9bc0d3	General perfomance optimizations.	2014-03-30 19:45:27 +04:00
cc9cii	d04bb3befb	MSVC uses C version of locale.	2014-03-30 17:23:22 +11:00
Jeffrey Haines	8ce938c6f1	Revert 6b28c06..98fd381 ... This rolls back to commit 6b28c06b2c.	2014-03-29 22:26:53 -04:00
Jeffrey Haines	98fd381564	Feature #1154 Not all NPCs get aggressive when one is attacked ... Compiling fix	2014-03-29 21:25:20 -04:00
Jeffrey Haines	6c866deb1b	Feature #1154 Not all NPCs get aggressive when one is attacked ... Partially implemented	2014-03-29 21:23:34 -04:00
scrawl	5eeed03f5b	Only exchange bribe gold if the bribe was accepted	2014-03-30 00:12:31 +01:00
scrawl	72df9e77c6	Don't show version text in the pause menu	2014-03-30 00:07:32 +01:00
gus	d9ea7107b7	compile fix.	2014-03-29 18:36:32 +01:00
gus	bee057346b	Merge branch 'master' of https://github.com/OpenMW/openmw.git into AIFix2 ... Conflicts: apps/openmw/mwmechanics/aifollow.cpp	2014-03-29 18:05:56 +01:00
Marc Zinnschlag	adab85eeb7	Merge remote-tracking branch 'jeffreyhaines/master'	2014-03-29 13:29:06 +01:00
Jeffrey Haines	6b28c06b2c	Feature #1233 Bribe gold in inventory - Corrected 1000 drake bribe	2014-03-29 07:47:41 -04:00
Jeffrey Haines	ad9286a30f	Revert "Revert "made mReceiver private"" ... This reverts commit 33aecc5218.	2014-03-29 07:45:56 -04:00
Jeffrey Haines	33aecc5218	Revert "made mReceiver private" ... This reverts commit 3e8f7b3bae.	2014-03-29 07:45:36 -04:00
pvdk	eb04fa85b7	Added background image to the last page too	2014-03-29 11:57:25 +01:00
pvdk	ef38fae09d	Merge remote-tracking branch 'upstream/master' into wizard	2014-03-29 11:56:35 +01:00
Marc Zinnschlag	c7b969821f	silenced a warning	2014-03-29 11:11:43 +01:00
Marc Zinnschlag	27095f3edb	Merge remote-tracking branch 'cc9cii/AiWander-improvements'	2014-03-29 11:08:51 +01:00
cc9cii	ebb1813b9b	Minor comment clarification.	2014-03-29 20:17:04 +11:00
cc9cii	07fd801d94	My previous analysis of the pathfinding issue was incorrect. It was in fact caused due to some of the pathgrid points being unreachable. Instead of returning an empty path in such a scenario, incorrect path + requested destination were being returned. There was also a defect where past cost was being used for selecting open points. ... There is still an unresolved issue where mGraph and mSCComp are being rebuilt unnecessarily. The check mCell != cell in buildPath() is being triggered frequently. Not sure why.	2014-03-29 19:35:52 +11:00
cc9cii	267855c44e	Prevent NPC suicides off silt the strider platform in Seyda Neen. Added some comments as well. There may be opportunities for some optimization but left that out for now.	2014-03-29 19:35:52 +11:00
cc9cii	90a813ad2c	Allow interrupting a walking NPC to trigger a greeting.	2014-03-29 19:35:52 +11:00
Marc Zinnschlag	04baa4a573	Merge remote-tracking branch 'jeffreyhaines/master'	2014-03-29 08:14:04 +01:00
Jeffrey Haines	3e8f7b3bae	made mReceiver private	2014-03-29 02:59:47 -04:00
Jeffrey Haines	13d330e427	Feature #1233 Bribe gold not in inventory ... Gold is now put into inventory receivers when bribing.	2014-03-28 21:16:42 -04:00
Marc Zinnschlag	86e5179fd8	Merge remote-tracking branch 'jeffreyhaines/master'	2014-03-28 22:40:12 +01:00
Jeffrey Haines	9efef31bb8	Feature #953 Trader Gold - Unused code/warning resolved ... Removed unused code getBaseGold throws proper error	2014-03-28 17:27:23 -04:00
Marc Zinnschlag	c38812d026	Merge remote-tracking branch 'jeffreyhaines/master'	2014-03-28 19:34:40 +01:00
Jeffrey Haines	401d21b4ee	getBaseGold implemented in MWWorld::Class for NPC and Creature ... Implemented a getBaseGold() to get the vendor gold base NPC gold base now can come from mNpdt12 and mNpdt52	2014-03-28 14:21:38 -04:00
Jeffrey Haines	895748f18d	Gold Pool implemented for Vendors ... It appears that my solution breaks persuasion gold for some reason. I may be wrong. I can’t see where this could be happening as the files I’ve changes should not affect persuasion at all.	2014-03-28 12:01:56 -04:00
Marc Zinnschlag	2c2106205d	Merge remote-tracking branch 'scrawl/master'	2014-03-28 09:56:35 +01:00
scrawl	d7df9cae21	Bug #1224: Changed fix to potentially allow for language independent saves	2014-03-27 22:32:42 +01:00
scrawl	4f852daf45	Don't play company logo when using --skip-menu	2014-03-27 19:59:33 +01:00
scrawl	f2cd37edd0	Play company logo movie	2014-03-27 19:51:48 +01:00
scrawl	5906d795c0	Refactored video player (now a MyGUI widget)	2014-03-27 19:10:15 +01:00
scrawl	2e4ef93b28	Add proper main menu (background image, logo animation, title music)	2014-03-27 15:25:01 +01:00
Marc Zinnschlag	5c81f20f46	Merge remote-tracking branch 'rohitnirmal/load-weap-icon'	2014-03-27 14:57:55 +01:00
Marc Zinnschlag	ce792cf182	Merge branch 'light'	2014-03-27 14:39:40 +01:00
Marc Zinnschlag	50f1679a4c	Merge remote-tracking branch 'jeffreyhaines/master'	2014-03-27 13:40:06 +01:00
Jeffrey Haines	6896142db1	Trader Gold Reset Delay ... Trade Time initialized to 0 Gold pot set correctly for npc’s and creatures	2014-03-27 07:30:24 -04:00
Marc Zinnschlag	53c4878d52	fix for inconsistent case in topic records	2014-03-27 10:01:42 +01:00
Jeffrey Haines	2a8bf46607	Trader Gold Reset Delay ... Implemented traded gold reset delay. Note: Traders gold pool is still in inventory.	2014-03-27 01:23:56 -04:00
Rohit Nirmal	e695890e01	Only update the icon if player is NOT unarmed, to avoid bad dereference.	2014-03-26 21:53:35 -05:00
Rohit Nirmal	bcacdc49af	Update weapon icon in HUD when save is loaded.	2014-03-26 21:08:31 -05:00
scrawl	27956f3624	Savegame dialog: Hide main menu after successful load	2014-03-27 02:36:21 +01:00
scrawl	e5e1e84c52	Ask for confirmation to exit OpenMW	2014-03-26 22:05:21 +01:00
scrawl	a5598e9c2e	Add Credits button to main menu (plays mw_credits.bik)	2014-03-26 21:38:57 +01:00
scrawl	23f4bbc5b0	Videoplayer: only pause previous sounds if there is an audio stream	2014-03-26 21:36:57 +01:00
scrawl	5562c78ac4	Ask for confirmation when selecting 'New Game'	2014-03-26 21:11:39 +01:00
scrawl	ecfaa41e93	Savegame dialog: use locale-aware datetime format	2014-03-26 20:56:39 +01:00
scrawl	53ba23e303	Fixes #1224: Store class name instead of id in savegame header	2014-03-26 19:56:12 +01:00
scrawl	793649c854	ToggleAI: Report current status on toggle	2014-03-26 19:55:52 +01:00
scrawl	688415ce54	Play deathknockout/deathknockdown animations when appropriate	2014-03-26 18:55:16 +01:00
Marc Zinnschlag	ed524b2fd4	added bright lighting mode	2014-03-26 18:29:15 +01:00
Marc Zinnschlag	9746f8bd32	added night lighting mode	2014-03-26 17:59:42 +01:00
Marc Zinnschlag	fa29942b27	added day lighting mode	2014-03-26 17:47:56 +01:00
Marc Zinnschlag	d5506172e8	added lighting switching	2014-03-23 15:14:26 +01:00
Marc Zinnschlag	205354ba30	some ambient light cleanup	2014-03-23 13:40:56 +01:00
Marc Zinnschlag	1b6b4e3442	Merge remote-tracking branch 'slothlife/weather_save'	2014-03-23 08:36:45 +01:00
cc9cii	772a49b2a6	Just some notes for future maintenance.	2014-03-23 13:38:11 +11:00
scrawl	0a17245633	Refactored settings window	2014-03-22 19:02:14 +01:00
Marc Zinnschlag	87ae03b5d4	fix for previous commit	2014-03-22 16:39:24 +01:00
Marc Zinnschlag	6bd3b3ee78	include local variable state in saved games	2014-03-22 15:00:49 +01:00
Marc Zinnschlag	4d80bc009a	Merge remote-tracking branch 'scrawl/master'	2014-03-22 09:54:42 +01:00
scrawl	0c207f7212	Fix build error	2014-03-22 02:08:09 +01:00
scrawl	394284d0f8	Fixes #1209: Tarhiel never falls ... There are a few pitfalls with this code: - Gravity is only considered when applying queued movement. Therefore, make sure to queue some movement every frame. (Could be refactored in the future?) - The character controller never detects being in free fall (!World::isOnGround) unless movement has been applied.	2014-03-22 02:08:04 +01:00
Alexander "Ace" Olofsson	317f1e0b63	Update dialoguesubview.cpp ... That doesn't work on Windows. (Are and/or allowed in C++ in any other compiler?)	2014-03-21 13:44:01 +01:00
Marc Zinnschlag	41fd94b160	compensated for different coordinate systems	2014-03-21 13:39:22 +01:00
Marc Zinnschlag	1e57d55717	update/close on deletion of reference/referenceable	2014-03-21 13:27:46 +01:00
Marc Zinnschlag	698fe8cce3	update preview title on changed referenceableID (preview for references only)	2014-03-21 12:52:46 +01:00
Marc Zinnschlag	58daf52a67	deal with empty and invalid referenceable ID fields	2014-03-21 12:44:06 +01:00
Marc Zinnschlag	1a9df4bc56	Merge branch 'preview'	2014-03-21 12:35:40 +01:00
Marek Kochanowicz	2a26ff2299	better fix	2014-03-21 12:13:54 +01:00
Marc Zinnschlag	fc8ae2b9b5	fixed encoding problems	2014-03-21 11:56:48 +01:00
Marc Zinnschlag	10ce47938b	update preview on reference/referenceable changes	2014-03-21 11:22:43 +01:00
Marc Zinnschlag	2128d3008c	Merge branch 'master' into preview	2014-03-21 08:12:06 +01:00
slothlife	6dce3e5186	Fixed include to use C99 header, not C++11 header	2014-03-21 01:33:11 -05:00
slothlife	6eab9c5179	Move weather state save/load to a new class	2014-03-21 01:19:40 -05:00
Rohit Nirmal	e3a9daf921	Play item sound when trying to sell a bound item, too.	2014-03-20 22:22:31 -05:00
Marc Zinnschlag	688e03a9d2	Merge remote-tracking branch 'sirherrbatka/Editor-Dialog'	2014-03-20 22:27:28 +01:00
Marek Kochanowicz	fbb619db73	…	2014-03-20 21:41:11 +01:00
Marek Kochanowicz	a692ce99fa	where was my mind…	2014-03-20 20:26:53 +01:00
Marek Kochanowicz	ccd5e549cd	moved buttons down	2014-03-20 19:53:03 +01:00
Marek Kochanowicz	832a10b2ac	solving problems	2014-03-20 18:40:10 +01:00
Marc Zinnschlag	1a1d52c513	fixed a column ID problem	2014-03-20 14:19:50 +01:00
Marek Kochanowicz	5c34823bb0	added some placeholder icons	2014-03-20 13:59:00 +01:00
Marek Kochanowicz	ad2f9a69a1	prevent deleting already deleted record	2014-03-20 08:59:04 +01:00
slothlife	1acd1bd913	Feature #1173: Saved Game: include weather state ... Removed some unused state in and changed Ogre::String to std::string in WeatherManager.	2014-03-20 01:25:52 -05:00
Rohit Nirmal	e4c4747a27	Play item sound even if merchant doesn't purchase it.	2014-03-19 20:08:01 -05:00
Marek Kochanowicz	ea9b6fa37e	view button	2014-03-19 12:01:36 +01:00
Marek Kochanowicz	8f3103ce65	added preview button	2014-03-19 11:43:25 +01:00
Marek Kochanowicz	6416ae90d2	Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog ... Conflicts: apps/opencs/CMakeLists.txt apps/opencs/view/world/subviews.cpp	2014-03-19 10:23:15 +01:00
Marek Kochanowicz	010160d047	missed those :/	2014-03-18 20:56:55 +01:00
Marek Kochanowicz	c0b2b783cb	use more proper creators	2014-03-18 20:53:21 +01:00
Marek Kochanowicz	f3475f7ef5	Merge branch 'master' of https://github.com/zinnschlag/openmw into Editor-Dialog	2014-03-18 19:24:10 +01:00
Marek Kochanowicz	db774b02d7	clone and create buttons work	2014-03-18 09:36:22 +01:00
pvdk	ef617fdf3d	Fail on the first error whilst extracting an archive	2014-03-18 00:33:31 +01:00
pvdk	667b0de250	Fixed problems with cd content autodetection	2014-03-17 23:39:21 +01:00
pvdk	2e1248537e	Minor fixes, installation should stop after one error message now	2014-03-17 21:33:44 +01:00
Marek Kochanowicz	95afca0558	delete record button	2014-03-17 19:28:41 +01:00
Marek Kochanowicz	7296b09357	revert button	2014-03-17 19:18:18 +01:00
pvdk	9e5e19f9cb	Improved existing installation handling	2014-03-17 18:28:05 +01:00
pvdk	ae5f783a16	Added some eye-candy to the wizard: a watermark and a placeholder icon	2014-03-17 17:50:51 +01:00
Marek Kochanowicz	09ba547630	use tool buttons with icons	2014-03-17 15:35:36 +01:00
pvdk	254fe0a424	Made install functions use file finding methods and improved error handling	2014-03-17 14:31:50 +01:00
scrawl	128a47570e	One more fix	2014-03-17 14:15:52 +01:00
scrawl	4443e22387	Build fix	2014-03-17 13:32:13 +01:00
scrawl	c8c0e5de38	Fixed code issues found with unity build. Missing include guards, duplicated functions, ...	2014-03-16 23:49:06 +01:00
pvdk	ef16b46148	Wizard now autodetects correct installation archive	2014-03-16 22:09:20 +01:00
scrawl	81dfc26d26	mwscript/locals was added twice	2014-03-16 21:39:46 +01:00
pvdk	b2156351d8	Work in progress commit, working on data1.hdr autodetection	2014-03-16 20:07:54 +01:00
pvdk	8fe837ae6e	Merge remote-tracking branch 'upstream/master' into wizard	2014-03-16 20:05:12 +01:00
Marc Zinnschlag	20ea859aac	adjusted the far clip distance	2014-03-16 17:14:44 +01:00
sirherrbatka	3c8eeb8c48	added comment	2014-03-16 17:11:13 +01:00
Marc Zinnschlag	6b11265fbc	consider scale and orientation when previewing reference	2014-03-16 17:06:45 +01:00
Marc Zinnschlag	48ea93d890	less random camera start position	2014-03-16 17:06:30 +01:00
sirherrbatka	4a0d1ba272	do not cast and check multiple times	2014-03-16 17:06:11 +01:00
Marc Zinnschlag	fa042a8aca	use proper title for reference prewview subviews (avoid internal ID)	2014-03-16 13:22:32 +01:00
Marc Zinnschlag	8b36de6c67	Merge remote-tracking branch 'cc9cii/Slaughterfish-fix'	2014-03-16 12:57:38 +01:00
Marc Zinnschlag	afbdd84467	Merge remote-tracking branch 'cc9cii/AiWander-fix'	2014-03-16 12:47:30 +01:00
Marc Zinnschlag	c36dfef972	prewview subview	2014-03-16 12:44:01 +01:00
cc9cii	f71fb83bfc	Cleaned up more inaccurate comments.	2014-03-16 20:56:11 +11:00
cc9cii	f57c11254f	Revert to original variable names.	2014-03-16 20:09:18 +11:00
cc9cii	22c544d9d7	Remove unnecessary comment.	2014-03-16 12:51:12 +11:00
cc9cii	fdbd564700	Apparently fall trace needs to be done with the middle of the object.	2014-03-16 08:57:55 +11:00
cc9cii	43757efdc4	Feature #1030 - partial fix to stop creatures unable to walk/fly to come out of water. Does not necessarily handle situations where they are already out of water, however.	2014-03-16 08:09:14 +11:00
scrawl	d08394bf78	Fixes #1205: apparently creature and hand-to-hand (health) attacks should also level up armor skill (tested in vanilla)	2014-03-15 21:00:25 +01:00
scrawl	61955111f1	Fixes #1204: Any health value < 1 should show as empty life bar.	2014-03-15 20:48:54 +01:00
scrawl	93c21b5ef2	Fixes #1197: incorrect mouse wheel step	2014-03-15 20:34:12 +01:00
scrawl	3880247017	Fixes #1206: effect texture override was not accounted for	2014-03-15 20:28:48 +01:00
Marc Zinnschlag	2fdf80bcbf	Merge remote-tracking branch 'gsedej/master'	2014-03-15 13:53:05 +01:00
cc9cii	e6977d00e8	Oops. Fix typo picked up by Zini.	2014-03-15 08:16:35 +11:00
cc9cii	b2e3fa70c2	Fix spelling errors in comments.	2014-03-14 07:04:39 +11:00
Marek Kochanowicz	4a623ace71	disabling works	2014-03-13 18:41:37 +01:00
Marek Kochanowicz	c97172d89c	fixed segfault and prevent drops from other documents	2014-03-13 17:00:14 +01:00
Marek Kochanowicz	e1a4b64efb	fixed segfault	2014-03-13 16:50:04 +01:00
cc9cii	d54ae58ec9	Bug #900 fix - minor update to comments	2014-03-14 00:09:03 +11:00
cc9cii	d92740efc9	Bug #900 fix - only fixed AiWonder, AiCombat, AiTravel and others may need a different strategy to this.	2014-03-13 23:44:52 +11:00
Marc Zinnschlag	7bc97fb8b8	reworked code for player positioning on startup and new game	2014-03-13 13:19:32 +01:00
Marek Kochanowicz	dd755a00e4	fix for the bug (?)	2014-03-13 08:52:37 +01:00
Marek Kochanowicz	cc1ceb35ce	drag and drop works	2014-03-12 20:34:55 +01:00
Marek Kochanowicz	fd4829141d	succesfully connected the signals	2014-03-12 19:55:51 +01:00
Marek Kochanowicz	1bf67e7390	added the new qlineedit subclass	2014-03-12 19:36:46 +01:00
Marek Kochanowicz	30a0c82e22	this code segfaults, but i don't know why	2014-03-12 16:28:10 +01:00
Marek Kochanowicz	919065db32	fixed segfault	2014-03-12 16:06:59 +01:00
Marek Kochanowicz	d1290ac556	skip deleled or erased records	2014-03-12 15:46:27 +01:00
Marek Kochanowicz	2278eb5e91	handle locking	2014-03-12 15:17:49 +01:00
Marek Kochanowicz	1a9d4204d2	correction	2014-03-12 15:07:17 +01:00
Gašper Sedej	43a12fffd5	indentation issue...	2014-03-12 14:37:44 +01:00
Marek Kochanowicz	2e226e63b6	change universalid of base subview after pressing next or prev	2014-03-12 13:04:40 +01:00
Gašper Sedej	d72a2f1ffb	Added code to test if git hash is availible	2014-03-12 12:33:42 +01:00
Marek Kochanowicz	cb9bcc3cc1	buttons are functional	2014-03-12 12:25:37 +01:00
scrawl	0cd40294a2	Fixed ranged combat for creatures	2014-03-12 11:30:44 +01:00
Marek Kochanowicz	299b7a6ce6	Added buttons, they don't do anything.	2014-03-12 11:08:04 +01:00
Gašper Sedej	06e02ed77f	Added version and revision number to mainmenu	2014-03-12 10:53:56 +01:00
Marek Kochanowicz	8d50af547a	created editwidget	2014-03-12 10:39:28 +01:00
Marek Kochanowicz	865e6b52ae	scroll area	2014-03-11 21:21:05 +01:00
Marek Kochanowicz	c422dc6eed	Refactorisation.	2014-03-11 20:40:31 +01:00
Marek Kochanowicz	5ad572346b	referencables also work now	2014-03-11 13:02:25 +01:00
Marek Kochanowicz	1edf5a4414	registered additional subviews.	2014-03-11 10:47:30 +01:00
Marek Kochanowicz	87286232d7	fixed bug, god bless overloading	2014-03-11 09:38:53 +01:00
Marek Kochanowicz	a25271f0b6	moving bloat away from the dispatcher	2014-03-11 09:14:13 +01:00
Marc Zinnschlag	ef1364878f	moved test cube from SceneWidget to WorldspaceWidget	2014-03-10 18:35:49 +01:00
Marek Kochanowicz	17b521cec8	additional check	2014-03-10 17:57:40 +01:00
Marek Kochanowicz	f4614c2c63	use qlabels for not editable fields	2014-03-10 17:52:45 +01:00
Marek Kochanowicz	089732419a	introduce longString	2014-03-10 17:18:29 +01:00
Marek Kochanowicz	cc96a38921	use qlinedit for the var	2014-03-10 13:27:52 +01:00
Marek Kochanowicz	874847c959	handle color	2014-03-10 13:25:01 +01:00
Marc Zinnschlag	7812427836	added Preview submenu item; fixed View issues regarding exterior cells	2014-03-10 12:44:34 +01:00
Marek Kochanowicz	73cb3ac0ed	embelishing	2014-03-10 12:04:03 +01:00
Marek Kochanowicz	361bc55973	dont force trying display	2014-03-10 09:47:41 +01:00
Marek Kochanowicz	9ab920bd80	display id and other not editable data	2014-03-10 09:37:53 +01:00
Marek Kochanowicz	b2fdaa74b0	trying to set the size policy	2014-03-09 18:44:04 +01:00
Marc Zinnschlag	2b17f5dde9	register resources locations on editor startup	2014-03-09 12:32:21 +01:00
Marc Zinnschlag	2de862126a	moved resources group creation from Engine to bsa component	2014-03-09 11:42:39 +01:00
Marek Kochanowicz	7eb10756d4	some extra views enabled	2014-03-09 08:58:24 +01:00
scrawl	6eaa7553f8	Fixes #1181: Enable controls when loading a savegame	2014-03-09 03:34:49 +01:00
Sandy Carter	72a3c50eb8	(#1191) Disallow picking up if inventory disabled ... Check if window manager has allowed the inventory window if not, then items should not be possible to pick up	2014-03-08 13:45:54 -05:00
Marek Kochanowicz	0447be7e7a	register extra views. do not display id	2014-03-08 17:24:00 +01:00
Marek Kochanowicz	1f1774b5e1	changing the enumdelegate seteditordata	2014-03-08 16:54:05 +01:00
Marek Kochanowicz	9612c6a6fd	handle also bool boxes	2014-03-08 16:50:42 +01:00
Marek Kochanowicz	08ccae6b49	handle comboboxes	2014-03-08 16:21:49 +01:00
Marek Kochanowicz	a8b11829d4	disable not editable widgets	2014-03-08 15:18:40 +01:00
Marek Kochanowicz	3c60345d6b	nest wrapper into the proxy class	2014-03-08 15:15:00 +01:00
scrawl	072dc6d438	Feature #50: Implement marksman mechanics.	2014-03-08 06:03:45 +01:00
scrawl	12de0afb03	Feature #50: Spawn projectiles ... Fix a bug in copyObjectToCell. Make actor rotations more consistent.	2014-03-08 01:31:27 +01:00
Marek Kochanowicz	2e6b45dafb	edit view, savind works	2014-03-07 22:17:40 +01:00
Marek Kochanowicz	020e3f8fc5	Merge branch 'master' of https://github.com/zinnschlag/openmw into dialogoue3	2014-03-07 17:16:38 +01:00
Marek Kochanowicz	f0a45fa15f	just saved progress	2014-03-07 17:15:43 +01:00
cc9cii	f36bea03ab	Bug #1189 fix by scrawl	2014-03-07 19:36:44 +11:00
Marek Kochanowicz	b0ae78e889	basicly enabled code	2014-03-06 20:10:13 +01:00
Marc Zinnschlag	f1353dc84f	Merge branch 'scene'	2014-03-06 16:46:44 +01:00
Marc Zinnschlag	516a3b9abd	close interior cell view when cell is deleted	2014-03-06 16:40:08 +01:00
Marc Zinnschlag	0254a209f6	some general cleanup	2014-03-06 13:51:21 +01:00
Marc Zinnschlag	f04348fb8e	do not offer view action for cells flagged as deleted	2014-03-06 13:43:06 +01:00
Marc Zinnschlag	4a119c8f46	ambient lighting in interior cells	2014-03-06 13:02:21 +01:00
Marc Zinnschlag	7e0f0c8402	fixed SceneWidget destructor	2014-03-06 12:42:09 +01:00
Marc Zinnschlag	397921e457	specialising WorldspaceWdiget into paged and unpaged subclasses	2014-03-06 10:13:39 +01:00
Marc Zinnschlag	7386d3eb0b	moved navigation into the WorldspaceWidget	2014-03-06 10:01:23 +01:00
scrawl	e08f6c9ce3	Bug #416: Copy framebuffer to a texture instead of not clearing ... Potentially faster than the previous workaround, and should work for triple buffering too.	2014-03-06 04:01:25 +01:00
scrawl	83b6fcf22e	Bug #416: Workaround for page flipping problem	2014-03-05 22:24:05 +01:00
scrawl	1d926816b5	Terrain: background load blendmaps & layer textures. Refactor QuadTree update.	2014-03-05 21:46:37 +01:00
scrawl	2a4e99c069	Set StaticGeometry origin ... Fixes an exception for coordinates far away from (0,0,0).	2014-03-05 21:46:37 +01:00
scrawl	edb5a54092	Include some more required Ogre headers explicitely.	2014-03-05 21:46:37 +01:00
scrawl	195071efc7	Terrain: geometry is now loaded in background threads. ... TODO: background load layer textures and blendmaps. "Distant land" setting has been removed for now (i.e. always enabled).	2014-03-05 21:46:37 +01:00
scrawl	065b6d3331	Terrain: moved ESM::Land load to earlier in the startup procedure ... Required for background loading as we cannot load ESM::Land data from background threads.	2014-03-05 21:46:36 +01:00
scrawl	8730b61362	Render maps after *all* cells have finished loading ... Still not fixing Bug #772, but at least this will allow for background loading of terrain.	2014-03-05 21:46:36 +01:00
scrawl	c9e349f60f	Terrain: support alternate coordinate systems. Get rid of LoadingListener for now	2014-03-05 21:46:36 +01:00
Bret Curtis	ab224f93c9	remove our stdint.h version that uses boost and force usage of system stdint.h	2014-03-05 17:08:58 +01:00
cc9cii	ce8d327e8e	Debug MSVC build of openmw needs number of sections beyond 2^16	2014-03-05 22:11:10 +11:00
gus	d84319300a	fix	2014-03-05 11:27:16 +01:00
gus	f4879dacd5	add AIfollow to summoned creatures	2014-03-05 11:24:39 +01:00
Marc Zinnschlag	a264e86e13	subclasses scene widget for worldspace scenes	2014-03-04 14:47:43 +01:00
Marc Zinnschlag	f9d2fde783	Merge branch 'openmw-29' ... Conflicts: apps/openmw/mwmechanics/aicombat.cpp	2014-03-04 09:34:38 +01:00
Marc Zinnschlag	0ae9cc0106	removed unused function	2014-03-03 08:21:16 +01:00
Marc Zinnschlag	26c2f28879	replaced global world->scene menu item with individual view context menu items in cell and reference tables	2014-03-02 22:43:44 +01:00
Marc Zinnschlag	55195f819a	changed edit requests from row index format to UniversalId/hint format	2014-03-02 22:34:41 +01:00
Marc Zinnschlag	797f5527ee	added hint parameter for UniversalId viewing requests	2014-03-02 13:29:02 +01:00
Marc Zinnschlag	cb3994281c	changed UniversalId::Type_Scene from index to string ID argument (argument is the worldspace)	2014-03-02 13:11:15 +01:00
Marc Zinnschlag	ca30f2af3d	minor fix	2014-03-02 11:03:37 +01:00
Marc Zinnschlag	536a0e0ab0	added orbit navigation mode	2014-03-01 14:15:04 +01:00
scrawl	a99aa15d14	Fix a copy&paste mistake leaving start rotation uninitialized	2014-02-28 17:23:58 +01:00
Marc Zinnschlag	4d3abeedcb	keep camera upright in 1st person mode	2014-02-28 13:37:01 +01:00
Marc Zinnschlag	ae637d6abc	rolling	2014-02-28 11:58:03 +01:00
Marc Zinnschlag	0926501717	Merge remote-tracking branch 'cc9cii/branch_0_29_fixes' into openmw-29	2014-02-27 15:45:45 +01:00
Marc Zinnschlag	4eea2c7a86	added free navigation mode	2014-02-27 15:42:59 +01:00
Marc Zinnschlag	c977b2a756	moved implementation of the 1st person camera into a separate file	2014-02-27 15:23:14 +01:00
Marc Zinnschlag	14c3bfcf62	added navigation class	2014-02-27 14:46:06 +01:00
cc9cii	56ae85df0c	Fix 32bit Windows crash while taking the save screenshot.	2014-02-28 00:28:02 +11:00
cc9cii	8fa88f4480	sync with upstream	2014-02-28 00:13:57 +11:00
cc9cii	2421f23c2f	cleanup the mess...	2014-02-27 23:59:23 +11:00
pvdk	05f8af0757	Use the correct encoding for the ini importer	2014-02-25 18:15:29 +01:00
pvdk	6b9082c6ba	Support different Tribunal patch .esm location, as seen on German GoTY disk	2014-02-25 17:36:55 +01:00
pvdk	d30c4edb14	Support separate Splash directory, found in some installation media cabinets	2014-02-25 17:23:26 +01:00
pvdk	3792b301e9	Wizard now runs the ini-importer to import settings from Morrowind.ini	2014-02-25 15:33:30 +01:00
Marc Zinnschlag	8f73cc9268	added navigation mode selection	2014-02-25 14:59:46 +01:00
Marc Zinnschlag	526d75df51	inverted ctrl key	2014-02-25 14:30:38 +01:00
Marc Zinnschlag	644f5cb8de	fixed mouse button release detection	2014-02-25 14:28:55 +01:00
Marc Zinnschlag	e33bd4d508	camera rotation via ctrl-left button drag	2014-02-25 14:24:35 +01:00
Marc Zinnschlag	e987199949	getting rid of some magic numbers	2014-02-25 14:14:53 +01:00
Marc Zinnschlag	07d20a2013	camera panning via left button drag	2014-02-25 14:09:07 +01:00
Marc Zinnschlag	b9107addc0	mouse wheel zooming	2014-02-25 13:39:49 +01:00
Marc Zinnschlag	b6ae521aa5	moving the camera with A and D keys	2014-02-25 13:31:15 +01:00
Marc Zinnschlag	af50575259	use shift key to speed up camera movement	2014-02-25 13:17:15 +01:00
Marc Zinnschlag	8081c067a6	moving the camera with W and S keys	2014-02-25 13:09:37 +01:00
Marc Zinnschlag	4ec4599be3	added navigation mode enum to SceneWidget	2014-02-25 12:30:45 +01:00
Marc Zinnschlag	6ec86564d1	re-enabled OGRE in OpenCS; cleaned up startup	2014-02-25 11:58:32 +01:00
cc9cii	5b48ca114f	aicombat pathfinding fix - check the correct list	2014-02-25 08:31:14 +01:00
cc9cii	85c467f00f	Minor cleanup for aicombat pathfinding workaround.	2014-02-25 08:30:52 +01:00
pvdk	36d4287da4	Fixed openmw.cfg handling: file should not be cleared anymore	2014-02-24 15:59:44 +01:00
Nikolay Kasyanov	76c1d60d23	Fixed OpenCS build on OS X	2014-02-24 15:59:05 +01:00
pvdk	fb59112b74	Merge remote-tracking branch 'upstream/master' into wizardhead	2014-02-24 13:58:51 +01:00
Marc Zinnschlag	c62a352956	Merge branch 'cellstore'	2014-02-24 10:03:13 +01:00
Marc Zinnschlag	9b18e01507	keep track of which cells have state that needs to be saved	2014-02-24 10:03:04 +01:00
Marc Zinnschlag	bfcd768078	various bits of cleanup	2014-02-23 21:39:18 +01:00
Marc Zinnschlag	83ded18af0	encapsulated reference collections	2014-02-23 21:21:27 +01:00
Marc Zinnschlag	367919200f	moved CellRefList into a separate file	2014-02-23 20:11:05 +01:00
Marc Zinnschlag	f220867144	make Ptr a bit more pointer-like	2014-02-23 18:17:41 +01:00
Marc Zinnschlag	b72c1c2c58	encapsulated water level	2014-02-23 17:34:18 +01:00
gus	95ff869163	Merge branch 'openmw-29' of https://github.com/zinnschlag/openmw.git into AIFix2	2014-02-23 17:07:49 +01:00
Marc Zinnschlag	79e723ad06	encapsulated mIds	2014-02-23 16:46:07 +01:00
Marc Zinnschlag	8ea686c6c8	encapsulated mState	2014-02-23 14:26:36 +01:00
cc9cii	1bd2664cb0	aicombat pathfinding workaround	2014-02-23 11:47:25 +01:00
cc9cii	1ab5948f19	merge upstream changes	2014-02-23 19:11:37 +11:00
Marc Zinnschlag	b0ae5b8ab7	Merge remote-tracking branch 'cc9cii/windows-save-fix' into openmw-29	2014-02-22 17:16:55 +01:00
cc9cii	fcfc8fcccb	Revert "Allow MinGW64 compilation in Windows/msys" ... This reverts commit c3f350e3fb. Conflicts: libs/platform/string.h	2014-02-22 23:45:13 +11:00
cc9cii	ac606a865c	Back out unnecessary change.	2014-02-22 23:22:23 +11:00
cc9cii	c241405d91	Fix Windows save & load.	2014-02-22 12:15:20 +11:00
cc9cii	c3f350e3fb	Allow MinGW64 compilation in Windows/msys	2014-02-22 12:06:50 +11:00
Nikolay Kasyanov	59508e914f	Fixed OpenCS build on OS X	2014-02-22 01:17:58 +04:00
Marek Kochanowicz	e348c6baa9	accept drops from filters table. Cool. ☺	2014-02-21 13:50:59 +01:00
Marek Kochanowicz	e2dce53543	additional check on droping to prevent exception	2014-02-21 12:55:01 +01:00
Marek Kochanowicz	fcf17805a0	Installing basic event filter	2014-02-21 12:48:39 +01:00
Marc Zinnschlag	7693f712bc	started making CellStore into a proper class; encapsulated mCell member	2014-02-21 11:35:46 +01:00
Marek Kochanowicz	55e9083570	refactorisation	2014-02-21 10:27:23 +01:00
Marek Kochanowicz	1c35a85adf	fixed bugs, added extra display_type	2014-02-20 19:27:51 +01:00
Marek Kochanowicz	7dff34ebf1	Features implemented. Time to debug.	2014-02-20 19:15:09 +01:00
Marek Kochanowicz	3ad6df1f92	try with the passing action	2014-02-20 17:54:18 +01:00
Marek Kochanowicz	38a86b5015	We can handle droping multiple records	2014-02-20 16:01:54 +01:00
Marek Kochanowicz	b788ab8b4c	correcting	2014-02-20 14:10:03 +01:00
Marek Kochanowicz	4fe21dc38f	Const correctness	2014-02-20 12:43:09 +01:00
Marc Zinnschlag	736644de05	Revert "#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()" ... This reverts commit 51fb9f65ea.	2014-02-20 12:31:40 +01:00
Marek Kochanowicz	eb3cbaa4e1	Create filter on droping record.	2014-02-20 12:25:47 +01:00
Marek Kochanowicz	c7b3e139aa	Propagate signal to the edit widget	2014-02-20 11:07:04 +01:00
pvdk	755c99df3c	Some minor fixes	2014-02-19 19:26:51 +01:00
pvdk	6916c0bc94	Wizard now writes valid Morrowind.ini files	2014-02-19 19:26:51 +01:00
pvdk	e8170adde5	Some minor changes, implemented suggestions	2014-02-19 19:26:50 +01:00
pvdk	ceb66d0790	Also install the separate Sounds directory for Tribunal	2014-02-19 19:26:50 +01:00
pvdk	5024f1bf77	Added a warning when trying to install tribunal after bloodmoon	2014-02-19 19:26:50 +01:00
pvdk	2ccf4d6112	Post-merge cleanups, using confignmanager for XDG paths now, thanks scrawl!	2014-02-19 19:26:50 +01:00
pvdk	c54217d008	Merge remote-tracking branch 'upstream/master' into HEAD ... Conflicts: CMakeLists.txt components/CMakeLists.txt components/config/gamesettings.cpp	2014-02-19 19:26:07 +01:00
Marek Kochanowicz	fca7701359	Column titles retrived and passed to the filterbox.	2014-02-19 16:15:51 +01:00
pvdk	b43325119a	Some changes to the version retrieval: ignore shallow clones	2014-02-19 14:19:08 +01:00
Marek Kochanowicz	d7a1abb30b	emit signal with types (will be connected to the tablesubview)	2014-02-19 12:55:39 +01:00
Marek Kochanowicz	dd95ed8e4c	Accept drops on the filterbox	2014-02-19 12:32:48 +01:00
Marek Kochanowicz	569533eeae	Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop	2014-02-19 11:23:53 +01:00
scrawl	d25b3ad9cb	Fix AiCombat for creatures with weapons	2014-02-19 11:23:03 +01:00
scrawl	ebc67a82cf	Don't list unnamed quests in the quest book	2014-02-19 11:23:03 +01:00
scrawl	1fba5d1bb9	Terrain: change world bounds from AABB to 4 floats	2014-02-19 11:23:03 +01:00
scrawl	bc376e6649	Closes #888: Treat "Bip 01" as animation root if existing	2014-02-19 11:23:03 +01:00
scrawl	439018e706	Get rid of useless return values	2014-02-19 11:23:03 +01:00
scrawl	90f6cda4cc	Moved includes to appropriate place	2014-02-19 11:23:03 +01:00
Marek Kochanowicz	e9664d80bd	make convert enumns public static	2014-02-19 11:22:47 +01:00
Marc Zinnschlag	550e5eb686	Merge remote-tracking branch 'corristo/osx-music-fix'	2014-02-18 09:12:02 +01:00
gus	d8f24ac499	bug fix	2014-02-17 15:49:49 +01:00
Marc Zinnschlag	ea16f79d77	Merge remote-tracking branch 'gus/AIFix2'	2014-02-17 10:54:07 +01:00
gus	84959eea28	woops, thanks scrawl	2014-02-17 10:50:10 +01:00
gus	6e1425321b	remove cout spam	2014-02-17 10:43:09 +01:00
gus	e5b19cf3c6	clean up	2014-02-17 10:37:11 +01:00
Marc Zinnschlag	02c6c65705	Merge remote-tracking branch 'sirherrbatka/DragDrop'	2014-02-17 09:55:50 +01:00
Marek Kochanowicz	2bb9e47507	Improvements.	2014-02-17 08:58:55 +01:00
Nikolay Kasyanov	51fb9f65ea	#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()	2014-02-17 02:59:23 +04:00
Nikolay Kasyanov	5e8cb2e466	Another attempt to fix #1041. This time I'm sending real data from decoder ... once after playback started.	2014-02-17 02:35:13 +04:00
Marek Kochanowicz	e1a0f60041	allow _foo ids without qoute	2014-02-16 20:26:22 +01:00
Marek Kochanowicz	b83817e05e	May only include alphanumeric characters and underscores and may not start with a number.	2014-02-16 20:18:28 +01:00
Marek Kochanowicz	3cc23a9cb3	very basic, but safe putting down " "	2014-02-16 18:41:42 +01:00
Nikolay Kasyanov	4e28fd85a3	Fixed build on OS X	2014-02-16 20:22:46 +04:00
Marc Zinnschlag	c18c3e51ee	handle IDs that don't exist anymore after loading	2014-02-16 16:23:05 +01:00
Marc Zinnschlag	9788bbcab9	partially store creature state in saved game files (only attributes and dynamics for now)	2014-02-16 15:56:36 +01:00
Marc Zinnschlag	b0532e0c85	store NPC state in saved game files	2014-02-16 15:51:45 +01:00
Marc Zinnschlag	9f721fd144	store list of known topics in saved game files	2014-02-16 12:54:27 +01:00
Marc Zinnschlag	6ac64bbe15	Merge branch 'script' ... Conflicts: readme.txt	2014-02-16 12:12:56 +01:00
Marek Kochanowicz	17af865a9f	checking for the source of the drop, reject those from other files for now	2014-02-16 09:51:33 +01:00
Marc Zinnschlag	9cdfca6c26	Merge remote-tracking branch 'potatoesmaster/disable-crash'	2014-02-15 22:55:00 +01:00
Marek Kochanowicz	cbe1fe2f95	removed misplaced bracket	2014-02-15 22:38:59 +01:00
Marek Kochanowicz	45d9364195	Put the id in the quote.	2014-02-15 22:14:27 +01:00
Marek Kochanowicz	ec8c8a9d88	-journalinfo +topic	2014-02-15 22:05:42 +01:00
Marek Kochanowicz	41606a67e4	implemented whitelist of allowed types in the scripts	2014-02-15 20:49:09 +01:00
Marek Kochanowicz	930b77e60a	allow drag and drop into the script edit window.	2014-02-15 19:52:40 +01:00
Marc Zinnschlag	01a7918124	Merge remote-tracking branch 'potatoesmaster/selected-spell'	2014-02-15 18:38:10 +01:00
Marek Kochanowicz	97fe5465bf	created new files	2014-02-15 17:55:18 +01:00
Emanuel Guevel	3d8ca02479	Fix breaking of enchanted items casting	2014-02-15 17:39:57 +01:00
Marc Zinnschlag	0afa61eed5	fixed referenceable-loading in case of more than one content file	2014-02-15 15:50:17 +01:00
Marc Zinnschlag	2007a3e902	improved script check error messages	2014-02-15 13:25:38 +01:00
Marek Kochanowicz	56be62b956	small reformatting	2014-02-15 13:23:51 +01:00
Marek Kochanowicz	4ee90c24e5	more readable code.	2014-02-15 13:22:14 +01:00
Marc Zinnschlag	4e04131957	fixing case broke sorting in script context	2014-02-15 13:09:43 +01:00
Marc Zinnschlag	2130ec39d6	disable warnings by default in script verifier	2014-02-15 12:58:34 +01:00
Marek Kochanowicz	b1f63947e8	Checking if the drop comes from same document.	2014-02-15 12:40:07 +01:00
Marek Kochanowicz	d6820b977e	store const ref to the document in the table.	2014-02-15 12:22:32 +01:00
Marek Kochanowicz	f3dc45f1ec	long line split.	2014-02-14 15:29:10 +01:00
Marek Kochanowicz	37d262b147	Splited very long line.	2014-02-14 15:12:34 +01:00
Marc Zinnschlag	7b8802588e	Merge remote-tracking branch 'sirherrbatka/DragDrop'	2014-02-14 14:28:30 +01:00
Marek Kochanowicz	aafde926d3	Documentation, corrections.	2014-02-14 14:04:36 +01:00
Marc Zinnschlag	e17af4231a	added script verifier	2014-02-14 13:38:30 +01:00
Marc Zinnschlag	0ff744c2ff	fixed CSMWorld::ScriptContext::isJournalId	2014-02-14 12:56:05 +01:00
gus	a315d5cc2b	aiactivate works. Bug when you try to use it on a reference that doesn't exist. Need to clran up door.cpp	2014-02-14 12:55:14 +01:00
Marek Kochanowicz	ae418f2538	nicer formatting	2014-02-14 12:51:50 +01:00
Marc Zinnschlag	0a8ffbfb1d	added missing implementation for CSMWorld::ScriptContext::getMemberType	2014-02-14 12:46:54 +01:00
Marc Zinnschlag	910d62e4b8	added missing implementation for CSMWorld::ScriptContext::getGlobalType	2014-02-14 11:59:33 +01:00
Marc Zinnschlag	451e1f413b	instead of using pre-compiled variable lists for remote member access get the variable list from the remote script on the fly	2014-02-14 11:15:16 +01:00
Emanuel Guevel	7c981587fc	When searching object by id, search in active cells before searching in the player's inventory	2014-02-13 22:58:12 +01:00
Marc Zinnschlag	053b3dc371	Merge branch 'openmw-28' ... Conflicts: CMakeLists.txt	2014-02-13 20:57:28 +01:00
Emanuel Guevel	e597328b6b	Make enable/disable a no-op for items in containers	2014-02-13 20:24:27 +01:00
Marek Kochanowicz	40cc108e54	drag and drop works.	2014-02-13 20:19:51 +01:00
Marek Kochanowicz	1bcc6d6918	using new icon.	2014-02-13 19:14:17 +01:00
Marek Kochanowicz	2afe3f3e57	Introduced multitype icon.	2014-02-13 19:00:35 +01:00
Marek Kochanowicz	6662560cbc	new displays for referencable table columns	2014-02-13 15:43:19 +01:00
Marc Zinnschlag	d6e212a02b	Merge branch 'master' into script	2014-02-13 15:02:02 +01:00
Marc Zinnschlag	e9238b456d	use case-insensitive sorting in columns	2014-02-13 15:01:10 +01:00
Marek Kochanowicz	09d3c7a446	Attempt to match types. Does not work at the moment.	2014-02-13 13:54:09 +01:00
gus	7c6e27e4f9	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2 ... Conflicts: apps/openmw/mwmechanics/aitravel.cpp	2014-02-13 12:59:04 +01:00
Marek Kochanowicz	71b2fc1c70	Introduced method to access display type.	2014-02-13 10:55:31 +01:00
Marc Zinnschlag	9c52820754	Merge remote-tracking branch 'scrawl/master'	2014-02-13 10:54:51 +01:00
Marek Kochanowicz	5f3f867a10	Implemented convertEnums function	2014-02-13 10:21:49 +01:00
scrawl	c6fb0f2d9b	Removed terrain component's dependency on ESM	2014-02-13 10:13:53 +01:00
Marc Zinnschlag	dde4fbd818	allow one more integer argument in RemoveSoulGem and up to 6 more in AiFollow and then throw them all away	2014-02-13 09:52:44 +01:00
Marc Zinnschlag	b3412b7eec	another case fix (remote member access again)	2014-02-12 15:22:17 +01:00
Marc Zinnschlag	dc433a3c09	fixed case handling problem for local variable access	2014-02-12 13:38:16 +01:00
Marc Zinnschlag	388735046f	fixed broken remote member variable access	2014-02-12 13:35:24 +01:00
Marek Kochanowicz	c142089bfe	Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop	2014-02-12 13:13:32 +01:00
Marek Kochanowicz	c00834a8de	added some iostream garbage.	2014-02-12 13:12:58 +01:00
Marek Kochanowicz	8dfdd87a07	Merge branch 'DnD' of https://github.com/gugus/openmw into DragDrop ... Conflicts: apps/opencs/view/world/table.cpp	2014-02-12 12:12:53 +01:00
Marek Kochanowicz	62c9c77ddf	Compiles now.	2014-02-12 11:42:19 +01:00
gus	6cf561f713	get index to where we are dropping	2014-02-12 11:32:01 +01:00
gus	2e33ab3a13	droping somewhat works	2014-02-12 11:16:12 +01:00
Marek Kochanowicz	e1a39b8388	Replaced some display_string with specific type. Damn, i wish this is correct ;-)	2014-02-12 09:24:08 +01:00
Marek Kochanowicz	fc135fbfee	Added new Display types	2014-02-12 09:04:52 +01:00
Emanuel Guevel	8824af30b4	Allow to display message box outside of dialogue window	2014-02-11 18:26:57 +01:00
Marc Zinnschlag	ffd1783690	Merge remote-tracking branch 'mrcheko/master'	2014-02-11 17:03:50 +01:00
Marc Zinnschlag	e44a7268fc	Merge remote-tracking branch 'potatoesmaster/selected-spell'	2014-02-11 17:00:41 +01:00
Emanuel Guevel	a3eea4f6b6	Do not allow spellcasting stance without spell selected	2014-02-11 16:34:51 +01:00
Emanuel Guevel	70d35da116	Unset selected spell when removed	2014-02-11 16:34:23 +01:00
Emanuel Guevel	6a4820c0f7	Show a message when the player attempts to cast a disabled spell	2014-02-11 14:52:58 +01:00
Marc Zinnschlag	9de2922d22	fixed case problem in remote member variable access	2014-02-11 13:56:56 +01:00
Marek Kochanowicz	53e2e8415d	replaced start with exec	2014-02-11 12:25:21 +01:00
gus	df46218acc	try droping	2014-02-10 16:48:04 +01:00
Marc Zinnschlag	3b990795c4	added access to remote access of local variables of global scripts	2014-02-10 14:45:55 +01:00
gus	b5006c5dbd	compile fix	2014-02-09 15:33:00 +01:00
mrcheko	a6be72673c	improves animation-controlled velocity check	2014-02-08 16:59:15 +02:00
scrawl	8f949c6ae2	Fix lockpicks	2014-02-08 07:35:34 +01:00
scrawl	6ce499f0e6	Fixes #848: Use hardcoded animation velocity for first person movement	2014-02-06 04:05:22 +01:00
scrawl	ff11d85a62	Fix wrong assertion	2014-02-06 03:15:01 +01:00
gus	632834ce10	WIP	2014-02-05 16:12:50 +01:00
scrawl	4a26909172	Fixes #1159: Don't allow quick keys menu in chargen	2014-02-05 12:15:49 +01:00
Marek Kochanowicz	3b8f04c0f3	Allow multi-item drag.	2014-02-05 11:44:08 +01:00
Marek Kochanowicz	f01b02c42d	Changed format.	2014-02-05 11:24:33 +01:00
Marek Kochanowicz	76b729ac9b	Removed getUniversalid interface.	2014-02-05 11:19:55 +01:00
scrawl	677fc84223	Refactor actors update	2014-02-05 09:50:21 +01:00
scrawl	0cc1cd8f7e	Fix message box formatting bug	2014-02-05 05:18:11 +01:00
scrawl	7907181c0c	Fix uninitialized member	2014-02-05 05:18:11 +01:00
scrawl	ffe19e7a52	Feature #50: Handle attach & release of projectiles	2014-02-05 05:18:11 +01:00
scrawl	8b8fb931a0	Feature #50: Don't allow ranged weapon attack when ammunition is empty	2014-02-05 05:18:10 +01:00
scrawl	a07eaa0c0d	Feature #50: Allow body pitch in third person for ranged weapon aiming	2014-02-05 05:18:10 +01:00
scrawl	5ee105c812	Fix typo	2014-02-05 05:18:10 +01:00
scrawl	7cf22391a5	Feature #50: Handle weapon controllers (i.e. bowstring animations, etc)	2014-02-05 05:18:10 +01:00
scrawl	e1e7a492e2	Fix movement speed formula for flying creatures	2014-02-05 05:18:10 +01:00
scrawl	f608ceeffc	Fixes #1158 (Armor rating label issues)	2014-02-05 05:18:10 +01:00
scrawl	8aed4fcfa4	Correction for marksman weapon inventory preview	2014-02-05 05:18:10 +01:00
scrawl	5b076aa570	Revert "Bug #1074: Inventory paperdoll obscures armour rating" ... This reverts commit b017a3be3e.	2014-02-05 05:18:10 +01:00
scrawl	df78357e05	Handle knockout separately (Closes #1151)	2014-02-05 05:18:09 +01:00
Marek Kochanowicz	04287cb87a	Provide method to return whole data vector from tablemimedata.	2014-02-04 19:42:52 +01:00
Marek Kochanowicz	8b799683c1	Display QPixMap with dragged object.	2014-02-04 18:48:18 +01:00
Marek Kochanowicz	3439940a8e	Tablemimedata able to handle vector of objects and return icon.	2014-02-04 18:38:31 +01:00
Marek Kochanowicz	423b2906be	Yes, you can drag. But not drop.	2014-02-04 11:40:48 +01:00
Marek Kochanowicz	dc80bfff55	Attempt to get basic tablemimedata subclass.	2014-02-04 09:13:40 +01:00
mrcheko	688f359a33	discard creatures speed and negative fatique changes	2014-02-03 23:09:26 +02:00
Marc Zinnschlag	c5b92ed6c8	Merge remote-tracking branch 'pvdk/versioninfo'	2014-02-03 11:21:11 +01:00
Marc Zinnschlag	21f502df34	compatibility fix	2014-02-03 11:20:55 +01:00
pvdk	f263acdac6	Merge remote-tracking branch 'upstream/master' into versioninfo	2014-02-03 02:27:24 +01:00
Alexander "Ace" Olofsson	e50a393de4	Fix linking issues on Windows using MSVC.	2014-02-02 23:59:57 +01:00
pvdk	4e03e9cf87	Changed development version info text and the tooltip now works on all platforms	2014-02-02 20:10:47 +01:00
Marc Zinnschlag	32860a05e3	added dummy implementations for getPcInJail and getPcTraveling	2014-02-02 15:35:18 +01:00
mrcheko	761f13d3ce	activate whole-body attack animations	2014-02-02 16:29:51 +02:00
Marc Zinnschlag	914ab1b8ab	allow 'x' instead of 'getjournalindex x'	2014-02-02 15:08:27 +01:00
Marc Zinnschlag	4ee43612f6	added new switch: --script-warn	2014-02-02 14:09:59 +01:00
mrcheko	b85a4dd35e	pos accum without conformity with animation bug/creature speed	2014-02-02 15:01:49 +02:00
Alexander "Ace" Olofsson	e3d85af70a	Fix an issue with int32_t being unknown on windows.	2014-02-02 13:57:19 +01:00
Marek Kochanowicz	a36cc26434	Created new files for TableMimeData class.	2014-02-01 19:06:41 +01:00
scrawl	1deb0a7cdf	Savegame dialog: Set key focus to editbox	2014-02-01 18:42:01 +01:00
scrawl	ec46575671	Overwriting saves fixes - copy description of overwritten slot, ask for confirmation	2014-02-01 18:42:01 +01:00
scrawl	6d37cd7e86	Savegame dialog: Don't allow empty save names	2014-02-01 18:42:01 +01:00
scrawl	63284d21a0	Savegame dialog: 'Enter' while editing a name is equivalent to pressing the ok button	2014-02-01 18:42:01 +01:00
scrawl	dea9d21db6	Some additional safety checks for global map loading	2014-02-01 18:42:01 +01:00
scrawl	f89b3cac02	Feature #764: Store the actor that gave the dialog response	2014-02-01 18:42:01 +01:00
scrawl	a988a0d6dc	Don't add duplicate topic responses to the journal	2014-02-01 18:42:00 +01:00
scrawl	37ef8ec908	Savegame dialog: support loading saves using Enter key or double-click	2014-02-01 18:42:00 +01:00
scrawl	49e26415be	Don't call loadGame() from within the MWMechanics::Actors update sequence	2014-02-01 18:42:00 +01:00
Marc Zinnschlag	1b5301eec0	Merge branch 'savedgame' ... Conflicts: apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwbase/soundmanager.hpp apps/openmw/mwgui/mapwindow.hpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp apps/openmw/mwsound/soundmanagerimp.hpp components/esm/loadcell.cpp	2014-02-01 18:16:32 +01:00
Marc Zinnschlag	5b04c10e1d	added creature/NPC state to saved games (only container/inventory for now)	2014-02-01 17:36:23 +01:00
Marc Zinnschlag	d2ec3ffdc8	handle equipped items when serialising inventory state	2014-02-01 17:31:05 +01:00
Marc Zinnschlag	bcc5894e2d	changed implementation functions for container serialisation from free functions to member functions (will need some polymorphism later)	2014-02-01 15:24:01 +01:00
Marc Zinnschlag	dd674566a2	store content of containers in saved game files	2014-01-31 13:25:32 +01:00
scrawl	4ec86d1c68	Bug #1147: Fix the inventory preview pose used for ranged weapons	2014-01-31 05:06:35 +01:00
scrawl	60bbab52fe	Support keyframe controllers for bones that aren't in the skeleton base	2014-01-31 05:06:34 +01:00
scrawl	da34f8bda1	Fix LastHitObject	2014-01-31 04:43:35 +01:00
scrawl	067c2bc2ec	Disable combat movements for creatures without weapons	2014-01-31 04:43:35 +01:00
scrawl	7820ea5806	"Always best attack" should only affect the player	2014-01-31 04:43:35 +01:00
scrawl	d0c6ecd03a	Bug #1148: Workaround for broken images in some MW versions	2014-01-31 04:43:35 +01:00
scrawl	52f89e9a17	Don't play "idle" voice entries for NPCs with Hello 0 ... Not entirely sure if this is correct, but it prevents the NPCs in the starting boat from incorrectly playing them.	2014-01-31 04:43:35 +01:00
scrawl	39d86a9468	Improvements to smooth NPC steering	2014-01-31 04:43:29 +01:00
mrcheko	80d8aa4030	bug with sequence of knockouts; giving sense to some hit state code	2014-01-30 23:54:26 +02:00
Marc Zinnschlag	900532a6ca	store additional state of lights in saved game files	2014-01-30 12:37:33 +01:00
Marc Zinnschlag	ec7cb90ca4	added support for serialisation of CustomData state	2014-01-30 11:50:13 +01:00
scrawl	2b15b8b484	Fix gold bugs (Fixes #1145, Fixes #1146)	2014-01-29 15:37:27 +01:00
scrawl	305e78c981	Fix creature attack bug	2014-01-29 15:37:27 +01:00
scrawl	e717694b36	Reset Run stance in AiWander	2014-01-29 15:37:27 +01:00
scrawl	23ffb8a4dc	Fixes #1143: Make getCurrentAiPackage return the package that was run last, not the package that will be run in the next frame. ... This makes the Mehra Milo script work properly.	2014-01-29 15:37:27 +01:00
scrawl	434fd21584	Don't set journal index if a higher index is currently set ... This is vanilla behaviour, and required for the Mehra Milo vivec informants quest.	2014-01-29 15:37:27 +01:00
scrawl	edff88542b	Allow double click / Enter key for accepting race/class/birthsign	2014-01-29 15:37:27 +01:00
scrawl	a8a09762ce	Don't crash when deleting or disabling a moving door	2014-01-29 15:37:26 +01:00
scrawl	190512156d	Use some more GMSTs for enchanting	2014-01-29 15:37:26 +01:00
scrawl	ea7e0abdc2	Move WhenStrikes skill success to a more appropriate place	2014-01-29 15:37:26 +01:00
scrawl	b8db151da7	Add missing skill increases for armor hits	2014-01-29 15:37:26 +01:00
scrawl	82146e7f8d	Use GMSTs for levelup	2014-01-29 15:37:26 +01:00
scrawl	cc40cec395	Move levelup to NpcStats ... The code came from back in the days where NpcStats did not derive from CreatureStats.	2014-01-29 15:37:26 +01:00
scrawl	ba67bf45f8	Fix an issue with InventoryStore copy constructor. Don't copy the iterator directly - mContainer will be wrong and comparisons against end() will always fail. ... This caused an exception when looting a creature that had moved cells.	2014-01-29 15:37:26 +01:00
scrawl	365ae15532	Drag&Drop: auto-hide windows that can't be drop targets on mouseover	2014-01-29 15:37:26 +01:00
mrcheko	3a5da7e6e8	merged with master	2014-01-29 00:03:00 +02:00
mrcheko	5ee1dc6be8	attacktypes error fix	2014-01-28 21:07:26 +02:00
Marc Zinnschlag	1d34f5e096	Merge remote-tracking branch 'sirherrbatka/cloning' ... Conflicts: apps/opencs/model/world/refiddata.cpp	2014-01-28 12:40:14 +01:00
Marc Zinnschlag	a473c3f619	some cleanup	2014-01-28 12:36:10 +01:00
Marc Zinnschlag	fd5486864a	Merge remote-tracking branch 'gus/AIFix2' ... Conflicts: apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwmechanics/actors.hpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp	2014-01-28 12:33:31 +01:00
Marek Kochanowicz	2bd98a69ab	Corrections, according to the comments. Thanks for the review. :-)	2014-01-28 11:16:48 +01:00
pvdk	1262eab03a	Added some nice error messages to the installation process	2014-01-28 01:03:47 +01:00
pvdk	2736527e5a	Did some cleanup work on the unshield thread: more code re-use	2014-01-27 22:54:14 +01:00
mrcheko	e50e94af0b	remove CreatureStats::mAttackType, set/getAttackType()	2014-01-27 23:05:17 +02:00
mrcheko	fe0268062d	merge with master	2014-01-27 22:38:01 +02:00
pvdk	802448b217	Added a settings page to the launcher	2014-01-27 20:14:02 +01:00
Marek Kochanowicz	d3000ce099	whitespaces removed again.	2014-01-27 19:47:54 +01:00
Marek Kochanowicz	62ea0bb066	Cleared whitespaces.	2014-01-27 19:40:05 +01:00
Marek Kochanowicz	c82db915f1	Removed needless includes	2014-01-27 19:32:51 +01:00
Marek Kochanowicz	d0b07de7ef	Corrected bug mentioned by zini.	2014-01-27 16:59:18 +01:00
pvdk	3fd88aca59	Re-added support for GoTY disks and added a messagebox, displayed when done	2014-01-27 16:51:22 +01:00
gus	846276f747	clean up	2014-01-27 15:14:24 +01:00
pvdk	8db333c8d0	Made the getter/setter functions thread-safe	2014-01-27 15:12:02 +01:00
Marek Kochanowicz	ed0ba906cf	removed needless include	2014-01-27 15:05:29 +01:00
Marek Kochanowicz	9c579dbd6c	ok, that should be enough	2014-01-27 15:03:29 +01:00
Marek Kochanowicz	84e07c95b1	formatting	2014-01-27 15:02:29 +01:00
Marek Kochanowicz	51115fa5be	spaces around operators	2014-01-27 14:56:57 +01:00
Marek Kochanowicz	c91ae86084	is there something that can generate diff from two git branches? Using github for this is kinda annoying.	2014-01-27 14:53:39 +01:00
Marek Kochanowicz	52176d6435	reforfucking	2014-01-27 14:51:57 +01:00
Marek Kochanowicz	2b71568bb6	still reformating	2014-01-27 14:50:36 +01:00
Marek Kochanowicz	316debb827	reformating	2014-01-27 14:46:58 +01:00
Marek Kochanowicz	4d6fb31610	reformating	2014-01-27 14:45:07 +01:00
Marek Kochanowicz	2899f04a3f	reformatting	2014-01-27 14:43:12 +01:00
Marek Kochanowicz	6a0b5defd7	removed needless member value.	2014-01-27 13:42:08 +01:00
Marek Kochanowicz	bb62efc3d8	Removed pointless includes.	2014-01-27 13:36:01 +01:00
Marc Zinnschlag	29c3a288e3	load and save of reference in cells (without CustomData state)	2014-01-27 13:27:42 +01:00
Marek Kochanowicz	71d6364754	Chaninging variables name to follow our policy.	2014-01-27 13:13:39 +01:00
Marek Kochanowicz	aa6d1ff4c3	removed needless argument for cloning	2014-01-27 13:08:14 +01:00
Marek Kochanowicz	be8b978a89	corrected mistake in data	2014-01-27 12:23:03 +01:00
Marek Kochanowicz	62c2259c87	removing coordinates handling	2014-01-27 10:10:23 +01:00
mrcheko	45b3aa3d93	corrected things connected to determining attack type	2014-01-26 23:32:57 +02:00
gus	f5d589388c	bug fix	2014-01-26 22:06:54 +01:00
gus	764011dd1b	clean up	2014-01-26 21:53:55 +01:00
gus	7cb47aa635	new implementation of pathfinding. Works, but need clean up	2014-01-26 21:26:19 +01:00
scrawl	eba6c9a8fd	Fix massive console spam regarding the scrib's idle3 animation	2014-01-26 02:49:32 +01:00
scrawl	b1066de81d	Revert "Merge remote-tracking branch 'mrcheko/master'" ... This reverts commit 4e360136b1, reversing changes made to 047bbe43b2. Conflicts: apps/openmw/mwmechanics/aicombat.cpp	2014-01-26 00:31:44 +01:00
scrawl	a1fbd1fcc8	Revert "Merge remote-tracking branch 'mrcheko/master'" ... This reverts commit df7c139e2f, reversing changes made to fec26342cd.	2014-01-26 00:14:49 +01:00
scrawl	e0de76a6f7	Save/load global map	2014-01-25 19:06:14 +01:00
scrawl	e62bf8fca9	Remove some garbage	2014-01-25 16:41:26 +01:00
scrawl	79a9c4e048	Clear mShared before populating it. Fixes an issue with duplicate records (e.g. dialogue keywords) after loading a savegame.	2014-01-25 16:33:39 +01:00
scrawl	bdb03926c2	Fix crash when loading another game after dying	2014-01-25 16:13:45 +01:00
scrawl	28185e2017	Death/godmode fixes: Revive player *after* character update, since there might be fall damage.	2014-01-25 15:54:24 +01:00
scrawl	f09328ca84	Clear global map overlay when starting/loading a game	2014-01-25 13:34:56 +01:00
pvdk	cdbf5c68b0	Implemented selection of installation media and added forgotten file	2014-01-24 22:25:22 +01:00
Marek Kochanowicz	032c542396	improving the cell cloning.	2014-01-24 20:34:33 +01:00
gus	707e579dfe	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2 ... Conflicts: apps/openmw/mwmechanics/aifollow.cpp	2014-01-24 19:16:50 +01:00
gus	5ca5946760	WIP	2014-01-24 19:13:23 +01:00
scrawl	03cf383be7	Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame ... Conflicts: apps/openmw/mwgui/referenceinterface.cpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp apps/openmw/mwscript/cellextensions.cpp apps/openmw/mwworld/cells.cpp apps/openmw/mwworld/cells.hpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/store.cpp apps/openmw/mwworld/worldimp.cpp	2014-01-24 18:28:35 +01:00
scrawl	295aed3533	Implement savegame screenshots	2014-01-24 17:49:16 +01:00
scrawl	786ed6ca5b	Include some required Ogre headers explicitely	2014-01-24 15:02:34 +01:00
scrawl	ac1859fb77	Merge branch 'savedgame' of https://github.com/zinnschlag/openmw into savedgame	2014-01-24 15:02:13 +01:00
scrawl	9b9c39af7a	Fix being able to activate magic bolts mid-flight	2014-01-24 13:22:39 +01:00
scrawl	ac4c904e62	Fix projectile bug	2014-01-24 13:22:30 +01:00
Marek Kochanowicz	01be9386d6	Id to the coordinates with the boost and explicit specialisations of template member functions.	2014-01-24 11:22:20 +01:00
mrcheko	87e83a92f8	refactoring of setting an attack type	2014-01-23 23:14:20 +02:00
Marek Kochanowicz	f390c7f4b0	Disable widgets in the cell creator.	2014-01-23 16:24:03 +01:00
Marek Kochanowicz	c87d9ff38d	Disable reference creator widget when in the clone mode.	2014-01-23 16:17:04 +01:00
Marek Kochanowicz	dda7ddb6f8	Disable not needed referencable creator widget when in cloning mode.	2014-01-23 16:00:44 +01:00
Marek Kochanowicz	1b1ecafdd8	introduced missing columns to data	2014-01-23 15:13:37 +01:00
pvdk	19bef4fce8	Distinguish between release and development builds	2014-01-23 13:18:05 +01:00
scrawl	70264eae3b	Feature #764: Quest completetion status in quest book	2014-01-23 13:08:56 +01:00
scrawl	849ee54399	Feature #764: Show quest names in quest book if present	2014-01-23 12:54:37 +01:00
Marc Zinnschlag	460089c0aa	ignore deleted references that did not came from a content file	2014-01-23 12:53:55 +01:00
Marc Zinnschlag	419e3a7d30	write references in cells to saved game file	2014-01-23 12:51:42 +01:00
scrawl	358cc3c62f	Closes #1060: Fix incorrect message box size	2014-01-23 12:24:06 +01:00
Marc Zinnschlag	22cb4784b5	store cell state in saved game files (no references yet)	2014-01-23 11:29:40 +01:00
Marek Kochanowicz	4d9d31b25e	refrences cloning does not work	2014-01-23 09:41:09 +01:00
pvdk	c354cd52be	Added compile date and time to the version info in the launcher	2014-01-22 18:37:49 +01:00
pvdk	fa186f5ec1	Added version information to the launcher	2014-01-22 17:51:10 +01:00
pvdk	c95b8bcb39	Moved the generated version header stuff into components	2014-01-22 17:33:55 +01:00
scrawl	cf378ec31e	Support optional volume and pitch arguments for soundgen events (e.g. moan 0.5 1.0) as required for some actors	2014-01-22 15:25:03 +01:00
scrawl	2e6e0fd0a0	Fix GetPcCell bug	2014-01-22 14:45:36 +01:00
scrawl	ea21d8fec3	Fix CreatureTargetted function	2014-01-22 13:30:45 +01:00
scrawl	4c94289b1f	Fix PC Health Percent function	2014-01-22 13:30:07 +01:00
scrawl	f27701cbe8	Detect selling stolen items or enchanting with stolen items	2014-01-22 13:04:55 +01:00
scrawl	264226dfe3	Handle iWereWolfBounty	2014-01-22 12:33:47 +01:00
scrawl	194413c955	Feature #1119: Implement Resistance/Weakness to normal weapons magic effect. Handle fWereWolfSilverWeaponDamageMult.	2014-01-22 12:26:53 +01:00
scrawl	f89c400305	Don't complain about greetings with no sound	2014-01-22 00:02:43 +01:00
scrawl	16f5f5862d	Feature #956: Implement blocking melee attacks	2014-01-21 23:25:24 +01:00
Marek Kochanowicz	b3b51992ef	copying references.	2014-01-21 21:37:21 +01:00
Marc Zinnschlag	9ebe66e693	improved cleanup; failed loads will now drop back into the main menu instead of crashing	2014-01-21 14:50:58 +01:00
Marc Zinnschlag	0f60898517	adding missing cleanup for SoundManager	2014-01-21 14:13:13 +01:00
scrawl	82a07af72c	Fix typo (should be Strength, not Luck). Use GMSTs for strength damage.	2014-01-21 12:30:23 +01:00
scrawl	1617a4f7d9	Use fCombatDistance	2014-01-21 12:30:23 +01:00
scrawl	a4404054bb	Feature #1130: Add race power spells for NPCs as well, not just the player	2014-01-21 12:30:23 +01:00
scrawl	5de8c7fe29	Feature #1130: Add auto-calculated NPC spells	2014-01-21 12:30:23 +01:00
scrawl	851a7d5014	Feature #957: Handle area effects for "on touch" range	2014-01-21 12:30:15 +01:00
Marek Kochanowicz	bc0130f8d8	do not double check if record is deleted	2014-01-21 10:35:08 +01:00
Marek Kochanowicz	9b56b6585b	Cloning works for referencables as well.	2014-01-21 09:43:02 +01:00
Marek Kochanowicz	7594bcf97a	Small refactoring.	2014-01-21 08:27:29 +01:00
Marek Kochanowicz	d0a52b7b24	mostly refreshing view.	2014-01-20 18:28:06 +01:00
Marek Kochanowicz	92ee252eef	Small correction.	2014-01-20 16:39:42 +01:00
Marek Kochanowicz	d82f272e05	Properly check if clone is deleted.	2014-01-20 16:17:49 +01:00
Marek Kochanowicz	5a52715701	implemented check for deletion. But it seems flawed.	2014-01-20 15:58:19 +01:00
Marek Kochanowicz	38636fab9a	added setId to adapter	2014-01-20 14:38:20 +01:00
Marek Kochanowicz	a45339bbe6	lower case in command, not in the collection	2014-01-20 14:14:59 +01:00
Marek Kochanowicz	33620a001b	Cloning works for single record type tables. Well, kinda.	2014-01-20 13:59:00 +01:00
scrawl	c8a9e9f7fa	Stop AiCombat when the target is dead	2014-01-20 13:54:10 +01:00
scrawl	42284603f7	Properly handle on target effects with mArea=0	2014-01-20 13:44:38 +01:00
scrawl	9cedd3bb2e	Fix spell area not displaying in tooltip	2014-01-20 13:11:34 +01:00
scrawl	205e8aa4e9	Feature #957: Implement area magic	2014-01-20 13:11:29 +01:00
scrawl	ba5300b071	Update the Ptr in SoundManager for references moved to a different cell. Fixes looping sounds not stopping after a moved object was already deleted.	2014-01-20 12:05:13 +01:00
scrawl	5dd3cfa09a	Loop projectile sounds	2014-01-20 11:50:52 +01:00
scrawl	df7c139e2f	Merge remote-tracking branch 'mrcheko/master'	2014-01-19 21:23:04 +01:00
scrawl	fec26342cd	Query the number of animation groups for death/hit animations, since they can vary a lot (argonian/khajiit, creatures, first person..)	2014-01-19 21:11:48 +01:00
mrcheko	339399f8b1	bug fix/logic fix/future suggestion	2014-01-19 22:09:51 +02:00
scrawl	05e75e1214	Closes #1127: Fix for subtitles for idle dialogue appearing outside of hearing range	2014-01-19 20:54:05 +01:00
scrawl	bea161331c	Play 'hello' voiced dialogue entries in AIWander	2014-01-19 20:53:58 +01:00
Marek Kochanowicz	0ea2bb7c4c	Working on commands	2014-01-19 16:49:39 +01:00
scrawl	0adc0f56ed	Issue #777: Consider weapons in Creature::hit	2014-01-19 16:13:16 +01:00
scrawl	9723263730	Bug #1126: Tweak creature attack distance a bit (still no idea where this should come from)	2014-01-19 14:47:58 +01:00
scrawl	1a00f26390	Bug #1126: Golden saints and many other creatures only have "Bip01 Head"	2014-01-19 14:33:41 +01:00
scrawl	4e360136b1	Merge remote-tracking branch 'mrcheko/master' ... Conflicts: apps/openmw/mwmechanics/aicombat.cpp apps/openmw/mwmechanics/character.cpp apps/openmw/mwmechanics/character.hpp	2014-01-19 14:01:39 +01:00
scrawl	047bbe43b2	Don't complain about missing jump animations	2014-01-19 13:46:40 +01:00
scrawl	13646a651b	Issue #777: Handle creatures with weapons in CharacterController. Move attack strength to CreatureStats.	2014-01-19 13:32:58 +01:00
scrawl	198bb0de60	Issue #777: Add CreatureAnimation variant for creatures with weapons/shields	2014-01-19 13:05:26 +01:00
Marek Kochanowicz	b3e45c55bc	progressing with the cloning	2014-01-19 11:44:47 +01:00
scrawl	589fbbd871	Issue #777: Create InventoryStore for creatures with weapons/shields	2014-01-19 11:43:23 +01:00
scrawl	69ca03c308	Issue #777: Move DrawState to CreatureStats. All creatures can cast spells, and some creatures have weapons.	2014-01-19 09:43:41 +01:00
scrawl	947b6c9645	kOgrePi unused	2014-01-18 22:16:31 +01:00
scrawl	4c0045b418	Bug #1109: Do not reset water level when loading a plugin with no water level record (for real this time)	2014-01-18 21:11:12 +01:00
Marc Zinnschlag	14e64c180f	on load check player record for dangling ID references	2014-01-18 15:06:58 +01:00
Marc Zinnschlag	6584a01d01	reset reference to player NPC record during cleanup	2014-01-18 14:53:25 +01:00
mrcheko	969340d61b	fixed StartCombat script	2014-01-18 12:55:17 +02:00
scrawl	525ce2f042	Some cleanup - move definitions to implementation file	2014-01-18 10:52:16 +01:00
scrawl	c04a8afc8b	Make sure onPcEquip is also set for Equip script instruction	2014-01-18 10:51:52 +01:00
scrawl	9653355cf1	Feature #701: Spawn levelled creatures in cells	2014-01-18 07:26:27 +01:00
mrcheko	df4df5b094	fixed weapRange for creatures/startcombat script(?)	2014-01-17 23:30:28 +02:00
scrawl	5049f3b134	Fix the group for creature attack animations	2014-01-17 20:18:35 +01:00
mrcheko	a11a6b616b	Merge remote-tracking branch 'upstream/master'	2014-01-17 21:00:55 +02:00
mrcheko	435bbdd530	one more mismatch fixed	2014-01-17 20:55:21 +02:00
mrcheko	46a4790cb1	final warnings removal	2014-01-17 20:33:49 +02:00
mrcheko	7df8273d71	fix for everybody	2014-01-17 20:01:15 +02:00
scrawl	3dcb292bc1	Do not soul trap creatures without a soul (which apparently exist)	2014-01-17 18:43:45 +01:00
mrcheko	5357f569e6	fix for scrawl	2014-01-17 19:36:22 +02:00
scrawl	149d77dedf	Feature #960: Add knockdown and hit recovery for creatures	2014-01-17 17:41:16 +01:00
scrawl	9b32b1403b	Feature #960: Implement Creature::hit	2014-01-17 17:19:08 +01:00
scrawl	228254c890	Handle creature attack animations in character controller	2014-01-17 16:31:27 +01:00
scrawl	c76a0448a3	Closes #1123: Implement SlowFall magic effect	2014-01-17 15:47:34 +01:00
scrawl	27d0d9c592	Fix exception when clicking on statics when in the inventory window	2014-01-17 15:27:59 +01:00
scrawl	5fc38e7ac4	Don't use blood effects for fatigue damage	2014-01-17 15:20:28 +01:00
scrawl	c548dcee13	Quick keys menu: make sure selected spell still exists	2014-01-17 15:20:22 +01:00
pvdk	0f7f3391f7	WIP: Working on the installation of addons	2014-01-17 13:21:44 +01:00
Marc Zinnschlag	1b7697a4b2	handle missing player specific state during load/save	2014-01-17 13:07:57 +01:00
scrawl	805843d7ff	Closes #1086: Implement blood effects	2014-01-17 11:27:13 +01:00
scrawl	240d96a0f1	Renamed AnimationValue to AnimationTime	2014-01-17 10:55:46 +01:00
scrawl	11394d83c5	Feature #1086: Import blood models/textures in MWIniImporter	2014-01-17 10:55:46 +01:00
scrawl	ddc432c7ef	Fix stealing bug	2014-01-17 10:55:46 +01:00
scrawl	e410eb5273	Play 'Idle' voiced dialogue entries in AIWander. Tweak voice max distance.	2014-01-17 10:55:46 +01:00
scrawl	2836c7c927	Do not set owner when adding items to a container, as opposed to NPC/creatures	2014-01-17 10:55:46 +01:00
scrawl	fe66012bcd	Closes #1115: Fix a bug causing number of AI packages to grow exponentially when adding an AI package. Not sure if adding the same package twice should even be allowed.	2014-01-17 10:55:46 +01:00
scrawl	f070d9966d	Implement movement speed formula for creatures. Still moving a bit too slow.	2014-01-17 10:55:46 +01:00
mrcheko	f2ad1c18f2	fix merging problem/some logic fixes	2014-01-16 22:24:05 +02:00
Alexander "Ace" Olofsson	ddf72c06de	Update statswindow.cpp ... Fixes a build issue on MSVC ('floor' : ambiguous call to overloaded function)	2014-01-16 12:09:50 +01:00
Marc Zinnschlag	c300cd9375	loading/saving of some player state (cell/coordinates and some other bits)	2014-01-16 12:03:23 +01:00
mrcheko	d5f794d4fb	update to combat ai behaviour	2014-01-15 22:56:55 +02:00
scrawl	ea8f60eddf	Implement movement speed formula for creatures. Still moving a bit too slow.	2014-01-15 16:30:16 +01:00
scrawl	d544551f61	Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization) ... Information provided by Hrnchamd.	2014-01-15 15:50:45 +01:00
scrawl	7534fc968d	Minor acrobatics fixes	2014-01-15 14:53:30 +01:00
scrawl	28a2585106	Unsheath weapon in AiWander	2014-01-15 14:53:29 +01:00
scrawl	dff67bb0b6	StopCombat: mark as non-hostile	2014-01-15 14:53:29 +01:00
scrawl	da3295d69c	Closes #1106: Move stance to CreatureStats, since creatures also have separate run/walk animations.	2014-01-15 14:53:29 +01:00
scrawl	03b2e99802	Remove unused Combat stance	2014-01-15 14:53:29 +01:00
scrawl	d0500e8124	Some unneeded includes cleanup	2014-01-15 14:53:28 +01:00
scrawl	0c4b6ea89f	Minor fix	2014-01-15 14:53:28 +01:00
scrawl	a432661b8a	Minor correction	2014-01-15 14:53:28 +01:00
scrawl	de64c57179	Fix some typos and accidental commit	2014-01-15 14:53:28 +01:00
Marc Zinnschlag	bf1a37dc38	Merge remote-tracking branch 'sirherrbatka/referencables_verifer'	2014-01-15 14:29:54 +01:00
Marek Kochanowicz	6224344957	Being any idiot is hard.	2014-01-15 12:52:38 +01:00
Marek Kochanowicz	3d722ba104	Corrected brackets.	2014-01-15 11:59:11 +01:00
Marek Kochanowicz	fbcb1a14fc	ooops, using search id	2014-01-15 11:12:56 +01:00
Marek Kochanowicz	89d4a90c06	Localised version of morrowind will no longer spam false positives. Don't check diff, please.	2014-01-15 10:30:43 +01:00
Marek Kochanowicz	344cae8f99	added new entry to the context menu	2014-01-14 15:44:04 +01:00
greye	61707694e8	fix memory leak in AISequence	2014-01-14 16:22:50 +04:00
Marek Kochanowicz	6397d9d40e	Added mCloneAction member	2014-01-14 13:12:15 +01:00
greye	15d946415e	minor cleanup ... Removed case folding via std::transform, excessive lowerCase() replaced with ciEqual().	2014-01-14 12:46:53 +04:00
Marek Kochanowicz	c981a2a6f8	Removed boost in favor of #include <components/misc/stringops.hpp>. Hopefully this will make scrawl happy. :P	2014-01-14 09:25:03 +01:00
Marek Kochanowicz	2c1ef610b9	Moving back to boost for case insensitive comparsion.	2014-01-14 09:16:59 +01:00
scrawl	52b9ebff9d	Closes #1092: Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell.	2014-01-14 07:42:03 +01:00
scrawl	69381c49c7	Added a todo comment	2014-01-14 07:39:44 +01:00
scrawl	b8583124e0	Correction for RemoveSoulgem instruction	2014-01-14 06:13:30 +01:00
scrawl	90b92a8f41	Move levelled list code out of ContainerStore	2014-01-14 05:37:06 +01:00
scrawl	6aa56354c0	Revert "Bug #991: Don't autoequip items with harmful permanent enchantments" ... This is no longer needed, since merchants no longer equip items sold to them (2f35e5a04e). Also, items with harmful enchantments that are initially in the NPCs inventory *must* be equipped (e.g. slave bracers) This reverts commit 71d9755ef1.	2014-01-14 05:24:58 +01:00
scrawl	9de3abcb5f	Closes #1105: Do not reduce magicka if unable to cast	2014-01-14 03:34:30 +01:00
scrawl	396efd580b	Fix a leftover of the old coordinate system	2014-01-14 03:26:56 +01:00
scrawl	2196ce427a	Closes #556: Link movie volume to 'master' volume slider, instead of 'music'.	2014-01-14 03:08:37 +01:00
scrawl	95651857f3	Fix code duplication	2014-01-14 02:52:34 +01:00
scrawl	0d0005c433	Fix fatigue not restoring when waiting	2014-01-14 02:20:13 +01:00
Marek Kochanowicz	e34cb9e931	changed according to the scrawl sugestion	2014-01-13 19:17:03 +01:00
Marek Kochanowicz	59de794e58	Creature check was not invoked.	2014-01-13 19:02:23 +01:00
Marek Kochanowicz	17cc6a695c	fixed bug resposnsible for exception throwed.	2014-01-13 18:34:28 +01:00
scrawl	ba27b693f8	Increase sneak skill on successful pickpocket	2014-01-13 10:18:03 +01:00
scrawl	73268a8606	Fix skill progress not working	2014-01-13 10:18:03 +01:00
scrawl	cd06b2177d	Automatically knock down when fatigue goes below zero	2014-01-13 10:18:03 +01:00
scrawl	413bf127de	Allow drain fatigue effect to reduce below zero	2014-01-13 10:18:02 +01:00
scrawl	3a1b6dd354	Handle fCombatKODamageMult and fCombatCriticalStrikeMult. Fix SelectWrapper Function_Detected.	2014-01-13 10:18:02 +01:00
scrawl	83872f6bf5	Knockdown / hit recovery improvements. Use formula and GMSTs from research wiki for knockdown determination. Hand-to-hand automatically knocks out when fatigue empty.	2014-01-13 10:18:02 +01:00
Marc Zinnschlag	3e58eb34e4	Merge remote-tracking branch 'sergeyshambir/startcombat' ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2014-01-13 10:17:10 +01:00
Marc Zinnschlag	63cd70f810	some junk removal	2014-01-13 10:03:25 +01:00
scrawl	7983b07b10	Get bk_treasuryreport script to work properly: ... - OnPcEquip needs to be set on *using* any item, not just equipping - Handle PcSkipEquip - Execute item's script once immediately after setting OnPcEquip - Do not set OnPcEquip when an item that has skipped equipping sets pcskipequip back to 0 and gets equipped	2014-01-13 06:20:18 +01:00
gus	5d4e148063	some clean up	2014-01-12 22:47:22 +01:00
gus	5d038423ec	attempt to solve Bug #1009 by not building graph every frame	2014-01-12 18:42:31 +01:00
Marc Zinnschlag	9025210965	Merge branch 'refnum' into savedgame ... Conflicts: apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/manualref.hpp components/esm/cellref.hpp	2014-01-12 16:58:06 +01:00
gus	0e46c40cb5	Make ACtionTeleport non player specific and teleport actors following the teleporting actor	2014-01-12 14:03:11 +01:00
gus	1ae62665d6	get all actors following a given actor	2014-01-12 14:02:40 +01:00
gus	dd870e35db	get all actors following a given actor	2014-01-12 14:02:15 +01:00
gus	2446abe076	Allow getting current active package	2014-01-12 14:01:54 +01:00
gus	7e96a391da	FollowCell duration = 0 -> infinite time	2014-01-12 11:39:42 +01:00
gus	7066844e52	Follow you until a certain cell is reached	2014-01-12 11:38:58 +01:00
scrawl	f78b846f9e	Handle CasterLinked magic effect flag	2014-01-12 10:21:49 +01:00
scrawl	767c72e619	Fix diagonal movement being faster than forward movement	2014-01-12 10:04:06 +01:00
scrawl	fb778f8ecd	Use fEncumbranceStrMult	2014-01-12 04:09:51 +01:00
scrawl	1d19d36bd6	Remove unused magic effect flags and update esmtool output	2014-01-12 01:25:00 +01:00
scrawl	921ef6cd9c	Closes #1093: Show weapon when initializing the character controller with a weapon equipped	2014-01-12 00:42:27 +01:00
scrawl	10ddea45e9	Move crime from onHit to hit, since failed hits are apparently also a crime	2014-01-11 23:12:21 +01:00
scrawl	44b2380874	Closes #947: Decrease fatigue when running, swimming and attacking	2014-01-11 22:28:50 +01:00
scrawl	dddc0979a2	Fix another fatigue cap issue	2014-01-11 22:28:50 +01:00
scrawl	224f288359	Don't attempt to change disposition for creatures	2014-01-11 21:30:26 +01:00
scrawl	3db299f1b2	Fix fall damage crash	2014-01-11 21:30:26 +01:00
gus	051d7141be	check position to stop AIFollow	2014-01-11 20:32:38 +01:00
Marc Zinnschlag	5ea25dc269	player state cleanup	2014-01-11 15:34:32 +01:00
Marc Zinnschlag	b1ffb64a1f	Merge remote-tracking branch 'gus/AIFix2'	2014-01-11 14:33:27 +01:00
gus	ccf07f9406	Bugfix	2014-01-11 12:07:10 +01:00
gus	2d66b2c4fa	AiFollow. Npc get stuck often (no stuck dtection yet)	2014-01-11 12:06:36 +01:00
gus	f41f08c352	Wrong logic... should improve performances	2014-01-11 12:04:32 +01:00
gus	0609b71df9	fix pathfinding	2014-01-11 11:57:07 +01:00
Marc Zinnschlag	a0872b2646	Merge remote-tracking branch 'gus/AIFix2'	2014-01-11 11:51:53 +01:00
Marc Zinnschlag	1b03eec63e	Merge remote-tracking branch 'scrawl/master'	2014-01-11 11:43:12 +01:00
gus	828e5841d8	Windows SDL fix	2014-01-11 11:00:34 +01:00
scrawl	a2ba0dde31	Implemented GoToJail	2014-01-11 06:47:58 +01:00
scrawl	3896c88403	Use VFX_DefaultCast / VFX_DefaultHit if the magic effect does not specify any	2014-01-11 05:58:05 +01:00
scrawl	9ddee8fd8c	Autocalculate NPC reputation as according to research wiki	2014-01-11 04:03:13 +01:00
scrawl	9127839cc1	Add a searchPtr method as required for getting an owner, which may already be dead and disposed of.	2014-01-11 03:33:17 +01:00
scrawl	bf6d302fba	Confiscate stolen items when caught	2014-01-11 03:29:41 +01:00
scrawl	909494ff35	Implement Assault crimes. In other words, NPCs now fight back!	2014-01-11 03:08:16 +01:00
scrawl	12944f2459	Fix an auto equipping bug that allowed twohanded weapon and shield at the same time	2014-01-11 03:07:35 +01:00
scrawl	d4a98ffc27	Increase fight rating when being the victim of a crime	2014-01-11 02:27:44 +01:00
scrawl	aba72ffefe	Fix up the merge a bit	2014-01-11 02:12:41 +01:00
scrawl	727aa30347	Dead actors are unaware of everything	2014-01-11 02:06:54 +01:00
scrawl	d01f89b153	Rewrite some awful code	2014-01-11 00:24:21 +01:00
scrawl	e9f63270d9	Speed fix for "on target" spells	2014-01-10 22:51:42 +01:00
scrawl	621e52f09d	Play "attack" voiced dialogue entries randomly based on iVoiceAttackOdds.	2014-01-10 22:48:42 +01:00
scrawl	d9d6f37619	Use iVoiceHitOdds	2014-01-10 22:44:40 +01:00
scrawl	15e48107f7	Use i1stPersonSneakDelta + some cleanup	2014-01-10 22:39:01 +01:00
scrawl	2744cde40f	Use a few additional GMSTs	2014-01-10 22:27:31 +01:00
scrawl	3bf36515d5	Implement Trespassing crime	2014-01-10 21:26:24 +01:00
scrawl	f5a70dccf0	Fix title of buttons in generate class result dialog	2014-01-10 21:13:03 +01:00
scrawl	627dcddb33	Do not allow training skills above their governing attribute	2014-01-10 20:53:53 +01:00
Marc Zinnschlag	f62497dfdc	Merge remote-tracking branch 'mrcheko/master'	2014-01-10 19:08:35 +01:00
mrcheko	ffcb7fb280	fix for bug scrawl mentioned	2014-01-10 19:04:07 +02:00
Marek Kochanowicz	cb0d3794f7	Final check is not performed with just +1! Something is not right.	2014-01-10 11:01:29 +01:00
Marek Kochanowicz	688488de62	replaced == operator for string comparsion in npc check with boost algorithm to get case insensitive check.	2014-01-10 10:43:03 +01:00
Marek Kochanowicz	31c59db71c	Splited another long line in the header.	2014-01-10 10:22:18 +01:00
Marek Kochanowicz	468b9d7340	camel case in the header	2014-01-10 09:50:56 +01:00
Marek Kochanowicz	e4d637fd64	splited long lines in the header.	2014-01-10 09:49:05 +01:00
Marek Kochanowicz	b98cdabe89	Shameful bug fixed.	2014-01-10 09:42:36 +01:00
mrcheko	d41f27451b	appropriate camera vanity<>preview mode switch + hit recoils fix	2014-01-09 23:36:40 +02:00
scrawl	546b0cee76	Closes #1077: Replace tags before trying to get the message length	2014-01-09 22:17:51 +01:00
scrawl	aa855e9524	Include some required Ogre headers explicitely	2014-01-09 20:56:24 +01:00
Marc Zinnschlag	5e2eb8caf8	Merge remote-tracking branch 'swick/master'	2014-01-09 09:47:42 +01:00
Marc Zinnschlag	85707b5e3e	Merge remote-tracking branch 'scrawl/master'	2014-01-09 09:35:54 +01:00
scrawl	768d9f7237	Scripting: Add an optional 'required' parameter to getReference (default: true). If required=false, it will not throw an exception if there's no reference. Fixes PcExpell not working without a reference like it's supposed to, and makes the code nicer for some others (use required=false instead of catching the exception)	2014-01-09 02:21:03 +01:00
scrawl	223c1d5a38	Use GMSTs for crime bounty	2014-01-09 02:20:52 +01:00
scrawl	6f9113fe88	Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions	2014-01-09 01:49:58 +01:00
scrawl	baf55df7a1	Gold fixes (when did this break?)	2014-01-09 01:34:10 +01:00
Sebastian Wick	925d28e4a7	crashcatcher uname error checking	2014-01-09 00:52:37 +01:00
scrawl	9bf7bf529c	Implement crime-related dialogue globals as they are described in MSFD	2014-01-09 00:40:25 +01:00
scrawl	d7f69205f6	Don't play "Menu Click" sound for disabled (= cannot receive input) buttons, plus some redundancy fixes	2014-01-09 00:06:24 +01:00
scrawl	0f5dc59176	Remove useless dependencies on InventoryWindow for getting player gold. Don't use string literals for gold_001 id, just to be sure.	2014-01-08 23:37:46 +01:00
scrawl	372cd437d1	Add a utility function for counting items in a container	2014-01-08 23:00:29 +01:00
scrawl	c55f9bd0aa	GetWaterLevel fix (similar to MCP): if there is no water in the cell, return -FLT_MAX to prevent mods from incorrectly thinking the player is underwater.	2014-01-08 20:19:47 +01:00
Marc Zinnschlag	7c8f735004	Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28	2014-01-08 20:16:39 +01:00
Marc Zinnschlag	a7be755db0	Merge remote-tracking branch 'mrcheko/master'	2014-01-08 20:13:31 +01:00
scrawl	bf02b77c1d	Closes #1090: Don't throw an exception if a cell has no region in GetPCCell	2014-01-08 19:57:13 +01:00
scrawl	154fae9f25	Don't suppress exceptions thrown while running scripts	2014-01-08 19:52:57 +01:00
scrawl	9baa1bef78	Expell player from faction when committing a crime against a faction member	2014-01-08 19:26:03 +01:00
scrawl	19d63f392f	Clean up the NpcStats expelled interface. Show message box when expelled.	2014-01-08 18:59:00 +01:00
scrawl	098f9712f1	Add getPlayerPtr() utility method. Reduces dependencies a lot.	2014-01-08 18:39:44 +01:00
scrawl	7b33f6f2ac	Detect crime of sleeping in other NPC's beds. ShowRestMenu needs to support an explicit/implicit reference for this.	2014-01-08 17:19:43 +01:00
scrawl	b99ca92fee	Add missing line of sight check	2014-01-08 17:18:13 +01:00
Nikolay Kasyanov	bc90443aeb	Revert "Music playback on OS X >= 10.9 works again. Fixes bug #1041." ... This reverts commit fc21dd1f3a.	2014-01-08 18:07:58 +04:00
mrcheko	46519062d3	hit recoils/knockdowns feature	2014-01-08 16:05:14 +02:00
scrawl	2bb21f2f76	Don't copy NpcStats/CreatureStats unnecessarily. Fixes a bug: taunt actions would not correctly increase the target's fight rating.	2014-01-08 02:35:36 +01:00
scrawl	c85c2cff4e	Fix disposition changes from trades not applying properly	2014-01-08 01:46:42 +01:00
scrawl	728365b48d	Remove an unused hook	2014-01-07 21:07:02 +01:00
scrawl	03b6334ceb	Get rid of a hack	2014-01-07 20:43:08 +01:00
scrawl	0285d18fc2	Respect items belonging to a faction	2014-01-07 20:24:01 +01:00
scrawl	3c0080d2c1	Implement theft detection	2014-01-07 19:58:17 +01:00
scrawl	d2d76f4f47	Fix disintegration bug	2014-01-07 19:21:19 +01:00
scrawl	c4ab2f417a	Fix exception closing container window	2014-01-07 18:11:19 +01:00
scrawl	90b55c8d4b	Use Ogre's asin/acos functions which will protect against NaNs	2014-01-07 17:09:08 +01:00
Marc Zinnschlag	48a08c4c4d	Merge remote-tracking branch 'endorph/master'	2014-01-07 14:12:15 +01:00
Dmitriy 'Endorph' Shkurskiy	9afa8e952e	tabs -> spaces	2014-01-07 14:32:14 +02:00
Marc Zinnschlag	72a81a2381	Merge remote-tracking branch 'scrawl/master'	2014-01-07 10:17:33 +01:00
scrawl	780bf5a2cd	Implement pickpocket detection. Play a voiced dialogue entry when detected.	2014-01-07 03:01:33 +01:00
scrawl	ea3ee4407f	oops, didn't mean to commit this	2014-01-07 02:48:44 +01:00
Sergey Shambir	d5a0ff17fd	MWScript: updated vmformat.txt, changed opcodes to fix sequence. ... Opcodes for StartCombat, StopCombat, GetTarget now follow the last previous opcode.	2014-01-07 05:06:20 +04:00
Sergey Shambir	d536ff3cdc	printAIPackage: changed field name from Unknown to ShouldRepeat too.	2014-01-07 04:58:59 +04:00
Sergey Shambir	5c7e39a92f	Implemented script commands StartCombat, StopCombat, GetTarget. ... Also renamed one field of AIWander class because it's not longer unknown.	2014-01-07 04:43:06 +04:00
scrawl	887db76ed2	Don't consider swimming or in-air characters as sneaking	2014-01-07 01:22:04 +01:00
scrawl	29c823b9d4	Implement awareness check function. Use this for combat AI and GetDetected instruction.	2014-01-07 00:51:09 +01:00
scrawl	4a3d148a48	Fixes #1089 (skill increases)	2014-01-07 00:37:52 +01:00
Marek Kochanowicz	b85fe2becf	Changes according to the comment.	2014-01-06 23:37:18 +01:00
Marc Zinnschlag	fefaec5804	Merge remote-tracking branch 'scrawl/savedgame' into savedgame	2014-01-06 22:30:08 +01:00
scrawl	68b87714bb	Addition to 2f35e5a04e: companions should still auto equip	2014-01-06 22:14:11 +01:00
mrcheko	2591ff2d5a	bug repairing	2014-01-06 22:00:01 +02:00
Marek Kochanowicz	06f8537087	added final check for player npc. Removed useless includes. However, this code spams exceptions and I can't figure out why.	2014-01-06 18:43:44 +01:00
Marc Zinnschlag	43dd3b8ef2	removed redundant deletion flag from CellRef	2014-01-06 13:53:20 +01:00
Marc Zinnschlag	0ad7aa1f53	Merge remote-tracking branch 'scrawl/master'	2014-01-06 10:22:07 +01:00
scrawl	62774fcc4a	Merge branch 'master' into HEAD ... Conflicts: apps/openmw/mwbase/world.hpp apps/openmw/mwinput/inputmanagerimp.cpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm/loadtes3.cpp	2014-01-06 00:23:17 +01:00
scrawl	2f35e5a04e	Stop merchants from autoequipping items sold to them	2014-01-05 22:43:09 +01:00
Marc Zinnschlag	e63b4964b2	Merge remote-tracking branch 'scrawl/master'	2014-01-05 21:27:06 +01:00
scrawl	dde2cd5d5a	Fix some code that still used setCount directly instead of using the ContainerStore interface. Also fix a related annoyance with the interface.	2014-01-05 20:53:45 +01:00
scrawl	73f8161d1e	Fix spell deletion not resetting the selected spell correctly	2014-01-05 19:40:05 +01:00
scrawl	b3764c504a	Implement GetPcJumping instruction	2014-01-05 19:08:12 +01:00
scrawl	45847c67ad	Lock NIF cache when loading an interior cell as well. Should improve load performance.	2014-01-05 18:38:21 +01:00
scrawl	c004fb778f	Get rid of underscore defines. They are reserved by the standard.	2014-01-05 18:22:29 +01:00
scrawl	b8e9343764	Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes	2014-01-05 18:09:50 +01:00
Marek Kochanowicz	c69814ed14	corrected one, additional name to follow policy	2014-01-05 18:00:49 +01:00
Marek Kochanowicz	4338706307	static is a keyword. renamed static to staticElement	2014-01-05 17:31:54 +01:00
Marek Kochanowicz	80d424591f	npc instead of NPC.	2014-01-05 17:28:47 +01:00
Marek Kochanowicz	693c398204	forgot to save the file before comit -_-'	2014-01-05 17:05:57 +01:00
Marek Kochanowicz	873870c7ce	Chainging names to comply our policy.	2014-01-05 17:04:57 +01:00
scrawl	ce013315ba	Nothing to see here, move along. ... Fine... it's flying cliff racers. But did you really want to know?	2014-01-05 16:09:06 +01:00
Marek Kochanowicz	c1f4a9cb0e	Added proper id check.	2014-01-05 12:18:26 +01:00
Marek Kochanowicz	89d8ee62fa	Removing name check from listCheck. Id can't be empty to be sure.	2014-01-05 12:12:36 +01:00
Marek Kochanowicz	220d92f865	changed ID check in leveled list to name.	2014-01-05 11:30:03 +01:00
scrawl	44e96fcaaa	Implement Charm magic effect	2014-01-05 01:56:36 +01:00
scrawl	14b70a3ce6	Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead)	2014-01-05 01:34:35 +01:00
scrawl	634a53211c	Make sure materials are built before trying to determine their transparency	2014-01-04 22:56:06 +01:00
pvdk	92234cf783	Changed crashcatcher's uname system info retrieval and cleaned indentation	2014-01-04 21:46:38 +01:00
scrawl	c4e4a8fb57	Closes #1083: Fix werewolf change handling	2014-01-04 20:50:18 +01:00
scrawl	f4517c8221	For dialogue filtering, use the Vampirism magic effect instead of the untouched NpcStats::mVampire	2014-01-04 20:50:18 +01:00
mrcheko	7002412760	resolve conflict in character.cpp	2014-01-04 17:55:09 +02:00
Marek Kochanowicz	e860717105	replaced raw values with enums.	2014-01-04 15:28:08 +01:00
Marek Kochanowicz	558690b571	implemented list of magical bolts for skipping.	2014-01-04 15:19:17 +01:00
Marek Kochanowicz	dfd1058551	Various style corrections.	2014-01-04 14:49:01 +01:00
Marek Kochanowicz	aa05ffcf60	Splited some long argument lists to the multiple lines.	2014-01-04 13:05:19 +01:00
Marc Zinnschlag	356b53bd22	Merge remote-tracking branch 'scrawl/master'	2014-01-04 11:38:31 +01:00
Dmitriy 'Endorph' Shkurskiy	7023395012	Windows-specific definition to omit inclusion of unused stuff from Windows.h	2014-01-04 07:46:29 +02:00
Dmitriy 'Endorph' Shkurskiy	18d4cdb2ac	Fix for VS2010-Debug: manual assignment operator and cctor added for MMWorld::ContainerStoreIterator	2014-01-04 07:46:29 +02:00
scrawl	16838595a3	Another console fix: discard text markup when getting the command line's text	2014-01-04 05:24:32 +01:00
scrawl	1b96c5d266	Console improvements: Show scrollbar, allow copying text from the history	2014-01-04 05:13:53 +01:00
scrawl	710a1e2f37	Smash case for manual reference IDs as well, consistent with references in data files	2014-01-04 04:39:06 +01:00
scrawl	557652112f	Show the target HP bar also when casting a heal effect (same as MCP)	2014-01-04 04:21:44 +01:00
scrawl	12691040d1	Fix incorrect disposition testing and get rid of of a related hack that is no longer needed.	2014-01-04 02:49:10 +01:00
scrawl	09d491d1ba	Move a piece of functionality to its appropriate place	2014-01-04 01:13:19 +01:00
scrawl	be2ebc5cac	Closes #1081: Implement disease contraction	2014-01-03 23:33:14 +01:00
scrawl	2a7d610f87	Implement GetSpellReadied instruction	2014-01-03 22:55:17 +01:00
scrawl	c0fbcf413f	Use the playermagic and playerfighting control switches	2014-01-03 22:44:35 +01:00
scrawl	e9bd43e2da	Use GMSTs for bound items/creatures	2014-01-03 20:54:14 +01:00
Marek Kochanowicz	1c3296fb64	Some changes in weapons check.	2014-01-03 18:25:06 +01:00
scrawl	617a65cdd2	Print message to dialogue window after successful trade	2014-01-03 17:40:14 +01:00
scrawl	b22dd40b41	Implement Paralyze magic effect	2014-01-03 17:06:05 +01:00
Marc Zinnschlag	ee621245bb	Merge remote-tracking branch 'scrawl/master'	2014-01-03 15:59:06 +01:00
scrawl	55c5d7cee4	Implement Resurrect instruction	2014-01-03 15:54:23 +01:00
Marek Kochanowicz	7b63e1942c	style corrections	2014-01-03 11:42:49 +01:00
Marek Kochanowicz	24f090ca98	Finishing stuff.	2014-01-03 11:31:54 +01:00
Marek Kochanowicz	8201c97abf	Inventory item template.	2014-01-03 09:16:41 +01:00
scrawl	b4230f716e	Implement RemoveEffects instruction	2014-01-03 05:19:10 +01:00
scrawl	7d8ca91286	Implement RemoveSpellEffects instruction	2014-01-03 05:18:44 +01:00
scrawl	366801f3d5	Implement explodeSpell instruction (like Cast, with caster = target)	2014-01-03 04:44:50 +01:00
scrawl	93e1a2df73	Implement Cast script instruction (shrines work now)	2014-01-03 04:09:52 +01:00
scrawl	b42240be6d	Implement Damage/restore skill/attribute effects. Use dedicated classes for skill and attribute values (instead of Stat<T>) since there are some important differences.	2014-01-03 03:48:43 +01:00
scrawl	32ff3b530c	Change all instances of skill/attribute values to use an appropriate typedef.	2014-01-03 01:59:15 +01:00
scrawl	623cdef69f	Code cleanup	2014-01-02 21:49:12 +01:00
scrawl	eba60858dd	Closes #1078: Show stat bar text even when 0	2014-01-02 21:48:33 +01:00
Marc Zinnschlag	3b75f6676c	Merge remote-tracking branch 'scrawl/openmw-0.28' into openmw-28	2014-01-02 21:27:08 +01:00
scrawl	299690631f	Implement SoulTrap magic effect	2014-01-02 21:21:28 +01:00
mrcheko	79e972bdb6	resolved accompanying minor problems	2014-01-02 21:54:41 +02:00
Lukasz Gromanowski	b017a3be3e	Bug #1074: Inventory paperdoll obscures armour rating ... Changed size of inventory paperdoll. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-01-02 20:20:57 +01:00
scrawl	596e0c8a49	Correct Dispel effect (use magnitude as chance)	2014-01-02 20:15:07 +01:00
scrawl	94d2ec8e4e	Add missing spells update	2014-01-02 20:02:28 +01:00
Marc Zinnschlag	5d3b696eb6	Merge remote-tracking branch 'scrawl/master' into openmw-28	2014-01-02 19:52:47 +01:00
scrawl	12de351feb	Check if levitation is enabled before levitating	2014-01-02 16:38:23 +01:00
scrawl	0990ca4b75	Closes #1072: Fix extra light being added multiple times when showCarriedLeft(true) is called repeatedly	2014-01-02 15:58:00 +01:00
scrawl	e6c0e187bc	Closes #1073: Check for all gold types in canSell. For containers, only gold_001 is relevant, but items in the world can be sold as well.	2014-01-02 15:44:58 +01:00
Marc Zinnschlag	0d3e67dafc	Merge branch 'master' into openmw-28	2014-01-02 13:39:36 +01:00
Marc Zinnschlag	a6e6411686	Merge remote-tracking branch 'scrawl/master'	2014-01-02 12:12:52 +01:00
scrawl	c558e12212	Don't try to move objects that are not in a cell	2014-01-02 03:06:48 +01:00
scrawl	993edf0384	Bug #1063: Safety check in moveObject. Required when items in containers execute script commands like setAtStart etc.	2014-01-02 02:27:48 +01:00
scrawl	0f2b2fabdb	Implement water walking	2014-01-02 02:03:44 +01:00
scrawl	783c501d70	Some checks to prevent bound item abuse	2014-01-02 01:36:08 +01:00
scrawl	590c8cb4a0	Implement Disintegrate effects. When an armor/weapon breaks, unequip it and do not allow equipping it again.	2014-01-02 01:03:44 +01:00
scrawl	899214a906	Use fVanityDelay	2014-01-02 00:13:23 +01:00
scrawl	c6421276bd	Closes #841: Correct activation distance in third person mode	2014-01-01 23:59:17 +01:00
scrawl	24aa743573	Add function for converting feet to game units	2014-01-01 23:34:18 +01:00
scrawl	f6387d5979	Implement Telekinesis magic effect. Remove some duplicate code.	2014-01-01 23:30:58 +01:00
pvdk	691e007524	Redid the unshield thread stuff, this time the way it should be done	2014-01-01 22:46:29 +01:00
scrawl	531bef6193	Shorter Vector3 initialisation	2014-01-01 22:46:10 +01:00
scrawl	5729672262	Show marked position on map. Implement Detect X magic effects.	2014-01-01 22:37:52 +01:00
mrcheko	16e10cc702	error fix	2014-01-01 22:46:29 +02:00
scrawl	bfc9fcf2cd	Add starting spells when building player (F_PCStart flag)	2014-01-01 21:34:00 +01:00
mrcheko	09a0a69b04	more improvements	2014-01-01 21:40:31 +02:00
Marc Zinnschlag	1f4c192bf6	Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting'	2014-01-01 19:47:11 +01:00
Marc Zinnschlag	e1355be47c	Merge remote-tracking branch 'lgro/valgrind_warnings'	2014-01-01 19:41:52 +01:00
scrawl	eab7ffd6b4	Remove redundant finding of default exterior position height	2014-01-01 18:05:28 +01:00
pvdk	a2ca7b92a2	Working on the unshield implementation, added support for moving temp files	2014-01-01 17:15:34 +01:00
scrawl	8e5cae1081	Implement mark/recall magic effects	2014-01-01 17:06:21 +01:00
Lukasz Gromanowski	2d4e06cd50	Updated comments about freeing format_ctx->pb->buffer. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-01-01 17:05:49 +01:00
Lukasz Gromanowski	722469d57b	Correction to the e9844e1 commit. ... Restored interrior check in WeatherManager::update(). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-01-01 16:45:39 +01:00
scrawl	69ba8a40bf	Fix weird formatting added during the merge	2014-01-01 16:13:20 +01:00
scrawl	b3cd10dbea	Remove redundant setTeleported calls	2014-01-01 15:18:25 +01:00
Marc Zinnschlag	b19b277f18	temporarily disable OGRE-integration in OpenCS (need to sort out path problem first)	2014-01-01 15:16:51 +01:00
Marc Zinnschlag	c3482b6f24	Merge remote-tracking branch 'scrawl/master' ... Conflicts: apps/openmw/mwmechanics/spellcasting.cpp	2014-01-01 15:05:42 +01:00
Marc Zinnschlag	5fa9aa5d1e	Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting' ... Conflicts: apps/openmw/mwworld/weather.cpp apps/openmw/mwworld/worldimp.cpp	2014-01-01 14:57:14 +01:00
scrawl	ea3b88951a	Implement divine/almsivi intervention magic effects	2014-01-01 02:22:11 +01:00
scrawl	c86760e3cd	Remember the last known exterior position of the player in case we fail to map the interior to a world position.	2014-01-01 01:10:55 +01:00
Lukasz Gromanowski	101813fd0d	Fixes #417: Apply weather instantly when teleporting ... Correction to previous commit - WeatherManager->update() will always be called. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-31 21:18:10 +01:00
Lukasz Gromanowski	e9844e1b37	Fixes #417: Apply weather instantly when teleporting ... Changed teleporting detection from "position tracking" to manually setting "teleportation" flag ( player->setTeleported(true) ). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-31 20:40:23 +01:00
scrawl	b02b966c44	Closes #994: Don't cap skills to 100 when set via console (except for modX variants)	2013-12-31 19:11:16 +01:00
Marc Zinnschlag	c34b586b65	Merge remote-tracking branch 'ace/fix'	2013-12-31 18:37:12 +01:00
scrawl	3604b9d171	Closes #566: In interior cells, update global map position marker using the first exterior teleport door	2013-12-31 18:35:46 +01:00
scrawl	be1938ee90	Closes #805: Don't add entities that are supposed to be invisible to static geometry	2013-12-31 18:32:46 +01:00
Lukasz Gromanowski	1ce4663065	Updated compiler opcodes for COE, and setHello. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-31 18:13:38 +01:00
mrcheko	a8fb1ae51c	improved, added knockdown after falling	2013-12-31 17:55:04 +02:00
Alexander "Ace" Olofsson	8381cad5a4	Don't try to set a cursor before one exists	2013-12-31 14:13:42 +01:00
mrcheko	d6345bce91	added npc hit reactions	2013-12-31 13:24:20 +02:00
scrawl	94cdc1efd2	Enable mipmap generator for 1.9+	2013-12-31 00:54:40 +01:00
Lukasz Gromanowski	cb04f43384	Fixes for "Conditional jump or move depends on uninitialised value(s)" ... and memleaks reported by valgrind. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-30 23:08:53 +01:00
Lukasz Gromanowski	6107d5bad2	Updated ffmpeg decoder fix ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-30 22:16:06 +01:00
Lukasz Gromanowski	5c5f87445b	Fixes for "Conditional jump or move depends on uninitialised value(s)" ... and memleaks reported by valgrind. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-30 21:47:06 +01:00
Marek Kochanowicz	cb723710fe	Corrected stupid typo.	2013-12-30 19:24:53 +01:00
scrawl	b8ac37347c	Code cleanup for Class::canBeEquipped	2013-12-30 19:04:35 +01:00
Marek Kochanowicz	79bc149c73	reverting refidata.hpp	2013-12-30 18:47:19 +01:00
Marek Kochanowicz	a7de04d0a4	reverting refiddata.cpp	2013-12-30 18:46:18 +01:00
Marek Kochanowicz	4a1987ddec	correcting	2013-12-30 18:41:16 +01:00
scrawl	79a440e94a	Many additions to 900bc06d2c: ... - Fix indentation - Consider any kind of light, not just torch_infinite_time - Hostile NPCs should also wear lights, if they have nothing else that could use the slot (or a twohanded weapon) - Remove redundant code and don't add additional lights to the inventory - World::isDark returns false for interiors which are unaffected by weather	2013-12-30 17:57:41 +01:00
Marek Kochanowicz	3758fe3834	reformatted	2013-12-30 13:23:16 +01:00
Marek Kochanowicz	c89608f390	Check for head and hair. Correct faction check.	2013-12-30 11:39:03 +01:00
Scott Howard	2f082ef796	remove unneeded libraries	2013-12-29 16:25:49 -05:00
Marek Kochanowicz	842e26b8e5	added comment	2013-12-29 21:53:33 +01:00
Marek Kochanowicz	13637e7166	Dynamic_casting, checking rank. Commented out faction check, since it will not work.	2013-12-29 21:45:09 +01:00
Marek Kochanowicz	e321d571e1	Added faction check.	2013-12-29 21:06:08 +01:00
Marek Kochanowicz	9df6d23afc	removing member size values, since this does not work properly.	2013-12-29 20:15:00 +01:00
Lukasz Gromanowski	c65f018760	Fixes #417: Apply weather instantly when teleporting ... Corrected constant name. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-29 15:09:49 +01:00
Marc Zinnschlag	6de39a7329	Merge remote-tracking branch 'lgro/issue845_NPCs_hold_torches_whole_day' ... Conflicts: apps/openmw/mwmechanics/character.cpp	2013-12-29 15:00:31 +01:00
Lukasz Gromanowski	faf8011c48	Fixes #417: Apply weather instantly when teleporting ... Removed changing speed of weather transition introduced in previous commit. Instead try to detect player "teleporting" (ie. coc), and then switch instantly to the next weather type. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-29 12:47:44 +01:00
scrawl	04f9f7af56	Closes #990: Add option to unlock mouse cursor when in any menu	2013-12-29 00:58:48 +01:00
scrawl	17ff8165d2	Closes #1065: Don't apply fall damage when landing in water	2013-12-29 00:36:36 +01:00
Marek Kochanowicz	bf0383fe05	Last fixes.	2013-12-28 18:07:01 +01:00
Marek Kochanowicz	147ee0ace3	small oops + added new variables to the constructor	2013-12-28 17:35:04 +01:00
scrawl	2a8ab932ef	Bug #951: Only recalculate derived stats when attributes change	2013-12-28 17:19:35 +01:00
Marek Kochanowicz	b9d1047ad6	Small fix for lights.	2013-12-28 16:18:16 +01:00
Lukasz Gromanowski	100edda8c0	Fixes #417: Apply weather instantly when teleporting ... Change speed of weather transition from blight to other (twice fast as normal) and from other to blight (four times faster than normal). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-28 16:15:34 +01:00
Marek Kochanowicz	be6e47bcb6	Corrections	2013-12-28 15:51:38 +01:00
Marek Kochanowicz	5406a70fdd	still working on npc check	2013-12-28 11:34:51 +01:00
Marek Kochanowicz	da3dda896a	Code compiles now	2013-12-27 22:57:36 +01:00
scrawl	596c9b80a9	Check if threads are joinable before joining (issue with boost 1.52)	2013-12-27 22:38:30 +01:00
Marek Kochanowicz	03235bf0a2	NPC. Still WIP.	2013-12-27 22:13:55 +01:00
scrawl	85ec80100c	Bug #1005: Hide torches/shields during spellcasting and hand-to-hand combat	2013-12-27 22:00:16 +01:00
scrawl	7265b427fe	Bug #1013: Rewrote fall height detection	2013-12-27 21:21:18 +01:00
scrawl	02277db685	Bug #1052: Don't use set/getOnlyText which discards escape characters	2013-12-27 19:52:10 +01:00
scrawl	686d9efac3	Bug #1060: Fix incorrect spell type checks	2013-12-27 18:58:35 +01:00
scrawl	27092a4494	flagAsModified should be private	2013-12-27 18:58:35 +01:00
scrawl	6400f23ab0	Use the material controller manager for effects with overridden texture	2013-12-27 14:54:36 +01:00
scrawl	d262d9e6b0	Bug #1054: Set render queue group for effects	2013-12-27 14:51:59 +01:00
scrawl	1c60a781a5	Add header to CMakeLists	2013-12-27 14:42:22 +01:00
scrawl	561c661156	Reset starting angle / position when adding world item to a container	2013-12-27 01:57:08 +01:00
scrawl	608bd0f525	Don't copy the base node pointer when adding a world object to a container. Fixes bug #1028	2013-12-27 01:34:56 +01:00
scrawl	30b1da996b	Issue #1029 - Quick keys menu: Select compatible replacement when tool used up	2013-12-27 00:51:29 +01:00
scrawl	5a287a7e01	Remove no longer accurate flagAsModified calls. Container items are now modified via ContainerStore, not RefData.	2013-12-27 00:41:19 +01:00
scrawl	d09a86e208	Issue #1018: Don't allow view mode switching while performing an action	2013-12-27 00:36:06 +01:00
scrawl	a3017e16d4	Don't allow changing the spell that is being cast mid-animation	2013-12-26 22:32:39 +01:00
scrawl	5054d8e6c1	Bug #1055: Check power use and mana before starting cast animation	2013-12-26 22:06:13 +01:00
scrawl	71d9755ef1	Bug #991: Don't autoequip items with harmful permanent enchantments	2013-12-26 21:26:59 +01:00
scrawl	5931fdcbde	Implement NiBillboardNode. Flags not handled yet.	2013-12-26 20:53:52 +01:00
scrawl	a3ff9e5be8	Change destruction order - fixes a shutdown crash discovered with mesa	2013-12-26 20:53:52 +01:00
scrawl	fb845e81a4	Rename nosound to no-sound for consistency	2013-12-26 20:53:52 +01:00
scrawl	85ed21dbd2	Remove unused command line option	2013-12-26 20:53:51 +01:00
scrawl	33389b9b63	XDG compliant paths	2013-12-26 20:53:51 +01:00
scrawl	a9e1e89bbc	Bug #1007: Fix the console getting key focus when a reference becomes unavailable, even if the console is not visible	2013-12-26 20:53:51 +01:00
scrawl	31c1f484ed	Slight performance improvement for WindowManager::updateVisible	2013-12-26 20:53:51 +01:00
scrawl	b6bad969a0	Fix an issue with items that have no UI icon	2013-12-26 20:53:51 +01:00
scrawl	81ec8c2f55	Handle --version and --help before reading configuration - putting these options into openmw.cfg makes no sense	2013-12-26 20:53:51 +01:00
scrawl	6d27ebabb6	Integrate AddGlow with material controllers	2013-12-26 20:53:45 +01:00
Marek Kochanowicz	f04a727af6	removed set sizes, consted sizes, added itemleveledlist check	2013-12-26 18:40:47 +01:00
Marek Kochanowicz	1da56e1790	checkin leveled items lists	2013-12-26 18:28:24 +01:00
Marek Kochanowicz	c2993909cf	added creature leveled list check	2013-12-26 18:16:54 +01:00
pvdk	3a55d88bac	Working on the installshield thread	2013-12-26 18:02:34 +01:00
Marek Kochanowicz	360a939aa0	Working on leveled lists now.	2013-12-26 15:35:58 +01:00
Marek Kochanowicz	6c95cea4c4	Added ingredient check	2013-12-26 15:24:52 +01:00
Marek Kochanowicz	c1715779fa	Added door check with related methods.	2013-12-26 12:59:43 +01:00
pvdk	40486370d9	Working on the Unshield functionality	2013-12-25 18:52:34 +01:00
pvdk	dddd9cba57	Added data path retrieval from openmw.cfg, to use as existing installs	2013-12-25 15:50:02 +01:00
pvdk	095ff4e17a	Moved launcher settings stuff into components, so they can be reused in the wizard	2013-12-25 00:50:25 +01:00
pvdk	3a37761d76	Some minor cleanups	2013-12-24 23:47:04 +01:00
pvdk	445f96434e	Added Morrowind.ini detection logic	2013-12-24 23:09:31 +01:00
Nikolay Kasyanov	9fabae5198	OS X: force Cocoa API for Ogre windows in OpenCS	2013-12-25 00:26:15 +04:00
pvdk	8ea31e5050	Working on a Morrowind.ini reader	2013-12-24 19:38:21 +01:00
Marek Kochanowicz	e4e7d50623	Added creatureCheck. I don't know meaning of all data fields here.	2013-12-23 12:32:35 +01:00
Marek Kochanowicz	94fcea4d4d	added mCreaturesSize	2013-12-22 14:46:07 +01:00
Marek Kochanowicz	32046070d5	Added getCreatures	2013-12-22 14:44:22 +01:00
Marek Kochanowicz	16af9e6986	added container check	2013-12-22 14:42:17 +01:00
Marek Kochanowicz	1a7f023237	added mContainersSize.	2013-12-22 14:35:40 +01:00
Marek Kochanowicz	dc594da0de	added getContainers	2013-12-22 14:34:29 +01:00
Marek Kochanowicz	bbcaef8e42	Added armor check and related stuff.	2013-12-22 14:32:42 +01:00
Marek Kochanowicz	97fc8acbdb	Added armor check	2013-12-22 14:22:03 +01:00
Marek Kochanowicz	955fe3e8cf	Added check for non-positive quality of alchemical apparatus	2013-12-22 10:00:04 +01:00
Marek Kochanowicz	1811f0a71b	Works, but it seems that I miss something in referencables. I will write post on the forum.	2013-12-21 15:40:39 +01:00
Marek Kochanowicz	a27441720e	Added enchantmnet check for books.	2013-12-21 12:07:40 +01:00
Marek Kochanowicz	ee5dfd1cc8	Adde potionCheck method	2013-12-21 11:15:46 +01:00
Marek Kochanowicz	21ee2a6d2e	Getting size of potions.	2013-12-21 11:02:58 +01:00
Marek Kochanowicz	a6c36e2377	Small optimization.	2013-12-21 11:01:40 +01:00
Marek Kochanowicz	385824aee0	Renamed getActivator to getActivators.	2013-12-21 10:59:13 +01:00
Marek Kochanowicz	4842c56cb5	added getpotions	2013-12-21 10:58:05 +01:00
Lukasz Gromanowski	900bc06d2c	Fixes #845: NPCs hold torches during the day ... Moved 'equipping torches at night and unequipping at day' code from Character to Actors class. Removed unneeded showLights method (introduced in previous commits) from animation/npcanimation classes. Since this commit autoEquip() method doesn't automatically equip lights. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-20 22:38:23 +01:00
Marek Kochanowicz	f69465d7e0	Added aditional checks for books. Activator check.	2013-12-20 22:31:17 +01:00
Marek Kochanowicz	8085fcc792	Added Referencable checks class, added method to get refidcontainer, added method to get mBooks. ... Currently only books are checked, and only if name is present.	2013-12-20 20:02:42 +01:00
Marc Zinnschlag	18e7e83585	Merge remote-tracking branch 'mrcheko/savedgame' into savedgame	2013-12-20 13:13:06 +01:00
mrcheko	8eb2696f6c	using gmst string	2013-12-20 14:04:59 +02:00
Lukasz Gromanowski	abc126e2af	Fixes #845: NPCs hold torches during the day ... Added check for Player character so it won't be affected by showing, or hidding torches. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-20 01:01:30 +01:00
Lukasz Gromanowski	6eb674e4e5	Fixes #845: NPCs hold torches during the day ... Added equipping/unequipping torches. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-20 00:18:34 +01:00
Lukasz Gromanowski	92072d968b	Fixes #845: NPCs hold torches during the day ... Simplified a bit code which shows and hides light. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-19 21:11:07 +01:00
mrcheko	3816a09c6f	bug 428 ask to load recent saved game	2013-12-19 22:08:34 +02:00
Marc Zinnschlag	16b3927f17	Merge remote-tracking branch 'scrawl/master'	2013-12-19 14:26:41 +01:00
scrawl	9afdf71af3	Fix crash with player->position command	2013-12-19 00:37:57 +01:00
scrawl	a0d38dfb63	Fix highlighted topics being selectable when in a choice	2013-12-19 00:26:08 +01:00
scrawl	876fb9a899	Addition to bb4bd999ba : adjust position for objects placed from inventory	2013-12-19 00:11:14 +01:00
Marc Zinnschlag	c22e38f825	removing 255 content file limitation	2013-12-17 21:19:05 +01:00
Marc Zinnschlag	09fadd446b	Merge remote-tracking branch 'mrcheko/savedgame' into savedgame	2013-12-17 19:33:32 +01:00
pvdk	da9b67b6d2	Fix for Bug #922: Launcher writing merged openmw.cfg files	2013-12-16 20:40:58 +01:00
mrcheko	a854eb73db	StateRunning check returns	2013-12-16 21:02:21 +02:00
scrawl	eb5e4ecec2	Remove more unused code	2013-12-16 15:35:38 +01:00
mrcheko	f50ff0b1c4	reworked http://bugs.openmw.org/issues/428	2013-12-16 15:40:47 +02:00
scrawl	19e5978a01	Merge branch 'master' of https://github.com/zinnschlag/openmw ... Conflicts: apps/openmw/main.cpp	2013-12-16 13:35:31 +01:00
scrawl	56893a097d	Don't stack used torches	2013-12-16 13:31:03 +01:00
scrawl	cd756a8a39	Fix incorrect value for partially used items (missing float casts). Make sure the correct value is displayed in tooltips.	2013-12-16 13:22:27 +01:00
Marc Zinnschlag	1cf1d49bc4	fix to content file reading error reporting in case of missing dependency	2013-12-16 11:39:24 +01:00
mrcheko	fd9f8c34f6	bug fix http://bugs.openmw.org/issues/428	2013-12-15 18:50:25 +02:00
Marc Zinnschlag	3590fa40bd	store global script state in saved game files	2013-12-15 16:16:50 +01:00
pvdk	30710bad70	Modified components widget so the checked items can be stored for all pages to access	2013-12-15 15:13:49 +01:00
pvdk	77fe73799a	Enabled language setting to be accessable from different pages	2013-12-15 13:12:48 +01:00
Nikolay Kasyanov	fc21dd1f3a	Music playback on OS X >= 10.9 works again. Fixes bug #1041.	2013-12-14 17:26:09 +04:00
pvdk	7132b9b0c5	Implement default installation path support for all platforms	2013-12-13 23:48:55 +01:00
Marc Zinnschlag	0890fa66b0	Merge remote-tracking branch 'mrcheko/master'	2013-12-13 18:47:11 +01:00
mrcheko	8b3a393a6b	bug fix at http://bugs.openmw.org/issues/985	2013-12-13 19:33:01 +02:00
mrcheko	c8bf69b91a	Revert "bug fix http://bugs.openmw.org/issues/985" ... This reverts commit 7a9b64c6f4.	2013-12-13 19:02:25 +02:00
pvdk	c82f0ec35f	Implemented the language selection page	2013-12-13 15:30:49 +01:00
pvdk	d7f9604140	WIP: Working on the installation selection and added the ui for the language page	2013-12-13 13:38:49 +01:00
scrawl	39eea24dc3	Don't try to show exceptions in a message box if SDL was not initialized	2013-12-13 03:50:01 +01:00
mrcheko	7a9b64c6f4	bug fix http://bugs.openmw.org/issues/985	2013-12-12 16:09:38 +02:00
Marc Zinnschlag	2a35c7d33a	fixed running global scripts a second time after they have been stopped	2013-12-12 13:16:32 +01:00
Marc Zinnschlag	74793c1c2f	globals script cleanup; fixed potential case folding bug	2013-12-12 13:15:38 +01:00
Marc Zinnschlag	fc37c77a91	store global variables in saved game files	2013-12-12 12:19:25 +01:00
Lukasz Gromanowski	91a4d9a2eb	Fixes #845: NPCs hold torches during the day ... Added method in WeatherManger and World which returns true if it is night. This method is used later in character controller to show torches (or other sources of light) at night and hide them at day. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-10 23:48:49 +01:00
Marc Zinnschlag	b38bfe1f21	removed a redundant function for listing global variables	2013-12-10 15:22:38 +01:00
Marc Zinnschlag	51bfa5cde3	rewrote global variable storage (using ESM variant type now)	2013-12-10 15:09:58 +01:00
Marc Zinnschlag	1fdd43bbb7	removed a redundant new	2013-12-10 12:31:18 +01:00
Emanuel Guevel	357ecd92b2	Do not display negative stat values ... Display zero instead of negative values. Also remove useless for loops and some unused attributes.	2013-12-10 00:41:36 +01:00
Emanuel Guevel	fc8bd1aacb	Allow fatigue stat to become negative when fatigue damages are taken	2013-12-09 21:53:04 +01:00
Marc Zinnschlag	77a2179d1e	Merge remote-tracking branch 'scrawl/master'	2013-12-09 18:39:34 +01:00
scrawl	0bc3a13c0f	Break invisibility on Use or Activate	2013-12-08 23:36:37 +01:00
scrawl	5fd2df5546	Ignore invisible targets for combat AI	2013-12-08 23:21:23 +01:00
scrawl	37a7ee8fcd	Set alpha value of character animations according to Invisibility / Chameleon effects.	2013-12-08 23:05:21 +01:00
pvdk	0e1d3237fe	Added some logic to the page switching	2013-12-08 22:58:29 +01:00
Lukasz Gromanowski	594cc693b2	Fixes #1006: Many NPCs have 0 skill ... Added calculation of skill values for NPC with mNpdtType set to NPC_WITH_AUTOCALCULATED_STATS (their NPDT is 12). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-08 21:47:43 +01:00
pvdk	8162f8370b	Added all the pages to the wizard	2013-12-08 21:35:57 +01:00
pvdk	f458f0c6c1	Added the Wizard .ui/resource files and some basic source to get started	2013-12-07 23:17:50 +01:00
Lukasz Gromanowski	8d63f8eea2	Fixes #998: Setting the max health should also set the current health ... Added setting current value of dynamic stat in OpSetDynamic class. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-07 21:00:46 +01:00
scrawl	1624e0fd8a	Rename ObjectList to ObjectScene. Wrap it in a SharedPtr so we can automate the destruction routine.	2013-12-07 20:15:39 +01:00
Marc Zinnschlag	ef8c0fab73	Merge remote-tracking branch 'scrawl/master'	2013-12-07 16:26:52 +01:00
scrawl	742e0e014d	Remove more cruft in MessageBox. Fixes inconsistent sizing when close to a newline.	2013-12-07 14:15:51 +01:00
scrawl	bb70deabb1	Add an incomplete implementation of SayAnimationValue (lip animation)	2013-12-07 14:15:45 +01:00
Marc Zinnschlag	1c13a9037a	save and load dynamic records	2013-12-07 13:17:28 +01:00
Marc Zinnschlag	030c733e2d	Merge branch 'master' into savedgame ... Conflicts: apps/openmw/mwmechanics/actors.cpp apps/openmw/mwworld/worldimp.cpp files/settings-default.cfg	2013-12-07 12:27:06 +01:00
Lukasz Gromanowski	e01085cac5	Fixes #1015: Player status window scroll state resets on status change ... Removed resetting scroll state position. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-07 02:57:30 +01:00
Marc Zinnschlag	48b779af80	Merge remote-tracking branch 'ace/win-fix'	2013-12-06 15:17:34 +01:00
Alexander "Ace" Olofsson	baacf91de4	Another windows build fix	2013-12-06 11:37:29 +01:00
Marc Zinnschlag	14eff87339	removed some junk from ESM store	2013-12-06 11:34:24 +01:00
Lukasz Gromanowski	bfd79bfbe6	Various fixes for CppCheck warnings. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-06 07:36:16 +01:00
Marc Zinnschlag	07f692bdd2	Merge remote-tracking branch 'scrawl/master'	2013-12-05 16:04:50 +01:00
scrawl	845bc5f7eb	Show fatal exceptions in a message box instead of cerr when running without a terminal	2013-12-05 15:51:07 +01:00
scrawl	afa71bb622	Throw an exception if a BSA is not found	2013-12-05 15:51:07 +01:00
scrawl	9ab8fe1038	Fix bsatool warning	2013-12-05 15:46:33 +01:00
scrawl	f695deb29d	Remember window positions	2013-12-05 15:46:23 +01:00
Marc Zinnschlag	ee6ddc3404	block saving while chargen is in progress	2013-12-05 14:56:30 +01:00
Marc Zinnschlag	8b7889f8e5	setup player after loading a saved game	2013-12-05 14:22:08 +01:00
Marc Zinnschlag	a7b42b867b	more cleanup	2013-12-05 14:18:43 +01:00
Marc Zinnschlag	ce624e024b	make sure player record stays in place across cleanups	2013-12-05 14:03:25 +01:00
Marc Zinnschlag	e818d43bc3	removed an outdated typedef and some dead code	2013-12-05 13:21:26 +01:00
Marc Zinnschlag	537b2efe8e	first round of cleaning up world cleanup	2013-12-05 12:49:25 +01:00
scrawl	8f4ffe4ddc	Fix new window size not being written to settings when manually resizing window	2013-12-03 15:55:31 +01:00
Marc Zinnschlag	63721682f6	GUI fix: previous character was selected when saving new character	2013-12-03 15:19:13 +01:00
Marc Zinnschlag	34cdd2bb1f	deal with dialogue/info records that don't exist anymore	2013-12-03 14:39:54 +01:00
Marc Zinnschlag	2293b92efe	storing and loading the journal	2013-12-03 14:28:46 +01:00
Marc Zinnschlag	2fe135d85f	journals subview was bound to the wrong universal ID type	2013-12-02 16:25:26 +01:00
Marc Zinnschlag	0f971163f7	use Entry instead of plain string for topic and quest entries	2013-12-01 14:50:25 +01:00
Marc Zinnschlag	b273f9e387	splitting JournalEntry into Entry and JournalEntry	2013-12-01 14:44:27 +01:00
Marc Zinnschlag	16e2d67b1f	added overloaded start/endRecord functions to ESMWriter	2013-12-01 13:32:11 +01:00
Marc Zinnschlag	c94f006307	Merge remote-tracking branch 'scrawl/master'	2013-11-30 15:06:09 +01:00
scrawl	8391891a5b	Ignore case for content file extensions	2013-11-30 14:25:29 +01:00
Marc Zinnschlag	43f5f16731	removed a todo comment	2013-11-30 12:54:44 +01:00
Marc Zinnschlag	177aab536d	storing topic name in MWDialogue::Topic (avoids a lookup in the GUI and also serves as preparation for better localisation support in OpenMW 1.1)	2013-11-30 12:41:18 +01:00
pvdk	46973e8e82	Fix for Bug #982: unchecking addons is now saved to profile	2013-11-30 12:08:37 +01:00
Marc Zinnschlag	eed46960fe	some spelling fixes	2013-11-30 12:02:56 +01:00
Marc Zinnschlag	9d64c92d33	store text in journal entries	2013-11-30 11:57:33 +01:00
Marc Zinnschlag	8b3e852ffc	Merge remote-tracking branch 'scrawl/master'	2013-11-30 11:09:38 +01:00
Marc Zinnschlag	aebc2791a5	fixed selecting current character based on value stored in settings	2013-11-30 11:08:41 +01:00
scrawl	4b4025ed0f	Keep the player's CharacterController when changing cells. Fixes several glitches.	2013-11-30 11:01:45 +01:00
Marc Zinnschlag	016500af98	Merge remote-tracking branch 'scrawl/master'	2013-11-30 09:45:46 +01:00
Marc Zinnschlag	04b1657d98	Merge branch 'openmw-27' ... Conflicts: apps/opencs/CMakeLists.txt apps/opencs/main.cpp	2013-11-30 09:45:41 +01:00
scrawl	e1e9de0f02	Don't hide tooltips on mouse click. Probably wasn't such a bright idea.	2013-11-30 09:04:52 +01:00
scrawl	6aa9e18915	Reset filter when starting a trade	2013-11-30 08:33:18 +01:00
scrawl	bb4bd999ba	PlaceAt: Copy the rotation when placing a non-actor. Don't modify placement position by bounding box for non-actors. Fixes placement in Graphic Herbalism mod.	2013-11-30 08:29:22 +01:00
scrawl	0e267b79ec	Don't heal dead actors when resting	2013-11-29 20:21:57 +01:00
scrawl	bcf61331ab	Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger.	2013-11-29 20:06:54 +01:00
scrawl	ce2d521b8f	Always apply queued movement, even when there's no duration. Fixes crash with --start="bal isra". ... When a script disables a reference that still has movement queued, trying to apply that movement will then fail due to the reference not being in the scene. Therefore, we should make sure that movement is always applied in the frame that it's queued in.	2013-11-29 20:03:50 +01:00
scrawl	ffc885853a	Fix bolt for magic effects that don't have one specified	2013-11-29 10:39:37 +01:00
scrawl	b82ee4b44f	Fix some problems with the previous commit	2013-11-28 21:49:15 +01:00
scrawl	076cc9230b	First try at handling target magic	2013-11-28 17:31:17 +01:00
scrawl	20ccfe2324	Play sound when enchanting	2013-11-28 11:37:30 +01:00
Marc Zinnschlag	5aea6ef80f	some clean up for the cleanup code	2013-11-28 11:22:34 +01:00
Marc Zinnschlag	35e8e23037	keep track of total play time per character	2013-11-28 09:33:50 +01:00
Marc Zinnschlag	7e2819c62e	store year in saved game profile	2013-11-28 09:27:10 +01:00
Marc Zinnschlag	b0eb5938bf	removed some redundant code	2013-11-28 09:13:54 +01:00
Marc Zinnschlag	71436b1160	changed interface for global variable access	2013-11-28 09:10:38 +01:00
scrawl	97fadb24ca	Update the Ptr in mObjects in Objects::updateObjectCell	2013-11-27 18:49:04 +01:00
scrawl	03c4b680ca	Fix changePointer	2013-11-27 18:49:04 +01:00
scrawl	a8c838b53a	Don't list deleted refs in CellStore::foreach	2013-11-27 18:49:04 +01:00
scrawl	49ea1aae67	Use GMST for sun damage reduction	2013-11-26 15:01:22 +01:00
Marc Zinnschlag	99ea63dc4a	factored out code for generating month names	2013-11-26 12:47:30 +01:00
Marc Zinnschlag	e6dc927f11	removed duplicates of the cell name function	2013-11-26 11:49:07 +01:00
Marc Zinnschlag	bc6fe682c9	replaced getCurrentCellName function with a more general getCellName function	2013-11-26 11:39:58 +01:00
Marc Zinnschlag	eea433f141	restore last played character selection across sessions	2013-11-26 10:37:58 +01:00
scrawl	eba068149d	Fix AIWander crash	2013-11-25 15:38:18 +01:00
Marc Zinnschlag	ad143e0524	case fix (content file names)	2013-11-25 14:56:05 +01:00
Marc Zinnschlag	616e3aa32f	store content file list in saved games and reject saved games not matching the current game	2013-11-25 13:00:05 +01:00
Marc Zinnschlag	55544e931c	reject newer formats when scanning saved games	2013-11-25 10:21:49 +01:00
Marc Zinnschlag	e3670cff8a	improved character selection logic	2013-11-24 16:58:41 +01:00
Marc Zinnschlag	67cd0887e6	added description field to saved game record; make use of description in GUI	2013-11-24 15:19:56 +01:00
Marc Zinnschlag	7efac4c9a5	fixed handling of characters without a valid slot	2013-11-24 15:05:00 +01:00
Marc Zinnschlag	18a3b38fb4	when scanning saved game directory, reject characters without a valid saved game	2013-11-24 14:42:58 +01:00
scrawl	14c9a4e1d3	Cap enchantment casting cost to 1 as displayed in enchanting window. Display current enchantment charge in spell window.	2013-11-23 23:12:54 +01:00
scrawl	07408a4652	Don't allow selling gold (again - when did this get broken?)	2013-11-23 22:52:20 +01:00
scrawl	4aa9f3bcef	Don't set the enchanted item in HUD for "WhenStrikes" enchantments	2013-11-23 22:48:56 +01:00
scrawl	f3e89e9168	Fix arrow down in console	2013-11-23 22:48:39 +01:00
scrawl	d2ed77f3f2	Fix shields being visible during spellcasting	2013-11-23 20:24:52 +01:00
Marc Zinnschlag	d8c40562ae	Merge remote-tracking branch 'scrawl/light'	2013-11-23 12:44:42 +01:00
scrawl	a1fe07181c	Fix rotation offset of some lights (bug 955)	2013-11-23 05:55:03 +01:00
scrawl	0e254aa7c7	Fix startNewGame assigning an already freed CellStore to the player Ptr supplied to WindowManager. Fixes a crash when equipping lights after starting a new game (bug 967). Side note: The inventory preview's Ptr being assigned a cell at all doesn't make sense, as that is used to determine the light setting which should be the same no matter which cell you're in.	2013-11-23 03:25:55 +01:00
scrawl	39de0510a0	Fix another case of container scripts not getting re-added	2013-11-22 02:12:37 +01:00
scrawl	829512ded4	Fix container scripts not getting re-added when the player changes cells	2013-11-22 01:02:12 +01:00
scrawl	2e87cbc231	Add basic functionality to SaveGameDialog	2013-11-21 20:34:34 +01:00
scrawl	cf79a83d4f	Avoid recreating widgets in MainMenu::updateMenu. Fix crash when pressing new game due to the button being destroyed from within it's own delegate.	2013-11-21 19:07:54 +01:00
scrawl	b490e56ba1	Remove redundant setLocals (already done by ContainerStore::add)	2013-11-21 17:19:41 +01:00
scrawl	61ab6e1739	Use fWortChanceValue for making ingredient/potion effects visible	2013-11-21 17:19:41 +01:00
scrawl	320ba98097	Correct getDerivedDisposition according to wiki (check if player expelled)	2013-11-21 17:19:41 +01:00
scrawl	6451b687d9	Adjust value for several item types as according to wiki	2013-11-21 17:19:41 +01:00
scrawl	b6c22ad5d9	Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount.	2013-11-21 17:19:30 +01:00
scrawl	bab657fe2b	Add a utility function to add items to a ContainerStore by RefID	2013-11-21 17:14:30 +01:00
scrawl	6641fd4635	Fix bug when enchanting: only the mBase pointer was updated, not the CellRef mRefID, which is used for container stacking. The new (enchanted) item was stacking with the old item when it was added, so the enchantment completely disappears.	2013-11-21 17:14:30 +01:00
scrawl	800a2845b0	Add Bound & Summon effects (will need some adjustments later)	2013-11-21 17:14:23 +01:00
Marc Zinnschlag	2702d10911	more comments	2013-11-21 12:31:04 +01:00
Marc Zinnschlag	b5f99522c7	added a few comments	2013-11-21 12:29:24 +01:00
Marc Zinnschlag	c165894869	load saved game record	2013-11-21 12:24:24 +01:00
Marc Zinnschlag	5ba56a5ea5	character signatures	2013-11-21 11:18:56 +01:00
Marc Zinnschlag	cbbdf390ad	added function for inspection of saved characters and character slots	2013-11-21 11:10:18 +01:00
Marc Zinnschlag	fc1501a510	store character profile information in saved game file	2013-11-21 10:53:42 +01:00
Marc Zinnschlag	e938c5a0ee	changed character creation logic (create on save instead of on new game)	2013-11-21 10:20:50 +01:00
scrawl	bf153e1c8e	Fix bug applying instant effects	2013-11-21 00:41:52 +01:00
scrawl	4ed4c1e319	Add Vampirism and Sun Damage effects. Some fixes.	2013-11-21 00:41:31 +01:00
scrawl	7f735c2c4c	Release and show the cursor when focus lost	2013-11-20 16:07:14 +01:00
scrawl	5a4bd9b202	Remove software cursor option, hw cursors seem to be working well enough	2013-11-20 06:20:16 +01:00
scrawl	fa63924884	Simplify message box manager, should fix a random bug with boxes not disappearing	2013-11-20 05:49:05 +01:00
scrawl	3452bd2e0b	Add glow effect for enchanted items	2013-11-20 00:13:12 +01:00
scrawl	0b9676aaa3	Fix an issue with the AI code	2013-11-19 18:43:32 +01:00
scrawl	38a82c4b0b	Add a todo comment	2013-11-19 18:43:21 +01:00
scrawl	8b095982e9	Don't auto equip for dead actors	2013-11-19 18:42:43 +01:00
scrawl	f3ff2e4260	Handle Unreflectable flag	2013-11-19 17:33:02 +01:00
scrawl	c03c82c78a	Apply disease resistance manually as according to wiki	2013-11-19 17:15:17 +01:00
Marc Zinnschlag	8190fdb16c	Merge remote-tracking branch 'scrawl/master'	2013-11-19 16:56:18 +01:00
scrawl	654b7d9ba5	Apply disease resistance manually as according to wiki	2013-11-19 16:52:26 +01:00
scrawl	e8dcd74741	Recharge enchanted items in player's inventory over time	2013-11-19 16:42:24 +01:00
Marc Zinnschlag	9487bd33c3	removed broken save function from ESMWriter	2013-11-19 16:07:36 +01:00
Marc Zinnschlag	5e64888227	added basic save slot management and connected main menu save to save function (bypassing the save GUI for now)	2013-11-19 15:38:26 +01:00
Marc Zinnschlag	11e254aac8	Merge remote-tracking branch 'gus/AICombat' ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp	2013-11-19 09:10:48 +01:00
scrawl	74e42a2d02	Add missing skill increases for Enchant skill	2013-11-19 07:39:07 +01:00
scrawl	cab535dd69	Implement magic item recharging via soulgem use	2013-11-19 06:48:47 +01:00
scrawl	16e5477c60	Fix an uninitalized member	2013-11-19 02:17:44 +01:00
gus	dff3cf162d	ToggleAI script instruction	2013-11-18 23:03:44 +01:00
Marc Zinnschlag	1c7a4d4b3a	adjust availability of main menu items based on game state	2013-11-18 15:52:25 +01:00
Marc Zinnschlag	f45cff8aff	flag game as ended when player dies	2013-11-18 15:38:08 +01:00
Marc Zinnschlag	82c8495338	removed boolean running flag with state enum	2013-11-18 15:15:47 +01:00
Marc Zinnschlag	e55691096c	Merge remote-tracking branch 'ace/win-fixes'	2013-11-18 13:46:28 +01:00
Alexander "Ace" Olofsson	4baaf9463e	Remove crashcatcher.cpp from windows builds, it can't be built or used there.	2013-11-18 12:34:25 +01:00
gus	4559e932ae	AI packages have priority and combat is triggered in actor.cpp using the Hostile setting in CreaturesState	2013-11-18 12:33:09 +01:00
scrawl	6902569d03	Implement Absorb effects (AbsorbHealth, etc)	2013-11-18 05:01:36 +01:00
scrawl	a420698237	Don't try to absorb or reflect for self casted spells	2013-11-17 23:41:24 +01:00
scrawl	0dc2e829dd	Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX.	2013-11-17 23:31:08 +01:00
scrawl	fc268bf302	Initialize mFallHeight	2013-11-17 23:31:08 +01:00
scrawl	47fc3f81f5	Don't update actors while paused	2013-11-17 23:31:08 +01:00
scrawl	2a11618ee7	Make sure the equipped weapon HUD icon is updated properly	2013-11-17 23:31:07 +01:00
scrawl	b8c358df63	Fix a bug with equipping using the quick keys: when item is already equipped, equipping it again would cause the slot to get unequipped first, possibly restacking and destroying the Ptr that was supposed to be equipped in the first place	2013-11-17 23:31:07 +01:00
Marc Zinnschlag	d32fcb99b5	Merge remote-tracking branch 'scrawl/master'	2013-11-17 13:39:04 +01:00
scrawl	e7993ced69	Fix invalid casts	2013-11-17 04:33:04 +01:00
scrawl	07251f0fa4	Don't apply spells to dead actors	2013-11-17 04:32:56 +01:00
scrawl	b8f5cd6cb7	Forgot to apply the same fix to companion window	2013-11-16 23:55:54 +01:00
Sebastian Wick	4a816b6c17	fix context menu	2013-11-16 23:08:03 +01:00
scrawl	eb46de54e4	Merge branch 'master' of https://github.com/zinnschlag/openmw	2013-11-16 22:48:59 +01:00
scrawl	7eb1dcb682	Fix trade windows crashing after a new game	2013-11-16 22:29:40 +01:00
scrawl	e32c73725c	Merge branch 'crashcatcher'	2013-11-16 20:56:07 +01:00
scrawl	f990ba09f0	gdb detection doesn't seem to work for the forked process	2013-11-16 20:55:41 +01:00
Marc Zinnschlag	a19242b4ec	fixed expression in if statement	2013-11-16 19:31:35 +01:00
vorenon	b2d2a3dd17	Closing message boxes with numpad enter	2013-11-16 19:15:47 +00:00
Marc Zinnschlag	985ce7c552	Merge remote-tracking branch 'scrawl/crashcatcher'	2013-11-16 18:34:08 +01:00
scrawl	20d806b40c	Change is_debugger_attached to a different hack	2013-11-16 18:15:54 +01:00
Marc Zinnschlag	c5f81e3508	don't run udpates if no game is running	2013-11-16 17:46:48 +01:00
scrawl	883140babf	Add missing include for signals to make travis happy	2013-11-16 17:00:26 +01:00
scrawl	b9899696e3	Add a crash catcher for unix. When encountering a fatal signal, attach gdb and log backtrace.	2013-11-16 15:56:15 +01:00
scrawl	aa84ce3f0d	Copy paste mistake (oops)	2013-11-16 14:44:31 +01:00
Marc Zinnschlag	ec5b2e9a7e	added running flag; moved new game code to MWState	2013-11-16 12:22:28 +01:00
Marc Zinnschlag	31ec973c9c	removed default value for --start	2013-11-16 12:08:00 +01:00
Marc Zinnschlag	b3a7c8c098	removed --new-game switch	2013-11-16 11:36:32 +01:00
Marc Zinnschlag	7a4b604376	added --skip-menu switch	2013-11-16 11:33:20 +01:00
Marc Zinnschlag	f19973450f	moved exit game flag from Environment to StateManager	2013-11-16 11:07:23 +01:00
Marc Zinnschlag	79b7fa258b	added new mwstate subsystem	2013-11-16 10:31:46 +01:00
scrawl	7474e87edc	Implement RestoreHealth/Magicka/Fatigue	2013-11-16 05:06:54 +01:00
scrawl	bb43ec9b35	Implement damage tick effects	2013-11-16 03:16:21 +01:00
scrawl	b1a29eb27e	Implement Resist & Weakness effects	2013-11-16 02:34:43 +01:00
scrawl	d49b6f19ff	Don't advance acrobatics skill for NPCs	2013-11-16 02:11:11 +01:00
scrawl	aa4b2d9504	Fix uninitialized mSkill/mAttribute for spellmaker spells	2013-11-16 01:19:39 +01:00
scrawl	c73217627e	Move code for listing effect sources to the spell management classes	2013-11-15 20:29:47 +01:00
Marc Zinnschlag	eddd6bf48d	enabled load and save items in main menu	2013-11-15 10:29:53 +01:00
scrawl	d619d0fa25	Don't grab the cursor while the console is opened	2013-11-15 03:39:25 +01:00
scrawl	065f14579f	Fix a container window regression (oops)	2013-11-15 02:57:21 +01:00
scrawl	f7befa3e54	Remove a no longer required method	2013-11-15 02:20:04 +01:00
scrawl	00af6b5617	Use an inventory store listener for animation parts and VFX update instead of updating them directly. Slightly more flexible, reduces InventoryStore dependencies and solves a crash during character creation due to the preview doll's animation not being registered in World.	2013-11-15 02:08:36 +01:00
scrawl	427de69b79	Allow stacking enchanted items when charge is full	2013-11-14 21:02:37 +01:00
scrawl	49125fa26e	Fix restacking unequipped items	2013-11-14 19:54:00 +01:00
scrawl	da85f3e575	Use the formula from the wiki for spell success.	2013-11-14 19:19:32 +01:00
scrawl	4083c55848	Make sure NpcAnimation base exists before runAnimation. Not sure yet why this is needed.	2013-11-14 19:18:27 +01:00
scrawl	5458207325	Reduce fatigue when casting. Has no effect in the vanilla game due to the GMSTs being 0.	2013-11-14 18:41:34 +01:00
scrawl	9c5847e2f4	Fix VFX not getting removed when an actor dies	2013-11-14 14:52:30 +01:00
scrawl	e26cc31e3b	Disable projectiles for now	2013-11-14 14:45:08 +01:00
scrawl	992a8e9c36	Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore.	2013-11-14 14:41:10 +01:00
scrawl	956d8adb99	Merge branch 'master' of https://github.com/zinnschlag/openmw into magic ... Conflicts: apps/openmw/mwgui/inventoryitemmodel.cpp	2013-11-14 14:25:22 +01:00
scrawl	0b5f5351b5	Fix continuous FX getting removed instantly	2013-11-14 13:30:48 +01:00
Marc Zinnschlag	1c020b74c8	hid ID column in info tables (not relevant for the user)	2013-11-14 13:14:37 +01:00
Marc Zinnschlag	9f0dac00ec	silenced a warning	2013-11-14 12:22:24 +01:00
Marc Zinnschlag	2af7f60488	flag reordered records as modified	2013-11-14 12:21:10 +01:00
Marc Zinnschlag	a44fad4c59	disabled revert for info tables (no easy way to make this work)	2013-11-14 11:55:02 +01:00
Marc Zinnschlag	d49b8e7443	Merge branch 'dialogue'	2013-11-14 11:40:50 +01:00
Marc Zinnschlag	780ea3a41f	added support for record reordering to model (only implemented in info collection)	2013-11-14 11:39:14 +01:00
scrawl	da5c59c8af	addEffect should check effectId, not model.	2013-11-13 19:07:44 +01:00
scrawl	ff7e4174f9	Fix some leftover code that still calculated random magnitude per spell rather than per effect. Major cleanup of InventoryStore: Magic effects are now updated when needed, rather than cached. Also allows to get rid of 'mutable' hacks and non-const method that should be const. Play sounds and particles when equipping a permanent enchantment item.	2013-11-13 18:51:28 +01:00
scrawl	a6e2f43b75	Stop continuous VFX when the effect is no longer active.	2013-11-13 15:44:43 +01:00
Marc Zinnschlag	68598f9b63	fixed handling of user directory defaultfilters file; some cleanup	2013-11-13 14:56:04 +01:00
scrawl	9b0e82a37f	Projectile models are now spawned (no movement or impact yet). Refactored trap activation to apply range types properly. Handle ContinuousVFX for magic effects (note they aren't stopped yet when the effect ends)	2013-11-13 14:02:15 +01:00
Marc Zinnschlag	a8274e5c86	Merge remote-tracking branch 'potatoesmaster/inventory-fix'	2013-11-13 13:55:24 +01:00
Marek Kochanowicz	821d0c5c2d	Corrected filter template loading.	2013-11-13 11:38:29 +01:00
scrawl	0627e23d3c	Fix wrong skill level for spell success formula.	2013-11-13 01:26:25 +01:00
Emanuel Guevel	baf13483c0	Update actor model only when in the current cell	2013-11-13 00:04:04 +01:00
scrawl	60bec03987	Rename variables called 'slots' to work around wrong code parsing in QT Creator.	2013-11-12 23:23:19 +01:00
scrawl	027f4152e4	Missing flagAsModified()	2013-11-12 23:17:03 +01:00
scrawl	3c6a391507	Rename arguments again	2013-11-12 23:12:56 +01:00
scrawl	700d06764c	Order of arguments for ContainerStore::stacks shouldn't matter. Supplying them in the correct order is error prone, and also caused a bug where equipped items would incorrectly stack.	2013-11-12 22:58:56 +01:00
scrawl	0dab7031c0	Make sure effects are destroyed with the animation	2013-11-12 02:22:44 +01:00
scrawl	eccb8f38ba	Apply "cast when strikes" enchantments when hitting with a weapon	2013-11-12 02:07:51 +01:00
scrawl	5f209b120b	Use the new ContainerStore::remove method.	2013-11-12 01:26:16 +01:00
scrawl	ffdb91bb21	Add particles for Cast + Hit. Not looking quite right yet.	2013-11-11 23:43:28 +01:00
Marc Zinnschlag	2fff7fc843	save info records	2013-11-11 12:21:26 +01:00
scrawl	6f3d737498	Missing const, thanks to jeaye	2013-11-10 23:27:11 +01:00
scrawl	1773c70455	Merge branch 'master' of https://github.com/zinnschlag/openmw into magic	2013-11-10 22:03:17 +01:00
Marc Zinnschlag	ef8360f346	silenced a warning	2013-11-10 21:45:27 +01:00
Marc Zinnschlag	cfbf444628	Merge remote-tracking branch 'potatoesmaster/inventory-remove'	2013-11-10 21:30:19 +01:00
Nikolay Kasyanov	05e19b37e3	Removed obsolete comment	2013-11-10 22:25:29 +04:00
Nikolay Kasyanov	dafe80874a	Added empty line	2013-11-10 22:24:31 +04:00
Nikolay Kasyanov	96714fc2c1	OpenCS: proper working dir & library path on OS X	2013-11-10 22:19:32 +04:00
Nikolay Kasyanov	fa13818360	OS X: OpenCS packaging	2013-11-10 22:04:13 +04:00
Nikolay Kasyanov	dfa900e4e3	OS X: Fixed “macro redefined” warning	2013-11-10 20:59:10 +04:00
Nikolay Kasyanov	0494fa543f	OpenCS: set current directory to bundle location on OS X, like in OpenMW binary	2013-11-10 20:39:35 +04:00
Nikolay Kasyanov	df5b52b45b	OpenCS.app icon & bundle properties	2013-11-10 20:11:53 +04:00
Nikolay Kasyanov	04edd25add	OpenCS as a separate app bundle	2013-11-10 19:09:05 +04:00
scrawl	6cd373c5c6	Only allow using powers once every 24 h. Apply on touch effects.	2013-11-10 15:40:31 +01:00
scrawl	71828351e6	Code cleanup: use enum instead of integer	2013-11-10 15:28:26 +01:00
Marc Zinnschlag	8c4303399f	Merge branch 'master' into dialogue ... Conflicts: apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/esm/loadinfo.hpp	2013-11-10 13:21:39 +01:00
Marc Zinnschlag	583f1ae9c2	fixed info record ordering and performance problems by determining topic ranges in the record collection instead of in the index collection	2013-11-10 13:00:46 +01:00
Marc Zinnschlag	ec6018928c	some fixes to info record sorting (doesn't address the main problem)	2013-11-10 12:09:49 +01:00
Marc Zinnschlag	b7bb7d6902	Merge remote-tracking branch 'scrawl/master' ... Conflicts: apps/opencs/editor.cpp	2013-11-10 11:49:48 +01:00
Emanuel Guevel	bbfd7f4c9d	Disable equipped item re-stacking when the item is removed from inventory ... The item was not removed if it was re-stacked.	2013-11-10 02:45:17 +01:00
Emanuel Guevel	d2dcf0b203	Add a warning comment to RefData::setCount()	2013-11-10 02:45:17 +01:00
Emanuel Guevel	467bd91651	Update actor model on inventory change	2013-11-10 02:45:17 +01:00
Emanuel Guevel	f428921b93	Always update the source container view on drag&drop ... This fix the indicator not being displayed for items auto-equipped after an other item is removed.	2013-11-10 02:45:17 +01:00
Emanuel Guevel	4fcf427e1f	InventoryWindow: call InventoryStore::unequipItem() when an equipped item is dragged ... The unequipped item is also re-stacked if needed.	2013-11-10 02:45:17 +01:00
Emanuel Guevel	37e91a278e	Add InventoryStore::unequipItem()	2013-11-10 02:45:17 +01:00
Emanuel Guevel	12dbbde1e3	InvStore::unequipSlot: return an iterator to the unequipped item	2013-11-10 02:45:17 +01:00
Emanuel Guevel	59c963b6cc	Auto-equip items when a clothe or an armor is removed from inventory ... This fix auto-equip on corpses.	2013-11-10 02:45:16 +01:00
Emanuel Guevel	750f1fd760	Edit ContainerStore::stacks for clarifications and correctness ... Rename arguments and fix some potential errors (add checks).	2013-11-10 02:45:16 +01:00
Emanuel Guevel	26e4ccb8c2	Cosmetic changes ... Rename ContainerStore::addImpl to addNewStack (it was confusing, since ContainerStore had methods named 'addImp' and 'addImpl').	2013-11-10 02:45:16 +01:00
Emanuel Guevel	aefa54d72d	Pass item count to ManualRef constructor ... This remove the need to call setCount in multiple places.	2013-11-10 02:45:16 +01:00
Emanuel Guevel	0691978603	Add item count to ManualRef constructor as optional argument	2013-11-10 02:45:16 +01:00
Emanuel Guevel	f4f2586e8c	Remove duplicate code for PlaceAtMe/PlaceAtPC using a template	2013-11-10 02:45:16 +01:00
Emanuel Guevel	8ff747fbef	Move some deleteObject logic from OpDelete to MWWorld::deleteObject	2013-11-10 02:45:16 +01:00
Emanuel Guevel	2786530430	Edit InventoryStore::equip() to call the new unequipSlot function… ... …to unequip previously equipped item.	2013-11-10 02:45:16 +01:00
Emanuel Guevel	52cef19982	Update weapon/magic icons when items are removed from player inventory	2013-11-10 02:45:16 +01:00
Emanuel Guevel	d05baa8c22	Add method InventoryStore::unequipSlot() ... This will permit to do run a treatment when an item is unequipped.	2013-11-10 02:45:16 +01:00
Emanuel Guevel	10abb9d297	Call ContainerStore::remove() to remove items from inventory ... Make placeObject() and dropObjectOnGround() in MWWorld to copy objects (and indicate it clearly). Enchanting an item now unequips it.	2013-11-10 02:45:16 +01:00
Emanuel Guevel	23b8206bdc	Add remove methods to MWWorld::ContainerStore	2013-11-10 02:45:16 +01:00
Marc Zinnschlag	a198751f21	Merge remote-tracking branch 'scrawl/magic'	2013-11-09 17:00:27 +01:00
Marc Zinnschlag	935d9241d8	first attempt at proper info record loading: partially incorrect and way too slow	2013-11-09 11:42:19 +01:00
scrawl	5c148a3d41	Fix effect source display	2013-11-09 11:09:44 +01:00
Marc Zinnschlag	8be3ffc2a0	Merge remote-tracking branch 'scrawl/magic' ... Conflicts: apps/openmw/mwworld/worldimp.cpp	2013-11-09 10:54:51 +01:00
scrawl	3e58655a90	Implemented Fortify/Drain skill magic effects. Scroll of icarian flight works!	2013-11-09 10:49:00 +01:00
scrawl	3ea7d58ca8	Advance skill on successfull spell cast	2013-11-09 10:34:46 +01:00
scrawl	976344f0a3	Handle CastOnce enchantments	2013-11-09 08:07:40 +01:00
scrawl	1051611ffa	Added spell failure sound	2013-11-09 07:59:17 +01:00
scrawl	cbe96a2170	Refactor ActiveSpells to track range type. Added basic self range magic.	2013-11-09 07:51:46 +01:00
Marc Zinnschlag	3d8da2b9e0	proper sorting for newly created records and some case smashing fixes	2013-11-08 12:16:41 +01:00
Marc Zinnschlag	a06aa881cb	make sure case handling in info IDs is consistent	2013-11-08 12:03:03 +01:00
Marc Zinnschlag	982024a328	Topic range access in InfoCollection	2013-11-08 11:52:30 +01:00
Marc Zinnschlag	0745a86039	added InfoCreator	2013-11-08 11:51:59 +01:00
Bret Curtis	5a071b0f81	necessary dpkg rules to get opencs building and packaged on dpkg systems	2013-11-08 09:08:56 +01:00
Bret Curtis	36efe9605f	necessary dpkg rules to get opencs building and packaged on dpkg systems	2013-11-07 23:05:45 +01:00
Marc Zinnschlag	fb417f9880	Merge remote-tracking branch 'scrawl/openmw-27' into openmw-27	2013-11-07 09:19:55 +01:00
Jordan Ayers	3fbf918751	Chargen Review Dialog: Init fix. ... Load the starting Health/Magicka/Fatigue from the player stats when creating the Review Dialog, and remove the extra copy of these stats. In some cases, the old stat values were never updated from 0/0.	2013-11-06 23:19:53 -06:00
Jordan Ayers	d48cc27a89	Chargen fix: Back sequence control. ... Related to bug #894. Eliminate double windows when using 'Back' from the review screen. Force consistent back behavior (handling was changing after a individual change button had been used).	2013-11-06 23:19:53 -06:00
Jordan Ayers	e94da61ff0	Chargen cleanup. ... Move common gui state pop out of if checks. Move health update before gui state push (used as input for some windows).	2013-11-06 23:19:53 -06:00
Marc Zinnschlag	d85360e7fd	Merge remote-tracking branch 'scrawl/ui'	2013-11-06 10:21:41 +01:00
Marc Zinnschlag	418ccf705d	Merge branch 'openmw-27' ... Conflicts: apps/launcher/graphicspage.hpp components/CMakeLists.txt	2013-11-06 10:21:25 +01:00
scrawl	9e2b1942fc	Fix journal for not installed tribunal (Options button should become Topics). Don't log an error when optional journal buttons (Tribunal) are not found.	2013-11-05 22:50:53 +01:00
scrawl	bf5529819d	Added combo box widget and use it in options menu. Fixes to VBox / HBox. Added savegame dialog.	2013-11-05 19:50:24 +01:00
Marc Zinnschlag	c545b3682a	compose info record IDs from actual record ID and parent topic ID (to make sure IDs are unique)	2013-11-05 12:57:55 +01:00
Marc Zinnschlag	2d4a6c0edf	cleaned up ID handling in INFO record (including a ESMTool bug fix)	2013-11-05 12:56:20 +01:00
Marc Zinnschlag	9d7695ea88	added missing columns to topic info table	2013-11-05 11:41:48 +01:00
Marc Zinnschlag	245d7b0ae4	Merge remote-tracking branch 'scrawl/windowclosefix'	2013-11-05 08:19:53 +01:00
Marc Zinnschlag	f4e6f31658	Merge remote-tracking branch 'scrawl/openmw-27'	2013-11-05 08:19:29 +01:00
scrawl	c3d9bc31bb	Fix exiting OpenMW via the window close button (regression)	2013-11-05 03:02:28 +01:00
scrawl	3a827d9c12	Deleted Obliviontt.zip	2013-11-05 00:32:06 +01:00
Alexander "Ace" Olofsson	468e8e3635	Missing iostream include	2013-11-04 10:36:22 +01:00
Marc Zinnschlag	dec1483fa4	Merge branch 'saving' into openmw-27	2013-11-04 08:57:32 +01:00
graffy76	6d439d032f	Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector	2013-11-03 21:38:10 -06:00
graffy76	ed913936f8	Eliminated game & addon keys from profile configuration	2013-11-03 21:36:41 -06:00
graffy76	dace904490	changed game/addon to content for writing to openmw.cfg from launcher	2013-11-03 16:45:18 -06:00
Marc Zinnschlag	3ac58b387b	fixed wording of an error message	2013-11-03 22:08:38 +01:00
graffy76	1d4b5a2425	Fix broken launcher content file display / selection scheme ... Disable selection of content files with missing dependencies (grayed out)	2013-11-03 14:02:41 -06:00
graffy76	12c06a5615	Fixed broken dependency check	2013-11-03 06:21:28 -06:00
Marc Zinnschlag	4724df7e9b	added topic/journal column to info tables	2013-11-03 10:48:50 +01:00
graffy76	973803eb2f	Fixed pathing issues in launcher	2013-11-03 00:02:46 -05:00
Lukasz Gromanowski	afce10cf37	Fixes #597: Assertion `dialogue->mId == id' failed in esmstore.cpp ... It seems that assertion was unnecessary, after removing it, dialogs related to moon-and-star in "Path of the Incarnate" quest were correctly loaded (dumped DialInfo records were correct). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-11-02 16:39:05 +01:00
graffy76	8d12e2b99d	fixed merge conflicts ... Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector Conflicts: apps/launcher/datafilespage.cpp apps/launcher/settings/gamesettings.hpp components/contentselector/model/contentmodel.cpp	2013-11-02 09:31:23 -05:00
graffy76	cddece4f9e	Another stab at fixing the pathing problem...	2013-11-01 21:47:26 -05:00
scrawl	e6960d915a	Add simple Ogre widget	2013-11-02 02:51:38 +01:00
Marc Zinnschlag	15b7d3263c	subclass ESM::DialInfo to keep track of parent topic	2013-11-01 17:43:45 +01:00
graffy76	0cb591e4f6	Fixed path problem with adjuster widget and local data path.	2013-10-31 18:12:13 -05:00
Marc Zinnschlag	ea0e8be0d3	disallow sorting (via column headers) in info tables	2013-10-31 13:40:14 +01:00
Marc Zinnschlag	90aa8f9db6	fixed dialogue record loading with multiple content files	2013-10-31 13:11:15 +01:00
Marc Zinnschlag	767cb54e7c	added missing columns to journal info table	2013-10-31 12:54:55 +01:00
Marc Zinnschlag	69f28ee4be	split info records between journal and topic info tables	2013-10-31 12:16:45 +01:00
gus	683b8d77dd	build fix (thanks travis)	2013-10-31 11:02:26 +01:00
gus	d587f3c946	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat ... Conflicts: apps/openmw/mwmechanics/actors.cpp apps/openmw/mwscript/docs/vmformat.txt	2013-10-31 09:51:17 +01:00
gus	02ded18fc5	Linux backslash fix	2013-10-31 09:43:12 +01:00
gus	2a927f65d3	perfomances optimisations (pathfinding is computed less often, max 4 times per sec)	2013-10-30 20:52:23 +01:00
gus	650a112e2e	better timer	2013-10-30 20:42:50 +01:00
scrawl	636d399c7f	Refactored Ogre initialisation into a component	2013-10-30 14:04:33 +01:00
scrawl	4f35fd8184	Removed a workaround from Renderer, some cleanup	2013-10-30 13:05:28 +01:00
Marc Zinnschlag	ba88c94d58	first attempt at an info record collection	2013-10-29 13:18:22 +01:00
Marc Zinnschlag	45f5a66bcc	use result of getAppendIndex instead of always appending at the end	2013-10-29 09:27:23 +01:00
gus	a6e7c6c104	disable AI combat for creatures	2013-10-28 23:04:46 +01:00
gus	5b20cce849	CMake fix	2013-10-28 18:36:09 +01:00
gus	0e86209224	linux fix :p	2013-10-28 18:33:10 +01:00
gus	b7a9243173	fighting should stop when the target is dead	2013-10-28 18:22:36 +01:00
gus	12d8b4e0f8	bugfix	2013-10-28 18:13:07 +01:00
gus	2d84f7d33d	NPC run	2013-10-28 18:10:00 +01:00
gus	d7584f9df7	getLineOfSight, no script instruction yet	2013-10-28 18:01:40 +01:00
Marc Zinnschlag	f5fbe7361f	Merge remote-tracking branch 'lgro/saving' into saving	2013-10-28 08:35:51 +01:00
graffy76	b51bef0d98	fixed missing adjuster widget in file dialog open view	2013-10-27 20:21:19 -05:00
Lukasz Gromanowski	d51c9b64dd	Issue #913: Merge --master and --plugin switches ... Launcher part of master/plugin switches merge. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-10-27 20:03:12 +01:00
Lukasz Gromanowski	489475a32f	Corrected compilation error (g++ 4.8.2) triggered by not found declaration ... in argument-dependent lookup at the point of instantiation. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-10-27 19:57:05 +01:00
Marc Zinnschlag	c2bbbef637	Merge remote-tracking branch 'rainChu/drowning-gauge'	2013-10-27 16:10:11 +01:00
gus	2515a1239e	improved combat conditions	2013-10-27 14:22:51 +01:00
Marc Zinnschlag	9a80e11182	reimplemented add and appendBlankRecord via insertRecord	2013-10-27 14:13:10 +01:00
gus	968968502e	NPC always face you when fighting	2013-10-27 14:03:58 +01:00
Marc Zinnschlag	525d6fadec	added Collection insert function for arbitrary position and reimplemented appendRecord in via this function	2013-10-27 14:00:25 +01:00
gus	a0edb55f60	only NPC with fight over 80 will attack you now	2013-10-27 13:50:29 +01:00
gus	882b136b35	bugfix of bugfix ^^	2013-10-27 13:21:16 +01:00
Alex "rainChu" Haddad	23eaf90846	Breath meter flashes when drowning	2013-10-27 04:05:01 -04:00
graffy76	ea7a8eb2a4	last commit	2013-10-26 23:04:39 -05:00
graffy76	5e123d3f52	Hide adjusterwidget for open files view	2013-10-26 22:57:22 -05:00
graffy76	9b483c3ae3	Fix for file path issues	2013-10-26 22:55:44 -05:00
graffy76	ba365ff49e	Fixed merge conflicts with saving branch	2013-10-25 19:23:03 -05:00
scrawl	8c9a5de26f	Fix an irritating error message	2013-10-25 23:47:53 +02:00
graffy76	9ce4a04a2d	merge from saving ... Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector Conflicts: apps/launcher/datafilespage.cpp apps/opencs/editor.cpp apps/opencs/view/doc/filedialog.cpp apps/opencs/view/doc/filedialog.hpp	2013-10-25 14:44:22 -05:00
graffy76	1a23cccce3	Implemented Launcher namespace	2013-10-25 11:17:26 -05:00
graffy76	16d87ea1d1	Merge branch 'master' into esxSelector	2013-10-25 08:11:24 -05:00
graffy76	2ca7f24731	Fixed filedialog new / edit content path issue	2013-10-24 17:33:28 -05:00
graffy76	b48f066f33	Reimplemented content selector for filedialog and datafilespage classes	2013-10-23 17:39:17 -05:00
graffy76	ba3589bc76	Revert "Implemented ContentSelector as a singleton "charm" modifier for" ... This reverts commit 24b167b755. Conflicts: apps/launcher/datafilespage.cpp apps/opencs/editor.cpp apps/opencs/view/doc/filedialog.cpp apps/opencs/view/doc/filedialog.hpp components/contentselector/view/contentselector.cpp components/contentselector/view/contentselector.hpp	2013-10-22 22:20:21 -05:00
graffy76	f9591ddda6	Reimplemented constentselector view class	2013-10-22 21:52:35 -05:00
Marc Zinnschlag	67bc0a0c70	additional modification to the IDValidator (restricting relaxed mode slightly more)	2013-10-22 11:32:10 +02:00
Marc Zinnschlag	dc473221e7	added ID-argument to CollectionBase::getAppendIndex (required for info record collection)	2013-10-22 11:21:12 +02:00
Marc Zinnschlag	aa61948801	relaxed rules for new IDs when ID is also a user visible text	2013-10-22 11:08:37 +02:00
Marc Zinnschlag	3146af34d6	some fixes for the merged filter branch	2013-10-21 19:28:57 +02:00
Marc Zinnschlag	fdba029566	Merge remote-tracking branch 'sirherrbatka/filters' into saving	2013-10-21 18:59:12 +02:00
Marek Kochanowicz	70602c2c36	Removed changes in the unimplemented copy ctor.	2013-10-21 18:24:16 +02:00
Marek Kochanowicz	5e1bdd605b	Corrected formatting in document.hpp	2013-10-21 18:15:26 +02:00
Marc Zinnschlag	88e09159c4	splitting off characters menu from mechanics menu (was getting too big)	2013-10-21 18:04:40 +02:00
Marc Zinnschlag	743c6ea5b1	save dialogue records	2013-10-21 16:47:32 +02:00
Marc Zinnschlag	c995533e07	Merge branch 'dialogue' into saving ... Conflicts: apps/opencs/model/world/columnimp.hpp apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/esm/loaddial.hpp	2013-10-21 16:45:43 +02:00
Marek Kochanowicz	b23df42817	Removed old comment. Changed to set resources path correctly.	2013-10-21 16:06:16 +02:00
Marc Zinnschlag	3b85d97087	handle deleted dialogue records	2013-10-21 15:38:13 +02:00
Marc Zinnschlag	dc12648a3e	add fixed dialogue records when creating a new omwgame file	2013-10-21 14:26:54 +02:00
Marc Zinnschlag	c0e5501431	disallow the deletion of non-topic, non-journal dialogue records	2013-10-21 13:58:47 +02:00
Marc Zinnschlag	0be157efea	set dialogue type for newly created dialogue records	2013-10-21 13:39:13 +02:00
Marc Zinnschlag	75c5316ad7	added dialogue type column to topics table	2013-10-20 17:26:09 +02:00
Marc Zinnschlag	adf3a41a83	added topic and journal tables	2013-10-20 17:15:32 +02:00
Marc Zinnschlag	ebf7732912	some cleanup	2013-10-20 15:48:39 +02:00
Marek Kochanowicz	96b6787255	Getting rid of extension. Correcting tiny mistake in filters file.	2013-10-20 10:56:27 +02:00
Marek Kochanowicz	184456892b	Added check to load custom filters set when present.	2013-10-19 18:43:47 +02:00
Marek Kochanowicz	4e26a61db3	Removed command line handling. Maybe zini will let me to implement it later. Implemented switch to handle resources directory. TODO: check for defaultfilters on data path.	2013-10-18 22:11:14 +02:00
Marek Kochanowicz	a7002e8a09	Implements switch (--help and --resources), and copying defaultfilters.omwaddon.project. Seems to work.	2013-10-17 18:21:41 +02:00
scrawl	3a3f2a37c8	Add cut, copy & paste of text	2013-10-17 12:47:49 +02:00
Marc Zinnschlag	8c139783b7	silenced a warning	2013-10-16 21:33:11 +02:00
Marc Zinnschlag	19bd0f90b9	Merge remote-tracking branch 'rainChu/torches'	2013-10-16 21:24:45 +02:00
Alex "rainChu" Haddad	65818155d8	Fixed punctuation consistency	2013-10-16 15:14:35 -04:00
Alex "rainChu" Haddad	e11da5c0a3	Added a constructor to Light CustomData	2013-10-16 15:13:36 -04:00
Marek Kochanowicz	3000386443	failed attempt on switch adding.	2013-10-16 13:07:26 +02:00
Alex "rainChu" Haddad	2643214ca6	Lights extinguish underwater	2013-10-15 21:50:32 -04:00
Alex "rainChu" Haddad	30ee3c5cf6	Equipped torches and lights run out of fuel	2013-10-15 21:50:14 -04:00
Emanuel Guevel	ba4b8a37e2	Remember pressed message box button longer ... Remember which button was pressed until a new interactive message box is displayed or until the pressed button number is read. Before that, it was not possible to get the pressed button after the message box was hidden/destroyed.	2013-10-14 12:55:06 +02:00
Marc Zinnschlag	db7ea30483	allow float values in cell for value tests	2013-10-14 11:15:36 +02:00
Marc Zinnschlag	679754b305	corrected an error message	2013-10-14 11:06:59 +02:00
Marc Zinnschlag	9b0766b678	minor fix in ValueNode::toString	2013-10-14 10:58:11 +02:00
Marc Zinnschlag	4905f1c8ab	make testing empty cells against an empty string yield true	2013-10-13 21:54:36 +02:00
Marc Zinnschlag	ce8694c84e	Merge remote-tracking branch 'scrawl/master'	2013-10-13 18:55:49 +02:00
scrawl	683ad40e21	No need for this ifdef since there is a default argument.	2013-10-13 18:28:22 +02:00
scrawl	fa264935ff	We can apply vsync at runtime now that the Ogre bug is fixed.	2013-10-13 17:56:26 +02:00
scrawl	f504ab42fe	Turn off vsync while in the loading screen	2013-10-13 17:52:14 +02:00
Marc Zinnschlag	b8ae195a46	Merge branch 'scene'	2013-10-13 15:42:27 +02:00
Marc Zinnschlag	4624bed899	changed handling of scene toolbar button icons	2013-10-13 15:41:48 +02:00
Marc Zinnschlag	fc5afe430b	Merge remote-tracking branch 'potatoesmaster/fatigue-restoration'	2013-10-13 14:40:48 +02:00
Emanuel Guevel	dcfff79460	Regenerate fatigue over time	2013-10-13 00:40:27 +02:00
Marc Zinnschlag	708cde2688	Merge remote-tracking branch 'jordan-ayers/topic/COC-Exterior-Cell-Selection'	2013-10-12 23:18:19 +02:00
Jordan Ayers	141382b8c0	COC Command: Exterior cell selection fix. ... Return the northernmost cell of the easternmost matching column for Ext. cells.	2013-10-12 14:48:37 -05:00
Marc Zinnschlag	608d154ad7	Merge remote-tracking branch 'rainChu/master'	2013-10-12 20:31:33 +02:00
Alex "rainChu" Haddad	cfc3093320	Reverted conditional compiling	2013-10-12 10:46:44 -04:00
Marc Zinnschlag	b5d620a8dc	fixed string filter on enum column when column is empty	2013-10-12 16:35:59 +02:00
Marc Zinnschlag	a29b8667ef	fixed string filter on boolean columns when testing against the value false	2013-10-12 16:29:36 +02:00
Marc Zinnschlag	a77044cda4	fixed column numbering	2013-10-12 16:15:47 +02:00
Marc Zinnschlag	2606feec3a	Merge remote-tracking branch 'lgro/cfg_without_data_path'	2013-10-12 13:52:38 +02:00
Marc Zinnschlag	3c580fbc59	Merge remote-tracking branch 'jordan-ayers/topic/MagicEffectDisplayFormat'	2013-10-12 13:40:29 +02:00
Marc Zinnschlag	458c752425	Merge remote-tracking branch 'mckibbenta/tgm'	2013-10-12 13:38:10 +02:00
Marc Zinnschlag	87cd5d4267	Merge remote-tracking branch 'potatoesmaster/DisableLevitation'	2013-10-12 13:31:06 +02:00
Marc Zinnschlag	9c4d88cd76	Merge remote-tracking branch 'potatoesmaster/acrobatics'	2013-10-12 13:20:12 +02:00
Marc Zinnschlag	c8dc6a70b7	Merge remote-tracking branch 'greye/master'	2013-10-12 13:14:47 +02:00
Marc Zinnschlag	c8695db66f	Merge remote-tracking branch 'wheybags/unshield_fixes'	2013-10-12 13:03:38 +02:00
Lukasz Gromanowski	5ce1f50fab	Cleanup in MWGui::WindowManager constructor initialzation list. ... Corrected order of initialization list, and added missing member field initializations - without this openmw crashes when installer is interrupted and there are no valid data path in openmw.cfg, as reported by BrotherBrick in: https://forum.openmw.org/viewtopic.php?f=20&p=19501#p19499 Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-10-10 23:06:37 +02:00
Jordan Ayers	6e4978643c	Magic Effect descriptions: support feet / level modes. ... Show proper suffixes for all magnitudes. Drop extra 'times' symbol in 'timesInt format (not consistent with other magnitude displays).	2013-10-09 00:08:11 -05:00
Jordan Ayers	6ab7002908	MagicEffect: Put magnitude type into ESM::MagicEffect helper.	2013-10-07 22:28:55 -05:00
Jordan Ayers	065f435225	Format fix: remove extra spaces from ranged TimesINT formatting.	2013-10-07 20:02:20 -05:00
gus	94069e3a7e	bugfix	2013-10-07 20:30:12 +02:00
graffy76	17950210fa	Merge branch 'master' into esxSelector	2013-10-07 06:52:20 -05:00
Marc Zinnschlag	74cee66273	consolidated magic numbers for button size	2013-10-07 11:24:53 +02:00
gus	1ac3d99c78	pathfinding now works in AICombat.	2013-10-07 10:20:02 +02:00
Marc Zinnschlag	4d6c3cdf09	removed more garbage	2013-10-07 08:55:04 +02:00
graffy76	4c72a9ffdf	Fixed non-loading files	2013-10-06 22:10:38 -05:00
graffy76	217a4d75b4	Implemented profile function in launcher datafiles page ... Implemented dependency sorting to ensure dependent files appear latest in the list.	2013-10-06 21:13:47 -05:00
Jordan Ayers	6303e56ce4	Magic Effect Display cleanup: Don't put spaces in percentages.	2013-10-06 20:35:59 -05:00
Jordan Ayers	707f45aa8e	Magic Effect Display improvement. ... Related to Bug #794. Always show one decimal point precision for Fortify Max. Magicka effect.	2013-10-06 20:26:39 -05:00
Jordan Ayers	6983a55a16	Magic effect display improvement. ... Related to Bug #794. Show the "x INT" notation for Fortify Max. Magicka. Show "%" notation for weakness / resistance effects.	2013-10-06 19:32:40 -05:00
Emanuel Guevel	2abe5c1c9a	Acrobatics: do not apply fall damages when slowfalling spell effect is active ... If spell effect ends up in mid-air, calculate fall height from then.	2013-10-02 23:34:25 +02:00
Emanuel Guevel	4265dddc40	Add MWWorld::isSlowFalling(Ptr)	2013-10-02 23:34:25 +02:00
Emanuel Guevel	6e09a5fb4a	Acrobatics: reinit fall height at current height rather than zero ... To prevent problems.	2013-10-02 23:34:25 +02:00
Emanuel Guevel	2b992ef3b5	Acrobatics: use calculated fatigueTerm	2013-10-02 23:34:24 +02:00
Emanuel Guevel	4c151e59a2	Acrobatics: do not touch modified stats	2013-10-02 23:34:24 +02:00
Emanuel Guevel	4860514865	Acrobatics: cosmetic changes	2013-10-02 23:34:24 +02:00
mckibbenta	857deb3723	Merge branch 'master' into tgm	2013-10-02 13:54:03 -04:00
mckibbenta	073f64c8bb	stop weapon condition degredation (for the player) with tgm on	2013-10-02 13:46:33 -04:00
Emanuel Guevel	496f786c2a	Implement Disable/EnableLevitation script functions ... Totally copied on Disable/EnableTeleporting implementation. Thanks KittyCat!	2013-10-02 15:33:20 +02:00
Alex "rainChu" Haddad	f1b4c2e400	Fixed first person offset to use world transform ... It slipped my mind that some necks might not be perfectly vertical.	2013-10-02 07:03:39 -04:00
Alex "rainChu" Haddad	ed0c31b485	Refactored, moved logic out of NpcAnimation ... The logic is now handled by RenderingManager, and Camera sets its animation's first person offset height. Due to how NpcAnimation seems to be updated, it has to be the one to actually set its own nodes, in the case of the hands. Otherwise, the hands would not move without a messier hack.	2013-10-02 05:16:52 -04:00
graffy76	a5a0f61533	Fixed missing profiles combobox	2013-10-01 22:36:49 -05:00
graffy76	00c78a4aa1	Implementing ContentSelector class in DataFilesPage ... Moved AdjusterWidget / FileWidget to ContentSelectorView	2013-10-01 21:29:45 -05:00
Emanuel Guevel	b8c60dabb3	Reintroduce Acrobatics changes made by Glorf ... Advance Acrobatics skill on jump and on landing, apply fall damage on landing.	2013-10-01 23:35:34 +02:00
Alex "rainChu" Haddad	0ddb5097fc	Revert "Bug #840, First Person Sneaking Camera Height" ... This reverts commit 296abfd48f.	2013-10-01 11:44:45 -04:00
Alex "rainChu" Haddad	296abfd48f	Bug #840, First Person Sneaking Camera Height ... Also, added comments to existing code in the area.	2013-10-01 10:48:34 -04:00
Alex "rainChu" Haddad	4496244b14	Tabs to spaces ... My own code uses only tabs - I forgot to change the setting on my IDE, sorry!	2013-10-01 05:36:13 -04:00
Alex "rainChu" Haddad	eae02ea00d	Cleaned up my hackish code for WinMain	2013-09-30 03:33:31 -04:00
Alex "rainChu" Haddad	00a776a1a8	Fixed compilation failure on my machine ... Fixed shared records not being populated before the player record is moved.	2013-09-30 02:54:20 -04:00
greye	4cdb57e388	workaround segfault on --new-game switch	2013-09-30 10:30:40 +04:00
Alex "rainChu" Haddad	bffbfff41c	My own fix to make it hackily compile	2013-09-30 00:32:06 -04:00
graffy76	24b167b755	Implemented ContentSelector as a singleton "charm" modifier for ... FileDialog...	2013-09-29 12:19:07 -05:00
Tom Mason	dd0a416249	cleaned up bloodmoon_fix_ini	2013-09-29 16:59:52 +01:00
Tom Mason	fd169c2399	fixed issue with cds where subfolders of Data Files were contained outside the Data Files folder	2013-09-29 15:49:47 +01:00
Lukasz Gromanowski	ef617d408b	Issue #913: Merge --master and --plugin switches ... Merged master/plugin switches in launcher. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-09-29 09:14:40 +02:00
Lukasz Gromanowski	9c2145eda1	Issue #913: Merge --master and --plugin switches ... Merged master/plugin switches into content in openmw and mwiniimporter. Extension in content files is now required. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-09-29 09:11:57 +02:00
gus	83a375b55d	AI now continue to hit you. ... TODO: change the way time is handled	2013-09-28 21:17:06 +02:00
Marc Zinnschlag	7be1f1afc2	implemented SceneToolMode as a horizontal panel with radiobutton-type buttons	2013-09-28 13:10:42 +02:00
gus	2537384c50	bug fix	2013-09-28 12:25:37 +02:00
Marc Zinnschlag	0c5f07a65a	added SceneToolMode class	2013-09-28 11:27:24 +02:00
Marc Zinnschlag	84cadc10f4	added scene toolbar buttons (still not doing anything)	2013-09-28 11:06:56 +02:00
Marc Zinnschlag	9ea092927f	added basic scene subview (no functionality yet)	2013-09-28 09:25:54 +02:00
Marc Zinnschlag	6143ec33e0	giving Documents direct access to ConfigurationManager	2013-09-27 15:24:58 +02:00
Marc Zinnschlag	e7c48cbe58	load project files	2013-09-27 15:04:30 +02:00
Marc Zinnschlag	62148b3247	moved implementation of searchColumnIndex and findColumnIndex functions from IdTable to CollectionBase	2013-09-27 15:04:09 +02:00
Marc Zinnschlag	baae548106	added project scope filter saving	2013-09-27 13:56:40 +02:00
Marc Zinnschlag	6ac4dedfbe	added missing column enum	2013-09-27 13:56:23 +02:00
Marc Zinnschlag	31346dde58	fixed uninitialise scope value for filters	2013-09-27 13:55:28 +02:00
Marc Zinnschlag	6f2c418a5c	(slightly) improved error reporting during save operations	2013-09-27 13:54:51 +02:00
Marc Zinnschlag	23095ec3ec	added missing scope column to filter table	2013-09-27 13:54:21 +02:00
Marc Zinnschlag	5779f799ab	create project file when saving content file	2013-09-27 11:36:06 +02:00
Marc Zinnschlag	1363e86828	made verifier ignore deleted records	2013-09-27 10:08:09 +02:00
gus	9353f4d14f	WIP AI combat	2013-09-25 18:01:36 +02:00
Marc Zinnschlag	96fd1c35bf	preserve author/descriptin meta data	2013-09-24 17:17:01 +02:00
Marc Zinnschlag	830530bd06	set record count in TES3 header	2013-09-24 17:08:24 +02:00
Marc Zinnschlag	e4fdebc85b	added saving for referenceable records	2013-09-24 13:53:19 +02:00
Marc Zinnschlag	c42e74dadf	make 4 byte record type accessable from record struct	2013-09-24 13:17:28 +02:00
graffy76	3b40192e90	Merge branch 'master' into esxSelector	2013-09-23 22:03:42 -05:00
Marek Kochanowicz	ae5e8b95ff	Solving Issue912	2013-09-23 20:12:04 +02:00
Marc Zinnschlag	0f1c4cb00e	cleanup	2013-09-23 15:34:52 +02:00
Berulacks	91d7291c0c	Switched to using proper enums as opposed to ints.	2013-09-23 08:31:36 -04:00
graffy76	d7cff6361e	Fixed filter issue (all addons for a gamefile are enabled for checking). ... Note: Other dependencies are not yet automatically selected when an addon is checked.	2013-09-23 06:51:49 -05:00
Berulacks	0c518fb047	Replaced tabs with spaces.	2013-09-23 07:36:50 -04:00
Berulacks	c423479f20	Fixed bug #887	2013-09-23 07:31:14 -04:00
Marc Zinnschlag	6d9ff39390	set dependencies when saving (requires further refinements)	2013-09-23 12:16:56 +02:00
Marc Zinnschlag	74d683b530	fixed save path for newly created addons	2013-09-23 11:58:11 +02:00
Marc Zinnschlag	63e0cf5154	fixed missing initialisation of adjuster widget in file dialogue	2013-09-23 11:26:29 +02:00
Marc Zinnschlag	d4b2a6b9f1	Merge remote-tracking branch 'graffy76/esxSelector' into saving	2013-09-23 10:09:43 +02:00
graffy76	513f0c4b3e	Implemented file/adjuster widgets into new addon creation dialog	2013-09-22 23:52:53 -05:00
Marc Zinnschlag	a6ea670255	use IdTypeDelegate in report table	2013-09-22 13:54:01 +02:00
Marc Zinnschlag	1c4a4b4f26	generalised RefIdTypeDelegate into IdTypeDelegate	2013-09-22 13:39:44 +02:00
Marc Zinnschlag	f2875e234c	added missing position columns to reference table	2013-09-22 10:43:09 +02:00
graffy76	70ac14b8ba	Merge branch 'master' into esxSelector	2013-09-21 23:07:53 -05:00
graffy76	cfdc19c427	Renamed esxSelector to contentSelector ... Fixed datafilespage model implementation in launcher Filtered addons in table view by selected game file	2013-09-21 23:06:29 -05:00
Marc Zinnschlag	94bb97e766	replacing tabs with spaces	2013-09-21 08:40:00 +02:00
Marc Zinnschlag	96b181bb54	Merge remote-tracking branch 'xethik/master'	2013-09-21 08:07:00 +02:00
Xethik	094e4d93b7	Generally speaking, you should never compare iterators from two different compilers ... http://stackoverflow.com/questions/4657513/comparing-iterators-from-different-containers It seems like this was just an overlook that happened to work on most systems. I was not able to thoroughly test this change, but it fixed an issue I was having in VC10. It's possible the prev.end() was a copy paste error that was meant to be new.end() anyways.	2013-09-20 21:38:10 -04:00
Xethik	58bb0b8773	Bug #907 ... Added a check to make sure playerview is allowed when attempting to scroll, locking out zooming before character creation.	2013-09-20 21:26:12 -04:00
graffy76	7b7dfa122d	Merge branch 'master' into esxSelector	2013-09-19 16:24:28 -05:00
Marc Zinnschlag	99fe6e68c7	Merge remote-tracking branch 'mckibbenta/tgm'	2013-09-19 15:14:35 +02:00
Marc Zinnschlag	8d4f4e395f	update syntax highlighting when ID list changes	2013-09-19 14:26:09 +02:00
Marc Zinnschlag	ba5e2a0330	changed ID listing to include deleted records by default	2013-09-19 13:42:19 +02:00
Marc Zinnschlag	9c751ae370	separate highlight colour for IDs	2013-09-19 12:30:42 +02:00
Marc Zinnschlag	3d2281fe80	added signals and functions to Data for handling ID list changes	2013-09-19 12:11:27 +02:00
Marc Zinnschlag	78f7f80fc3	configured script highlighting with extensions	2013-09-19 08:58:27 +02:00
graffy76	0eb06ada39	Implemneting drag and drop	2013-09-18 02:36:23 -05:00
scrawl	d5ef843f56	Fix a missing model update	2013-09-16 19:22:08 +02:00
Marc Zinnschlag	acfd78c62a	implemented saving for all supported record types except cells, referencables and references	2013-09-16 14:17:04 +02:00
Marc Zinnschlag	03054c8160	forgot to write record ID	2013-09-16 14:10:05 +02:00
Marc Zinnschlag	bf0fba68af	added save stage for globals	2013-09-16 12:51:57 +02:00
mckibbenta	6bb6ba6372	added god mode comment	2013-09-15 16:12:59 -04:00
mckibbenta	3035675a26	Merge branch 'master' of https://github.com/zinnschlag/openmw	2013-09-15 15:49:18 -04:00
mckibbenta	644f081c60	minor changes	2013-09-15 15:48:32 -04:00
Marc Zinnschlag	db70095148	write TES3 header	2013-09-15 15:31:44 +02:00
Marc Zinnschlag	231419028d	minor fix	2013-09-15 15:03:17 +02:00
Marc Zinnschlag	fa25a068a8	basic saving (no data is written to file yet)	2013-09-15 15:00:41 +02:00
Marc Zinnschlag	8326ac9b6f	replaced dummy save implementation with a threaded dummy save implementation	2013-09-15 12:53:59 +02:00
Marc Zinnschlag	d71d282952	more Operation enhancements in preparation for save operation	2013-09-15 12:03:36 +02:00
Marc Zinnschlag	414e6abb95	more signal cleanup	2013-09-15 11:35:12 +02:00
Marc Zinnschlag	a5aebfb760	minor cleanup	2013-09-15 09:32:20 +02:00
mckibbenta	c9f1bd8735	Merge branch 'master' of https://github.com/zinnschlag/openmw	2013-09-14 16:38:46 -04:00
Marc Zinnschlag	b7bffc8a79	removed Verifier class (using Operation class without subclassing now)	2013-09-14 15:16:31 +02:00
Marc Zinnschlag	f4c03c6a29	added ordered-flag to Operation (currently ignored)	2013-09-14 15:12:24 +02:00
Marc Zinnschlag	077a157841	moved Operation and Stage from model/tools to model/doc	2013-09-14 14:56:23 +02:00
Marc Zinnschlag	c961abce96	added warning message to startup window	2013-09-14 14:00:07 +02:00
Marc Zinnschlag	9637e1641b	fix for building with system tinyxml	2013-09-14 13:33:49 +02:00
Marc Zinnschlag	07ff0a8de9	possible build fix for Windows	2013-09-12 20:52:05 +02:00
Marc Zinnschlag	bf8a25c2c6	Merge remote-tracking branch 'mckibbenta/tgm'	2013-09-12 19:07:35 +02:00
mckibbenta	89b7d6121d	Initial toggleGodMod/tgm instruction. Currently only affects player health.	2013-09-12 08:30:00 -04:00
mckibbenta	85b8af6262	Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm	2013-09-12 08:08:07 -04:00
scrawl	09e692f1f6	Fixed polish font	2013-09-10 22:11:57 +02:00
Marc Zinnschlag	554c44892a	Merge branch 'newgame'	2013-09-10 16:45:09 +02:00
Marc Zinnschlag	e9f14449eb	added AdjusterWidget	2013-09-10 16:45:01 +02:00
gus	f9bfbc8764	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat	2013-09-10 16:18:39 +02:00
gus	46a734852b	adding script instruction getLOS + some test about AI	2013-09-10 16:16:13 +02:00
Marc Zinnschlag	2dc3c0ae4f	integrated startup icons	2013-09-09 09:41:43 +02:00
Marc Zinnschlag	25b7cd33ea	added FileWidget; fixed OpenCS configuration	2013-09-08 14:31:20 +02:00
Marc Zinnschlag	ecedb60169	splitting new game and new addon functions (new game currently not working)	2013-09-08 12:06:28 +02:00
Marc Zinnschlag	f7940d7d1a	focus load document button by default in startup window	2013-09-08 11:24:06 +02:00
Marc Zinnschlag	2d9e9fe3e1	Merge branch 'startup'	2013-09-08 09:34:41 +02:00
Marc Zinnschlag	cae5eb424d	cleaned up opening the settings dialogue from a view	2013-09-08 09:33:45 +02:00
Marc Zinnschlag	efdf2961f0	open user settings dialogue centered	2013-09-08 09:28:43 +02:00
Marc Zinnschlag	0e81fb32dd	hooked up edit config signal from startup window	2013-09-08 09:26:43 +02:00
Marc Zinnschlag	17bf7e59a4	added proper startup dialogue (still missing icons)	2013-09-08 09:15:26 +02:00
graffy76	a6e7cf9a8c	Implementing drag and drop	2013-09-07 15:57:40 -05:00
Tom Mason	7b9c5c75e7	silenced unshield	2013-09-07 16:16:09 +01:00
Tom Mason	2b50e34566	Fixed issue with copy_file ... from: https://forum.openmw.org/viewtopic.php?f=20&t=1718&hilit=0.26&start=50#p18705	2013-09-07 15:41:51 +01:00
Marc Zinnschlag	9b7cd5958f	Merge remote-tracking branch 'scrawl/master'	2013-09-07 08:23:25 +02:00
scrawl	10c21579bc	Item stacking case sensitivity fix	2013-09-07 01:00:38 +02:00
Marc Zinnschlag	3d66f7521e	Merge remote-tracking branch 'marcrbouvier/master'	2013-09-06 08:44:59 +02:00
Marc Bouvier	784cba21f2	[Feature #881] Change Tabs to Spaces ... Some of the tabs were not made of spaces, so Git defaults tabs to the length of 8 spaces. OpenMW uses 4 spaces per tab.	2013-09-05 23:02:51 -05:00
Marc Zinnschlag	dc345dd43d	Merge branch 'filter'	2013-09-05 15:47:52 +02:00
Marc Zinnschlag	8f0ab29a9f	allow the use of keywords for strings without quotation marks	2013-09-05 15:47:38 +02:00
Marc Zinnschlag	645b50ef36	added support for half-sided intervals to filter parser	2013-09-05 15:38:28 +02:00
Marc Zinnschlag	f3ce9c22a1	rewrote value node to support half-sided intervals (meaning infinity or -infinity for the missing half)	2013-09-05 15:22:14 +02:00
Marc Zinnschlag	9332684335	allow the use of value types in string filters	2013-09-05 15:05:49 +02:00
Marc Zinnschlag	f2e86e860e	allow the use of record types in string filters	2013-09-05 14:39:56 +02:00
Marc Zinnschlag	8bebe7179c	some UniversalId fixes	2013-09-05 13:58:36 +02:00
Alexander "Ace" Olofsson	5e42c73356	Better fix for unshield, comments on changes, no more commented out code.	2013-09-05 10:39:17 +02:00
mckibbenta	ae02499eff	Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm	2013-09-04 21:15:44 -04:00
Alexander "Ace" Olofsson	22a5f7198f	A few fixes to build on Windows	2013-09-04 23:25:47 +02:00
Marc Zinnschlag	842a616909	more cleanup	2013-09-03 14:18:34 +02:00
Marc Zinnschlag	6cd7da6547	Merge remote-tracking branch 'marcrbouvier/master'	2013-09-03 13:47:07 +02:00
Marc Bouvier	6b11f59ed4	[Feature #881] Rename QLocalServer ... The server name should be more unique to the project so there isn't a interprocess clash.	2013-09-03 06:24:11 -05:00
Marc Zinnschlag	80f8024da7	allow specifying record modification status column enum via strings	2013-09-03 13:03:02 +02:00
Marc Zinnschlag	f80373a849	removed two unused files	2013-09-03 12:53:45 +02:00
Marc Zinnschlag	1744a64f77	in filters allow specifiying boolean columns as strings	2013-09-03 12:32:06 +02:00
Marc Bouvier	0ae2bb2fae	[Feature #881] Code Formatting ... Code formatted to the OpenMW policy.	2013-09-03 05:22:48 -05:00
Marc Bouvier	563bd0b430	[Feature #881] Raise OpenCS New Window After Re-execution ... The OpenCS startup window of the existing exist is raised when trying to start a new instance. This is done by the new instance connection to the existing instance's QLocalServer. Once the connection is established the existing instance raises the startup window.	2013-09-03 04:12:19 -05:00
Marc Bouvier	51332b86a1	[Feature #811] Only 1 Instance of OpenCS is Allowed ... If another instance of OpenCS is started, then it will terminate. This is done by creating a QLocalServer with a unique ID. If another QLocalServer with the same ID attempts to be opened, then the creation of the QLocalServer will fail and the application will terminate.	2013-09-03 01:44:21 -05:00
mckibbenta	e545f49807	Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm	2013-09-02 18:40:37 -04:00
Marc Zinnschlag	9cb121bd04	allow specifying enums as text in filters	2013-09-02 12:23:19 +02:00
Marc Zinnschlag	649ef6f120	moved list of enum literals from ViewManager to Columns (which makes them available to the rest of model now)	2013-09-02 11:58:05 +02:00
Marc Zinnschlag	e03de11fa8	Merge remote-tracking branch 'corristo/master'	2013-09-02 10:57:01 +02:00
Marc Zinnschlag	7076ea9467	Merge remote-tracking branch 'scrawl/map'	2013-09-02 10:55:12 +02:00
Marc Zinnschlag	5f380bc085	Merge remote-tracking branch 'lgro/unittests'	2013-09-02 10:54:51 +02:00
Nikolay Kasyanov	f9cfe654f2	Workaround for https://bugreports.qt-project.org/browse/QTBUG-22154 ... (Qt redefines min OS X version and SDL in turn checks this version and doesn't accept version set by Qt)	2013-09-01 23:17:41 +04:00
scrawl	3ddeb075fb	Fix a cell border seam on the map	2013-08-31 04:36:23 +02:00
Lukasz Gromanowski	2c49458b6c	Added unittests for FileFinder::FileFinderStrict class. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-08-31 00:13:42 +02:00
Lukasz Gromanowski	0e83b50659	Changed test dir for SearchTest. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-08-30 23:24:33 +02:00
Lukasz Gromanowski	2baaef7d87	Added unittests for FileFinder::FileFinder class. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-08-30 23:23:34 +02:00
Lukasz Gromanowski	303e02cab5	Added unittests for FileFinder::find function. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-08-30 22:45:30 +02:00
Lukasz Gromanowski	515a865daa	Changed ASSERT_EQ to ASSERT_TRUE/FALSE. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-08-30 22:44:03 +02:00
Lukasz Gromanowski	da0b90ee45	Converted tests from components/misc into google unittests. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-08-30 21:57:06 +02:00
Chris Robinson	82a09a988b	Minor pathfinding cleanup	2013-08-29 19:17:27 -07:00
Chris Robinson	8f23b330d3	Remove unnecessary initialization	2013-08-29 17:41:20 -07:00
Chris Robinson	9499ac4fd5	Increase the distance for reaching a path node	2013-08-29 17:41:20 -07:00
Chris Robinson	f9dbce685a	Avoid killing AIWander and AITravel when far away ... This fixes the problem of certain NPCs not wandering because they happened to spawn near a cell border away from the player, which immediately "completed" the wander package. AIWander can't cause NPCs to cross cell boundaries, so there's no risk of them walking into an unloaded to. AITravel will now simply stop moving, and resume later when the cell is loaded.	2013-08-29 17:41:20 -07:00
mckibbenta	f65172bdca	Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm	2013-08-29 20:26:36 -04:00
mckibbenta	eef9df504a	fiddlings	2013-08-29 20:25:36 -04:00
scrawl	c8e31725dc	Fix weather sounds persisting on a new game	2013-08-29 15:16:08 +02:00
Marc Zinnschlag	9f0b34eae0	fixed reference loading code (editor)	2013-08-29 13:27:54 +02:00
Marc Zinnschlag	ce90c2f3be	Merge remote-tracking branch 'kcat/master'	2013-08-28 21:05:07 +02:00
Chris Robinson	e589d0ec91	Werewolves can't activate activators	2013-08-28 11:36:22 -07:00
Chris Robinson	84d259ab8e	Avoid reconstructing strings for updating the dynamic stats ... Attributes still do this, but they change infrequently enough that it doesn't matter.	2013-08-28 10:50:29 -07:00
scrawl	5918b84666	Don't crash on resize events during load	2013-08-28 17:05:28 +02:00
Marc Zinnschlag	94e255ea47	Merge branch 'filter'	2013-08-28 12:42:03 +02:00
Chris Robinson	92082dae66	Modify the current magicka and fatigue when the base changes	2013-08-27 22:44:52 -07:00
Chris Robinson	305b5fec0f	Avoid needlessly copying the MagicEffects	2013-08-27 21:40:31 -07:00
Chris Robinson	281fdbd81b	Cleanup some redundancy	2013-08-27 17:56:47 -07:00
Chris Robinson	33c173a23a	Update the watched Ptr when changing it	2013-08-27 17:22:07 -07:00
Chris Robinson	39af9a13fa	Remove some unused functions	2013-08-27 17:13:49 -07:00
Chris Robinson	189541aa72	Apply drowning damage based on the update duration ... 1 damage every 0.33 seconds is 3 damage a second. Applying it this way avoid having to track another stat.	2013-08-27 17:08:23 -07:00
Chris Robinson	f216b25be8	Slightly randomize time between environment sounds ... We should use the "Minimum Time Between Environmental Sounds" and "Maximum Time Between Environmental Sounds" INI/fallback settings, but we don't have them.	2013-08-27 16:04:19 -07:00
Chris Robinson	02df8ab841	Store the underwater sound to easily stop it	2013-08-27 13:48:20 -07:00
Chris Robinson	16331bf1ed	Avoid a hack to play the underwater sound properly	2013-08-27 13:26:57 -07:00
Marc Zinnschlag	26b3d93293	streamlined filter syntax	2013-08-27 18:58:23 +02:00
scrawl	839d251cc5	Renamed Terrain::Terrain to Terrain::World to make VC happy	2013-08-27 16:01:16 +02:00
scrawl	d3d6dfbde8	Refactored loading screen ... - Add loading progress for data files, global map, terrain - Refactored and improved cell loading progress	2013-08-27 15:48:13 +02:00
Marc Zinnschlag	2e9948e86a	improved one-shot filter handling; allow empty pre-defined filters	2013-08-26 14:40:34 +02:00
Marc Zinnschlag	aa935ff03d	update tables on filter record changes	2013-08-26 12:49:13 +02:00
Marc Zinnschlag	20bd0707dc	avoid use of column number literals	2013-08-26 12:25:52 +02:00
Marc Zinnschlag	937f5b11a2	fixed broken record deletion	2013-08-26 12:25:19 +02:00
Marc Zinnschlag	dcc55b60c3	Merge remote-tracking branch 'kcat/misc-cleanup'	2013-08-26 08:51:19 +02:00
mckibbenta	60fa69139e	minor changes	2013-08-25 19:20:14 -04:00
Chris Robinson	f2889e4bb5	Remove unused functions and parameters	2013-08-25 16:08:45 -07:00
Chris Robinson	3843357cd2	Fix actor stepping	2013-08-25 16:08:43 -07:00
Chris Robinson	0463dc0653	Use a smaller static geometry size for interior cells	2013-08-25 16:08:43 -07:00
Chris Robinson	bd6dd071aa	Use the non-accumulation root's parent as the accumulation root ... This relies on the non-accumulation root not being the skeleton root. I haven't found an instance where this isn't the case.	2013-08-25 16:08:42 -07:00
scrawl	3f8a69b4ad	Don't crash when trying to delete a reference that doesn't exist anymore	2013-08-26 00:14:02 +02:00
scrawl	5af89a9e8f	Fix an AABB assert for loading empty exterior cells	2013-08-26 00:13:42 +02:00
scrawl	c6d2d1999a	Fix an item duplication glitch	2013-08-25 17:40:08 +02:00
mckibbenta	06701467ab	Merge branch 'master' into tgm	2013-08-24 21:28:26 -04:00
mckibbenta	8998b90e8b	initial do-nothing implementation; registered opcode	2013-08-24 21:19:12 -04:00
Marc Zinnschlag	d007d4dc9a	allow colons in names (filter)	2013-08-24 19:12:47 +02:00
Marc Zinnschlag	7e02c9acf2	added filter text column to filter table	2013-08-24 18:53:11 +02:00
Marc Zinnschlag	25e6380884	implemented use of predefined filters	2013-08-24 17:40:00 +02:00
Marc Zinnschlag	d1516792ce	made document data available to filter parser	2013-08-24 17:17:22 +02:00
Marc Zinnschlag	7aee1da5c6	fixed some columns	2013-08-24 16:51:49 +02:00
Marc Zinnschlag	51fbb0f3f4	fixed a segfault when opening views for tables that do not allow the creation of new records	2013-08-24 15:33:46 +02:00
Marc Zinnschlag	948cb0ef34	Merge remote-tracking branch 'marcrbouvier/master'	2013-08-24 15:13:07 +02:00
Marc Zinnschlag	f605dcdd24	Merge branch 'filter'	2013-08-24 14:51:05 +02:00
Marc Zinnschlag	78c7de440d	simplified filter nodes even more	2013-08-24 14:49:05 +02:00
Marc Zinnschlag	cf58670c85	removed global filter scope (would have caused sync problems between projects)	2013-08-24 14:46:42 +02:00
Marc Zinnschlag	3cf60da5a7	added numeric value filter node	2013-08-24 14:43:38 +02:00
Chris Robinson	ca24a809fc	Use the position of the actor to determine if they're swimming	2013-08-23 13:44:16 -07:00
Chris Robinson	3fa65f21dd	Use a proper cone shape with a contact test to check for melee hits	2013-08-23 12:27:40 -07:00
Chris Robinson	f5d03a16c1	Rename getFacedObject and getFacedHandle for melee hits	2013-08-23 12:27:39 -07:00
Marc Zinnschlag	537ab38985	fixed type in error message	2013-08-23 14:49:41 +02:00
Marc Zinnschlag	c56007cceb	fixed a record counting bug (was using the wrong model)	2013-08-23 14:11:33 +02:00
Marc Zinnschlag	2823e5693d	Merge remote-tracking branch 'scrawl/hit'	2013-08-22 15:35:17 +02:00
Marc Zinnschlag	63b1df85e7	fixed string parsing	2013-08-22 15:22:39 +02:00
Marc Zinnschlag	f615a9397b	made text node filter case-insensitive	2013-08-22 15:16:22 +02:00
Marc Zinnschlag	de956737fe	added text filter node	2013-08-22 14:50:42 +02:00
Marc Zinnschlag	decd826208	fixed an include guard	2013-08-22 14:00:55 +02:00
Marc Zinnschlag	ba6edc55d4	added not filter node	2013-08-22 13:45:50 +02:00
Marc Zinnschlag	806e9a2888	added and and or filter nodes	2013-08-22 13:14:35 +02:00
scrawl	22d5598082	Fix bad_cast exception when hitting creatures	2013-08-22 12:17:12 +02:00
scrawl	1adce8afb3	Fix ambient light getting set from the cell data for non-interior cells	2013-08-22 10:47:48 +02:00
Marc Zinnschlag	50041fc211	simplified filter system by taking out filter references and user values for now (these are post-1.0 features anyway)	2013-08-22 09:17:57 +02:00
Marc Bouvier	2e8b0cf502	Remove Directory Paths in Qt Classes Includes ... Qt recommends that the path location not be used when including a class. Also, this is how other files include Qt classes in the OpenCS app. This change is for consistency only.	2013-08-21 17:14:29 -05:00
Marc Zinnschlag	e03e2f0817	Merge remote-tracking branch 'scrawl/master'	2013-08-21 19:50:08 +02:00
scrawl	758d989a03	If multiple plugins have land data for the same cell, the last plugin should win	2013-08-21 17:26:11 +02:00
scrawl	ce5ea6d7d2	Use a proper node hierarchy; disconnect the root when entering interior	2013-08-21 17:26:11 +02:00
Chris Robinson	c855ab65cf	Non-colliding objects are considered flying	2013-08-21 07:24:54 -07:00
Chris Robinson	602be9bbe7	Avoid swimming into the air from underwater	2013-08-21 07:24:54 -07:00
Chris Robinson	9f09bb6f6f	Use separate inputs for swimming and flying	2013-08-21 07:24:54 -07:00
Chris Robinson	a546ace94d	Remove an unused method	2013-08-21 07:24:54 -07:00
vorenon	3bf3bd4b8c	Silenced some warnings	2013-08-21 13:53:49 +02:00
Chris Robinson	1a9672e31b	Don't update player physics more than 60 times a second ... Bullet and/or our collision handling code doesn't like timesteps much smaller than that. Ideally we should do physics in 60fps (or even 30fps) steps and use prediction and interpolation to get more, but that's not straight forward and needs a fixed timestep loop to lock physics and logic together.	2013-08-20 11:31:49 -07:00
graffy76	e6fdc7e7fd	...	2013-08-20 12:34:39 -05:00
Marc Zinnschlag	a61215dab1	some general filter parser cleanup	2013-08-20 16:04:06 +02:00
graffy76	6898321676	Reenabling features ... Profile functions enabled New/load file functions partially enabled Layout reorganized	2013-08-20 08:16:56 -05:00
Chris Robinson	0e56b2facb	Merge remote-tracking branch 'zini/master' into physics	2013-08-20 04:42:28 -07:00
Chris Robinson	d9040df9d6	Increase the max number of physics iterations ... Should help with highly tessellated collision meshes with high framerates.	2013-08-20 04:41:52 -07:00
scrawl	ecf7786d11	terrain_num_lights was removed	2013-08-20 12:31:47 +02:00
scrawl	fa76d1631b	Some terrain fixes	2013-08-20 12:08:46 +02:00
scrawl	0545622f5a	Fix werewolf state not getting completely reset when starting a new game	2013-08-20 11:24:19 +02:00
Chris Robinson	a993af53e7	Merge remote-tracking branch 'zini/master' into physics	2013-08-20 02:21:44 -07:00
Chris Robinson	a17997a973	Continually add bits of input velocity to inertia when falling	2013-08-20 02:10:18 -07:00
Marc Zinnschlag	0c8f85f17d	Merge remote-tracking branch 'wheybags/master'	2013-08-20 11:05:50 +02:00
graffy76	24e38846da	Fixed broken profile actions	2013-08-20 03:53:23 -05:00
graffy76	b52645bf2a	Fixes to accommodate master/plugin loading	2013-08-20 03:23:32 -05:00
scrawl	8c8653160d	Crash fix, material fix	2013-08-20 09:52:27 +02:00
Tom Mason	7f0f9037be	fix for older versions of unshield	2013-08-19 22:57:21 +01:00
scrawl	13afcc9324	Don't link to OgreTerrain	2013-08-19 22:22:14 +02:00
Tom Mason	06ff40eda7	only use unshield on not windows	2013-08-19 20:20:08 +01:00
Tom Mason	865a7c63df	cmake for system libunshield	2013-08-19 20:20:00 +01:00
Tom Mason	d3748cd5bb	Install uncompressed data files from cd	2013-08-19 20:19:53 +01:00
Tom Mason	9d1daf7dc2	enum was unnecessary	2013-08-19 20:19:47 +01:00
Tom Mason	641b7b0336	anonymous namespace	2013-08-19 20:19:41 +01:00
Tom Mason	454b64974d	filenames	2013-08-19 20:19:35 +01:00
Tom Mason	3264b5974e	fix invalid syntax	2013-08-19 20:19:25 +01:00
Tom Mason	90a892d304	unshield fixes	2013-08-19 20:19:11 +01:00
Tom Mason	ceb3317807	Integrate unshield with launcher	2013-08-19 20:19:01 +01:00
scrawl	ebf9debb80	Enabled terrain self shadows, implemented getHeightAt, some optimizations	2013-08-19 20:39:37 +02:00
Chris Robinson	d727b15580	Fix tracing down	2013-08-19 20:39:37 +02:00
Chris Robinson	394fc75697	Clean up the trace struct	2013-08-19 20:39:37 +02:00
Chris Robinson	b351109649	Get rid of the old newtrace method	2013-08-19 20:39:37 +02:00
Chris Robinson	14acacf401	Use a better method to do actor physics traces	2013-08-19 20:39:37 +02:00
Chris Robinson	76b812f75f	Improve actor movement collision handling	2013-08-19 20:39:37 +02:00
Chris Robinson	584eec3743	Store the object class in the LiveCellRef	2013-08-19 20:39:37 +02:00
scrawl	e27437f8ed	New terrain renderer - improvements: ... - Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now. - Fixes several blending issues and cell border seams - Fix map render to use the terrain bounding box instead of an arbitrary height - Different LODs are now properly connected instead of using skirts - Support self shadowing - Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better - Support a fixed function fallback (though the splatting shader usually performs better) - Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance	2013-08-19 20:34:20 +02:00
Chris Robinson	cf6e3ab933	Fix a potential divide-by-zero	2013-08-19 09:36:51 -07:00
Chris Robinson	dca599b8c5	Add NPC landing sounds for soundgen keys	2013-08-19 08:58:50 -07:00
Chris Robinson	2ec39f3622	Don't start the jump animation until after the actor is airborn ... A bit counter-intuitive, but otherwise certain jump animations will improperly add an offset to the initial inertia.	2013-08-19 08:24:47 -07:00
Chris Robinson	ac3d3df9fc	Implement jumping animations	2013-08-19 08:10:18 -07:00
Chris Robinson	48e594b7c4	Improve stepping down when starting on the ground	2013-08-19 08:09:23 -07:00
Chris Robinson	3ca4d54bf9	Better handle animations with a 0-length loop	2013-08-19 07:26:42 -07:00
Chris Robinson	1aa92067c2	Fix tracing down	2013-08-19 04:56:02 -07:00
Chris Robinson	6e9f15793d	Implement a jumping state	2013-08-18 23:42:56 -07:00
graffy76	e614ec3353	Fixing profile code in progress...	2013-08-18 17:11:23 -05:00
graffy76	f6217f9c6a	Moved esx selector classes out of global namespace	2013-08-18 15:11:29 -05:00
Marc Zinnschlag	c87a279444	added error reporting in the filter edit widget (change the text colour for now)	2013-08-18 17:54:18 +02:00
Marc Zinnschlag	c7e97a83e1	automatically build column map on filter change	2013-08-18 17:28:04 +02:00
Chris Robinson	7770203dff	Some physics cleanup ... Gets rid of some unneeded/unused variables, and halves the 'on ground' offset.	2013-08-18 08:24:39 -07:00
Marc Zinnschlag	ea8b9ce45b	apply filter to table after filter text change	2013-08-18 16:53:28 +02:00
Marc Zinnschlag	470f890a9a	fixed BooleanNode constructor	2013-08-18 16:52:51 +02:00
graffy76	a14e0b32d8	Restructured esxselector directory ... Added ./view Removed ./utils and ./model/esm Relocated code accordingly.	2013-08-18 09:48:13 -05:00
graffy76	45277c0082	Minor changes ... Stretched table columns to fit widget width Reduced width of opencs file dialog Hid the file size column for launcher Added alternating row colors in table view	2013-08-18 09:34:33 -05:00
Chris Robinson	b0f8045c72	Improve mid-air control	2013-08-18 05:59:06 -07:00
Chris Robinson	8c3564326e	Improve movement inertia ... Handles all 3 axis. Incoming velocity is only added to inertia when leaving the ground, and does not continually add to it.	2013-08-18 05:38:50 -07:00
Marc Zinnschlag	c38860fa72	added parser and custom filter edit widget (parser not functional yet; always returns a false boolean node)	2013-08-18 14:17:18 +02:00
Chris Robinson	9d56e2d86d	Apply movement by queueing it to do later	2013-08-17 22:34:38 -07:00
graffy76	2878f51cd3	Reimplemented dependency selection feature ... Moved more code to ContentSelector Added support for omwgame and omwaddon files	2013-08-17 19:40:28 -05:00
Chris Robinson	96bab88da6	Add physics methods to queue and apply movements	2013-08-17 07:48:45 -07:00
Chris Robinson	0481e64b02	Fix tracing down	2013-08-17 05:09:34 -07:00
Chris Robinson	8bcce0fb55	Clean up the trace struct	2013-08-17 05:09:33 -07:00
Chris Robinson	62c7b3698d	Get rid of the old newtrace method	2013-08-17 05:09:33 -07:00
Chris Robinson	65ce3c6ba5	Use a better method to do actor physics traces	2013-08-17 05:09:32 -07:00
Chris Robinson	d82f54c771	Improve actor movement collision handling	2013-08-17 05:09:30 -07:00
graffy76	b24dd5c6ac	Continued migration of code to ContentSelector	2013-08-17 05:55:43 -05:00
graffy76	61602789e1	Began migrating code to ContentSelector base	2013-08-16 22:23:21 -05:00
graffy76	4c8c6d6971	Moved init code to master / plugin proxy classes	2013-08-16 21:20:48 -05:00
graffy76	7389507eb5	Created masterproxylist class	2013-08-16 21:12:30 -05:00
graffy76	2bc56d0b5c	Fixed missing item list in launcher combobox	2013-08-16 20:59:58 -05:00
graffy76	b850fe0289	Removed vertical headers from plugin view	2013-08-16 18:59:01 -05:00
graffy76	49c4e1bf9e	Removed master table widget	2013-08-16 18:23:02 -05:00
graffy76	84e5c2610a	Implemented combobox for game file selection	2013-08-16 18:00:23 -05:00
graffy76	bfb71f23c9	Changed filter mechanism for game / addons ... Filters by number of master references, regardless of extension	2013-08-16 17:26:23 -05:00
Marc Zinnschlag	236dc9fc43	replaced binary filter node with a n-ary node	2013-08-16 14:18:31 +02:00
Marc Zinnschlag	528e047fd5	repalced std::auto_ptr with boost::shared_ptr in filter nodes	2013-08-16 13:57:54 +02:00
Chris Robinson	21121d5ba5	Store the object class in the LiveCellRef	2013-08-16 04:18:48 -07:00
Chris Robinson	08d1d486a4	Merge remote-tracking branch 'zini/master' into ptr-improvements	2013-08-15 17:42:16 -07:00
Marc Zinnschlag	d122699b2f	and another fix for the same issue :(	2013-08-15 18:29:09 +02:00
Chris Robinson	58481ec7c3	Merge remote-tracking branch 'zini/master' into ptr-improvements	2013-08-15 07:11:38 -07:00
Marc Zinnschlag	7b4d8afde7	fix to previous commit	2013-08-15 15:53:50 +02:00
Chris Robinson	fdbf09ed40	Merge remote-tracking branch 'zini/master' into ptr-improvements ... Conflicts: apps/openmw/mwworld/containerstore.cpp	2013-08-15 05:56:24 -07:00
Marc Zinnschlag	e94fcce622	accessing references via their ID now also works for references in containers in active cells	2013-08-15 14:45:13 +02:00
Chris Robinson	2853b56ed5	Throw an exception when trying to get an empty Ptr's type	2013-08-15 04:52:01 -07:00
Chris Robinson	0f2b2ff1ce	Small header cleanup	2013-08-15 01:21:43 -07:00
Chris Robinson	86f2cd5848	Use dynamic_cast to get the LiveCellRef	2013-08-14 20:26:50 -07:00
Chris Robinson	48c07fbd98	Remove some unnecessary fields from Ptr	2013-08-14 17:05:42 -07:00
Chris Robinson	74f855e948	Move common LiveCellRef fields to the base class	2013-08-14 01:55:51 -07:00
Chris Robinson	11166a1a17	Don't store the type name string in the Ptr ... This should get rid of all heap allocations caused by constructing or copying Ptr objects.	2013-08-14 00:45:28 -07:00
Chris Robinson	b6d2888c48	Avoid using boost::any in MWWorld::Ptr ... Reduces dependency on Boost, and should improve performance a bit when copying or constructing Ptr objects.	2013-08-14 00:45:27 -07:00
Marc Zinnschlag	aee0336780	Merge remote-tracking branch 'kcat/script-functions'	2013-08-14 09:05:40 +02:00
Chris Robinson	73437dfdca	GetEffect can accept an effect ID string as well	2013-08-13 19:18:21 -07:00
Chris Robinson	c1dfa980bf	Combine ShowVarsImplicit and ShowVarsExplicit ... Also removes an unnecessary else statement	2013-08-13 17:31:15 -07:00
Marc Zinnschlag	e2e76147c8	Merge remote-tracking branch 'potatoesmaster/magic'	2013-08-13 15:36:43 +02:00
Chris Robinson	30973352e8	Implement ShowVars (SV) console function	2013-08-13 04:54:41 -07:00
Chris Robinson	2353ac1739	Properly implement SetWerewolfAcrobatics	2013-08-13 04:54:41 -07:00
Emanuel Guevel	ad3646cb15	Fix spell icons displayed when effect ended	2013-08-13 04:57:45 +02:00
Emanuel Guevel	a47c76001c	Apply trap magic effects	2013-08-13 04:56:15 +02:00
Emanuel Guevel	37ea0f3fb9	Display refusal message when weapon/magic icons are clicked as werewolf	2013-08-12 15:36:16 +02:00
Emanuel Guevel	997f37700d	Display HUD icons for hidden windows	2013-08-12 15:06:09 +02:00
Emanuel Guevel	c27c33f542	Fix pinned windows hiding ... They were always displayed in console mode and in game (even if they were force hidden).	2013-08-12 15:04:41 +02:00
Marc Zinnschlag	789a66eaa7	added filter box and basic record filter UI (not functional yet; only supporting on-the-fly filters for now)	2013-08-11 20:39:21 +02:00
Chris Robinson	6fd4cdb5fb	Play randomized werewolf sounds	2013-08-11 00:53:17 -07:00
Chris Robinson	00d6690b4d	Ignore encumbrance in werewolf form ... According to UESP, inventory weight is ignored. Not sure if this includes feather and burden effects.	2013-08-10 20:25:18 -07:00
Chris Robinson	180f0d0fe9	Restart from the loop point if replaying the same animation	2013-08-09 21:25:28 -07:00
Chris Robinson	5968165de0	Merge remote-tracking branch 'zini/master' into werewolf ... Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp	2013-08-09 07:00:00 -07:00
Chris Robinson	a28c36de17	Don't count as running if not actually moving along (local) X/Y	2013-08-09 06:53:07 -07:00
Chris Robinson	c2d8eb377f	Play some appropriate sounds in werewolf form	2013-08-09 06:40:16 -07:00
Marc Zinnschlag	f5b06d5d52	basic filter tree structure	2013-08-09 14:49:05 +02:00
Chris Robinson	db1036e5e5	Handle SetWerewolfAcrobatics	2013-08-09 05:37:56 -07:00
Chris Robinson	ae183cb3e4	Handle werewolf stats	2013-08-09 05:14:58 -07:00
Marc Zinnschlag	a95715b61d	added description field to filter record	2013-08-09 13:45:50 +02:00
Chris Robinson	72a399054f	Don't assume only players activate doors	2013-08-09 01:35:29 -07:00
Chris Robinson	46bc7bd9c8	Some cleanup since NpcStats is now also CreatureStats ... This isn't a thorough cleaning, so keep an eye out for more	2013-08-09 01:14:08 -07:00
Marc Zinnschlag	fb0b57efaa	Merge remote-tracking branch 'vorenon/bug876'	2013-08-09 09:38:10 +02:00
Chris Robinson	75b6515915	Inherit NpcStats from CreatureStats	2013-08-08 23:28:02 -07:00
Chris Robinson	89c7f5bc70	Handle object activation as a werewolf	2013-08-08 22:34:53 -07:00
Chris Robinson	6110a0ee3b	Don't allow resting as a werewolf	2013-08-08 18:30:47 -07:00
Chris Robinson	75131e6a48	Rebuild the actor after switching between werewolf forms	2013-08-08 17:16:24 -07:00
Chris Robinson	5fbfce6d1e	Don't show WerewolfRobe objects in the inventory ... Pretty ugly hard-coding, but this is likely what vanilla does since it has no option to mark clothes or armor as unplayable like Oblivion does.	2013-08-08 16:05:26 -07:00
Chris Robinson	d77d60cbc2	Remove an unneeded forceUpdate method	2013-08-08 15:37:08 -07:00
vorenon	a718a62ef5	Fix for bug 876	2013-08-09 00:06:34 +02:00
PLkolek	86020ad94d	Added underwater and drowning sounds.	2013-08-08 20:57:15 +02:00
Marc Zinnschlag	f6226e4859	added Creator class for filters	2013-08-08 15:55:23 +02:00
Chris Robinson	e3d5a1b38d	Dialog function 72 is not player-specific ... It's used to force any NPC in werewolf form to play the appropriate growls for combat.	2013-08-08 06:02:16 -07:00
Chris Robinson	960ea3d96c	Add/remove a WerewolfRobe when werewolf form is toggled	2013-08-08 04:40:31 -07:00
Chris Robinson	3cff7b1e42	Don't assume icons have a period in their filename	2013-08-08 04:40:31 -07:00
Chris Robinson	1f6055d54b	Don't try to apply body skins for werewolves ... They instead use a hidden WerewolfRobe object for their body	2013-08-08 04:40:31 -07:00
Chris Robinson	946ca7f931	Return the appropriate name for werewolf NPCs	2013-08-08 04:40:31 -07:00
Chris Robinson	dfdd2dc308	Handle swimleft and swimright soundgen keys	2013-08-08 04:40:31 -07:00
Chris Robinson	109df46590	Fix werewolf claw damage multiplier	2013-08-08 04:40:31 -07:00
Chris Robinson	9694b18d1b	Update part skeletons immediately when added	2013-08-08 04:40:30 -07:00
Chris Robinson	f73578a832	Remove unnecessary mBodyPrefix field	2013-08-08 04:40:30 -07:00
Chris Robinson	5051544144	Remove some duplicate code	2013-08-08 04:40:30 -07:00
Chris Robinson	ceed2e30b8	Handle NPCs being a werewolf in NpcAnimation ... Note that the body mesh comes from having a WerewolfRobe force-equipped.	2013-08-08 04:40:30 -07:00
Chris Robinson	5ac82a50b7	Remove unused function	2013-08-08 04:40:30 -07:00
Marc Zinnschlag	e9521dc8f1	Merge remote-tracking branch 'potatoesmaster/pinning'	2013-08-08 13:06:58 +02:00
Marc Zinnschlag	bf839d19cf	Merge branch 'columns'	2013-08-08 12:50:57 +02:00
Marc Zinnschlag	0944338c27	avoid the use of hardcoded column numbers	2013-08-08 12:49:30 +02:00
Emanuel Guevel	1cbfcc3910	Fix HUD weapon icon when turning from werewolf to normal ... The werewolf hand icon remained until the inventory menu was opened.	2013-08-08 10:56:44 +02:00
Chris Robinson	2bac4566c0	Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf ... Conflicts: apps/openmw/mwmechanics/actors.cpp apps/openmw/mwscript/statsextensions.cpp	2013-08-08 00:09:29 -07:00
Chris Robinson	4985e17865	Fix werewolf claw damage multiplier	2013-08-07 19:15:36 -07:00
Chris Robinson	4641737fc4	Update part skeletons immediately when added	2013-08-07 19:15:36 -07:00
Chris Robinson	dc0360b1f6	Remove unnecessary mBodyPrefix field	2013-08-07 19:15:36 -07:00
Chris Robinson	0f52ed9a9b	Remove some duplicate code	2013-08-07 19:15:36 -07:00
Chris Robinson	deee14ccfd	Handle NPCs being a werewolf in NpcAnimation ... Note that the body mesh comes from having a WerewolfRobe force-equipped.	2013-08-07 19:15:36 -07:00
Chris Robinson	ab44cd63a1	Remove unused function	2013-08-07 19:15:35 -07:00
Emanuel Guevel	b2e5e8dd0d	Saner inventory window pinning/hiding ... Hide inventory window pin button in container, companion and barter mode. Restore the pinned inventory window position when exiting these modes. Allow toggling windows visibility in inventory mode only.	2013-08-07 23:30:08 +02:00
Alex	b9579e085f	cleanup	2013-08-07 15:40:57 -04:00
Alex	a0931b01fe	Merge branch 'master' of https://github.com/zinnschlag/openmw into compiler-reorg	2013-08-07 13:19:23 -04:00
Alex	c3ca5b7c32	mild cleanup	2013-08-07 13:16:20 -04:00
PLkolek	8f4506f5b6	Implemented drowning. ... Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one), the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red.	2013-08-07 16:46:46 +02:00
Emanuel Guevel	48d2554ac3	Auto-equip when items are added to the inventory ... We limit that to armor pieces and clothing items. No auto-equiping for the player nor werewolves.	2013-08-07 15:17:55 +02:00
Emanuel Guevel	e0d0cdd18a	Do not auto-equip items continuously ... This was called every couple of frames.	2013-08-07 14:30:13 +02:00
Chris Robinson	076e7d8e16	Make insertBegin internal	2013-08-07 03:56:07 -07:00
Chris Robinson	2b2101958d	Destroy the scene node we create	2013-08-07 03:56:07 -07:00
Chris Robinson	0458fd5531	Remove unused/unneeded parameters	2013-08-07 03:56:06 -07:00
Emanuel Guevel	fd0a159a64	MWScript: update first unused opcode number	2013-08-07 12:05:53 +02:00
Emanuel Guevel	47b8a31317	Fixes suggested by KittyCat	2013-08-07 12:05:53 +02:00
Marc Zinnschlag	932fffd1a7	Merge remote-tracking branch 'kcat/light-objects'	2013-08-07 11:21:01 +02:00
Chris Robinson	b4b095ca72	Don't try to get the center of a null bounding box	2013-08-07 01:32:36 -07:00
Chris Robinson	80d271aeb1	Remove unused stuff	2013-08-07 01:31:01 -07:00
Marc Zinnschlag	76b9d3dbc1	columns are now identified via an enum instead the name string	2013-08-07 09:36:05 +02:00
Chris Robinson	3555476dfd	Use Animation-derived objects for generic objects	2013-08-06 19:49:07 -07:00
Chris Robinson	a9dca21d05	Create the Animation SceneNode in the constructor	2013-08-06 19:49:05 -07:00
Chris Robinson	48784c7e2f	Use for_each and functors to avoid some for loops	2013-08-06 19:49:05 -07:00
Chris Robinson	de95926e9f	Use controllers to animate lights in ObjectLists	2013-08-06 19:49:04 -07:00
Chris Robinson	8984d8f8ee	Use a map to simplify NPC part referencing	2013-08-06 19:49:02 -07:00
Chris Robinson	e976bb16c5	Add a light for torches	2013-08-06 19:49:02 -07:00
Chris Robinson	57fb065a86	Add Ogre::Light objects to the object list ... Note that NIFs actually have NiLight-based light records which could be used to create Ogre::Light objects. However, no Morrowind NIF uses them, as far as I can tell.	2013-08-06 19:49:01 -07:00
Chris Robinson	a9cc3a2844	Ensure a valid CellStore for Ptr::isInCell	2013-08-06 19:49:01 -07:00
Chris Robinson	1f436f9886	Render torches	2013-08-06 19:49:01 -07:00
Chris Robinson	8f69c51b24	Avoid some unnecessary references	2013-08-06 19:49:00 -07:00
Chris Robinson	2c03fec4bb	Use the fatigue term for jumping	2013-08-06 19:49:00 -07:00
Chris Robinson	eab4e09566	Handle the pick/probe in the character controller	2013-08-06 19:48:59 -07:00
scrawl	3f7daa4884	Forgot to change initTerrainTextures	2013-08-07 02:58:03 +02:00
Alex	de1f423bd7	initial move of script opcodes and registerExtensions functions to components/compiler	2013-08-06 20:38:41 -04:00
scrawl	76e538c22a	Unused variable fix	2013-08-07 02:03:23 +02:00
scrawl	726c93c365	Terrain fixes to match vanilla better - vertices need to be mapped directly to texels for colormap and blendmap (this also caused seams at cell borders), layer uv scale appears to be 8 not 10	2013-08-07 01:34:17 +02:00
Marc Zinnschlag	03af7175dd	Merge remote-tracking branch 'potatoesmaster/bug-839'	2013-08-06 17:39:29 +02:00
Emanuel Guevel	c59ad62c57	Fix UndoWerewolf script instruction	2013-08-06 14:30:01 +02:00
Emanuel Guevel	5188a1c2cd	Implement script instructions Become/UndoWerewolf	2013-08-06 12:34:35 +02:00
Emanuel Guevel	20d40c4368	Implement MWWorld::World::setWerewolf()	2013-08-06 12:34:35 +02:00
Emanuel Guevel	aa563e947e	Implement MWWorld::InventoryStore::unequipAll()	2013-08-06 12:34:35 +02:00
Emanuel Guevel	ddc92d1fbd	Set appropriate weapon icon when player is a werewolf	2013-08-06 12:34:35 +02:00
Emanuel Guevel	d054366460	Permit to force hiding GUI windows	2013-08-06 12:34:35 +02:00
scrawl	4caac0d859	Fix idle animations repeating	2013-08-05 02:06:23 +02:00
vorenon	76a1abe9fa	Don't allow the use of the "jump" key while sneaking - Update	2013-08-04 20:10:33 +02:00
vorenon	56cb36caf1	Don't allow the use of the "jump" key while sneaking	2013-08-04 19:45:41 +02:00
Emanuel Guevel	71da2f0a12	Do not allow magic/combat stance unless magic/inventory window are accessible	2013-08-04 00:21:27 +02:00
Marc Zinnschlag	41b2fa985b	silenced some warnings	2013-08-03 15:26:53 +02:00
Marc Zinnschlag	9123afa863	Merge remote-tracking branch 'gus/MeleeCombat2'	2013-08-03 15:23:36 +02:00
Marc Zinnschlag	3170490a8e	silenced some warnings	2013-08-03 15:21:11 +02:00
Marc Zinnschlag	253e00e3a0	Merge remote-tracking branch 'gus/MeleeCombat2' into columns	2013-08-03 15:18:39 +02:00
Marc Zinnschlag	501753c01b	Merge remote-tracking branch 'scrawl/master' into columns	2013-08-03 15:06:30 +02:00
gus	a23e7fac93	clean up	2013-08-03 13:58:16 +02:00
scrawl	982f743ddd	Fix wrong idle animations played	2013-08-03 13:13:33 +02:00
gus	c8bb32c40d	small maths correction	2013-08-03 12:29:18 +02:00
gus	a25ee360dc	use angles and GMST. not sure this work as it should	2013-08-03 12:16:51 +02:00
Marc Zinnschlag	8f330e7e3c	Merge remote-tracking branch 'potatoesmaster/sneak'	2013-08-03 11:49:20 +02:00
gus	830762722d	first attempt: hit detection with a sphere (not finished)	2013-08-03 11:26:36 +02:00
Emanuel Guevel	a9483dbdf1	Show sneak indicator when sneaking ... Temporary solution, as the indicator should be shown only when the player is not detected by any other actor.	2013-08-03 03:03:29 +02:00
Emanuel Guevel	8f8362d2c4	Expose sneak indicator widget through WindowManager	2013-08-03 03:03:29 +02:00
Emanuel Guevel	9757694060	Update sneaking indicator position with other widgets	2013-08-03 02:43:56 +02:00
Emanuel Guevel	4685aea2a1	mwiniimport: ignore empty values	2013-08-03 00:21:05 +02:00
vorenon	aa45127895	Adjusted swish sounds ... Sorry Chris, I was wrong. The game actually uses SwishM for every attack, but at a different pitch depending on the force of the attack. I realized it after testing your changes.	2013-08-02 16:33:39 +02:00
Marc Zinnschlag	d2f96deb98	renamed columns.hpp to columimp.hpp	2013-08-02 10:42:52 +02:00
Chris Robinson	f57c829cba	Play the appropriate swish sound and follow-up animation	2013-08-02 00:21:02 -07:00
Chris Robinson	b70975a74d	Move getEvasion to CreatureStats	2013-08-02 00:21:01 -07:00
Chris Robinson	9e7d670745	Inline Class::get(const Ptr& ptr)	2013-08-02 00:20:59 -07:00
Marc Zinnschlag	ca94d1a2fb	Merge remote-tracking branch 'swick/inventorypos' ... Conflicts: apps/openmw/mwgui/inventorywindow.cpp	2013-07-31 22:16:56 +02:00
Marc Zinnschlag	24273f338b	Merge remote-tracking branch 'scrawl/master'	2013-07-31 22:12:07 +02:00
Sebastian Wick	7ed763262f	GUI mode dependent position	2013-07-31 21:40:29 +02:00
scrawl	fe51a00112	Fix the initial player inventory being added twice when starting a new game	2013-07-31 21:00:58 +02:00
scrawl	f1f6336a4a	Fixed screenshot keybinding, and make it bindable	2013-07-31 20:24:44 +02:00
Marc Zinnschlag	5cafe65cd7	Merge remote-tracking branch 'scrawl/cppcheck'	2013-07-31 20:00:35 +02:00
scrawl	d106ed3b08	Fixed alchemy	2013-07-31 19:03:51 +02:00
Marc Zinnschlag	4dfd5282ab	Merge remote-tracking branch 'kolek/enchantingwindow'	2013-07-31 19:01:49 +02:00
Marc Zinnschlag	25917b00ec	Merge remote-tracking branch 'scrawl/master'	2013-07-31 19:00:24 +02:00
scrawl	7dc30a01cd	Some changes suggested by cppcheck	2013-07-31 18:46:32 +02:00
scrawl	43e0df479e	Make NPCs auto-equip after their inventory is loaded, this fixes NPCs that start as dead not auto-equipping	2013-07-31 16:30:22 +02:00
PLkolek	f297c21e4d	Old door sound fades out on door open/close. Door sound is synchronised to angle on action.	2013-07-31 15:46:23 +02:00
PLkolek	8bc8c38f2d	Spell cost is updatedon every change in enchanting and spellmaking.	2013-07-31 13:33:30 +02:00
PLkolek	7fd7621458	Fixed area slider in self enchantments.	2013-07-31 12:26:34 +02:00
Marc Zinnschlag	6ce2b962e1	Merge remote-tracking branch 'scrawl/inventory'	2013-07-31 09:15:22 +02:00
Marc Zinnschlag	eedced729f	Merge remote-tracking branch 'scrawl/master'	2013-07-31 09:14:12 +02:00
Marc Zinnschlag	7639506e49	Merge remote-tracking branch 'scrawl/ai'	2013-07-31 09:07:46 +02:00
scrawl	16cacb338a	Initialize MWMechanics::AiSequence from ESM::AiPackageList	2013-07-31 00:55:08 +02:00
scrawl	45006ea193	Fix inventory/container content loading so that it's done for dynamically spawned objects as well	2013-07-31 00:02:24 +02:00
scrawl	90a5d8b6f5	Fix uninitialized AL listener position/orientation when the game is paused during the first frame	2013-07-30 23:24:18 +02:00
Marc Zinnschlag	958b0c4915	Merge remote-tracking branch 'scrawl/untilhealed'	2013-07-30 22:41:05 +02:00
scrawl	da01ec4f52	Only show the "Rest until healed" button when stats are not full	2013-07-30 22:07:27 +02:00
scrawl	04b90b7d14	Other actors no longer collide with an actor that has collision disabled	2013-07-30 22:00:48 +02:00
scrawl	472a381263	Fix health meter (again)	2013-07-30 16:09:12 +02:00
Marc Zinnschlag	adb05737ee	Merge branch 'master' into filter ... Conflicts: apps/opencs/model/world/universalid.cpp apps/opencs/view/doc/view.cpp apps/opencs/view/world/subviews.cpp	2013-07-30 15:55:50 +02:00
Marc Zinnschlag	2e667f1d94	Merge branch 'bottombar'	2013-07-30 12:55:12 +02:00
Marc Zinnschlag	434f97c95c	fixed two missing icons	2013-07-30 12:55:02 +02:00
Marc Zinnschlag	102700a498	added specialised Creator for references	2013-07-30 12:53:03 +02:00
Marc Zinnschlag	57be764cce	added specialised Creator for referenceable records	2013-07-30 12:34:18 +02:00
Marc Zinnschlag	3642562959	Merge remote-tracking branch 'scrawl/master'	2013-07-30 08:11:40 +02:00
scrawl	426e3ec6c6	Fix enemy health meter for creatures	2013-07-30 06:17:21 +02:00
scrawl	3961c276b8	Added enemy health meter	2013-07-30 06:00:20 +02:00
Marc Zinnschlag	e27ba55541	Merge remote-tracking branch 'swick/countdialog'	2013-07-29 21:38:04 +02:00
Sebastian Wick	40d3efc671	use cancel methid	2013-07-29 18:35:23 +02:00
Sebastian Wick	7b40e57ba1	Allow the 'Activate' key to close the countdialog window; cleanups	2013-07-29 18:27:00 +02:00
Marc Zinnschlag	90ab7b2bf5	Merge remote-tracking branch 'swick/viewmodetransission'	2013-07-29 17:08:49 +02:00
Sebastian Wick	7c24c0a64e	fix uninitialized variables	2013-07-29 16:45:35 +02:00
Sebastian Wick	d2b7cb5bb2	First/Third person transitions with mouse wheel	2013-07-29 16:43:16 +02:00
Marc Zinnschlag	34c825ce52	added icons and type listing to UniversalId class	2013-07-29 16:21:42 +02:00
Marc Zinnschlag	661b290c49	automatically scroll table to the position of a newly created record	2013-07-29 15:00:41 +02:00
Sebastian Wick	1b310c5c5b	use SDL resolutions in the ingame settings	2013-07-29 13:34:56 +02:00
Marc Zinnschlag	3fa4a194a7	Merge remote-tracking branch 'scrawl/master'	2013-07-29 09:59:23 +02:00
scrawl	6164e5bae6	Restored window resizing	2013-07-29 02:32:08 +02:00
Chris Robinson	3744850545	Fix hand-to-hand health damage reduction	2013-07-28 16:07:09 -07:00
Chris Robinson	39507e3f0f	Decrease armor condition on successful hits	2013-07-28 15:51:17 -07:00
Chris Robinson	1af48ab6e0	Decrease weapon condition on successful hits	2013-07-28 15:17:01 -07:00
Chris Robinson	465f4d2063	Properly handle starting an animation at the end	2013-07-28 09:56:03 -07:00
Marc Zinnschlag	82958e6514	added custom creator for cell records	2013-07-28 18:08:57 +02:00
Chris Robinson	54f91d4b3a	Implement hand-to-hand attacks	2013-07-28 06:48:25 -07:00
Marc Zinnschlag	899e18b2cf	report ID errors also via input field tool tips	2013-07-28 15:28:35 +02:00
Marc Zinnschlag	5ec9d370cb	check if ID is already in use when creating new IDs	2013-07-28 15:27:15 +02:00
Marc Zinnschlag	124a70906f	added creator edit lock	2013-07-28 14:51:47 +02:00
Marc Zinnschlag	32c697abc6	validate IDs entered by the user	2013-07-28 14:40:11 +02:00
Marc Zinnschlag	4f6e99c391	more compact layout for the bottom box	2013-07-28 14:00:26 +02:00
Marc Zinnschlag	00fcb79f08	moved record creation to GenericCreator class (now taking ID from user instead of using a procedurally generated one)	2013-07-28 13:43:16 +02:00
Marc Zinnschlag	2d46a1db2f	changed CreateCommand to work directly on the model instead of the proxy	2013-07-28 13:39:33 +02:00
Chris Robinson	a34f0de3e1	Play the correct medium armor foot sounds	2013-07-28 04:17:36 -07:00
Chris Robinson	db4f34b332	Play hit sounds when hitting creatures and NPCs	2013-07-27 11:20:39 -07:00
Chris Robinson	1a40d01afa	Fix NPC armor rating calculation and reduce redundant lookups	2013-07-27 09:31:16 -07:00
Chris Robinson	f73008546f	Keep a sound updated with its object's position	2013-07-27 07:24:18 -07:00
Chris Robinson	c94653dc49	Implement the ModRegion script function	2013-07-27 07:10:18 -07:00
Marc Zinnschlag	f93af52486	handling down a reference to Data and the undo stack to the creators	2013-07-27 13:28:12 +02:00
Chris Robinson	1174b85ac8	Implement Disable/EnableTeleporting script functions	2013-07-27 00:14:55 -07:00
Marc Zinnschlag	fee748d4b5	added creator bar UI and cancel button	2013-07-26 21:09:23 +02:00
Chris Robinson	3298eb1b37	Implement HitOnMe script function	2013-07-26 10:50:23 -07:00
Chris Robinson	5379e607cb	Handle the OnPCHitMe script variable	2013-07-26 10:50:23 -07:00
Chris Robinson	f215d2cc30	Only raise weapon skills for the player	2013-07-26 10:50:23 -07:00
Chris Robinson	bec420c69b	Add Class::onHit for creatures	2013-07-26 10:50:23 -07:00
Chris Robinson	dd6edd21f8	Add a separate on-hit method to handle objects being hit	2013-07-26 10:50:23 -07:00
Marc Zinnschlag	b8ac45defe	added creator to bottom box layout and re-routed add record event to bottom box	2013-07-26 18:22:31 +02:00
Marc Zinnschlag	d899cbb449	removed some junk	2013-07-26 18:14:34 +02:00
Marc Zinnschlag	ed83e2e70a	added creator to bottom box; more cleanup	2013-07-26 12:51:45 +02:00
Marc Zinnschlag	6c4bdc0101	minor cleanup; less pointer usage	2013-07-26 12:42:15 +02:00
Marc Zinnschlag	ba5ca5beed	replaced createAndDelete flag with a new class hierarhy (Creator)	2013-07-26 12:35:17 +02:00
Emanuel Guevel	aa14656ff2	esmtool: fix swapped comparison operators	2013-07-26 10:24:15 +02:00
Marc Zinnschlag	3fbbbdc64b	Merge remote-tracking branch 'scrawl/master'	2013-07-26 08:06:53 +02:00
Chris Robinson	a569ae367e	Fix hit chance calculation	2013-07-25 13:09:26 -07:00
Chris Robinson	6195062d72	Try to figure out what gets hit ... This isn't the greatest. The distance multiplier is a guess, and a sphere cast may be better.	2013-07-25 12:58:43 -07:00
Chris Robinson	b3a057d679	Handle hit chance and damage calculation ... Math is based on what the UESP describes, with some tweaks (using fatigue term, and the fCombatCriticalStrikeMult GMST): http://www.uesp.net/wiki/Morrowind:Combat	2013-07-25 08:15:42 -07:00
Marc Zinnschlag	4327b81bc3	fixed column handling in table (had problems with filtered out columns before)	2013-07-25 14:38:53 +02:00
Marc Zinnschlag	55e7e71c11	added optional per-subview status bar	2013-07-25 14:29:56 +02:00
Chris Robinson	1dcc893703	Merge remote-tracking branch 'zini/master' into combat	2013-07-25 01:16:49 -07:00
Chris Robinson	4ad28ed369	Don't play a weapon-down sound when unreadying a spell	2013-07-25 00:46:20 -07:00
Chris Robinson	92cc566fdc	Rename the Class::attack method to Class::hit	2013-07-25 00:30:01 -07:00
Chris Robinson	0db02af807	Set up the weapon state in the CharacterController constructor	2013-07-24 21:08:16 -07:00
Chris Robinson	d9a9c3d6bd	Handle the "land" soundgen type	2013-07-24 10:36:04 -07:00
Chris Robinson	705498ec24	Play a swish sound when attacking	2013-07-24 10:34:53 -07:00
Chris Robinson	d8ec813939	Say something from the "hit" dialog topic when losing health	2013-07-24 10:02:50 -07:00
Chris Robinson	59f1bc7542	Use time values for the aniamtion's start, stop, and loop points ... This seems to be closer to the expected behavior. This more cleanly handles 0- length animations, especially where the start marker comes after the stop marker while still being on the same time key.	2013-07-24 08:38:36 -07:00
Chris Robinson	bf1d907d07	Don't play casting animations for enchantments	2013-07-24 05:39:15 -07:00
Chris Robinson	cc8e8c1272	Use the attack strength as determined by how long the attack was held	2013-07-24 03:18:53 -07:00
Chris Robinson	0c8d4d9be2	Add beginnings of melee hits	2013-07-24 02:51:42 -07:00
Chris Robinson	45302f9e25	Handle controllers in the NPC's bound object parts	2013-07-23 22:05:03 -07:00
Marc Zinnschlag	a80e80dd94	added layout to table sub view	2013-07-23 21:59:02 +02:00
Chris Robinson	11b094559f	Play the appropriate casting animation sound	2013-07-23 11:12:19 -07:00
Emanuel Guevel	70a5a83419	Change the formula used to calculate initial NPC health	2013-07-23 16:48:54 +02:00
Chris Robinson	17282c69b1	Handle spell-casting animation sequences	2013-07-23 07:30:54 -07:00
Chris Robinson	4d157cb19a	Handle marksmen weapon attack sequences	2013-07-23 06:13:08 -07:00
Chris Robinson	fecb8c1cc4	Fix the completion amount for 0-length anims	2013-07-23 05:30:37 -07:00
Chris Robinson	d5d832846e	Rename the follow-up upper character state enum	2013-07-23 04:56:49 -07:00
Chris Robinson	537d5c4934	Avoid trying to play animations without any animation sources	2013-07-23 04:36:25 -07:00
Chris Robinson	ad6d663e09	Remove some unnecessary debug messages	2013-07-23 03:44:52 -07:00
Chris Robinson	24567294ff	Move NPC state update handling into a separate method	2013-07-23 03:26:24 -07:00
Chris Robinson	22e07968af	Store the current weapon group name	2013-07-23 02:50:52 -07:00
Chris Robinson	0240efa6cf	Improve weapon attack logic to better handle picks, probes, and h2h	2013-07-23 02:28:58 -07:00
Chris Robinson	ef17fdeb15	Remove some unused methods	2013-07-23 01:37:41 -07:00
Marc Zinnschlag	ec575200e3	Merge remote-tracking branch 'gus/MeleeCombat2' ... Conflicts: apps/openmw/mwrender/animation.cpp	2013-07-23 09:12:23 +02:00
Marc Zinnschlag	7600d6c04b	basic filter table	2013-07-22 21:18:47 +02:00
Marc Zinnschlag	66534a45da	replaced double click in table with a context menu item (edit) because double click was interfering with basic table functionality	2013-07-21 17:53:39 +02:00
Emanuel Guevel	48f0e64ec3	Fix health calculation at character creation	2013-07-21 11:02:03 +02:00
Emanuel Guevel	1c330fc899	Use the correct formula for NPC health initialization	2013-07-21 10:13:46 +02:00
Emanuel Guevel	2356e6218e	Complete health increase on level up	2013-07-20 22:14:10 +02:00
Emanuel Guevel	2a0644a7c3	Move some levelup logic from mwgui to mwmechanics	2013-07-20 22:14:10 +02:00
Emanuel Guevel	7837dcdc19	Calculate NPC health on loading instead of updating it continually ... Only NPC with auto-calculated stats are concerned.	2013-07-20 22:14:10 +02:00
Emanuel Guevel	074e241c32	MWMechanics::DynamicStat: fix members initialization	2013-07-20 22:14:09 +02:00
Marc Zinnschlag	a8168c58c2	Merge remote-tracking branch 'kolek/thirdpersonzoom'	2013-07-20 18:29:59 +02:00
Kolzi	d12bac2d9e	Third person zoom - fixed code review issues.	2013-07-20 16:55:35 +02:00
Marc Zinnschlag	0fad2e7f40	restructured main menu	2013-07-20 13:46:56 +02:00
Marc Zinnschlag	2497c18702	replaced settings change notifications for columns with a more robust implementation	2013-07-20 13:19:27 +02:00
Kolzi	1b7966ca27	Can zoom in and out in third person view.	2013-07-19 16:12:01 +02:00
Chris Robinson	0cb7d186e7	Use Play_TypeFoot for 'left' and 'right' soundgen keys	2013-07-18 21:50:11 -07:00
Chris Robinson	14e0c182f3	Allow specifying the sound type to playSound and playSound3D	2013-07-18 21:50:11 -07:00
Chris Robinson	ac4dfd3b39	Play the appropriate foot sound based on footwear	2013-07-18 21:50:11 -07:00
scrawl	bf332b633e	Make VideoPlayer::playVideo block until the video finishes	2013-07-18 14:14:10 +02:00
Marc Zinnschlag	365ea11e86	Merge remote-tracking branch 'graffy76/RefIdTypeDelegate'	2013-07-18 13:51:24 +02:00
Marc Zinnschlag	fdd47e5b73	silenced a warning	2013-07-18 13:50:12 +02:00
graffy76	0ae254f6a8	Fixed segfault opening tables	2013-07-18 06:31:47 -05:00
Chris Robinson	9c13568bb7	Remove idles from the state list and rename it	2013-07-18 01:49:53 -07:00
Chris Robinson	e803cdbe7f	Handle swimdeath and missing death animations	2013-07-18 01:13:53 -07:00
Chris Robinson	f01b0b48cc	Don't start with an idle state if dead	2013-07-18 00:35:03 -07:00
Chris Robinson	e78bdd2a5d	Clear 'swim' from the animation name as a backup instead of 'sneak'	2013-07-18 00:22:40 -07:00
Chris Robinson	9ea6b22a83	Handle soundgen animation keys	2013-07-17 23:58:21 -07:00
Chris Robinson	d6324d71bf	Ensure mechanics actors/objects are cleared before adding them	2013-07-17 21:39:21 -07:00
Chris Robinson	c7692acb79	Update the player's Ptr in mwrender when changing cells	2013-07-17 19:11:03 -07:00
graffy76	6486f342b5	Fixed setting synchronization issue ... Moved default settings to CSMSettings::UserSettings. Other minor code changes / cleanup	2013-07-17 20:19:01 -05:00
Marc Zinnschlag	1b4cd787a5	Merge remote-tracking branch 'kcat/animation-state'	2013-07-17 11:33:04 +02:00
Chris Robinson	0cd4df3edf	Stop playing idles on death	2013-07-17 02:19:22 -07:00
Chris Robinson	e2e278d06d	Fix some animations not playing properly ... Default movement animation speed multiplier should be 1, not 0. Only randomize death1...death5 for NPCs.	2013-07-17 02:06:31 -07:00
scrawl	dfe912dcab	Enum renaming	2013-07-16 23:38:55 +02:00
scrawl	91e95e1404	Use the correct slash, chop or thrust animation	2013-07-16 23:32:41 +02:00
gugus	9043fe427f	Merge pull request #4 from scrawl/melee ... Fixes weapon input to use A_Use instead of hardcoding to mouse button	2013-07-16 07:35:21 -07:00
scrawl	9536b5050b	Fixes weapon input to use A_Use instead of hardcoding to mouse button	2013-07-16 16:25:41 +02:00
gus	66e3eacace	fix bows	2013-07-16 15:14:34 +01:00
gus	701ff94887	bugfix for lockpick	2013-07-16 14:46:44 +01:00
gus	20341ae8b7	simplification + taking into account weapon speed. Seems too fast, but i'm not sure	2013-07-16 14:10:14 +01:00
gus	8fc6e73649	post-merge fix	2013-07-16 11:51:18 +01:00
gus	ee47e99dad	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into MeleeCombat2 ... Conflicts: apps/openmw/mwmechanics/character.cpp apps/openmw/mwmechanics/character.hpp	2013-07-16 11:40:19 +01:00
Marc Zinnschlag	47f7bbd48a	fixed OpenCS crash during cell loading when loading multiple ESX files	2013-07-16 12:08:35 +02:00
gus	f6e3445414	Jittering gone + bugfix: chop animation works! ... TODO: fix this unequip stuff	2013-07-16 09:50:59 +01:00
Chris Robinson	e5e9c83ed5	Merge remote-tracking branch 'zini/master' into animation-state	2013-07-16 01:33:46 -07:00
Chris Robinson	a932a89e02	Specify the velocity-based animation speed multiplier when playing it	2013-07-16 01:30:03 -07:00
Chris Robinson	f296d13c20	Add a speed multiplier to the animation state	2013-07-16 00:43:31 -07:00
Chris Robinson	3a1facefdf	Store a pointer to the character controller for non-actor objects	2013-07-15 23:47:04 -07:00
Chris Robinson	06e631f213	Track death separately in the character controller	2013-07-15 23:43:33 -07:00
Chris Robinson	4ae65c20e6	Separate movement and idle states ... This allows us to better handle cases of "missing" animations. Mainly for first-person, but also for spells and certain weapon types.	2013-07-15 22:56:23 -07:00
scrawl	94d45e1518	Fix twohanded weapons not unequipping when equipping a torch	2013-07-15 23:21:01 +02:00
scrawl	daf9dca121	Fix exception when starting a new game	2013-07-15 20:37:36 +02:00
gus	f7f23ac5d8	improvement of the chop animation. Still some jittering.	2013-07-15 17:18:16 +01:00
gus	f7b711aabe	bugfix	2013-07-15 16:37:32 +01:00
gus	076f98cbba	change way animations keys are handled (thanks KittyCat!)	2013-07-15 16:37:25 +01:00
Marc Zinnschlag	fd9cc1c282	Merge remote-tracking branch 'vorenon/container'	2013-07-15 09:33:16 +02:00
Marc Zinnschlag	a0022e711b	Merge remote-tracking branch 'scrawl/raycast'	2013-07-15 09:20:16 +02:00
vorenon	66eb82b363	oops again	2013-07-15 02:26:22 +02:00
vorenon	33779ae23c	oops	2013-07-15 02:23:18 +02:00
vorenon	d4739a451a	added ability to close container windows with the activation key	2013-07-15 02:18:24 +02:00
scrawl	c81b852071	Fixes inaccurate ray casts; rely on getCameraToViewportRay	2013-07-15 00:39:37 +02:00
scrawl	8407e2b3aa	Fixes the console sometimes receiving text after it was closed	2013-07-14 23:54:28 +02:00
Marc Zinnschlag	1bc343f363	Merge remote-tracking branch 'kcat/first-person'	2013-07-14 21:28:09 +02:00
scrawl	fa5198d7b2	Fix an assertion	2013-07-14 14:59:24 +02:00
scrawl	61661c8653	Fix first person meshes casting shadows	2013-07-14 14:55:07 +02:00
scrawl	a049638e7f	Fixes character previews getting shadowed randomly	2013-07-14 14:54:40 +02:00
Marc Zinnschlag	6a5ab34971	Merge branch 'region'	2013-07-14 12:19:02 +02:00
Chris Robinson	3771e5839e	Allow some more third person fallbacks in first person	2013-07-13 17:03:10 -07:00
Chris Robinson	5ee889e8b6	Attach the camera to the Head node in first-person	2013-07-13 16:12:38 -07:00
gus	3947f44aa3	Porting old work	2013-07-13 22:24:52 +01:00
Chris Robinson	2d7620e774	Rotate the neck when looking up and down in first-person	2013-07-13 12:39:06 -07:00
Marc Zinnschlag	4cce466dc7	inverted region map y-axis	2013-07-13 16:34:10 +02:00
Chris Robinson	4df1f198a7	Avoid a map lookup for every skin body part when updating	2013-07-12 22:32:09 -07:00
Chris Robinson	6de56615aa	Avoid casting shadows in first-person view	2013-07-12 22:32:05 -07:00
Chris Robinson	025fa4e0d5	Use a multimap for the bodypart map	2013-07-12 22:32:04 -07:00
Chris Robinson	a5e4faaed2	Show arms and body parts in first person ... This isn't yet fully correct. The arms need to rotate up and down with the camera, and the mesh's bounding box is causing them to blink out at certain angles since they don't fit the animation.	2013-07-12 22:31:59 -07:00
Chris Robinson	908f010c74	Reset the NPC object root when switching POV ... When in first person, the skeleton in the .1st.nif file is used. In particular, these have extra finger bones that are used by the first person models.	2013-07-12 22:31:57 -07:00
Chris Robinson	7883087586	Store a pointer to the character controller in the map	2013-07-12 22:31:50 -07:00
Marc Zinnschlag	c26a6f884f	added region map tooltips	2013-07-12 12:55:14 +02:00
greye	29b7734b52	add qualifiers for names in templates to make gcc 4.7+ happy	2013-07-12 08:33:02 +04:00
Marc Zinnschlag	c808bf2b23	updating region map on changes to region and cell records	2013-07-11 15:05:28 +02:00
Marc Zinnschlag	b17f383c6d	Merge remote-tracking branch 'graffy76/RefIdTypeDelegate' ... Conflicts: apps/opencs/view/world/table.cpp	2013-07-11 09:09:52 +02:00
graffy76	11178cc470	Repo permissions commit fix #3	2013-07-10 21:44:25 -05:00
graffy76	bb049806df	Repo permissions commit fix #2	2013-07-10 21:13:59 -05:00
graffy76	ae4e3181d9	Fixing repo permissions commit #1	2013-07-10 17:29:07 -05:00
scrawl	bbb5d2b98a	Change tooltip positioning to resemble vanilla	2013-07-10 03:40:13 +02:00
Marc Zinnschlag	d389b70ec4	added missing case folding	2013-07-09 14:22:58 +02:00
Marc Zinnschlag	121978a69e	some cleanup; added handling of deleted cells (now displayed instead of ignored)	2013-07-09 14:20:28 +02:00
Marc Zinnschlag	116320cc0d	dealing with invalid regions and cells without regions	2013-07-08 17:13:58 +02:00
Marc Zinnschlag	6159724b04	build region map from records (only initial build; updates not implemented yet)	2013-07-08 16:53:08 +02:00
Marc Zinnschlag	4f05f2bddf	basic region map; non-interactive for now and working with dummy data instead of real cell/region records	2013-07-08 13:12:50 +02:00
Marc Zinnschlag	71a6955182	Merge remote-tracking branch 'scrawl/master'	2013-07-08 09:46:00 +02:00
scrawl	91f6d87126	Fix an uninitialized variable	2013-07-07 16:57:46 +02:00
Marc Zinnschlag	602e40e19d	Merge remote-tracking branch 'greye/coc'	2013-07-07 13:34:28 +02:00
greye	e553f285b8	update player position on engine start	2013-07-07 15:06:05 +04:00
greye	f3d54a7ba4	move finding default cell positions to World	2013-07-07 15:03:06 +04:00
greye	0c303aa285	fix fading on cell transition when cell is loaded	2013-07-07 14:30:11 +04:00
greye	6bb3942288	use Land height data for position in coc	2013-07-07 13:47:58 +04:00
greye	a3094b808e	update coc behaviour for interior cells	2013-07-07 13:47:58 +04:00
scrawl	744c5804ed	Simplified doors, now they will stop after hitting an obstacle instead of trying to back off.	2013-07-07 03:52:17 +02:00
Marc Zinnschlag	de5898c953	post merge fixes	2013-07-06 18:34:14 +02:00
Marc Zinnschlag	4986b7d65d	Merge branch 'master' into ref	2013-07-06 17:54:19 +02:00
Marc Zinnschlag	1c4b70805b	added missing reference table columns	2013-07-06 17:41:06 +02:00
Marc Zinnschlag	9a39f32c32	store ID of cell in reference struct	2013-07-06 17:06:06 +02:00
Marc Zinnschlag	9a49125281	added references table	2013-07-06 17:03:18 +02:00
scrawl	72600a16cf	Fix chargen race menu bug, updating a render target from within MyGUI's ControllerManager update is not a good idea	2013-07-06 17:02:40 +02:00
scrawl	58fce74620	Use the already existing mScrollPage as step size for scrollbar button repeats; increased precision of options menu sliders	2013-07-06 16:40:57 +02:00
scrawl	5c8950f91c	Merge branch 'master' of git://github.com/zinnschlag/openmw	2013-07-06 16:08:29 +02:00
Marc Zinnschlag	f9d7c7574e	Merge remote-tracking branch 'swick/scrollbar'	2013-07-06 13:13:27 +02:00
Marc Zinnschlag	3dc42fb948	Merge remote-tracking branch 'greye/master'	2013-07-06 12:28:01 +02:00
greye	76d95dffb6	special case for loading StartScript records	2013-07-05 23:52:46 +04:00
Sebastian Wick	26bd2a5301	use the new scrollbar; range dependent step size; fix	2013-07-05 20:28:46 +02:00
Sebastian Wick	b43f41c2bd	use a mygui controller for scrollbar repeat	2013-07-05 19:17:00 +02:00
Sebastian Wick	e3d8bdbafe	autorepeat scrollbar	2013-07-02 17:29:47 +02:00
graffy76	9f6d250463	QDebug reference removal	2013-07-01 07:40:47 -05:00
Marc Zinnschlag	847ec9fa56	Merge remote-tracking branch 'swick/master'	2013-07-01 10:16:39 +02:00
Sebastian Wick	8bdc9ff3ae	set position of the window for multiple monitors	2013-07-01 03:56:33 +02:00
graffy76	55b115935a	Implemented RefRecordTypeDelegate ... Added accessor functions to CSMWorld::UniversalId for static const sIdArg[]	2013-06-30 07:43:58 -05:00
graffy76	9d95a38934	Implementing delegate for referenceables table Type column ... Added delegate skeleton class Added delegate creation code in ViewManager Added Display_RefRecordType enum to columnbase.hpp Changed Type column'sDisplay type to Display_RefRecordType in refidcollection.cpp modified OpenCS CMakeLists.txt to incorporate RefRecordTypeDelegate class	2013-06-29 08:54:32 -05:00
Marc Zinnschlag	56637a39a3	Merge remote-tracking branch 'vheuken/master'	2013-06-29 12:27:01 +02:00
Marc Zinnschlag	cd538538b5	fixed weather code	2013-06-28 09:00:21 +02:00
Vincent Heuken	f43b48015e	remove actor's collisionbox on death	2013-06-27 19:42:27 -07:00
Vincent Heuken	b095c24854	resize actor collision boxes on death	2013-06-27 14:11:20 -07:00
scrawl	123a60581f	Only link to SDL2main on windows	2013-06-27 21:45:32 +02:00
Marc Zinnschlag	e88040662e	Merge remote-tracking branch 'glorf/master'	2013-06-27 12:24:09 +02:00
Marc Zinnschlag	afb120d5ce	Merge remote-tracking branch 'graffy76/recordStatusDelegate'	2013-06-27 08:11:27 +02:00
graffy76	6deddf7229	Fixed code conventions in user settings, changed top-level page names	2013-06-26 21:18:21 -05:00
Glorf	88f8637145	Bugfix #795	2013-06-26 22:20:24 +02:00
Glorf	5b81d124bb	Catched another exception	2013-06-26 18:43:27 +02:00
Glorf	f4d302501e	Bugfix #826	2013-06-26 18:29:09 +02:00
Marc Zinnschlag	623200b50e	Merge remote-tracking branch 'pakanek/libav_headers'	2013-06-26 10:58:43 +02:00
Marc Zinnschlag	8ffea60b72	some cleanup	2013-06-26 10:09:26 +02:00
Marc Zinnschlag	12cfe1fdfe	Merge remote-tracking branch 'graffy76/recordStatusDelegate'	2013-06-26 09:48:51 +02:00
Miroslav Puda	743b3dec99	Correction of libavutil version	2013-06-26 07:17:29 +02:00
graffy76	f0f895ad10	Fixed settings file error message ... Errors only occur if both global and local settings files are not found. All other file read errors fail silently.	2013-06-25 19:32:36 -05:00
Alexander "Ace" Olofsson	0a2ed8b0d7	Make OpenMW able to initialize SDL in windows builds	2013-06-25 15:05:10 +02:00
eroen	d75391de8e	libav-9 - fix missing includes ... With libav-9 and ffmpeg-1.0, libavcodec/avcodec.h no longer defines the AV_CH_LAYOUT_* constants. They have been defined in libavutil/channel_layout.h for a long time prior to this.	2013-06-24 21:08:28 +02:00
Marc Zinnschlag	05649a1654	Merge remote-tracking branch 'swick/master'	2013-06-24 14:35:32 +02:00
Vincent Heuken	09cca0bf80	more detailed error message when SDL fails to initialize	2013-06-23 16:45:23 -07:00
Marc Zinnschlag	99508a6eaa	minor cleanup	2013-06-23 22:52:02 +02:00
Sebastian Wick	20e591fe18	use index instead of string manipulation	2013-06-23 21:56:27 +02:00
Sebastian Wick	357974a429	more minor stuff	2013-06-23 21:34:41 +02:00
mckibbenta	1f4d1d3b57	Merge branch 'master' of https://github.com/zinnschlag/openmw	2013-06-23 15:29:35 -04:00
mckibbenta	5803726233	modified gmst addition during creation of new base file	2013-06-23 15:19:08 -04:00
Sebastian Wick	c97fac8116	use QMessageBox to show errors	2013-06-23 21:16:51 +02:00
Sebastian Wick	89dee80dcf	simpler remove of duplicates	2013-06-23 21:04:49 +02:00
Sebastian Wick	6abb5d5f75	small fixes	2013-06-23 20:53:50 +02:00
Sebastian Wick	dbfc39468b	better workaround	2013-06-23 20:45:24 +02:00
Marc Zinnschlag	0829548106	Merge remote-tracking branch 'swick/multimonitor' ... Conflicts: apps/launcher/graphicspage.cpp	2013-06-23 08:34:35 +02:00
Sebastian Wick	6f7a7b4714	remove old code	2013-06-23 05:02:19 +02:00
Sebastian Wick	bb39a85f16	remove double entries	2013-06-23 04:43:34 +02:00
Sebastian Wick	14d074e3e7	select first screen if none is in the setting	2013-06-23 04:21:32 +02:00
Sebastian Wick	a1fea97c3b	use SDL for resolution -> multimonitor support	2013-06-23 03:49:30 +02:00
mckibbenta	16a27e28f7	inluded gmsts with default values to creation of new base files	2013-06-22 21:01:27 -04:00
Marc Zinnschlag	d61c12ccfc	minor cleanup	2013-06-22 20:32:11 +02:00
Sebastian Wick	d364fd8561	Merge branch 'master' of https://github.com/zinnschlag/openmw	2013-06-22 19:17:39 +02:00
Sebastian Wick	0e29286856	fix custom resolution maximum	2013-06-22 19:15:13 +02:00
graffy76	62e164b2aa	Fixed load file error if no file is found	2013-06-22 07:43:28 -05:00
graffy76	a73b97d125	Fixed broken references and other bugs ... Removed references to CSVSettings::SamplePage class Removed multiple QDebug references Fixed custom LineEdits (window size user pref) would not accept data	2013-06-21 23:23:43 -05:00
Marc Zinnschlag	f5ba2b37e7	Merge remote-tracking branch 'vorenon/fixes'	2013-06-21 20:28:45 +02:00
vorenon	efdcd9649c	Fading for Exterior->Interior cell transitions	2013-06-21 20:19:35 +02:00
Marc Zinnschlag	8b909ff838	killed a stray srand	2013-06-21 08:58:52 +02:00
graffy76	b3d185e421	Unsaved changes missed in previous commits	2013-06-20 18:08:53 -05:00
graffy76	f4a2cf64c2	Removed CSVSettings::SamplePage class files	2013-06-20 18:07:34 -05:00
graffy76	101c147217	Final changes for record status icon feature, incl. window size user ... preference 1. Included updated status icons, added base.png 2. Added doxygen comments CSV / CSM Settings classes 3. Implemented Glorf's code for window size preference 4. Minor changes code that searches maps in CSV / CSM Settings classes 5. Removed CSVSettings::SamplePage class 6. Other minor code maintenance / improvements	2013-06-20 18:06:25 -05:00
Miroslav Puda	8da3494d74	Revert "Type of weather changed from string to enum." ... This reverts commit 04d90b4c47. Conflicts: apps/openmw/mwworld/weather.cpp apps/openmw/mwworld/weather.hpp	2013-06-20 21:51:07 +02:00
Miroslav Puda	26a6bdb27d	Correction of sigsegv.	2013-06-19 20:06:02 +02:00
Miroslav Puda	f9940413fd	Static for nextWeather()	2013-06-19 16:49:43 +02:00
Miroslav Puda	bf31e5385c	Removal of duplicit exterior checking and unneded string copiing.	2013-06-19 16:18:43 +02:00
Miroslav Puda	8a45686e0a	WeatherResult added as member variable.	2013-06-19 06:50:36 +02:00
Miroslav Puda	f01aa8f55e	Simpler statistical calculation of next weather; minus before parens.	2013-06-19 04:57:36 +02:00
Miroslav Puda	04d90b4c47	Type of weather changed from string to enum.	2013-06-19 03:24:30 +02:00
vorenon	4e8e048968	Added missing click sounds to dialogue	2013-06-19 01:46:38 +02:00
Marc Zinnschlag	94ec05c2c6	Revert "simplifying CSMWorld::CellRef" ... With the refactored collection class we can now handle the more complex load function This reverts commit 97f421df8a.	2013-06-18 11:27:05 +02:00
Marc Zinnschlag	9c6fa29938	Merge remote-tracking branch 'glorf/bugfix2'	2013-06-17 23:33:09 +02:00
Glorf	09cc57381a	Bugfix #809	2013-06-18 00:43:31 +02:00
Thoronador	d26e721d10	no const for int and bool	2013-06-17 18:47:12 +02:00
Thoronador	9313b2b3fe	better const correctness for MwIniImporter	2013-06-17 17:44:40 +02:00
Marc Zinnschlag	f0718c477f	Merge remote-tracking branch 'darkf/issue-812'	2013-06-17 15:02:18 +02:00
Marc Zinnschlag	5b3d2f5da1	gave Collection class its own header file and removed an unsed cpp file	2013-06-17 14:28:09 +02:00
Marc Zinnschlag	8f167a603c	split IdCollection into Collection and IdCollection class	2013-06-17 14:16:26 +02:00
Marc Zinnschlag	4b2d920f9d	rewrote IdCollection::load (not using private members of IdCollection anymore)	2013-06-17 13:49:32 +02:00
graffy76	f87eb67968	Fixed conflicts ... Merge branch 'cs-windows' of https://github.com/Glorf/openmw Conflicts: apps/opencs/model/settings/usersettings.cpp apps/opencs/model/settings/usersettings.hpp apps/opencs/view/settings/usersettingsdialog.cpp	2013-06-17 06:45:44 -05:00
Marc Zinnschlag	2968b96882	added a bit more documentation	2013-06-17 13:03:32 +02:00
Marc Zinnschlag	f4e7916ec4	moved IdCollection base into its own source file pair and renamed it to Collection	2013-06-17 11:42:02 +02:00
darkf	43455129d0	launcher: Instead of killing config writing due to no master files being selected, instead display a warning when Play is pressed.	2013-06-17 08:58:48 +00:00
Marc Zinnschlag	b5926257f5	Merge remote-tracking branch 'scrawl/sdl_input2'	2013-06-16 21:23:35 +02:00
scrawl	b16bc69479	Removed the no longer needed --debug switch	2013-06-16 20:39:40 +02:00
Marc Zinnschlag	57ce87bf12	Merge remote-tracking branch 'scrawl/sdl_input2'	2013-06-16 20:37:15 +02:00
scrawl	4fd7891d2c	Fix a message box issue	2013-06-16 20:26:27 +02:00
vorenon	76a2abcbe3	added missing line break in front of multiple choice questions	2013-06-16 19:46:55 +02:00
scrawl	b16c92c2f5	Better handle SDL_TEXTINPUT events	2013-06-16 19:43:59 +02:00
vorenon	ed6098388f	return false instead of std::exit	2013-06-16 18:13:14 +02:00
vorenon	b97a051dc6	Merge branch 'bug813' of https://github.com/vorenon/openmw into bug813	2013-06-16 18:12:09 +02:00
scrawl	03682184c6	Enable SDL_TEXTINPUT events only when a text input widget currently has key focus	2013-06-16 18:06:55 +02:00
Marc Zinnschlag	3e29506d5c	Merge remote-tracking branch 'vorenon/dialogue'	2013-06-16 17:03:50 +02:00
vorenon	9ac4a9c5eb	Don't start OpenMW if no master file is selected. This fixes bug #813	2013-06-16 04:59:34 +02:00
vorenon	4c0086b54c	Workaround for bug #820	2013-06-16 01:09:03 +02:00
scrawl	4c8a04d9cb	Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2 ... Conflicts: apps/openmw/mwinput/inputmanagerimp.cpp	2013-06-15 17:41:42 +02:00
scrawl	5252ffa104	More cleanup	2013-06-15 17:06:27 +02:00
scrawl	289587b1a9	Cleanup	2013-06-15 16:29:25 +02:00
scrawl	f1ff9b69b3	Mouse grab and relative input need to be disabled when the mouse leaves the window; Disabled resolution switching / window resizing for now due to several glitches	2013-06-15 15:33:47 +02:00
graffy76	700d55f1fb	Fixed / implemented missing features for RecordStatusDelegate ... Implemented updating editor application from preferences menu, loading settings when editor loads, adding Record Status Display prefernce. Fixed multiple bugs, made changes to CSM(V)Settings classes to make implementing new prefrences easier. Rewrote CSMSettings::UserSettings to retain last-loaded settings. Adjusted icon position in Record Status column Capitalized status text Added delegate to referenceables table	2013-06-15 06:40:18 -05:00
scrawl	9331a6380c	Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2	2013-06-15 13:25:27 +02:00
scrawl	4fb32f7f05	Moved window resize messages to sdlinputwrapper	2013-06-15 13:22:29 +02:00
Nikolay Kasyanov	9807eacb58	Removed obsolete OIS workaround	2013-06-15 15:17:29 +04:00
Nikolay Kasyanov	5984a15846	We don't need Carbon on OS X anymore	2013-06-15 14:47:33 +04:00
Rohit Nirmal	e5ddaaf676	Fix wrong indenting from my last commits.	2013-06-13 11:17:34 -05:00
Marc Zinnschlag	df016778be	Merge remote-tracking branch 'rohitnirmal/journal-open-sound'	2013-06-13 18:04:38 +02:00
scrawl	0880805559	Minor cleanup	2013-06-13 12:13:40 +02:00
Rohit Nirmal	9d4ecc3e73	replace tabs with spaces.	2013-06-13 00:52:26 -05:00
Rohit Nirmal	aac3ada14b	Use mousewheel to turn book pages.	2013-06-13 00:50:07 -05:00
scrawl	fcf35d3871	Removed the UI cursor sensitivity slider	2013-06-12 20:27:55 +02:00
scrawl	ab3634d692	Removed some remains of OIS	2013-06-12 20:13:19 +02:00
scrawl	14a2a26a56	Fullscreen resizing fix	2013-06-12 20:08:55 +02:00
scrawl	403704b92a	Use openmw.png for SDL_SetWindowIcon	2013-06-12 16:15:04 +02:00
scrawl	705488ddfb	Fix mouse movement events being discarded when there's more than one event in a frame	2013-06-12 16:07:46 +02:00
scrawl	cc077eaba6	Fix mouse wheel triggering a click event in mygui	2013-06-12 15:10:04 +02:00
scrawl	918a1655bb	Restored HW cursor rotation and resolution/fullscreen switching	2013-06-12 14:58:07 +02:00
scrawl	495aeb5d3b	Merge branch 'master' into HEAD ... Conflicts: CMakeLists.txt apps/openmw/engine.cpp apps/openmw/mwgui/cursorreplace.cpp apps/openmw/mwgui/cursorreplace.hpp apps/openmw/mwgui/windowmanagerimp.cpp apps/openmw/mwgui/windowmanagerimp.hpp apps/openmw/mwinput/inputmanagerimp.cpp libs/openengine/ogre/renderer.cpp	2013-06-12 12:34:33 +02:00
Marc Zinnschlag	df1f1bd5c8	Merge remote-tracking branch 'glorf/cs-windows'	2013-06-12 10:58:08 +02:00
Glorf	548f4d683f	Globalization of user settings	2013-06-12 12:36:35 +02:00
Marc Zinnschlag	bd08677a7f	Merge branch 'openmw24'	2013-06-12 10:37:33 +02:00
Marc Zinnschlag	c891e529f3	Merge remote-tracking branch 'rohitnirmal/launcher-fix-rohit'	2013-06-12 10:32:53 +02:00
Rohit Nirmal	2fd4d71774	trim whitespace from key and value while reading settings file - stops ugly buildup in settings.cfg, and correctly reads settings from it.	2013-06-11 23:00:12 -05:00
darkf	fc0f04324c	Remove some superfluous mSkyManager NULL checks	2013-06-11 20:56:40 -07:00
darkf	fb462f1b1a	launcher: Throw error if no data files are selected	2013-06-11 20:28:38 -07:00
darkf	fd25616cab	launcher: Properly quit if settings write fails.	2013-06-11 20:28:36 -07:00
Rohit Nirmal	fdeac21f22	Merge branch 'master' of https://github.com/zinnschlag/openmw into journal-open-sound	2013-06-11 21:36:00 -05:00
Rohit Nirmal	b5caa25e5c	Just move check if player owns journal to inputmanagerimp.cpp - prevents playing sound when going to main menu.	2013-06-10 19:42:38 -05:00
fstp	98e5cb6d7b	Added ifdef to keep backward compatibility with the FFmpeg library.	2013-06-10 15:10:39 +02:00
Rohit Nirmal	4eede86ce6	Moved journal open/close sound effect playback to JournalWindowImpl, and have opening sound play only if the player has the journal.	2013-06-09 23:27:47 -05:00
fstp	a3b2a76e60	Added virtual destructors to classes LocalMapBase and EffectEditorBase.	2013-06-09 23:08:57 +02:00
Glorf	10165d3c6b	Feature #468	2013-06-09 00:34:27 +02:00
Marc Zinnschlag	97f421df8a	simplifying CSMWorld::CellRef	2013-06-08 15:50:36 +02:00
Marc Zinnschlag	1e60ad3cd6	Promoted references to a top level record internally. ... Note: This does not change the structure of the ESX format.	2013-06-08 12:45:13 +02:00
Marc Zinnschlag	48496a644f	Merge remote-tracking branch 'scrawl/master'	2013-06-06 23:42:21 +02:00
scrawl	daab4f55a3	Use Morrowind's fonts	2013-06-06 22:26:06 +02:00
pvdk	b3595a6a2e	Fix for duplicate key/value pairs being written to settings.cfg, Bug #755	2013-06-02 21:43:22 +02:00
Marc Zinnschlag	f586eef604	Merge remote-tracking branch 'torben/pathfindingoverhaul'	2013-06-01 10:44:23 +02:00
Torben Carrington	09beafd044	Pathfinding Overhaul - Master cleanup! Cleaned pathfinding entirely, all AI packages that are implemented as well, Increased buffer! This makes the intro guard no longer walk into you or go to far into the room (not tested against vanilla distances but it seems accurate enough until the next itteration of pathfinding fixes).	2013-05-31 17:49:52 -07:00
Torben Carrington	a4caec56cf	Pathfinding Overhaul - Fixed selecting cells that are inaccessable from AIWander and pathfinding in general (sadly requires minor effort on the AI Packages implementation but it is the quickest way I can see), minor cleanup again (there is a lot to cleanup, this will prolly be in every commit).	2013-05-31 17:01:42 -07:00
scrawl	8bd712cc95	Fix being able to move slowly when over encumbered	2013-05-31 04:08:44 +02:00
Torben Carrington	73a9671742	Pathfinding Overhaul - Changed the name of checkIfNextPointReached to a more intuitive name considering what it does (checkPathCompleted) and fixed a minor bug in it, modified buildPath() to take one final parameter, a bool which dictates whether or not to always use pathfinding (like AIWander should be doing) or to allow for "shortcuts", modified all ai packages to work with these two changes.	2013-05-29 20:05:17 -07:00
graffy76	1d93cf09bc	Cell formatting and code optimization changes	2013-05-29 21:55:19 -05:00
Torben Carrington	c080785235	Pathfinding Overhaul - Finished cleaning, removed unnecessary parameter in one function, fixed use of the function in ai packages and added use of clearPath() function in aiwander, fixed algorithms and got rid of excess subtractions in getDistance functions (thanks to Chris!).	2013-05-29 19:26:45 -07:00
Torben Carrington	7b465ae4f1	Pathfinding Overhaul - Even more cleanup and spacing corrections, small renaming (more to come), removed a few unnecessary actions that wasted CPU time and tmp RAM.	2013-05-29 17:33:33 -07:00
Torben Carrington	96fdaf7410	Pathfinding Overhaul - More cleanup.	2013-05-29 16:10:15 -07:00
Torben Carrington	4838678944	Pathfinding Overhaul - Cleanup, removed unnecessary include, fixed spacing, added a function for clearing a path, overall preperation to begin working on fixing pathfinding.	2013-05-29 15:59:23 -07:00
graffy76	35fb9b669a	Final details implemented ... Png icons, alignments fixed.	2013-05-29 06:38:35 -05:00
Miroslav Puda	dc17fa1636	Removal of duplicit enumeration and unnecessary conditions.	2013-05-29 00:01:18 +02:00
Marc Zinnschlag	bbec3680c6	Merge remote-tracking branch 'pakanek/enchanting-mechanics'	2013-05-28 10:02:03 +02:00
Marc Zinnschlag	6e7416d8c5	Merge remote-tracking branch 'scrawl/master'	2013-05-28 09:59:41 +02:00
scrawl	9a43927078	Fix weapons not appearing in Enchantable filter	2013-05-28 03:15:13 +02:00
Miroslav Puda	7a4a386cbe	Removal of tab characters.	2013-05-27 20:47:53 +02:00
Torben Carrington	dbbc96f600	AIWander Segmentation Fault Fix - Fixes the segmentation fault that used to occur when there was no pathgrid in the cell and a range was passed to AIWander.	2013-05-27 11:44:46 -07:00
Miroslav Puda	b40e24c50c	Refactorization	2013-05-27 20:23:04 +02:00
Miroslav Puda	4e17bc1499	Fix for display of cast cost decimal value	2013-05-27 20:16:57 +02:00
Marc Zinnschlag	7927ac818c	Merge remote-tracking branch 'torben/aiwanderpatchpotential'	2013-05-27 18:29:15 +02:00
Miroslav Puda	9a9b075a02	Correct cast cost for enchantments.	2013-05-27 18:08:12 +02:00
Torben Carrington	ebc1fdd017	AIWander Patch - fixed another possibility of a bug occuring, best to fix it now then wait until it happens.	2013-05-27 09:05:42 -07:00
scrawl	0c7f48ec8a	Implement movement for creatures (formula is a stub)	2013-05-27 18:03:06 +02:00
Miroslav Puda	1c7b94e94f	Switching in nextCastStyle() is now based on enum CastingStyle.	2013-05-27 16:08:58 +02:00
Miroslav Puda	252a1d9223	Replacement of some magical constants	2013-05-27 15:50:47 +02:00
Miroslav Puda	9e1eb8b3b1	Merge branch 'master' of https://github.com/zinnschlag/openmw into enchanting-mechanics	2013-05-27 14:45:22 +02:00
Miroslav Puda	4788b5e226	Better formula for enchantment cost and code refactorization.	2013-05-27 14:42:08 +02:00
Miroslav Puda	56edc1b213	Correction of getting spell range "Target".	2013-05-27 12:26:06 +02:00
Torben Carrington	bd6d54cc8f	AIWander Minor Patch - Forgot an else statement and another check on an empty node vector, previously no nodes in range or only one would cause the AIWander to not do anything, now they will play idles correctly still.	2013-05-27 03:24:41 -07:00
Marc Zinnschlag	86dd6d0847	Merge remote-tracking branch 'eroen/libcxx'	2013-05-27 10:27:31 +02:00
Marc Zinnschlag	fa63ebce78	Merge remote-tracking branch 'scrawl/master'	2013-05-27 10:19:02 +02:00
Marc Zinnschlag	bd8344b387	Merge remote-tracking branch 'torben/aiwander'	2013-05-27 10:16:37 +02:00
Torben Carrington	3b43ee751e	AI Execute Fix - May as well not create the object either to save extra time.	2013-05-26 19:54:59 -07:00
Torben Carrington	feb180724c	AI Execution Fix - Preiovusly AiExecute was being called even when in a menu, this was not correct behavior.	2013-05-26 19:33:45 -07:00
scrawl	3a6e54c4f5	Sell owned items in the cell	2013-05-27 02:18:36 +02:00
Torben Carrington	fd96d47fe4	AIWander Completed. Replicates vanilla as best possible, pathfinding needs fixing before this looks correct but once the pathfinding files are edited this will behave pretty much exactly as vanilla. Major credit to Hrnchamd for major research.	2013-05-26 11:30:42 -07:00
Torben Carrington	96daad7a22	AIWander - shortened some if statements and made super minor optimizations to others, now using proper GMST to load proper idlechance instead of hacky set value."	2013-05-26 09:31:56 -07:00
Torben Carrington	e37324b967	AIWander everything works. only two things to do: Implement limiting selection on z axis, and correcting decision algorithm.	2013-05-26 08:49:44 -07:00
eroen	2850032d9e	libc++ fixes: avcodec/avformat workaround ... With libc++, string includes stdint.h, which breaks the fragile avformat.h workaround, which depends on __STDC_CONSTANT_MACROS being defined before stdint.h is included. Moving the string inclusion after that eyesore shouldn't break anything.	2013-05-26 12:01:01 +02:00
Marc Zinnschlag	5fac75845c	Merge remote-tracking branch 'torben/aiescortclean'	2013-05-25 15:35:56 +02:00
Torben Carrington	ddf28ca201	AIEscort Cleanup - Fixed spacing, removed unnecessary includes, fixed branch itself. The other pull requests were fine, it was just this one with the problem.	2013-05-25 04:36:21 -07:00
Marc Zinnschlag	94474e8952	Merge remote-tracking branch 'torben/checkidlecomplete'	2013-05-25 12:35:34 +02:00
Marc Zinnschlag	81cd1c6e30	Merge remote-tracking branch 'torben/aitravelcleanup'	2013-05-25 12:35:00 +02:00
Torben Carrington	c8c1ddd927	Adds functionality for checking if the animation group passed is currently playing on the actor passed. This is needed for AIWander.	2013-05-24 20:10:07 -07:00
scrawl	1e7cf4ae1c	GLES2 experiment	2013-05-25 04:15:24 +02:00
Torben Carrington	56b1384c90	AITravel Cleanup - Removed unnecessary includes and other varius cleanups.	2013-05-24 18:16:35 -07:00
riothamus	d9350be8da	Console Object Selection Fix	2013-05-24 09:31:56 -04:00
Marc Zinnschlag	b1a8dc35e0	minor adjustments	2013-05-24 15:03:46 +02:00
Marc Zinnschlag	62479cd885	Merge remote-tracking branch 'torben/aiwanderrepeat'	2013-05-24 14:58:10 +02:00
Torben Carrington	1cfe037d6b	AIWander - Added support for the Repeat parameter to mimic vanilla.	2013-05-24 04:49:20 -07:00
scrawl	32e90bb733	Fix chargen statssheet	2013-05-23 17:28:45 +02:00
Marc Zinnschlag	2d894fde57	Merge remote-tracking branch 'riothamus/riothamus-b788' into openmw24	2013-05-23 16:08:58 +02:00
riothamus	7187f50c40	Bug 788	2013-05-23 09:13:21 -04:00
Miroslav Puda	00866ef246	Merge branch 'master' of https://github.com/zinnschlag/openmw into esmtool_plain_script	2013-05-22 20:25:47 +02:00
Miroslav Puda	8a9ddcaa32	Plain output moved at the end of records output.	2013-05-22 20:24:23 +02:00
Miroslav Puda	d3d5cb4edf	New command line option --plain to print contents of scripts, books, dialogs.	2013-05-22 20:09:11 +02:00
Marc Zinnschlag	c40e753ea9	Merge remote-tracking branch 'pakanek/master'	2013-05-22 14:07:49 +02:00
Marc Zinnschlag	6d0b8f7bc8	added missing include	2013-05-22 10:14:12 +02:00
Miroslav Puda	3cebb41459	missing break	2013-05-21 21:04:15 +02:00
Edmondo Tommasina	f0482dd796	dialogue.cpp: fix build error "‘bind’ is not a member of ‘boost‘" ... /var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp: In constructor ‘MWGui::DialogueWindow::DialogueWindow()’: /var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp:271:44: error: ‘bind’ is not a member of ‘boost’	2013-05-20 23:51:01 +02:00
Marc Zinnschlag	5d4c311de7	Merge remote-tracking branch 'scrawl/master'	2013-05-20 15:01:25 +02:00
scrawl	d3effdf34c	Fix exception when trying to equip a shield while a lockpick is equipped	2013-05-20 13:32:38 +02:00
scrawl	d9dd02c610	Security fixes	2013-05-20 12:42:11 +02:00
Marc Zinnschlag	c1ceb32b28	Merge remote-tracking branch 'scrawl/master'	2013-05-20 12:10:51 +02:00
scrawl	2715520d6f	Cleanup Security class	2013-05-19 23:19:48 +02:00
scrawl	5173779f4b	Add sounds for security skill	2013-05-19 19:48:51 +02:00
scrawl	7a2d1cd8ce	Security skill	2013-05-19 18:40:37 +02:00
Marc Zinnschlag	c626e2b257	Merge branch 'ref' ... Conflicts: apps/opencs/view/doc/view.hpp	2013-05-19 14:59:01 +02:00
Marc Zinnschlag	ca33d66ed9	added missing columns for weapon records	2013-05-19 14:44:41 +02:00
Marc Zinnschlag	2123900db5	added missing columns for NPC records	2013-05-19 13:53:47 +02:00
scrawl	c7805e7dd2	Fix sun glare persisting after changing to an interior cell	2013-05-18 23:10:37 +02:00
scrawl	4983d08fe4	Fix a problem with statics disappearing sometimes on the map ... Ogre::StaticGeometry doesn't seem to like materials being changed at runtime. It stores raw pointers to Ogre::Technique objects also, which conflicts with shiny's way of managing "unloaded" materials as having zero techniques. If a static geometry object is baked from an unloaded material, it won't find any techniques to use and can't render. By moving the unload call afterwards, it will be detected as in use by a renderable and won't be unloaded. Ideally this needs fixing of Ogre::StaticGeometry to not hold on to Technique objects (they also currently need to be rebuilt whenever user settings are changed, which also causes "unloading" of materials)	2013-05-18 22:55:30 +02:00
Marc Zinnschlag	8d78bea4aa	added missing column for misc record	2013-05-18 18:55:23 +02:00
Marc Zinnschlag	862e568f9b	added missing columns for Light record	2013-05-18 18:46:41 +02:00
scrawl	60563afc10	Fix a new game crash, reset camera	2013-05-17 22:53:43 +02:00
Chris Robinson	53d1c3939c	Merge remote-tracking branch 'zini/master' into animations	2013-05-17 06:26:34 -07:00
Chris Robinson	e8bbb755c3	Play the left-arm torch animation when it's equipped	2013-05-17 06:21:59 -07:00
Marc Zinnschlag	749fd418b5	added missing columns for door record	2013-05-17 15:10:41 +02:00
Marc Zinnschlag	e2b8f9ea6d	Merge remote-tracking branch 'scrawl/master'	2013-05-17 14:37:41 +02:00
scrawl	d096b19307	Fix not being able to equip arrows/bolts	2013-05-17 14:11:19 +02:00
scrawl	3cadb5918f	Fix containers showing random items from my commit earlier	2013-05-17 14:11:02 +02:00
Chris Robinson	ee585046ac	Don't show weapons in first-person	2013-05-17 01:56:16 -07:00
Chris Robinson	4b9a888d74	Use the PickProbe animation group as appropriate	2013-05-17 01:46:51 -07:00
Marc Zinnschlag	f8c675a638	Merge remote-tracking branch 'graffy76/usersettings'	2013-05-17 10:24:52 +02:00
graffy76	3ce35e691c	Commented out sample editor settings page	2013-05-16 20:43:05 -05:00
Marc Zinnschlag	cc42b1ef48	Merge remote-tracking branch 'riothamus/riothamus-b752'	2013-05-16 20:07:48 +02:00
riothamus	d89dbde940	Bug 752, spacing fix	2013-05-16 14:05:22 -04:00
Marc Zinnschlag	ef9abda754	Merge remote-tracking branch 'glorf/weather'	2013-05-16 19:53:28 +02:00
Marc Zinnschlag	9fe5ff46cd	Merge remote-tracking branch 'riothamus/riothamus-b752'	2013-05-16 19:52:14 +02:00
riothamus	36f1197b51	Bug 752, cleanup	2013-05-16 13:51:54 -04:00
Glorf	19ce233667	Workaround for MOC compiler problem	2013-05-16 19:46:04 +02:00
riothamus	db981a72fe	Bug 752	2013-05-16 13:40:00 -04:00
Marc Zinnschlag	2c8a511179	Merge remote-tracking branch 'scrawl/persistence'	2013-05-16 19:37:41 +02:00
scrawl	8a3d3f954b	NPC/creature persistence flag	2013-05-16 18:50:26 +02:00
Marc Zinnschlag	54f56b0515	Merge remote-tracking branch 'graffy76/usersettings' ... Conflicts: apps/opencs/view/doc/view.cpp apps/opencs/view/doc/view.hpp	2013-05-16 18:04:55 +02:00
graffy76	13242c2bd5	Eliminated code centering the initial view in the middle of the screen	2013-05-16 10:14:13 -05:00
Marc Zinnschlag	889a87982e	added missing columns for creatures	2013-05-16 16:27:33 +02:00
Chris Robinson	6201cb0093	Add a method to clear the animation queue	2013-05-16 06:59:41 -07:00
Glorf	af28be915f	Use fallback video name	2013-05-16 13:47:27 +02:00
Glorf	0539ca6a9c	Bugfix #778	2013-05-16 13:35:28 +02:00
Chris Robinson	6c6200efef	Merge remote-tracking branch 'zini/master' into animations	2013-05-15 16:34:51 -07:00
Marc Zinnschlag	9fee99d56c	Merge remote-tracking branch 'scrawl/master'	2013-05-15 22:43:00 +02:00
scrawl	aaa9aba999	Some fixes	2013-05-15 22:38:53 +02:00
scrawl	c41f119ba6	Added new game button	2013-05-15 17:54:18 +02:00
Marc Zinnschlag	d794a62d19	added missing columns for container record	2013-05-15 17:02:34 +02:00
Chris Robinson	71d39c2fa0	Merge remote-tracking branch 'zini/master' into animations	2013-05-15 06:36:06 -07:00
Chris Robinson	e069215583	Don't clear the last queued animation when it stops	2013-05-15 06:32:20 -07:00
Marc Zinnschlag	28f2a7d2b4	added missing column for clothing records	2013-05-15 11:37:46 +02:00
Chris Robinson	66f55b3178	Play the item up/down sound when readying/unreadying weapons	2013-05-15 01:45:47 -07:00
Chris Robinson	b459a010b0	Fix vec.z being applied while not in the air	2013-05-14 23:03:28 -07:00
Chris Robinson	3c5c10144a	Remove a duplicate showWeapons call	2013-05-14 19:38:57 -07:00
Marc Zinnschlag	56b2b05f9a	Merge remote-tracking branch 'glorf/weather'	2013-05-14 22:56:26 +02:00
Glorf	39c7bc8363	Corrected celestical object sizes	2013-05-14 20:34:40 +02:00
Glorf	9fa2dd5277	Playing with moons part 2	2013-05-14 19:58:08 +02:00
Chris Robinson	e8661794fe	Avoid trying to find a state for non-actors. ... They're only ever play idles, unless PlayGroup is called.	2013-05-14 07:29:07 -07:00
Marc Zinnschlag	eba9d3e3ee	added missing columns for book record	2013-05-14 14:40:06 +02:00
Marc Zinnschlag	fce9939f83	added missing columns for armor record	2013-05-14 14:33:34 +02:00
Marc Zinnschlag	7c57f2c221	added AI-related actor columns	2013-05-14 13:20:59 +02:00
Chris Robinson	355f653614	Use AnimationAlloc instead of AnimationAllocatedObject	2013-05-14 01:30:01 -07:00
Chris Robinson	47a9a4cdff	Clean up a for loop	2013-05-14 01:29:15 -07:00
scrawl	96e3b3b7c2	Fix a compile error, OGRE_NEW only works for classes derived from AllocatedObject	2013-05-13 21:03:53 +02:00
Marc Zinnschlag	d684120f7a	Merge remote-tracking branch 'scrawl/master'	2013-05-13 20:47:50 +02:00
scrawl	ac4fa1941d	Fix the frame update not getting called on the first frame	2013-05-13 20:08:12 +02:00
Marc Zinnschlag	74d791e207	fixed auto calc column	2013-05-13 14:07:31 +02:00
Marc Zinnschlag	897e55391d	added columns for tool IDs	2013-05-13 13:36:24 +02:00
Marc Zinnschlag	52d81dc9fa	added columns for enchantments	2013-05-13 13:11:43 +02:00
Chris Robinson	822f130f79	Merge remote-tracking branch 'zini/master' into animations	2013-05-13 04:09:56 -07:00
Chris Robinson	8ec722ac92	Use std::find_if instead of ugly for loops	2013-05-13 04:08:36 -07:00
Marc Zinnschlag	90bae2bead	do not create editors for unused columns	2013-05-13 12:55:28 +02:00
Marc Zinnschlag	929b38ff6a	added missing columns for apparati records	2013-05-13 12:51:27 +02:00
Chris Robinson	f83ee5d316	Play ready/unready animations on the upper body	2013-05-13 03:32:00 -07:00
Torben Carrington	4d10a1c407	Fixed an additional 0 being sent into the AIWander idle parameters vector (Thanks to Chris)	2013-05-13 02:57:52 -07:00
Marc Zinnschlag	af191c7382	fixed AiWander arguments	2013-05-13 11:27:36 +02:00
Chris Robinson	a9928bb842	Split up the UpperBody group ... Also recognize the [un]equip start and stop text keys.	2013-05-13 02:09:22 -07:00
Chris Robinson	70dc2f77ad	Move the priority enum to MWMechanics	2013-05-13 00:54:44 -07:00
Chris Robinson	7ba2508556	add a priority for death animations, and store it in the state list	2013-05-12 19:19:21 -07:00
graffy76	c71d921f09	Moved signalUpdateEditorSettings from UserSettingsDialog to ... UserSettings. UserSettings is now derived from QObject.	2013-05-12 15:15:57 -05:00
graffy76	144be59735	Changed enum names to match OpenMW naming conventions	2013-05-12 14:28:36 -05:00
Marc Zinnschlag	7fd277b87a	added missing column for potions	2013-05-12 15:50:29 +02:00
Chris Robinson	4e389b5a8f	Store whether a given animation loops in the state table	2013-05-12 05:59:39 -07:00
Chris Robinson	bbb38c61cc	Fix queued animations	2013-05-12 05:08:01 -07:00
Chris Robinson	3988866ecd	Make sure active groups are updated after a state is auto-disabled	2013-05-12 04:34:37 -07:00
Chris Robinson	2c556e4036	Be smarter about handling non-moving animations ... Don't rely on being told by the play method, so the animation can automatically change without impacting the character controller.	2013-05-12 04:29:42 -07:00
Marc Zinnschlag	9835c6df11	Merge remote-tracking branch 'scrawl/tradefix'	2013-05-12 12:58:32 +02:00
Chris Robinson	4ea347ac52	Use shared pointers to store animation sources ... This ensures references to the sources stay valid as long it the object is, rather than becoming invalidated whenever one is added or removed.	2013-05-11 19:38:23 -07:00
graffy76	88df3b980f	Implemented UserSettings as a singleton.	2013-05-11 20:55:36 -05:00
scrawl	b56d50287e	Barter mechanic fix	2013-05-11 22:56:36 +02:00
Marc Zinnschlag	e14cb6853f	Merge remote-tracking branch 'scrawl/containerui'	2013-05-11 19:23:02 +02:00
Marc Zinnschlag	da92921387	added columns related to items in inventories	2013-05-11 19:21:16 +02:00
Marc Zinnschlag	ee2bc94698	added script column	2013-05-11 18:57:23 +02:00
Marc Zinnschlag	e24ecfd5d2	added name column	2013-05-11 18:43:16 +02:00
scrawl	0c4a963132	Container UI rewrite	2013-05-11 18:38:27 +02:00
Marc Zinnschlag	318ebe0cb6	added model column	2013-05-11 18:35:48 +02:00
Marc Zinnschlag	8ef2d04007	added type column	2013-05-11 17:49:38 +02:00
Marc Zinnschlag	c22f773f72	load all types of referenceable IDs	2013-05-11 17:45:28 +02:00
Marc Zinnschlag	d715cf5431	replaced static adapter with a template	2013-05-11 17:34:18 +02:00
Marc Zinnschlag	9426eda47a	small test with statics and two columns	2013-05-11 17:01:16 +02:00
Marc Zinnschlag	02ace69511	fixed RefID search	2013-05-11 16:55:10 +02:00
graffy76	d0b23a4786	Relocated "User Settings" to Edit->Preferences ... Removed <QDebug> reference from view.hpp	2013-05-11 07:40:10 -05:00
graffy76	a8b45e0a13	Three primary changes: ... 1. Declared QStringPair::isEmpty() const 2. Split the CsSettings namespace into two: CSMSettings and CSVSettings. (Required splitting the support.hpp file) 3. Declared several classes as _noqt in CMakeLists.txt for OpenCS	2013-05-11 05:55:46 -05:00
Chris Robinson	6b8a687a79	Add methods to disable an animation ... And rename WeaponState to WeaponType	2013-05-10 22:22:39 -07:00
Chris Robinson	6605aa7dec	Create three bone groups ... This still won't work as expected. Currently there is only one priority level, and only one animation state per priority level can be active at a time. It's close, though.	2013-05-10 20:45:09 -07:00
Chris Robinson	abc676eedd	Allow specifying which bone groups to play an animation on	2013-05-10 20:05:09 -07:00
Chris Robinson	56eede2610	Search more aggressively for an animation velocity	2013-05-10 19:31:33 -07:00
Chris Robinson	5a9c1e1245	Don't explicitly track the last position	2013-05-10 18:58:14 -07:00
Chris Robinson	7c3b014193	Figure out which animations to play based on priority ... Bone group will also be taken into account later.	2013-05-10 18:37:44 -07:00
Chris Robinson	921f534980	Parameterize the number of bone groups	2013-05-10 16:35:43 -07:00
Chris Robinson	8a9b0eb5f7	Store the AnimSource in the animation state	2013-05-10 15:27:29 -07:00
Glorf	6aaa8d6dc0	Fixed fading problem	2013-05-10 19:33:43 +02:00
Glorf	9cc85cbe81	Playing with moons part 1	2013-05-10 18:55:56 +02:00
graffy76	8d0f350446	New file structure separating view classes from model classes. Deleted ... .ui file.	2013-05-10 10:00:58 -05:00
Chris Robinson	58efce5008	Rename animation layers to animation states	2013-05-10 04:01:30 -07:00
Chris Robinson	ccff364b52	Use a map of active layers instead of an array ... A bit of an upheaval. Each animation is now a "layer", instead of each layer having an animation. Incidentally, this is much closer to how Ogre handles animation states. In the future, each layer will have a priority, which will be used to determine which one affects a given bone group (which we currently only have one of).	2013-05-10 03:08:07 -07:00
kpp	24d619d6b4	Changes the logic of WindowManager::messageBox() ... Fixes removeItem Fixes addItem	2013-05-10 14:06:25 +04:00
Chris Robinson	d5490b0f8f	Fix an outdated comment	2013-05-09 23:07:50 -07:00
Chris Robinson	74ed1f73b4	Merge remote-tracking branch 'zini/master' into animations	2013-05-09 13:53:38 -07:00
Marc Zinnschlag	5c99f15ad3	Merge remote-tracking branch 'torben/aiescort'	2013-05-09 14:27:22 +02:00
Glorf	6417fa504e	Fixed constness	2013-05-09 13:56:13 +02:00
Torben Carrington	4928c9d079	Removed sqrt function call (minor optimization thanks to Chris)	2013-05-08 20:47:31 -07:00
Torben Carrington	d20178dd56	Removed unnecessary std::cout messages	2013-05-08 20:05:45 -07:00
Torben Carrington	133964f0e4	AIEscort complete	2013-05-08 20:02:24 -07:00
Torben Carrington	c03dca47f5	AIEscort implemented and working - only touchups are needed.	2013-05-08 17:19:47 -07:00
Glorf	c605f15a15	Another weather cleanup	2013-05-09 00:36:58 +02:00
Torben Carrington	10840765d9	Framework - duration and pathing implemented, no waiting for follower yet.	2013-05-08 15:27:20 -07:00
Marc Zinnschlag	51067698a8	minor cleanup	2013-05-08 21:26:39 +02:00
Marc Zinnschlag	c80ffa0a16	Merge remote-tracking branch 'gus/AIFix'	2013-05-08 20:31:57 +02:00
scrawl	90b7df439f	Fix image buttons	2013-05-08 13:55:15 +02:00
graffy76	cb9c82324c	UserSettings system	2013-05-07 20:36:34 -05:00
graffy76	f6203cac2a	update for master	2013-05-07 20:33:42 -05:00
Chris Robinson	8e38dc410f	Allow loading multiple animation sources ... Animation sources are treated differently from base objects. When given "path\file.nif", base objects will look for "path\xfile.nif" and use that if it exists (falling back to the original name if not found). Animation sources will instead use "path\xfile.kf", ignoring it if the file doesn't exist.	2013-05-07 16:59:32 -07:00
gus	603af21715	little interface improvement	2013-05-07 19:42:21 +01:00
gus	a328a03bd3	more fix. Fargoth quest almost work as in vanilla now.	2013-05-07 19:35:10 +01:00
scrawl	301efb411e	Fix exit crash	2013-05-07 19:15:28 +02:00
scrawl	8845c0cee1	Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera.	2013-05-07 17:38:24 +02:00
Marc Zinnschlag	0f29ab8cf9	fixed the interface of the adapter class	2013-05-07 14:19:02 +02:00
Marc Zinnschlag	f7f56a1a1f	added a RefIdCollection to Data	2013-05-07 11:23:18 +02:00
Glorf	68f249e8f4	Small weather cleanup	2013-05-07 10:27:37 +02:00
Chris Robinson	e85bc8b2cd	Only load one Nif for Animation objects ... This breaks quite a bit, but it's needed for the transition to using the .kf files.	2013-05-06 23:11:26 -07:00
Chris Robinson	6a3ba41170	Don't store camera nodes, we don't need them.	2013-05-06 21:46:11 -07:00
Chris Robinson	90e29c83c0	Merge remote-tracking branch 'zini/master' into animations ... Conflicts: apps/openmw/mwmechanics/character.cpp	2013-05-06 19:17:39 -07:00
scrawl	007a3cf9bd	rename IInterface to Interface	2013-05-06 16:05:56 +02:00
scrawl	b5071ced23	Removed using namespace	2013-05-06 16:04:28 +02:00
scrawl	757a26794a	Merge branch 'master' of https://github.com/zinnschlag/openmw into journal	2013-05-06 15:35:38 +02:00
scrawl	c6edb0288a	Remove unused file	2013-05-06 15:30:23 +02:00
scrawl	1315432322	Handle @# links in journal	2013-05-06 15:14:39 +02:00
Marc Zinnschlag	e9f1aac7bd	added data structures for referenceable records	2013-05-06 14:11:55 +02:00
scrawl	d43adbaa7c	Topic link fixes for russian version, thanks to greye for testing	2013-05-06 13:13:14 +02:00
scrawl	166eac2e25	Cleanup	2013-05-06 11:31:34 +02:00
gus	006f25d1c0	First try to improve AI. Does not work yet due to strange bug in physicsystem	2013-05-06 00:46:50 +01:00
scrawl	38c399a698	Fix duplicate sounds	2013-05-05 10:51:17 +02:00
scrawl	062ff189a2	Merge branch 'master' into memory	2013-05-04 23:04:33 +02:00
scrawl	0f2866dc15	Text replace fix	2013-05-04 18:49:51 +02:00
scrawl	48c5e33c79	Fix a limitation of the keyword search. It can now highlight keywords that have longer child variations correctly.	2013-05-04 17:40:00 +02:00
scrawl	a33e6b9c35	Fast forward to the last page in the journal when opening it	2013-05-04 16:06:48 +02:00
scrawl	d16bb26a48	Added text colors, goodbye, message	2013-05-04 15:15:44 +02:00
scrawl	f07497bbde	Fix lockup	2013-05-04 14:18:13 +02:00
scrawl	78e6dab9d2	Dialogue history rewrite WIP	2013-05-04 14:15:47 +02:00
scrawl	6cd28d1156	Fix a bug in getPCNextRank	2013-05-04 12:28:12 +02:00
scrawl	0bb51fd91d	Retrieve the correct case for topics in the journal	2013-05-03 22:53:29 +02:00
scrawl	1f58edb9db	Merge branch 'master' of https://github.com/zinnschlag/openmw into journal	2013-05-03 18:17:27 +02:00
gus	7fe7111c19	Fargoth quest almost works. There is still a sall problem as the path taken is not exactly the same. I need to copy the exact way morrowind do pathfinding...	2013-05-03 17:09:09 +01:00
Marc Zinnschlag	2e6594f8f7	Merge remote-tracking branch 'glorf/bugfix-5'	2013-05-03 14:55:00 +02:00
scrawl	75dcf52552	Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made)	2013-05-03 13:55:57 +02:00
Glorf	517dfb4d75	Bugfix #732 part 2	2013-05-03 13:24:34 +02:00
Marc Zinnschlag	13e7abd7df	added assign function to Record class	2013-05-03 12:52:45 +02:00
Glorf	57f22c77c0	Bugfix #732 part 1	2013-05-03 12:44:27 +02:00
greye	a8b1706678	init pointer value to prevent segfault	2013-05-03 10:51:42 +04:00
kpp	dcccfd9f22	Initialize values	2013-05-02 22:43:21 +04:00
Marc Zinnschlag	1b84aeb5b9	fixed a problem with editing records that do not exist in base	2013-05-02 14:30:39 +02:00
kpp	28ef4d97da	Fixes Bug #734 'Book empty line problem' ... Hides buttons 'Next' and 'Prev' at the last and at the first page	2013-05-02 07:35:25 +04:00
Chris Robinson	03a6190c5a	Merge remote-tracking branch 'zini/master' into animations	2013-05-01 10:20:42 -07:00
Chris Robinson	a120653c38	Implement handling weapon states	2013-05-01 10:19:16 -07:00
Marc Zinnschlag	d5741c7141	Merge remote-tracking branch 'scrawl/master'	2013-05-01 16:58:43 +02:00
Marc Zinnschlag	95eeea2a27	Revert "Merge remote-tracking branch 'glorf/acrobatics'" ... This reverts commit 089ef7a2a0, reversing changes made to 67422c397c.	2013-05-01 16:56:16 +02:00
Marc Zinnschlag	f8a331f173	fixed a bad cast	2013-05-01 16:49:34 +02:00
scrawl	1acfd849a2	Fix a case folding bug	2013-05-01 16:38:16 +02:00
Marc Zinnschlag	6f0ccb6e38	Merge remote-tracking branch 'scrawl/insertrecords'	2013-05-01 13:55:26 +02:00
Marc Zinnschlag	089ef7a2a0	Merge remote-tracking branch 'glorf/acrobatics'	2013-05-01 13:44:23 +02:00
scrawl	40a0969055	Insert records that may not exist in vanilla MW	2013-05-01 12:47:50 +02:00
Glorf	b8630239d7	Code cleanup	2013-05-01 12:25:02 +02:00
Glorf	236ec3409f	Finished acrobatics	2013-05-01 12:21:59 +02:00
scrawl	67422c397c	GetWindSpeed	2013-05-01 11:42:24 +02:00
scrawl	5063d90dda	GetStartingAngle was implemented, but not registered	2013-05-01 11:22:46 +02:00
scrawl	627c3fdb6b	Added GetStandingPC, GetStandingActor; Fixed GetStartingPos	2013-05-01 11:15:43 +02:00
scrawl	3c68c87923	Fix some naming guidelines, fix topic index exception, fix exception in keyword search for some journal entries	2013-05-01 10:28:59 +02:00
scrawl	8bc59f8fe6	Merge branch 'master' into journal	2013-05-01 08:27:42 +02:00
Chris Robinson	d01351431c	Merge remote-tracking branch 'zini/master' into animations	2013-04-30 19:27:55 -07:00
Chris Robinson	4b15da076b	Move getStateInfo into the character controller	2013-04-30 19:26:41 -07:00
Glorf	d30e43784a	Fatigue decrease when jumping, live decrease when falling	2013-04-30 23:39:56 +02:00
Glorf	5a8c1661be	Jump acrobatics working, started falling acrobatics implementation	2013-04-30 20:44:17 +02:00
scrawl	1420a2cb33	Tweaked adjustPosition. Now uses a very thin box for tracing the feet only.	2013-04-30 20:43:38 +02:00
scrawl	91c89e5db4	Use sphere cast instead of ray for camera distance adjustment; use the box orientation value in newtrace	2013-04-30 20:26:59 +02:00
Glorf	add3cd6456	Advance acrobatics on jump	2013-04-30 18:22:59 +02:00
scrawl	2a42556aa5	Merge branch 'master' into HEAD	2013-04-30 14:54:10 +02:00
Marc Zinnschlag	61e476118d	Merge remote-tracking branch 'kcat/animations'	2013-04-30 10:25:26 +02:00
Marc Zinnschlag	2cb7e1f3d5	Merge remote-tracking branch 'glorf/bugfix-4'	2013-04-30 10:24:02 +02:00
scrawl	c0dd383cd0	Fix door collision to work with all possible movement directions	2013-04-30 09:43:32 +02:00
Chris Robinson	05060e57ec	Add a weapon state to the character controller	2013-04-29 13:07:49 -07:00
Glorf	d283f8d85f	Bugfix #748	2013-04-29 21:19:13 +02:00
Chris Robinson	020e3e8a8e	Show the equipped weapon in the inventory screen ... And use the proper pose based on what's equipped.	2013-04-29 12:08:43 -07:00
Chris Robinson	854de1c6c1	Make sure the weapon is in the proper group	2013-04-29 11:43:37 -07:00
Chris Robinson	15a2eeebb8	Merge remote-tracking branch 'zini/master' into animations ... Conflicts: apps/openmw/mwworld/worldimp.cpp	2013-04-29 10:16:29 -07:00
Chris Robinson	063322b081	Declare some variables closer to where they're used	2013-04-29 10:12:50 -07:00
Chris Robinson	0cf531ba12	Make sure to update parts when the weapon changes	2013-04-29 09:53:36 -07:00
Marc Zinnschlag	93868c8bca	Merge remote-tracking branch 'scrawl/master'	2013-04-29 18:08:25 +02:00
Marc Zinnschlag	bab899513a	Merge remote-tracking branch 'glorf/bugfix-4'	2013-04-29 18:04:22 +02:00
Glorf	74de8b83b6	Enabled collision when new game	2013-04-29 17:56:16 +02:00
Marc Zinnschlag	236751ec45	some IdCollection and IdTable cleanup	2013-04-29 17:52:01 +02:00
Chris Robinson	a15758ac85	Fix preview and vanity cameras	2013-04-29 08:48:45 -07:00
Glorf	6222b3f52a	Bugfix #744	2013-04-29 17:19:20 +02:00
Chris Robinson	d17e1e83d5	Rename MWRender's Player to Camera	2013-04-29 05:50:40 -07:00
Chris Robinson	dbba126344	Use a method to check if the view should be first person	2013-04-29 04:40:28 -07:00
Chris Robinson	bb8277920b	Manage the player's NpcAnimation object in the RenderingManager ... It may be more appropriate to manage it in MWRender::Actors with the other Animation-based objects, but that will need some (minor) interface changes.	2013-04-29 03:31:46 -07:00
scrawl	6c5ea1ea7a	Fix incorrect weapon health meter for fully repaired weapons, fix exception when equipping lockpicks or probes	2013-04-29 12:05:10 +02:00
scrawl	5ff098b8fb	Fix quick keys being triggered when in UI mode	2013-04-29 11:55:30 +02:00
scrawl	867c7db014	Fix wrong door sounds	2013-04-29 11:00:15 +02:00
scrawl	9648804af5	Fix terrain material leak, this should in theory allow the terrain to free its temporary resources	2013-04-29 10:20:38 +02:00
scrawl	78596cad83	Fix enchantment points value	2013-04-29 10:19:09 +02:00
Chris Robinson	ba3a67f84b	Don't store the player base node in MWRender::Player	2013-04-28 23:44:44 -07:00
Chris Robinson	24e503330b	Merge remote-tracking branch 'zini/master' into animations	2013-04-28 09:41:31 -07:00
Marc Zinnschlag	11a45b3034	Merge remote-tracking branch 'scrawl/doors'	2013-04-28 18:22:09 +02:00
scrawl	67e5e939a1	Fix some doors	2013-04-28 17:57:36 +02:00
Marc Zinnschlag	f2a5377b2b	Merge remote-tracking branch 'glorf/bugfix-4'	2013-04-28 16:52:48 +02:00
Marc Zinnschlag	116ac05677	Merge remote-tracking branch 'scrawl/doors'	2013-04-28 16:44:11 +02:00
Glorf	98baf9fac1	Bugfix #718	2013-04-28 16:36:12 +02:00
scrawl	6ecd88af14	More fixes	2013-04-28 15:59:59 +02:00
scrawl	4ee1a6ee02	Put door physics in a separate method, some fixes	2013-04-28 15:36:37 +02:00
Marc Zinnschlag	cd61177eed	Merge remote-tracking branch 'gus/renderWeaponShield'	2013-04-28 15:00:47 +02:00
scrawl	9343b4459e	Opening doors	2013-04-28 14:59:15 +02:00
Marc Zinnschlag	a6b7f8e904	Merge remote-tracking branch 'scrawl/fall'	2013-04-28 14:14:10 +02:00
Marc Zinnschlag	93c98e1df4	Merge remote-tracking branch 'scrawl/athletics'	2013-04-28 14:11:12 +02:00
Marc Zinnschlag	738a54337d	removed redundant case smashing	2013-04-28 14:07:53 +02:00
gus	3d9ceede77	little fix (weapons disapeared when tab was pressed)	2013-04-28 12:33:41 +01:00
gus	5388c25e64	Fix or lockpicks.	2013-04-28 11:55:50 +01:00
gus	766d1efa84	Render weapon and shield. Only shield can be seen right now as weapons need to be drawed out.	2013-04-28 11:41:01 +01:00
scrawl	7d61459ccd	Added stub implementation for 'Fall'. There is no use for this function because our physics controller applies gravity constantly anyway.	2013-04-28 11:13:21 +02:00
scrawl	fdf80c1c4f	Fix unused variable	2013-04-28 11:05:01 +02:00
scrawl	db78d15fc4	Fix changeWeather	2013-04-28 11:02:30 +02:00
Chris Robinson	ce7bc20fa1	Avoid special-casing player rotation	2013-04-28 01:14:58 -07:00
scrawl	07891fa213	Athletics skill increase	2013-04-28 07:53:04 +02:00
Glorf	3669d0a998	Bugfix #742	2013-04-27 20:57:44 +02:00
Marc Zinnschlag	e7bf1d230c	fixed an indexing problem in IdCollection	2013-04-27 16:22:04 +02:00
Chris Robinson	ab52e68c05	Merge remote-tracking branch 'zini/master' into animations	2013-04-27 05:16:15 -07:00
Chris Robinson	137017b325	Don't allow forcing vanity mode	2013-04-27 01:24:36 -07:00
Glorf	ade871ce12	Corrected unused opcodes	2013-04-26 17:31:58 +02:00
Glorf	89f7ef2472	Move, moveworld script instructions	2013-04-26 17:28:19 +02:00
Marc Zinnschlag	32138dbb0f	silenced a warning	2013-04-26 13:33:47 +02:00
Chris Robinson	2822f431c4	Merge remote-tracking branch 'zini/master' into animations	2013-04-26 01:38:51 -07:00
Chris Robinson	b666f1d551	Work around a problem with MWRender::Player::renderPlayer ... NpcAnimation::setViewMode makes a call to the character controller, in the mechanics manager, to forcefully update the character's state. This in turn makes a call to the player's old NpcAniamtion object that was just deleted. The mechanics manager will eventually remove and reinsert the player, so the old character controller will be removed and a new one will get the right Animation object again, but not in time for the setViewMode call. There's many factors that all contribute to this run-around, which needs discussion on how to best fix.	2013-04-26 01:30:36 -07:00
Chris Robinson	55ee4e65a9	Clean up the slotlist struct	2013-04-25 23:42:20 -07:00
scrawl	7821610ec6	Make OnDeath work with explicit reference	2013-04-26 02:08:53 +02:00
scrawl	a373f53988	Added SetAtStart	2013-04-26 02:02:51 +02:00
Marc Zinnschlag	4e45222a63	Merge remote-tracking branch 'glorf/rotate-update1'	2013-04-25 20:57:24 +02:00
Glorf	240217ae42	Fixed rotations more than 360 degrees	2013-04-25 20:52:38 +02:00
Marc Zinnschlag	1e9656ee9c	Merge remote-tracking branch 'glorf/rotate-update1'	2013-04-25 20:22:40 +02:00
Marc Zinnschlag	2c1796cc74	Merge remote-tracking branch 'kcat/animations' into ref	2013-04-25 20:12:14 +02:00
Glorf	7cd4dd0c91	Improved local rotations	2013-04-25 19:14:10 +02:00
Chris Robinson	274f3c7b77	Force character state to update after switching view modes	2013-04-25 07:08:11 -07:00
Chris Robinson	e4eb4b7e30	Keep track of the character looping state	2013-04-25 06:29:17 -07:00
Chris Robinson	9da2c9153e	Don't store the animation group string in the character controller	2013-04-25 06:12:37 -07:00
Chris Robinson	849335d8cc	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-25 05:35:33 -07:00
Chris Robinson	2769adcee0	Implement switching to and from first-person animations ... Note that the current animation gets interrupted, so switching to first person may break movement until you stop and try to move again. This can be fixed by alerting the character controller in the mechanics manager to force a state update when switching POV.	2013-04-25 05:23:05 -07:00
Chris Robinson	9a2a32f2a5	Add a method to clear all Animation sources except the first ... The first needs to remain, since that's where any mSkelBase entity comes from, and where any retrieved nodes are from.	2013-04-25 05:02:11 -07:00
Chris Robinson	9be20b90f1	Fix potential infinite loop when layer 0 is empty	2013-04-25 03:35:40 -07:00
Marc Zinnschlag	08e2254628	Merge remote-tracking branch 'pvdk/spacefix'	2013-04-25 12:15:35 +02:00
pvdk	d5d14c5147	Fixes issue with multiple spaces in plugin filename not being read correctly	2013-04-25 11:04:12 +02:00
Chris Robinson	76c8e81908	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-25 01:35:21 -07:00
Marc Zinnschlag	247a76766d	fixed a typo in a doxygen comment	2013-04-25 10:27:43 +02:00
Marc Zinnschlag	71fc8f5830	Merge remote-tracking branch 'scrawl/item' into next	2013-04-25 10:21:14 +02:00
Chris Robinson	86fda1bff6	Only set mSkelBase from the first objectlist	2013-04-25 00:52:26 -07:00
Chris Robinson	7eac37be23	Make sure the old layer is cleared before starting the next	2013-04-25 00:18:02 -07:00
Chris Robinson	09fc50948b	Add methods to disable and get info for a layer	2013-04-25 00:08:16 -07:00
Chris Robinson	24f1eba902	Keep track of whether an animation supplies movement ... Also handle it when it doesn't.	2013-04-24 22:45:43 -07:00
Nathan Jeffords	7db6447a00	dropped the I infront of the journal view model interfaces	2013-04-24 21:53:25 -07:00
Nathan Jeffords	36a6806faf	drop the leading 'I' from the book page control interfaces	2013-04-24 21:44:29 -07:00
Nathan Jeffords	4c22afc29b	made a pass at conforming to established naming convention	2013-04-24 20:22:57 -07:00
Nathan Jeffords	c7ede9b523	port code to C++03	2013-04-24 20:22:57 -07:00
Nathan Jeffords	718af692c9	reworked journal to match bethesda's implemenation	2013-04-24 20:20:01 -07:00
Nathan Jeffords	f02a53b121	Created a helper class to format books for display from the journal ... view-model data.	2013-04-24 20:20:01 -07:00
Nathan Jeffords	50d688c2fc	Created a view-model to present journal data to the UI in the form it ... intends to display it.	2013-04-24 20:20:00 -07:00
Nathan Jeffords	55ca037411	Created a MyGUI widget to present a page of formatted text.	2013-04-24 20:20:00 -07:00
Nathan Jeffords	8dad04eef1	hid JournalWindow behind IJournalWindow interface, and put its entire ... implementation, class definition and all, into journalwindow.cpp	2013-04-24 20:20:00 -07:00
scrawl	9e3917881d	Don't fail on nonexistent items in a levelled list	2013-04-25 04:44:30 +02:00
Chris Robinson	0817d59f23	Allow specifying where to start in an animation	2013-04-24 19:09:36 -07:00
scrawl	933f894148	Added Blind and Night Eye effects	2013-04-25 02:31:51 +02:00
scrawl	baa7a9160c	Rank condition should always fail if NPC is not in a faction	2013-04-25 02:31:39 +02:00
scrawl	a7092ef2d7	Fix activation not working sometimes ... The current player cell was only being updated when the reference was not empty, causing it to incorrectly detect a cell change the first time something was activated in a newly visited cell, immediately closing the opened dialogue again.	2013-04-25 02:31:39 +02:00
Nathan Jeffords	2dc01fe56b	fixed the type of iterator uses in MWWorld::Store ... The containers type used to declare some iterators was not an exact match for the type of the container the iterator was being initialized from. This was causing build failure on windows.	2013-04-25 02:31:39 +02:00
scrawl	51580ead4f	Fix consecutive dialogue choices	2013-04-25 02:31:39 +02:00
Marc Zinnschlag	87ce2110dc	hotfix for CharacterPreview destructor	2013-04-25 02:31:38 +02:00
scrawl	cd57e3f896	Auto calculate attributes if there are not specified in the NPC record	2013-04-25 02:31:38 +02:00
Glorf	53fb17da10	Rotation system fixes	2013-04-24 21:42:04 +02:00
Chris Robinson	333354fe62	Remove the character controller from the Animation class	2013-04-24 07:10:41 -07:00
Chris Robinson	b80891099e	Don't use the character controller to handle text keys ... The Animation class has the Ptr and can call to whatever subsystem is needed.	2013-04-24 06:48:34 -07:00
Chris Robinson	e8cabc9434	Pass the loop count from loopgroup to the play method ... Instead of queueing each iteration separately.	2013-04-24 06:32:11 -07:00
Chris Robinson	b482d5be09	Add a method to check if a given layer is playing	2013-04-24 05:23:45 -07:00
Chris Robinson	c58dfbe921	Specify the loop count to Animation::play	2013-04-24 04:56:39 -07:00
Chris Robinson	7241267d5c	Make an AnimationValue for each animation layer	2013-04-24 04:41:52 -07:00
Chris Robinson	102b3bdef9	Update position by reference	2013-04-24 01:57:51 -07:00
Chris Robinson	9e05ee53da	Avoid looking for the controller if there is no NonAccum node ... Also, make sure there is a controller before updating the position.	2013-04-24 01:18:08 -07:00
Chris Robinson	544011e096	Fix 'start' text key fallback lookup	2013-04-24 00:40:58 -07:00
Chris Robinson	7e2995bc2f	Fix setting up active controllers	2013-04-23 19:43:26 -07:00
Chris Robinson	6a67a5e650	Merge remote-tracking branch 'zini/next' into nifogre	2013-04-23 16:57:48 -07:00
Chris Robinson	8c9e2e0ee9	Improve handling of reaching the stop animation text key	2013-04-23 05:34:08 -07:00
Chris Robinson	c4806f01f8	Use a separate list of controllers to update ... This should make it easier to figure out what controllers need to be updated for various animation sources and layers.	2013-04-23 04:08:09 -07:00
greye	cfccf0981d	update IndexedStore::setUp() for multiple datafile support	2013-04-23 14:36:38 +04:00
Chris Robinson	e4c5aac966	Keep track of the animation layers a given object list is animating on ... This only tracks layers they explicitly animate on. They may animate on other layers as well, if nothing else is animating on them.	2013-04-23 02:48:11 -07:00
Marc Zinnschlag	a17d17c191	added additional type argument to IdCollection::load	2013-04-23 11:22:07 +02:00
Marc Zinnschlag	808718d967	added referenceable record types to UniversalId	2013-04-23 11:21:21 +02:00
Marc Zinnschlag	afe7b3c64c	added additional type argument to IdCollection::appendBlankRecord	2013-04-23 10:56:55 +02:00
Chris Robinson	e378176937	Don't update controllers that have already been updated	2013-04-23 00:15:31 -07:00
Chris Robinson	8782ae6976	Separate some Animation fields into a separate AnimLayer class	2013-04-22 23:52:28 -07:00
Chris Robinson	c3ce49798a	Fix animation velocity calculation	2013-04-22 21:34:39 -07:00
Chris Robinson	7279e015e9	Search the textkeys to check if an animation group exists	2013-04-22 20:59:55 -07:00
Chris Robinson	a2fc43c7df	Use reset to check that the animation exists and has the right markers	2013-04-22 20:41:54 -07:00
Chris Robinson	507d72ede5	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-22 18:44:28 -07:00
Chris Robinson	bb64efc18e	Improve looping behavior	2013-04-22 05:08:52 -07:00
Chris Robinson	cc70c6263b	Use the NodeTargetValue for the NonAccum root	2013-04-22 04:10:46 -07:00
Chris Robinson	9485a4aa6d	Look through the whole animation stack to find the "velocity"	2013-04-22 01:40:41 -07:00
Marc Zinnschlag	29cb076113	Merge remote-tracking branch 'scrawl/rank'	2013-04-22 09:52:28 +02:00
Marc Zinnschlag	3fa35af796	Merge remote-tracking branch 'scrawl/master'	2013-04-22 09:52:24 +02:00
Chris Robinson	a7776e124c	Only set mNonAccumRoot from mSkelBase	2013-04-22 00:22:31 -07:00
Chris Robinson	a3511c62cf	Don't store textkeys in user object bindings ... It's a bit unwieldy to have them stored in the 'skeleton master' instead of the skeleton instance. And although the text keys are extracted for each created instance now, this shouldn't be much worse than the multimap copying going on before. Plus, proper serialization can help for future optimizations.	2013-04-22 00:01:30 -07:00
scrawl	56b871e362	Rank condition should always fail if NPC is not in a faction	2013-04-22 07:57:53 +02:00
Chris Robinson	2345b5e8b3	Avoid storing text keys for each animation	2013-04-21 22:56:40 -07:00
Chris Robinson	7d59340ed6	Don't clip out the group name from the textkeys	2013-04-21 22:13:49 -07:00
Chris Robinson	6c85d6763a	Pass "loop stop" to the character controller	2013-04-21 18:38:25 -07:00
Chris Robinson	d7c9df16f8	Store the current animation group	2013-04-21 18:32:34 -07:00
scrawl	8bf1149cec	Fix activation not working sometimes ... The current player cell was only being updated when the reference was not empty, causing it to incorrectly detect a cell change the first time something was activated in a newly visited cell, immediately closing the opened dialogue again.	2013-04-21 21:24:48 +02:00
Nathan Jeffords	19325f9d40	fixed the type of iterator uses in MWWorld::Store ... The containers type used to declare some iterators was not an exact match for the type of the container the iterator was being initialized from. This was causing build failure on windows.	2013-04-21 11:41:09 -07:00
Chris Robinson	835ff8eb1e	Avoid creating an AnimationValue per ObjectList	2013-04-20 17:13:27 -07:00
Chris Robinson	4122b0b55f	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-20 00:25:00 -07:00
scrawl	a8e3acd6c4	Fix consecutive dialogue choices	2013-04-19 17:57:22 +02:00
Marc Zinnschlag	f13b0c884f	hotfix for CharacterPreview destructor	2013-04-19 14:41:26 +02:00
Chris Robinson	50bb92beb3	Use a method to set the visibility flags and render queue.	2013-04-19 02:01:50 -07:00
Marc Zinnschlag	9c1e280614	Merge remote-tracking branch 'scrawl/master'	2013-04-19 00:23:24 +02:00
Chris Robinson	434f3ac8c8	Merge remote-tracking branch 'zini/next' into nifogre	2013-04-18 15:14:28 -07:00
scrawl	ef9afeb53e	Auto calculate attributes if there are not specified in the NPC record	2013-04-18 23:51:43 +02:00
Marc Zinnschlag	1b764e5d3c	Merge remote-tracking branch 'gus/AI'	2013-04-18 22:17:49 +02:00
Glorf	f9deb593d1	Bugfix #578	2013-04-18 21:37:58 +02:00
gus	c753eb4c28	another way to do pathfinding. Slightly less powerfull algorithme in theory, but morrowind pathgrids are so simple it shouldn't be a problem. Hope it solves the bug for KittyCat	2013-04-18 18:35:01 +01:00
scrawl	3c5e4ceefd	Workaround for ambiguous "Chargen_plank" ID in chargen script (one at -22,16 and one at -2,-9)	2013-04-18 16:46:32 +02:00
Chris Robinson	6d59325bff	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-17 23:21:17 -07:00
Britt Mathis	1dff1fabdb	Fixed race.cpp	2013-04-17 19:38:13 -04:00
Britt Mathis	7eee86ab66	No more using namespace	2013-04-17 18:56:48 -04:00
scrawl	c519fc360d	Move away from fixed record names for body parts	2013-04-18 00:19:34 +02:00
scrawl	0341a9e778	Fix a gcc 4.8 warning	2013-04-17 20:57:22 +02:00
scrawl	547f77031d	Fix crash when disabling objects in a previously loaded cell, then coming back to that cell and leaving again	2013-04-17 17:06:30 +02:00
Bret Curtis	c1ec16986b	add cmake fix for compiling with binutils >= 2.23 which requires explicit linking for dl<friends> and Xt	2013-04-17 12:04:05 +02:00
Marc Zinnschlag	5bbab1abd9	Merge remote-tracking branch 'galdor557/master'	2013-04-17 09:52:58 +02:00
Britt Mathis	60fadaeaf0	Cleaned up includes in implementation files	2013-04-16 20:16:22 -04:00
Glorf	e3a9f73eb6	Improved getangle script behaviour	2013-04-16 21:40:34 +02:00
Glorf	1fd59d0ce0	Removed useless include	2013-04-16 21:21:54 +02:00
Glorf	1e92ffc314	Added rotation layer	2013-04-16 21:17:19 +02:00
Chris Robinson	cac793758b	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-16 11:52:19 -07:00
Marc Zinnschlag	518cb0e3b7	added another abstraction layer to ID access in IdCollection	2013-04-16 12:12:04 +02:00
Chris Robinson	4ce98e9bd6	Store iterators for start and stop keys	2013-04-15 20:37:10 -07:00
Chris Robinson	1b1f9f7921	Allow multiple ObjectLists to be created for Animations. ... addObjectList may not currently be called outside of the related constructor.	2013-04-15 18:55:28 -07:00
Glorf	e0357c7b7c	Merge rotate	2013-04-15 20:29:38 +02:00
Glorf	763308868d	Fixed rotation speed	2013-04-15 17:45:18 +02:00
Glorf	972481f63f	Working rotate, rotateworld	2013-04-15 16:45:53 +02:00
scrawl	7fcaffefb0	Fixed travel window to use the rotation part of ESM::Position	2013-04-15 03:13:25 +02:00
Chris Robinson	69084139aa	Use an array of objectlists, instead of one base objectlist and an array of 'animation sources'	2013-04-14 17:58:21 -07:00
scrawl	2693b78536	Add initial player inventory when new game is started	2013-04-15 02:56:23 +02:00
Chris Robinson	f9dee25fd1	Store the base skeleton entity in MWRender::Animation	2013-04-14 16:56:35 -07:00
Glorf	4e0233cf06	Base local rotations implementation	2013-04-14 21:42:37 +02:00
Marc Zinnschlag	9bc07e6221	Merge remote-tracking branch 'scrawl/diseasefix'	2013-04-14 19:45:55 +02:00
Marc Zinnschlag	615ce0b199	Merge remote-tracking branch 'scrawl/master'	2013-04-14 19:45:33 +02:00
Marc Zinnschlag	b2b953d2a8	added region column to cell table	2013-04-14 19:34:55 +02:00
scrawl	a57fbbb168	Fix wrong detection of diseases	2013-04-14 17:51:17 +02:00
scrawl	48f46e505c	Look in exterior cells first (chargen_crate_01_empty is in the prison ship but also outside of it, the one outside needs to be disabled)	2013-04-14 17:37:39 +02:00
Marc Zinnschlag	71148121a2	added flag columns to cell table	2013-04-14 17:10:37 +02:00
Marc Zinnschlag	0c33dd86d5	added basic cell table	2013-04-14 17:04:55 +02:00
Marc Zinnschlag	62aa563466	Merge remote-tracking branch 'scrawl/scale'	2013-04-13 10:32:09 +02:00
Marc Zinnschlag	41744818bb	Merge remote-tracking branch 'scrawl/master'	2013-04-13 10:23:35 +02:00
scrawl	d50150ad71	Scale adjustment factor should not be written back to cellref scale	2013-04-13 00:13:56 +02:00
scrawl	2eb9395661	Do some padding with zeros on the resource group name to avoid priority problems with more than 10 resource groups.	2013-04-13 00:05:31 +02:00
scrawl	86bac7aa92	Fix wrong BSA group name typo	2013-04-12 23:40:30 +02:00
gus	905cff2a94	anonymous namespace	2013-04-11 18:02:12 +01:00
gus	0a187e56aa	bugfix	2013-04-11 17:58:11 +01:00
gus	6934b20abd	actors are now updates every frame. This should not be the case, but this is a quickfix for AI.	2013-04-11 17:57:58 +01:00
gus	b5b0e7a656	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AI	2013-04-11 16:15:32 +01:00
Marc Zinnschlag	5bfa691f14	Merge branch 'script'	2013-04-11 10:50:46 +02:00
Marc Zinnschlag	f17cebde0a	syntax colouring for comments	2013-04-11 10:50:35 +02:00
Marc Zinnschlag	31289237ce	Merge remote-tracking branch 'kcat/nifogre'	2013-04-11 10:16:48 +02:00
Marc Zinnschlag	3f846a50d9	Merge remote-tracking branch 'galdor557/master' ... Conflicts: apps/openmw/mwgui/travelwindow.cpp	2013-04-11 10:15:42 +02:00
Chris Robinson	82091e3d07	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-10 23:20:28 -07:00
Britt Mathis	6128b9276f	Removed non-essential includes from all MWGui header files.	2013-04-11 00:21:56 -04:00
Chris Robinson	caff28e20a	Move NIFSkeletonLoader to a separate file	2013-04-10 19:58:17 -07:00
Glorf	106ef4c936	Rotate script	2013-04-10 22:53:03 +02:00
Marc Zinnschlag	74145410f2	basic syntax highlighting in script subview	2013-04-10 22:49:22 +02:00
Marc Zinnschlag	3a87b12baf	delete script subview on script deletion	2013-04-10 21:31:14 +02:00
Britt Mathis	f7383905b7	Finally eliminated calls to MWBase::WindowManager in constructors	2013-04-10 14:46:21 -04:00
Marc Zinnschlag	d61ec1063e	added script editor	2013-04-10 20:14:10 +02:00
Britt Mathis	d768f6b57e	Deleted *_* files in MwGui, builds.	2013-04-10 13:05:15 -04:00
Marc Zinnschlag	beb1858a57	Merge remote-tracking branch 'glorf/bugfix'	2013-04-10 17:39:19 +02:00
Glorf	ad49d1ecab	Sixth minor fix	2013-04-10 15:24:20 +02:00
Britt Mathis	ce9bc6d9ba	MwGui windowManager calls fixed to use MWBase::Environment::get().getWindowManager, filenames in MwGui now comply with naming conventions	2013-04-10 00:32:05 -04:00
Chris Robinson	50d8353a8d	Fix a hack so arms dont show in first-person	2013-04-09 16:51:04 -07:00
Chris Robinson	9d29921913	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-09 15:12:19 -07:00
Chris Robinson	a700c50e84	Add a first-person view mode to NpcAnimation ... And use it instead of showing/hiding the player.	2013-04-09 15:10:14 -07:00
Marc Zinnschlag	a2ab43be7e	Merge remote-tracking branch 'scrawl/master'	2013-04-09 21:22:38 +02:00
scrawl	0e7d555cdf	Terrain material now uses multiple passes if required, which means it can support an arbitrary number of layers. Also re-enables PSSM.	2013-04-09 20:31:00 +02:00
Tom Mason	6ca2b1af74	fix for turning animations playing when in vanity mode	2013-04-09 19:24:41 +01:00
Glorf	bd93e63150	Fifth minor fix	2013-04-09 19:46:27 +02:00
Glorf	248fff6eb7	Fourth minor fix	2013-04-09 19:41:03 +02:00
Glorf	44ef02eb99	Third minor fix	2013-04-09 19:04:59 +02:00
Chris Robinson	029d565727	Avoid calling setVisible for character previews	2013-04-09 09:23:07 -07:00
Chris Robinson	9f9d978b0f	Use an enum to specify the NPC's view mode (normal, head only)	2013-04-09 09:07:05 -07:00
Glorf	46925e93a6	Second minor fix	2013-04-09 16:14:08 +02:00
Marc Zinnschlag	cd33f40c8f	re-enabled opening of record subviews via double click in table	2013-04-09 14:28:31 +02:00
Marc Zinnschlag	be4a01bdb4	added missing recrod type columns	2013-04-09 14:27:32 +02:00
Marc Zinnschlag	40bb772e34	added verifier for spell record	2013-04-09 12:44:49 +02:00
Marc Zinnschlag	ae0a7d5bcd	added cost and type columns to spell table	2013-04-09 11:53:47 +02:00
Marc Zinnschlag	ec6dff38b1	added basic spell table	2013-04-09 11:40:36 +02:00
Glorf	623c2c8201	Minor fix	2013-04-09 07:45:07 +02:00
scrawl	01ae91f640	Fix several NPCs spawning in the ground	2013-04-09 01:24:17 +02:00
Glorf	7c22e123f4	Bugfix #691 changes	2013-04-08 22:10:55 +02:00
Chris Robinson	01a1a0b846	Merge remote-tracking branch 'zini/master' into nifogre ... Conflicts: components/nifogre/ogrenifloader.cpp	2013-04-08 11:46:57 -07:00
Marc Zinnschlag	ef09b1cac8	Merge remote-tracking branch 'glorf/bugfix-1'	2013-04-08 20:23:18 +02:00
Marc Zinnschlag	85e5bd212b	Merge remote-tracking branch 'scrawl/master'	2013-04-08 20:05:52 +02:00
Glorf	2f52df22ce	Bugfix #553	2013-04-08 19:00:38 +02:00
Glorf	194ca2584d	Small azura's star fix	2013-04-08 17:53:41 +02:00
Glorf	50932a7a6b	Finished bugfix #691	2013-04-08 17:50:03 +02:00
scrawl	d0bcf83091	Adjust player position to ground after using travel services	2013-04-08 16:30:18 +02:00
scrawl	a7de870a44	Fix mercenary not updating its profit when item was dragged onto the player avatar	2013-04-08 16:21:18 +02:00
Chris Robinson	08d43fe217	Make the getHeadNode method more general	2013-04-08 05:48:52 -07:00
Chris Robinson	3768e04a0c	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-07 17:24:47 -07:00
Chris Robinson	7baca30a1d	Only get the non-accum root's keyframe when updating positions ... The actual animation pose is now handled by the controllers, based on the current animation time.	2013-04-07 16:21:45 -07:00
Chris Robinson	261ea1fe5e	Implement a KeyframeController	2013-04-07 14:56:23 -07:00
Marc Zinnschlag	43a5013690	added verifier for birthsign record	2013-04-07 23:25:35 +02:00
Chris Robinson	f69a8259e1	Update animation source controller targets	2013-04-07 13:51:04 -07:00
scrawl	9e08497f02	Initial container content should inherit the owner of its container	2013-04-07 22:07:04 +02:00
Chris Robinson	7494f90301	Remove an unneeded function	2013-04-07 13:02:46 -07:00
scrawl	480467b6eb	Reset the 'owner' field for items that were legitimately bought from an NPC.	2013-04-07 21:53:11 +02:00
Chris Robinson	2362e920f3	Use an unconnected object list for animation sources ... We'll want the controllers, as the plan is to use their keyframe controllers to animate the actual skeleton used for the meshes.	2013-04-07 12:41:27 -07:00
scrawl	f3c8cd2065	Don't buy/sell keys which are set to open a lock	2013-04-07 21:38:53 +02:00
scrawl	2d2196b0d6	Implemented levelled items	2013-04-07 21:01:02 +02:00
Marc Zinnschlag	baf8eaecb8	added texture column to birthsign table	2013-04-07 20:46:04 +02:00
Marc Zinnschlag	60cc95305d	added basic birthsign table	2013-04-07 20:26:39 +02:00
Chris Robinson	80a1abd48a	Clear the old text keys when setting new animation sources	2013-04-07 11:09:55 -07:00
Marc Zinnschlag	a0d34c5e8d	Merge remote-tracking branch 'wheybags/autorun2'	2013-04-07 19:51:02 +02:00
Marc Zinnschlag	a91e3c0b01	Merge remote-tracking branch 'scrawl/fatigue_bug'	2013-04-07 19:50:16 +02:00
Marc Zinnschlag	5dc1a00544	Merge remote-tracking branch 'scrawl/master'	2013-04-07 19:43:39 +02:00
Marc Zinnschlag	593646436e	added verifier for region record	2013-04-07 19:39:13 +02:00
Marc Zinnschlag	c9424f577f	added sleeplist column to region table	2013-04-07 19:29:15 +02:00
Tom Mason	822866b5ae	fixed autorun	2013-04-07 18:04:30 +01:00
Marc Zinnschlag	f49a2a97c5	added map colour column to region table	2013-04-07 16:56:21 +02:00
Marc Zinnschlag	e25f5c6dfe	added basic region table	2013-04-07 16:32:06 +02:00
scrawl	8bbfba3f43	Fix fatigue not being set to its maximum value when player is rebuilt	2013-04-07 16:18:40 +02:00
scrawl	755a80a522	Fix camera shaking when near the pitch limit.	2013-04-07 15:52:43 +02:00
Marc Zinnschlag	ff1d908af4	added script table	2013-04-07 15:17:35 +02:00
Chris Robinson	be419bc891	Handle NiCamera nodes	2013-04-07 02:28:15 -07:00
Chris Robinson	878b4c15c5	Set visibility flags and the render queue group for particles	2013-04-07 02:08:33 -07:00
Chris Robinson	2db72ae607	Rename EntityList to ObjectList	2013-04-07 01:52:35 -07:00
Marc Zinnschlag	e2c6458adb	added verifier for sound records	2013-04-06 21:48:52 +02:00
Marc Zinnschlag	50b58b2ead	added sound file column to sound table	2013-04-06 21:43:05 +02:00
Marc Zinnschlag	dd5940b395	added sound parameter columns to sonud table	2013-04-06 21:40:03 +02:00
Marc Zinnschlag	8bf569d58a	added basic sound table	2013-04-06 21:21:10 +02:00
Chris Robinson	41e410347e	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-06 10:35:01 -07:00
Marc Zinnschlag	053f744566	Merge remote-tracking branch 'scrawl/master'	2013-04-06 19:31:46 +02:00
scrawl	1f3df4df0f	Perform a sanity check on count arguments	2013-04-06 19:25:29 +02:00
Marc Zinnschlag	0f34c79d0a	Merge branch 'race'	2013-04-06 19:21:38 +02:00
Marc Zinnschlag	98e7b3fd93	check for at least one playable race	2013-04-06 19:20:59 +02:00
Marc Zinnschlag	9bc3945f40	multiple fixes to UniversalId constructor	2013-04-06 19:20:46 +02:00
Chris Robinson	59f1d4b047	Add support for NiUVController on meshes	2013-04-06 09:44:10 -07:00
Marc Zinnschlag	0fb583e065	added verifier for race record	2013-04-06 17:35:36 +02:00
Chris Robinson	1d934e3112	Reduce some stdout spam	2013-04-06 04:46:28 -07:00
Chris Robinson	0631b28646	Prepare for supporting controller objects	2013-04-05 10:13:54 -07:00
Chris Robinson	af2a38db38	Fix looping anims that dont have "loop start"	2013-04-05 08:27:26 -07:00
Glorf	48d9885554	Started bugfix #691	2013-04-05 15:42:05 +02:00
Marc Zinnschlag	35fe828108	added race table weight/height columns	2013-04-05 13:46:48 +02:00
Marc Zinnschlag	076831c9cc	added flag columns to race table	2013-04-05 12:48:05 +02:00
Chris Robinson	4d14fe0d95	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-04 22:06:27 -07:00
Marc Zinnschlag	034ebf8ffd	Merge remote-tracking branch 'scrawl/master'	2013-04-04 19:57:55 +02:00
scrawl	2e7d5377f4	Fix crash when moving npcs to an inactive cell	2013-04-04 16:51:22 +02:00
scrawl	48a88f1917	Fix startRandomTitle	2013-04-04 15:10:27 +02:00
Marc Zinnschlag	73da794d77	added basic race table	2013-04-04 14:34:39 +02:00
Chris Robinson	77ba0fbe73	Prepare for creating particles ... This adds a vector of ParticleSystems to the EntityList, and modifies corresponding code to handle it. It also loads the ParticleFX plugin so particles can be created (although they aren't yet).	2013-04-04 05:10:52 -07:00
Marc Zinnschlag	18e046e628	cleaned up race record struct	2013-04-04 13:50:36 +02:00
Marc Zinnschlag	62d70f17c8	removed another redundant include	2013-04-04 12:42:38 +02:00
Marc Zinnschlag	111ebf84bb	replaced an include with a forward declaration	2013-04-04 12:27:57 +02:00
Marc Zinnschlag	5244362fba	some cleanup	2013-04-04 12:23:06 +02:00
Marc Zinnschlag	8c7d578ddc	moved the CellRef struct to its own header	2013-04-04 12:13:15 +02:00
Marc Zinnschlag	e8c32d0c3d	MWWorld::Player cleanup	2013-04-04 12:05:03 +02:00
Marc Zinnschlag	7136ac0079	added missing attribute columns to faction table	2013-04-04 10:58:53 +02:00
Marc Zinnschlag	b5eaa464ad	added faction record verifier	2013-04-04 10:39:43 +02:00
Marc Zinnschlag	06533b8d71	additional check for using the same attribute twice in a class	2013-04-04 10:31:10 +02:00
Marc Zinnschlag	fea44c05d4	added class record verifier	2013-04-04 10:10:58 +02:00
scrawl	ebaf80d539	Trace actors onto the ground after load, when moved to a different cell by the console or on player cell change.	2013-04-03 23:55:57 +02:00
scrawl	43cdbd033d	Display remaining item health / enchantment charge in HUD icons, display remaining enchanment charge in tooltips	2013-04-03 21:17:31 +02:00
scrawl	8ca88d1a70	Fix merchant repair menu allowing repair of repair items	2013-04-03 21:17:31 +02:00
Marc Zinnschlag	32d3fe0e35	Merge remote-tracking branch 'glorf/enchanting'	2013-04-03 19:39:18 +02:00
Glorf	08e9bb0236	Another small enchanting fix	2013-04-03 18:25:40 +02:00
Glorf	2179619721	Small enchanting fix	2013-04-03 18:06:11 +02:00
Glorf	ae3e4ecf8b	Finished enchanting	2013-04-03 18:02:30 +02:00
scrawl	f0d49fdbd0	Create separate groups for each data dir / BSA file.	2013-04-03 12:28:57 +02:00
scrawl	aac2ba1d5f	Fix loading screen looking for wallpapers in a fixed group.	2013-04-03 12:24:13 +02:00
scrawl	05a5cb3ae4	Improved responsiveness of the inventory window when resizing.	2013-04-03 00:27:29 +02:00
scrawl	df0ee82a3c	Loose files should have priority over BSA resources. This makes texture replacers work.	2013-04-02 23:45:32 +02:00
Glorf	7b7d3353a6	Exception for enchanting with Azura Star	2013-04-02 22:23:38 +02:00
Marc Zinnschlag	ffb133c862	Merge remote-tracking branch 'lgro/qt_and_boost_join_workaround'	2013-04-02 22:18:32 +02:00
Lukasz Gromanowski	98727d2fb6	Workaround for launcher compilation problems due to bug in Qt MOC compiler. ... For details please see: https://forum.openmw.org/viewtopic.php?f=7&t=1451 https://bugreports.qt-project.org/browse/QTBUG-22829 Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-04-02 21:32:23 +02:00
Glorf	369cf0b4ca	Enchanting price mechanics	2013-04-02 20:46:48 +02:00
Marc Zinnschlag	676a92e2e0	moved Verify function from World menu to File menu	2013-04-02 15:47:25 +02:00
Marc Zinnschlag	9d009af2a1	simplified code for sub view factory creation	2013-04-02 15:33:28 +02:00
Marc Zinnschlag	0856e3ebc2	Merge remote-tracking branch 'glorf/bugfix'	2013-04-02 14:35:14 +02:00
Marc Zinnschlag	df658d29f0	Merge branch 'faction'	2013-04-02 14:21:51 +02:00
Marc Zinnschlag	82498f6cff	added hidden flag column to faction table	2013-04-02 14:20:51 +02:00
Marc Zinnschlag	384c88182d	dealing with unset attribute fields	2013-04-02 14:15:22 +02:00
Glorf	900c2cfa81	Minor bugfix #646 change	2013-04-02 14:08:59 +02:00
Marc Zinnschlag	ec6bdbeb40	added skill columns to faction table	2013-04-02 14:04:13 +02:00
Marc Zinnschlag	f9f520df34	adjusted faction record to increase consistency with other records	2013-04-02 13:59:45 +02:00
Marc Zinnschlag	c71edb613d	added faction table	2013-04-02 12:00:45 +02:00
Glorf	d25c838e1d	Bugfix #646	2013-04-02 11:42:29 +02:00
gus	6a33170ca2	More bugfix, but I don't like this one.	2013-04-01 17:44:06 +00:00
gus	20af7d89a2	post master-merge fixes. Looks a little odd.	2013-04-01 17:30:40 +00:00
gus	2be9405c96	the sgn function is no longer in the global namespace	2013-04-01 15:44:08 +00:00
Marc Zinnschlag	751c679255	Merge remote-tracking branch 'glorf/enchanting'	2013-04-01 17:35:04 +02:00
Marc Zinnschlag	9dbd024076	another minor fix	2013-04-01 17:30:54 +02:00
Glorf	1bff6ed872	Enchaning values import, fixed constness	2013-04-01 17:12:47 +02:00
gus	1eb3d3e10e	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AI ... Conflicts: apps/openmw/CMakeLists.txt	2013-04-01 14:10:19 +00:00
gus	47cc945ef4	more refactoring	2013-04-01 12:38:13 +00:00
Marc Zinnschlag	26db983599	minor fix	2013-04-01 10:46:08 +02:00
Chris Robinson	f976eb5bd8	Improve mouselook scaling	2013-03-31 17:32:39 -07:00
Chris Robinson	d0703efd69	Another place to check the class' isActor method	2013-03-31 17:32:39 -07:00
Chris Robinson	04aeb3dd07	Rename Mechanics' Activators to Objects	2013-03-31 17:32:38 -07:00
Chris Robinson	10d04c928c	Use the object's class to check if it's an actor	2013-03-31 17:32:38 -07:00
Glorf	d29a42dcbe	Fixed enchanting mechanics	2013-03-31 23:18:23 +02:00
gus	63424ade56	refactoring	2013-03-31 17:30:03 +00:00
Lukasz Gromanowski	acae815cd2	Added workaround for OpenCS compilation problems due to bug in Qt MOC compiler. ... For details please see: https://forum.openmw.org/viewtopic.php?f=7&t=1451 https://bugreports.qt-project.org/browse/QTBUG-22829 Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-03-31 18:00:46 +02:00
scrawl	8fd961bbac	Fix ReferenceInterface not resetting the Ptr after it was deleted, causing onReferenceUnavailable to be called every frame. Fix inputmanager hiding the cursor when it shouldn't.	2013-03-31 15:50:48 +02:00
scrawl	1a2daa3bc1	Merge branch 'master' of git://github.com/zinnschlag/openmw into companion	2013-03-31 14:50:03 +02:00
scrawl	bc6e1fd981	Add missing files	2013-03-31 14:36:03 +02:00
scrawl	b0199c703c	Companion UI	2013-03-31 13:13:46 +02:00
Chris Robinson	4836ba16f7	Implement turning states	2013-03-31 03:50:20 -07:00
Chris Robinson	7611caa6eb	Merge remote-tracking branch 'zini/master' into rotation	2013-03-31 03:00:11 -07:00
Chris Robinson	13c098266c	Pass player rotation through the movement settings	2013-03-31 02:57:22 -07:00
scrawl	69099c11a2	Merge branch 'enchanting' into companion	2013-03-31 11:52:55 +02:00
Chris Robinson	18e8ff7198	Actually rotate the object when updating physics	2013-03-31 02:24:44 -07:00
Chris Robinson	b6f2b39a2f	Clear the movement and rotation vector when getting them	2013-03-31 01:56:38 -07:00
Marc Zinnschlag	607435aaf2	Merge branch 'class'	2013-03-31 10:49:56 +02:00
lazydev	38d19d33d8	fix for #634	2013-03-31 10:45:42 +02:00
Chris Robinson	7b02ec411b	Apply the rotation when updating the character controller	2013-03-31 01:29:24 -07:00
Marc Zinnschlag	e71181810f	Merge remote-tracking branch 'scrawl/master'	2013-03-31 10:18:13 +02:00
scrawl	13be61812a	Made the "Unknown class key" exception slightly more helpful	2013-03-31 10:16:02 +02:00
Marc Zinnschlag	48d6fe8014	Merge remote-tracking branch 'kcat/rotation'	2013-03-31 10:14:57 +02:00
Chris Robinson	466c0086b8	Use a full Movement to hand off to the world physics update	2013-03-31 00:13:56 -07:00
Chris Robinson	0ce188b7cc	Store the position and rotation in MWMechanics::Movement	2013-03-30 19:00:46 -07:00
Chris Robinson	af65ecd841	Pass the movement vector in as a parameter to CharacterController::update	2013-03-30 18:37:40 -07:00
Chris Robinson	63af72c315	Avoid converting to and from quaternions	2013-03-30 17:31:16 -07:00
Chris Robinson	c8606d2f63	Implement IsWerewolf script function	2013-03-30 13:22:33 -07:00
scrawl	e27e53f607	Fix not playable body parts appearing in the race selection menu.	2013-03-30 20:04:05 +01:00
lazydev	ee5d0277e8	fix for #634	2013-03-30 22:18:34 +04:00
Glorf	7dbc779c3a	Self-enchanting mechanics	2013-03-30 19:08:42 +01:00
scrawl	0f0cc0e3e3	Fix a few gold conditions that I missed, trade window was affected	2013-03-30 18:29:21 +01:00
scrawl	a723ad8f29	Don't allow toggling inventory or journal when a modal window is opened	2013-03-30 16:32:24 +01:00
scrawl	0079f62180	Gold condition now always checks RefID instead of the name. This is necessary because in the french MW version, the sGold GMST is different from the name of the gold references.	2013-03-30 16:27:06 +01:00
scrawl	51204f098e	Added soulgem dialog; made interactive message boxes not close the previous UI	2013-03-30 15:51:07 +01:00
scrawl	e7af718b55	Remove unnecessary WindowManager::messageBox arguments	2013-03-30 12:56:37 +01:00
scrawl	04673b2f14	Don't enchant if the enchantment value is too high for the item	2013-03-30 12:54:20 +01:00
scrawl	5e7e9fd26a	Properly calculate light activation range	2013-03-29 20:21:37 +01:00
Marc Zinnschlag	573368849b	Merge remote-tracking branch 'glorf/enchanting' ... Conflicts: apps/openmw/CMakeLists.txt	2013-03-29 16:48:21 +01:00
Glorf	86275e5bd4	Some enchanting fixes	2013-03-29 12:00:09 +01:00
Marc Zinnschlag	e7684c4677	some random cleanup	2013-03-29 09:04:02 +01:00
Chris Robinson	c5f0556451	Handle light linear/quadratic settings	2013-03-28 20:57:33 -07:00
Glorf	cc8f7f238e	Enchanted item base ptr fix	2013-03-29 00:55:29 +01:00
Glorf	eb88463b94	Some enchanting fixes	2013-03-28 23:39:20 +01:00
Glorf	6643fe789c	Enchanting system	2013-03-28 17:41:00 +01:00
scrawl	564256c4e1	Fix the spell icon panel being visible when it shouldn't.	2013-03-27 18:04:15 +01:00
scrawl	406488d086	Soulgem value should be multiplied by the trapped soul	2013-03-27 17:39:49 +01:00
scrawl	6f1575d42a	CELL record corrections	2013-03-27 17:27:43 +01:00
scrawl	efe6a3ebee	Fix compile error & warnings	2013-03-26 18:01:01 +01:00
scrawl	2ecd2f4ecd	Merge branch 'next' into HEAD	2013-03-26 17:44:53 +01:00
Marc Zinnschlag	82f1cee116	added is-playable column to class	2013-03-26 09:51:39 +01:00
Marc Zinnschlag	ea3b14f2d2	added skill columns to class	2013-03-26 09:43:13 +01:00
scrawl	6a2b87e14a	Fix dialogue response coloring for creatures	2013-03-25 17:37:59 +01:00
scrawl	4be0c6b708	Fix topics not being selectable for creatures	2013-03-25 17:32:01 +01:00
Marc Zinnschlag	65cda580db	added attributes to class table	2013-03-25 14:31:46 +01:00
Marc Zinnschlag	c7275965b8	added basic class record table	2013-03-25 13:22:06 +01:00
Marc Zinnschlag	f2969e7143	fixed access to records flagged as deleted	2013-03-25 12:56:52 +01:00
Marc Zinnschlag	f39f694638	various global variable fixes in editor	2013-03-25 11:59:25 +01:00
Marc Zinnschlag	6c76e97bbc	fixed day count in rest dialogue	2013-03-25 11:53:02 +01:00
Marc Zinnschlag	1078386fd7	Merge branch 'skills' into next	2013-03-25 11:07:14 +01:00
Marc Zinnschlag	dc67ddf39b	added verifier stage for skill records	2013-03-25 11:07:04 +01:00
Marc Zinnschlag	739e7e7298	improved record access from ID collection	2013-03-25 11:06:40 +01:00
Marc Zinnschlag	7450554ef1	fixed a broken UniversalId constructor	2013-03-25 11:04:41 +01:00
Marc Zinnschlag	10c5f29075	added attribute column to skills	2013-03-24 15:50:29 +01:00
Marc Zinnschlag	114f99ddbf	add skill records when creating a new base file	2013-03-24 15:10:03 +01:00
Marc Zinnschlag	4208d52b1a	added use value columns to skills	2013-03-24 14:51:48 +01:00
Marc Zinnschlag	7cae61a202	Merge remote-tracking branch 'psi29a/master' into next	2013-03-23 18:51:05 +01:00
Bret Curtis	962b504129	add dpkg information for mwiniimporter, this blocked debian/ubuntu buildd from building	2013-03-23 16:20:10 +01:00
Marc Zinnschlag	0ce962e815	added specialisation column to skill table	2013-03-23 13:13:53 +01:00
Marc Zinnschlag	92f0098911	added new constructors for EnumDelegateFactory	2013-03-23 13:13:34 +01:00
scrawl	a2ca679beb	Added PC repair feature	2013-03-23 08:16:46 +01:00
scrawl	78f3f19f62	Thrown weapons, arrows and bolts shouldn't have item health	2013-03-22 14:28:50 +01:00
scrawl	20774f8f81	Added merchant repair feature	2013-03-22 14:13:10 +01:00
scrawl	8e2f9f5186	Fix CellRef to load current weapon/armor health correctly, also show it in the tooltips	2013-03-22 12:24:09 +01:00
Marc Zinnschlag	feaf2b43fb	disabled and deleted objects where not correctly ignored during adding objects to a cell when it became active	2013-03-22 09:44:59 +01:00
scrawl	918cdcffc2	Split up components/esm/loadlocks	2013-03-22 05:50:54 +01:00
Marc Zinnschlag	8e472cc624	added description column to skill table	2013-03-21 14:38:06 +01:00
Marc Zinnschlag	fefe061294	added basic support for skills to editor	2013-03-21 14:31:32 +01:00
Marc Zinnschlag	947ab6635b	removed automatic detection of setting modified to the same value of base with subsequent setting modifiction state to base only (can cause problems with implicitly added records)	2013-03-21 14:29:31 +01:00
Marc Zinnschlag	a955068853	added universal IDs for skills	2013-03-21 13:40:55 +01:00
Marc Zinnschlag	9464f45d57	fixed an encoding problem. I hate you QString. I hate you so much	2013-03-21 12:47:22 +01:00
Marc Zinnschlag	cafbabde45	fixed broken loading of single files into the editor	2013-03-21 12:13:32 +01:00
Marc Zinnschlag	ebb1dab8e1	removed debugging leftovers	2013-03-21 10:19:07 +01:00
Marc Zinnschlag	d05508db52	switching editor id tables from QAbstractTableModel to QAbstractItemModel (in preparation for record types like containers)	2013-03-21 10:07:25 +01:00
Marc Zinnschlag	cd84b68e4b	silencing some warnings	2013-03-20 20:55:48 +01:00
Marc Zinnschlag	775f9e8402	Merge remote-tracking branch 'potatoesmaster/dialogue' into next	2013-03-20 20:53:14 +01:00
Emanuel Guevel	6783ff6748	Workaround to have dialogues until actor detection is implemented for NPCs	2013-03-20 20:10:55 +01:00
Emanuel Guevel	8de93db488	Coding style consistence	2013-03-20 20:10:55 +01:00
Emanuel Guevel	f25b56ac88	Add dialogue function: NotLocal	2013-03-20 20:10:54 +01:00
Emanuel Guevel	ad3478c8f2	Fix inverted dialogue functions (NotClass etc.) ... The comparison present is useless for these functions.	2013-03-20 20:10:54 +01:00
scrawl	4cbb202306	Several tooltip fixes	2013-03-20 03:31:01 +01:00
scrawl	b9c3a4816d	Fix dialogue topics still being accessible in the history pane when they shouldn't be	2013-03-20 03:30:15 +01:00
scrawl	2509b34ace	Enabled bloodmoon weather	2013-03-20 02:48:10 +01:00
scrawl	6c1ff8caca	Merge branch 'master' into next ... Conflicts: apps/openmw/mwworld/weather.cpp components/fileorderlist/model/datafilesmodel.cpp	2013-03-20 02:29:03 +01:00
scrawl	21cc7483e4	Fix broken weather transitions	2013-03-20 01:20:56 +01:00
Glorf	3bd545ed8e	In-console nonexistent class fix	2013-03-19 21:55:37 +01:00
Glorf	dd11ae04ee	Console code cleaned	2013-03-19 17:25:41 +01:00
pvdk	e76d03dcc4	Added a warning message to the importer dialog	2013-03-19 12:01:54 +01:00
Glorf	f5bf7254a8	Minor console selection improvements	2013-03-18 23:46:17 +01:00
Glorf	a07c910d0b	Feature #535: Console object selection improvements	2013-03-18 21:33:12 +01:00
Marc Zinnschlag	0092a2f437	Merge remote-tracking branch 'pvdk/firstrunfix'	2013-03-18 20:09:10 +01:00
Marc Zinnschlag	c53d7ba6d6	Merge remote-tracking branch 'pvdk/resolutionfix'	2013-03-18 19:59:20 +01:00
Marc Zinnschlag	e4ed5b836e	added ondeath script function	2013-03-18 11:04:47 +01:00
Marc Zinnschlag	fd2c07a6f4	delete death events on adding an actor to the scene	2013-03-18 10:54:47 +01:00
Marc Zinnschlag	61cb0f98a6	keep track of death events	2013-03-18 10:47:09 +01:00
Marc Zinnschlag	08f6d04960	constness fixes	2013-03-18 08:29:40 +01:00
Marc Zinnschlag	19c3b5516d	Merge remote-tracking branch 'glorf/fallbacks-next' into next	2013-03-18 08:14:25 +01:00
scrawl	95e1cdc07d	Move getArmorRating to MWWorld::Class.	2013-03-17 22:29:12 +01:00
scrawl	c66675b599	Fix the 'Take all' button taking equipped items when stealing	2013-03-17 22:28:28 +01:00
Glorf	5922637c58	Unblocked Solstheim weather that should work now.	2013-03-17 20:12:26 +01:00
Glorf	f3fd3a7691	Much more moons fallbacks	2013-03-17 19:36:14 +01:00
Glorf	1369090a80	More moons fallbacks, minor weather fixes	2013-03-17 14:50:02 +01:00
Glorf	6165cd2c6b	Moons fallbacks partially implemented	2013-03-17 14:22:30 +01:00
Glorf	ea7f386e7d	Access to Fallback via getFallback	2013-03-17 13:50:15 +01:00
greye	52ed451ae7	fix eraseStatic() assumptions	2013-03-17 08:36:15 +04:00
scrawl	c07b3ea61d	Text defines for npc race, class, and faction should use the translated name	2013-03-17 04:20:30 +01:00
scrawl	dd57eabc3e	Better use an enum for magic effect IDs	2013-03-16 23:28:26 +01:00
scrawl	1666bc7740	Armor rating	2013-03-16 22:53:33 +01:00
scrawl	e8b08326dc	Corrected Id, Race, Class, Faction and Cell select functions to do the exact opposite as before. That is how they are displayed in the CS, anyway.	2013-03-16 20:52:05 +01:00
scrawl	cebcbe11f8	Implemented service refusal	2013-03-16 20:32:21 +01:00
scrawl	c0b0227e8a	enchanting	2013-03-16 19:00:14 +01:00
pvdk	75be474005	Use the resolution QRegExp cap() instead of converting ints back and forth	2013-03-16 13:45:23 +01:00
pvdk	d1860f2d6c	Removed color information from Direct3D resolutions	2013-03-16 13:40:29 +01:00
pvdk	c15d920133	Fixed the first run dialog, makes sure Morrowind.ini is found	2013-03-16 01:46:28 +01:00
scrawl	485b6c855a	Fix NPC race height not being applied	2013-03-15 16:44:35 +01:00
Marc Zinnschlag	66a2df68db	some cleanup	2013-03-15 10:26:04 +01:00
Glorf	727a598cbe	Last tabulator died	2013-03-15 10:32:03 +01:00
Glorf	542c1bcc53	Some other tabulators deleted	2013-03-15 10:28:39 +01:00
Glorf	e1c6c3fe02	Tabulators deleted	2013-03-15 10:22:02 +01:00
Glorf	521bebd2f4	Fallback system rewritten, added light fallbacks	2013-03-15 10:17:30 +01:00
Marc Zinnschlag	4de2a741ed	Merge remote-tracking branch 'scrawl/master'	2013-03-15 09:58:24 +01:00
pvdk	110dd5d0ee	Possible fix for the resolutions not appearing with Direct3D Renderer	2013-03-15 01:56:39 +01:00
scrawl	3e9cd0e2e3	Fix the back button on generate class result dialog advancing creation stage	2013-03-14 22:33:51 +01:00
Marc Zinnschlag	ef72894b81	Merge remote-tracking branch 'scrawl/alwaysrun' into next	2013-03-14 22:11:12 +01:00
scrawl	7ab236337b	Dialogue responses should be random only for persuasion results	2013-03-14 21:33:00 +01:00
scrawl	b36295cbb3	Removed a leftover	2013-03-14 21:10:22 +01:00
scrawl	5b943a965f	Handle always run in the inputmanager, instead of using forced stance.	2013-03-14 21:08:19 +01:00
scrawl	2d8f0949a4	Always run key (Y)	2013-03-14 20:27:16 +01:00
scrawl	beab20cb42	Fix message boxes not opening if they opened as a result of object activation	2013-03-14 19:53:57 +01:00
gus	9efb073617	clean up + correct a bug	2013-03-14 18:05:00 +00:00
gus	80804fac35	check if the NPC is close from a non loaded cell. If yes, AITravel is simply ended.	2013-03-14 17:16:37 +00:00
greye	d30b38f336	fix Store<T>::eraseStatic()	2013-03-14 19:28:17 +04:00
Marc Zinnschlag	73278edf7e	Merge remote-tracking branch 'scrawl/collision' into next	2013-03-14 13:29:31 +01:00
scrawl	84afd87321	Placeable objects should not collide unless they have a NiRootCollisionNode	2013-03-14 03:04:02 +01:00
scrawl	c4a42f2e1f	Fix infinite recursion on shutdown caused by incorrect onWidgetDestroy listener	2013-03-13 23:17:25 +01:00
scrawl	e4717d7c92	Merge branch 'next' of git://github.com/zinnschlag/openmw into next	2013-03-13 19:46:05 +01:00
scrawl	17fb0f5a69	Merge branch 'master' of git://github.com/zinnschlag/openmw	2013-03-13 19:45:47 +01:00
scrawl	0223df4dfc	Fix invalid cast exception in the spell creation dialog	2013-03-13 19:45:22 +01:00
scrawl	fdcbdbf35d	Rewrote layout tooltips to use the new box layout system, fixes word wrapping delay	2013-03-13 19:44:34 +01:00
gus	f943580138	Somehow manages to get from one cell to another, but this looks wrong... And I don't know how morrowind do it, because aitravel is completly buggy	2013-03-12 17:44:22 +00:00
Marc Zinnschlag	25fd7a41eb	Merge remote-tracking branch 'scrawl/next' into next	2013-03-12 18:13:57 +01:00
scrawl	4c588cbab6	Levelup dialog is now dynamic; added level descriptions	2013-03-12 17:18:47 +01:00
Marc Zinnschlag	10fad47a81	some cleanup	2013-03-12 14:51:16 +01:00
Marc Zinnschlag	170451cb79	Merge remote-tracking branch 'graffy76/saveOnClose' into next	2013-03-12 14:47:42 +01:00
Marc Zinnschlag	75bd30844d	added optional format sub-record to tes3 record	2013-03-12 14:33:35 +01:00
graffy76	50abb22162	Fix to allow application closing from multiple views and a single view.	2013-03-12 06:28:13 -05:00
Marc Zinnschlag	9e68a420ae	restructuring tes3 record structs	2013-03-12 08:15:20 +01:00
Marc Zinnschlag	ce67fbdfca	Merge remote-tracking branch 'pvdk/encoding'	2013-03-12 07:02:44 +01:00
Marc Zinnschlag	0b51e89b78	Merge remote-tracking branch 'pvdk/uifix2'	2013-03-12 07:01:41 +01:00
pvdk	31ba332647	Moved Windows icon to files/launcher	2013-03-12 04:05:14 +01:00
pvdk	f574c37e93	Added encoding flag to ini importer arguments	2013-03-12 04:00:43 +01:00
scrawl	41a958cd4e	Fix hardcoded beast races in MWClass::Npc::getModel	2013-03-12 02:50:23 +01:00
scrawl	46d8f3ce5a	Fix hardcoded race IDs	2013-03-12 02:44:03 +01:00
scrawl	eeb60edb65	Properly check for the Beast flag instead of hardcoding beast races	2013-03-12 02:09:54 +01:00
scrawl	543f573739	Fix the firstguard armor mod	2013-03-12 02:02:59 +01:00
pvdk	81604613b5	Narrowed down includes to improve compile time	2013-03-12 01:29:13 +01:00
scrawl	bcdab2aeab	Fix wrong padding breaking local map for cells where the bounds center is far from the origin	2013-03-11 19:32:39 +01:00
Marc Zinnschlag	2e1a1fd11a	removing some remains of the removed GMST fixing feature	2013-03-11 16:30:47 +01:00
Marc Zinnschlag	64d517dd79	removed unused file type information from esm component	2013-03-11 14:42:49 +01:00
graffy76	96b62940b3	Fixes docked subviews becoming tabbed and application closure when ... closing one of several views.	2013-03-11 06:38:27 -05:00
Marc Zinnschlag	a0df25c631	Merge remote-tracking branch 'pvdk/uifix'	2013-03-11 10:10:48 +01:00
Pieter van der Kloet	b4d408af5d	Added actions to datafiles.ui and implemented them in the launcher	2013-03-11 01:48:01 +01:00
Pieter van der Kloet	fc1940257a	Fixed issue with new profile dialog being too small	2013-03-11 01:23:24 +01:00
Pieter van der Kloet	091c569fbe	Fixed issue with the combobox dropdown looking weird	2013-03-11 01:20:30 +01:00
pvdk	52e5dcc7f0	Some fixes to the way data paths are saved and settings are handled	2013-03-10 21:12:26 +01:00
Marc Zinnschlag	f6d2dec973	Merge remote-tracking branch 'glorf/master'	2013-03-10 17:28:57 +01:00
gus	bbc4c23f7e	AITravel now works correctly on exterior cells. As long as NPC don't try to leave cell, it's ok.	2013-03-10 15:07:22 +00:00
Glorf	93de570f9a	Moved specializations out of step	2013-03-10 15:58:29 +01:00
Glorf	04e99ee9d6	Character creation struct consts	2013-03-10 15:15:33 +01:00
Glorf	1ef682896a	Character creation questions import	2013-03-10 15:03:48 +01:00
graffy76	ce91ef36ea	Fix for warnings on close, leaves all views open until a decision is ... made	2013-03-10 07:49:43 -05:00
Glorf	d5ca00c927	Another fix	2013-03-10 12:11:38 +01:00
Marc Zinnschlag	bdec87e51b	some cleanup	2013-03-10 11:30:50 +01:00
Glorf	81338d3b23	Weather code fixes	2013-03-10 11:30:24 +01:00
Marc Zinnschlag	65c382116f	Merge remote-tracking branch 'glorf/master'	2013-03-10 11:24:23 +01:00
Marc Zinnschlag	6cef7fb610	rescale all objects to the range of [0.5, 2] when a cell becomes active	2013-03-10 10:00:20 +01:00
Glorf	a68c55fea5	Merge branch 'master' of git://github.com/zinnschlag/openmw	2013-03-10 00:29:42 +01:00
Glorf	aebd9a3700	Weather to pull	2013-03-10 00:24:14 +01:00
Marc Zinnschlag	549678394c	Merge remote-tracking branch 'potatoesmaster/fallback-archives'	2013-03-09 23:01:42 +01:00
scrawl	a51b73b609	Fix topics that have the same name as a service opening that service when clicked	2013-03-09 21:50:01 +01:00
Marc Zinnschlag	fbaad8e105	Merge remote-tracking branch 'potatoesmaster/strfix'	2013-03-09 21:33:32 +01:00
Emanuel Guevel	289bbc64f7	Load fallback archives listed in openmw.cfg at startup	2013-03-09 21:14:11 +01:00
Sebastian Wick	0ae48c1f83	fix for Bug #509	2013-03-09 20:40:59 +01:00
scrawl	b19571df89	If character creation dialogs are enabled in the wrong order, force creation stage to advance	2013-03-09 14:59:50 +01:00
Marc Zinnschlag	2cc20c67cb	Merge remote-tracking branch 'scrawl/raycasting'	2013-03-09 14:34:29 +01:00
scrawl	5c94c654d4	Fix wrong rotation of objects dropped on the ground	2013-03-09 13:27:24 +01:00
scrawl	c8b31b4745	Remove an outdated message	2013-03-09 13:26:00 +01:00
graffy76	c17821e6c8	Merge branch 'master' of https://github.com/zinnschlag/openmw into saveOnClose	2013-03-08 20:08:56 -06:00
Emanuel Guevel	c020665cf2	Fix appending int to string in an exception message	2013-03-09 01:00:03 +01:00
scrawl	d7c4a622cf	Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack	2013-03-08 23:46:25 +01:00
Marc Zinnschlag	d396785008	Merge remote-tracking branch 'scrawl/master'	2013-03-08 11:00:20 +01:00
graffy76	03c7f18112	Fixes for save-on-close message boxes	2013-03-07 17:48:05 -06:00
scrawl	285b4bf726	Allow zooming camera in vanity or preview mode with the mousewheel	2013-03-08 00:12:56 +01:00
Emanuel Guevel	1223a2e105	Bsatool: extract and extractall modes	2013-03-07 21:21:00 +01:00
Emanuel Guevel	3adf3f5121	Revive bsatool	2013-03-07 21:13:10 +01:00
Marc Zinnschlag	17e406e58c	Merge remote-tracking branch 'mikesc/bug586'	2013-03-07 20:48:58 +01:00
Michal Sciubidlo	f2f4b6e2d5	Make MWWorld::getInterior case insensitive. ... Interior cells names can use different mix of uppercase/lowercase in different places. getInterior() should return same cell in all cases. Fixes bug #586.	2013-03-07 20:15:01 +01:00
Marc Zinnschlag	2a9d15cd9f	Merge remote-tracking branch 'scrawl/master'	2013-03-07 16:42:07 +01:00
scrawl	66a754e9aa	Fix tooltip position when hovering the crosshair over NPCs	2013-03-07 15:25:22 +01:00
scrawl	0ee0dbdb97	Added "dispose corpse" button, added stealing (all items visible and no penalty yet)	2013-03-07 14:00:13 +01:00
scrawl	e34685b8a3	Fix manually changed mouse cursor	2013-03-07 12:46:26 +01:00
Marc Zinnschlag	a994a23f4e	file loading fixes	2013-03-07 07:56:29 +01:00
Pieter van der Kloet	9145fb210b	Merge remote-tracking branch 'upstream/master' into opencsui	2013-03-07 03:02:03 +01:00
Pieter van der Kloet	7504ae675b	Implemented a file dialog for the editor using launcher .ui	2013-03-07 03:00:59 +01:00
gus	01908dbcc2	little improvement	2013-03-06 21:17:33 +00:00
gus	5fc7103425	First attempt at pathfinding using boost::graph	2013-03-06 20:31:47 +00:00
scrawl	8be9627c8d	Fix method signatures	2013-03-06 21:26:41 +01:00
scrawl	f7d8f6456f	Stats should never go below 0	2013-03-06 20:45:11 +01:00
Marc Zinnschlag	642653d10e	World constructor fixes	2013-03-06 19:57:00 +01:00
Marc Zinnschlag	7e100c36b5	Merge remote-tracking branch 'gus/AI'	2013-03-06 19:05:55 +01:00
Marc Zinnschlag	ef86a693c3	Merge remote-tracking branch 'scrawl/sneak'	2013-03-06 18:59:37 +01:00
Marc Zinnschlag	69eb5aa99a	Merge remote-tracking branch 'scrawl/master'	2013-03-06 18:59:02 +01:00
gus	5938e19362	Clean up	2013-03-06 17:31:57 +00:00
scrawl	66d2d3522f	Race selection preview: render only the head, and focus the camera on its node	2013-03-06 18:03:47 +01:00
scrawl	268bb23590	Implemented sneaking animation	2013-03-06 16:58:56 +01:00
scrawl	39411eda7b	Fix the spell buying window listing already owned spells	2013-03-06 15:11:40 +01:00
Pieter van der Kloet	c9859382bf	Made the launcher write the custom resolution to file, cleaned resolution parsing	2013-03-06 01:35:32 +01:00
gus	d3bf3812a4	changing rotation order (fix some misoriented objects)	2013-03-05 20:16:57 +00:00
gus	8b6f0e0770	Correct orientation sign	2013-03-05 18:28:57 +00:00
Marc Zinnschlag	d839a4c6c2	Merge remote-tracking branch 'scrawl/graphics'	2013-03-05 16:31:22 +01:00
scrawl	fe7b2732d8	Avoid manually updating render targets from within frameRenderingQueued	2013-03-05 14:24:29 +01:00
scrawl	2486ec6cb9	Material fixes (vertex colors, alpha)	2013-03-05 13:51:48 +01:00
Marc Zinnschlag	46de45b9a2	added var type column to globals	2013-03-05 11:37:13 +01:00
Marc Zinnschlag	dc3edc6024	Merge branch 'vartype'	2013-03-05 10:59:08 +01:00
Marc Zinnschlag	1489570b09	change variant in info record to new type	2013-03-05 10:34:03 +01:00
Marc Zinnschlag	ba4907fbaf	use new Variant type for GMSTs	2013-03-05 08:02:27 +01:00
Pieter van der Kloet	770d8af931	Forgot to add the DataFilesPage .ui	2013-03-05 03:57:27 +01:00
Pieter van der Kloet	75cf009101	Finished implementing the .ui file for the DataFilesPage	2013-03-05 03:47:57 +01:00
Pieter van der Kloet	4c9d0563fe	WIP: Implementing the .ui for the DataFilesPage	2013-03-05 03:13:39 +01:00
Pieter van der Kloet	fb5213a754	Made the GraphicsPage use a .ui file and added support for custom res	2013-03-05 02:17:28 +01:00
Marc Zinnschlag	8a887a0aef	Merge remote-tracking branch 'potatoesmaster/tradewindow'	2013-03-04 19:42:51 +01:00
Marc Zinnschlag	ac810faa7e	Merge remote-tracking branch 'scrawl/master'	2013-03-04 19:36:58 +01:00
Marc Zinnschlag	a93034b0a9	Merge remote-tracking branch 'k1ll/store_segfault_fix'	2013-03-04 19:27:14 +01:00
scrawl	d5c6c221c1	Books/scrolls: Fix the take button incorrectly showing	2013-03-04 17:28:01 +01:00
scrawl	ca707aa65f	Transparency should be evaluated per subentity, not per NIF	2013-03-04 16:57:00 +01:00
scrawl	cab5315a8e	Disable mipmaps generation	2013-03-04 16:28:20 +01:00
Marc Zinnschlag	a1ac20c6f3	changed global variable records to new variant type	2013-03-04 14:32:59 +01:00
Marc Zinnschlag	65081f5520	added variant class	2013-03-04 14:32:23 +01:00
gus	3384d92761	oups introduced a bug..	2013-03-04 12:28:43 +00:00
gus	48b3f1e0cf	Clean up. But still a little hacky	2013-03-04 12:08:35 +00:00
Emanuel Guevel	8e07638699	Update the trading offer on "max sale" button click	2013-03-04 12:24:41 +01:00
graffy76	6911868f2a	File->close and File->exit menu items added. Exit uses ... closeAllWindows() to ensure ViewManager::closeRequest is called on the last open window. Exit will close all open windows but the last one in cases of active save operation or modified file.	2013-03-03 15:58:26 -06:00
scrawl	f1d35b73b8	Cleanup	2013-03-03 19:52:20 +01:00
scrawl	359ae06fcf	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-03-03 19:35:26 +01:00
scrawl	c9fefc7f5d	Simpler, more lightweight underwater effect, changed colors to match vanilla better	2013-03-03 19:28:11 +01:00
Marc Zinnschlag	123a111580	Merge remote-tracking branch 'scrawl/master'	2013-03-03 17:13:05 +01:00
scrawl	f0e3463e9b	Disable assertion for comparing iterators from different containers (Bug #605)	2013-03-03 16:50:10 +01:00
scrawl	5341bf9504	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-03-03 15:51:58 +01:00
Marc Zinnschlag	3e97943e06	Merge remote-tracking branch 'scrawl/includes'	2013-03-03 15:37:13 +01:00
Marc Zinnschlag	5595675664	Merge remote-tracking branch 'scrawl/effects'	2013-03-03 15:33:23 +01:00
scrawl	05bd94effb	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-03-03 15:14:20 +01:00
scrawl	002830e13b	Make sure render textures are inactive when in a cell without water	2013-03-03 15:11:45 +01:00
scrawl	867b22ce19	Fix a terrain glitch	2013-03-03 15:11:19 +01:00
scrawl	11f21a1988	Weather update should be before renderer update	2013-03-03 15:10:40 +01:00
gus	5951abfae2	fix some script instructions	2013-03-03 13:59:38 +00:00
gus	7fb2ff18a3	Fix bug induced by previous commit (player orientation wasn't stored correctly), and fix NPC not beeing able to move with certain angles (like angle Z 70) because the trace function was hitting NPC own hitboxes. The solution prposed here is a little hacky, but i works. Need a little clean up(mBody shouldn't be public)	2013-03-03 13:06:45 +00:00
gus	e1882dce32	correcting a bug: player orientation wasn't stored correctly, and objects orientation wasn't properly retrived.	2013-03-03 13:02:41 +00:00
scrawl	9a84f6744f	Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr)	2013-03-03 13:11:02 +01:00
scrawl	6037c44ea6	Fix ingredient effect display	2013-03-03 12:41:57 +01:00
scrawl	6f05c4229f	Implemented potion & ingredient effect stacking	2013-03-03 12:41:37 +01:00
scrawl	8e05c4159d	Magic effect icons for permanent enchantments	2013-03-03 12:17:37 +01:00
scrawl	cf87708c1f	Magic effect icons for spells	2013-03-03 12:01:19 +01:00
scrawl	0f6fd80294	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics ... Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp apps/openmw/mwrender/npcanimation.cpp files/mygui/openmw_settings_window.layout	2013-03-03 11:02:38 +01:00
graffy76	eb90bd71ba	Fixed triggering confirmation messages boxes when more than one view is ... open.	2013-03-02 21:34:55 -06:00
Pieter van der Kloet	0a6e3701ab	Made the Play page use a .ui file too	2013-03-03 01:49:41 +01:00
Pieter van der Kloet	f2193bb1ba	Made the mainwindow use a .ui file and removed the stylesheet	2013-03-03 00:48:09 +01:00
Pieter van der Kloet	2b6bb9657b	Added Qt Designer .ui files	2013-03-02 23:49:31 +01:00
Pieter van der Kloet	a3c5c868ec	Merge remote-tracking branch 'upstream/master' into launcherui	2013-03-02 23:01:53 +01:00
Nathan Jeffords	109dff2d29	renamed high level NIF files...	2013-03-02 13:23:09 -08:00
k1ll	dde43e8c87	Some cleanup	2013-03-02 21:46:31 +01:00
graffy76	bf6c855e6d	Final changes to implement save-on-close features	2013-03-02 12:49:26 -06:00
Nathan Jeffords	d3c1f5e7b2	renamed low-level NIF related files and include guards to conform to naming convention	2013-03-02 10:46:12 -08:00
k1ll	9acd4061cc	Fix dangling static references in mShared	2013-03-02 17:04:17 +01:00
graffy76	9193ddc9d3	Merge branch 'master' into saveOnClose	2013-03-02 09:24:42 -06:00
graffy76	a2e36594c9	Completed "abort save on close" feature	2013-03-02 09:22:44 -06:00
graffy76	f85be6a744	80% complete save-on-close feature	2013-03-02 07:57:41 -06:00
scrawl	e1957e4ee9	Potion effects should be hidden until discovered	2013-03-02 13:34:26 +01:00
Marc Zinnschlag	0f4f91605a	some cleanup	2013-03-02 11:19:48 +01:00
Marc Zinnschlag	401903c9ce	Merge remote-tracking branch 'lazydev/master'	2013-03-02 11:11:41 +01:00
lazydev	ccb7ed93b3	fix for https://bugs.openmw.org/issues/593	2013-03-02 03:54:25 +04:00
Marc Zinnschlag	3961fb36d4	Merge remote-tracking branch 'chris/transparency-fixes'	2013-03-01 23:18:35 +01:00
Chris Robinson	e6b547b9ba	Merge remote-tracking branch 'zini/master' into transparency-fixes	2013-03-01 13:32:30 -08:00
scrawl	ef1678e47e	Oops, rotation center should be dynamic	2013-03-01 22:32:02 +01:00
Chris Robinson	238a8feb18	Fix transparency checks	2013-03-01 13:27:25 -08:00
scrawl	d8f2d0195a	Got rid of the texture rotation hack by rendering the cursor manually.	2013-03-01 18:45:52 +01:00
scrawl	1d988676fe	Local map: the obtained bounding box wasn't exactly accurate, getWorldBoundingBox seems to solve this.	2013-02-28 22:56:29 +01:00
Chris Robinson	1168f15361	Don't disable depth writes when blending is enabled	2013-02-28 12:17:58 -08:00
scrawl	b7ab12e7cf	Workaround to prevent the map drawing on top of the world button	2013-02-28 21:12:13 +01:00
scrawl	3efbb5e728	Don't try to render a map in empty cells	2013-02-28 20:27:35 +01:00
Marc Zinnschlag	038c5c3e82	Merge remote-tracking branch 'mikesc/bug574'	2013-02-28 20:21:38 +01:00
Michal Sciubidlo	3df34fb5cc	fix bug 574	2013-02-28 19:52:32 +01:00
vorenon	c9a701cfa1	Removed the 3 dots after the load text.	2013-02-28 19:25:18 +01:00
vorenon	f66f67eaa1	Loading text uses now the corresponding GMSTs	2013-02-28 17:54:42 +01:00
vorenon	a6fb58bc59	Using "Loading Exterior" and "Loading Interior" instead of "Loading Cell" ... This commit replaces the default "Loading Cell" text with "Loading Interior" and "Loading Exterior"	2013-02-28 16:31:24 +01:00
vorenon	d4aa33b9a7	Removing the unloading cells part instead of just commenting them.	2013-02-28 15:58:03 +01:00
vorenon	ffd96c7715	Removed "Unloading Cell..." text from loading screen ... OpenMW unloads the cell so fast, it's hardly noticable. This commit gets rid of the "flicker" every time a cell loads.	2013-02-28 13:19:05 +01:00
Chris Robinson	bfe80bb8dc	Avoid duplicating skeletons due to casing issues ... Manually created resource names are apparently always case sensitive, causing some skeletons to get loaded multiple times.	2013-02-27 12:33:36 -08:00
Marc Zinnschlag	ce1310614c	Merge remote-tracking branch 'potatoesmaster/pinned'	2013-02-27 17:37:04 +01:00
Marc Zinnschlag	14459460c1	Merge remote-tracking branch 'potatoesmaster/gender'	2013-02-27 17:36:57 +01:00
Marc Zinnschlag	7cae69ee4e	Merge remote-tracking branch 'vorenon/master'	2013-02-27 17:36:03 +01:00
Emanuel Guevel	be9d49c510	Do not hide pinned windows during loadings	2013-02-27 16:17:41 +01:00
Emanuel Guevel	0bc4c3556a	Fix dialogue gender filter	2013-02-27 15:58:01 +01:00
scrawl	369f881170	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-27 09:25:44 +01:00
scrawl	9b0ac4e299	NPCs / creatures can now emit ripples	2013-02-27 09:20:42 +01:00
vorenon	89cba3cf45	Replaced ifs/elseifs with switch	2013-02-26 19:52:51 +01:00
vorenon	13c33c1613	added missing click sound to main menu	2013-02-26 19:37:47 +01:00
Chris Robinson	35e2b6942a	Merge remote-tracking branch 'zini/master' into misc-cleanup	2013-02-26 10:21:28 -08:00
Chris Robinson	ceafcc2ebb	Support float samples with ffmpeg ... Requires the AL_EXT_FLOAT32 extension in OpenAL	2013-02-26 10:19:33 -08:00
Nathan Jeffords	21f502e3dd	properly handle potentially non 16 bit planar audio formats	2013-02-26 09:37:18 -08:00
vorenon	b1ca719d61	Added click sound to OK button for message boxes	2013-02-26 16:37:59 +01:00
vorenon	1a43d86d9e	Close messages boxes with the activation key (Bug #589)	2013-02-26 15:58:32 +01:00
scrawl	d4264353a3	Merge branch 'z-up' into graphics ... Conflicts: apps/openmw/mwrender/localmap.cpp apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/water.cpp files/materials/water.shader	2013-02-26 14:54:53 +01:00
Marc Zinnschlag	dc445844d2	Merge remote-tracking branch 'scrawl/z-up'	2013-02-26 14:37:50 +01:00
Marc Zinnschlag	a7102c143f	ESX variable type cleanup	2013-02-26 14:37:11 +01:00
scrawl	b9912a19e0	Z-up conversion: fix player arrow direction on global map	2013-02-26 14:31:30 +01:00
scrawl	cd68012498	Z-up conversion: raycasts	2013-02-26 14:28:35 +01:00
scrawl	cc9b72b9b1	Removing some leftovers of mwRoot node	2013-02-26 14:01:10 +01:00
scrawl	341f9b96e2	Local map: restore zHigh	2013-02-26 13:53:23 +01:00
scrawl	284ba58e1e	Z-up conversion: global map, shader fix	2013-02-26 13:52:01 +01:00
scrawl	2e7bc1a368	Z-up conversion: local map, fix tcg	2013-02-26 13:39:10 +01:00
scrawl	5c0c5854e8	Unrelated change: we always want the XAutoRepeat workaround, regardless of using exclusive input or not	2013-02-26 12:01:10 +01:00
scrawl	3ef952172d	Z-up conversion: water, sky	2013-02-26 10:38:48 +01:00
scrawl	3cb3ec91c0	Z-up conversion: camera	2013-02-26 09:12:35 +01:00
scrawl	a5451eb9d9	Z-up conversion: terrain, objects	2013-02-26 08:30:06 +01:00
Chris Robinson	955e2713a9	Fix encumbrance term calculation	2013-02-25 17:29:32 -08:00
Chris Robinson	a576e9e430	Set the race selection character preview in a valid (idle) pose.	2013-02-25 16:40:08 -08:00
Chris Robinson	9679daa6a4	Merge remote-tracking branch 'zini/master' into misc-cleanup	2013-02-25 13:10:21 -08:00
Chris Robinson	da575b181e	Use the correct GMST for the race menu	2013-02-25 13:04:17 -08:00
Pieter van der Kloet	b209b6a0e6	Added missing includes	2013-02-25 22:00:51 +01:00
Pieter van der Kloet	469d608f51	Merge remote-tracking branch 'upstream/master' into launchernext	2013-02-25 21:26:54 +01:00
Pieter van der Kloet	9cd8dd39de	Make the launcher code conform to the coding standards and cleanup	2013-02-25 21:22:07 +01:00
Marc Zinnschlag	bd9884b244	Merge remote-tracking branch 'chris/misc-cleanup'	2013-02-25 19:45:09 +01:00
Chris Robinson	000128d084	Merge remote-tracking branch 'zini/master' into misc-cleanup	2013-02-25 10:38:08 -08:00
Marc Zinnschlag	08f13ef5ab	Merge remote-tracking branch 'greye/master'	2013-02-25 19:34:03 +01:00
Marc Zinnschlag	fa45def475	Merge remote-tracking branch 'scrawl/master'	2013-02-25 19:30:30 +01:00
greye	661fd73c6e	fix rotation for objects in inactive cells and forced vanity mode	2013-02-25 22:00:50 +04:00
Chris Robinson	48271e49ec	Properly update the Ptr object in the mechanics manager when moving across cells	2013-02-25 09:57:34 -08:00
scrawl	8aff033a0c	Atmosphere no longer does "real" alpha blending to blend with the horizon, this is in preparation for proper underwater viewport BG / fog	2013-02-25 18:29:11 +01:00
scrawl	b1fc68d44d	Merge branch 'master' into graphics	2013-02-25 17:36:33 +01:00
scrawl	355390429e	Fix World::isUnderwater to use dynamic waterlevel	2013-02-25 17:27:50 +01:00
Marc Zinnschlag	88e8659a49	minor cleanup	2013-02-25 16:52:31 +01:00
Chris Robinson	5d5d28c06c	Increase the ID cache to 40 ... Helps improve performance with Tribunal and Bloodmoon's scripts	2013-02-25 07:43:56 -08:00
scrawl	73d48a95f6	Add message box when the player tries to move when being overencumbered.	2013-02-25 16:31:48 +01:00
scrawl	cacdb33b42	Merge branch 'master' into graphics ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/sky.cpp	2013-02-25 15:12:03 +01:00
Marc Zinnschlag	cd40d167ce	Merge remote-tracking branch 'chris/animation2'	2013-02-25 14:56:03 +01:00
scrawl	dfe29db9cb	Fix bug #591: Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation)	2013-02-25 06:57:32 +01:00
Pieter van der Kloet	c4ebdc230c	Cleaned up strings and indentation	2013-02-25 01:28:13 +01:00
Pieter van der Kloet	a0007325ad	Added a warning when stylesheet cannot be read and check if data paths contain masters/plugins	2013-02-25 01:22:14 +01:00
Pieter van der Kloet	6eaaf20c94	Merge remote-tracking branch 'upstream/master' into launchernext	2013-02-25 00:56:23 +01:00
Pieter van der Kloet	17a0a201df	Various fixes and changes to the settings handling	2013-02-25 00:56:04 +01:00
Chris Robinson	000236ba80	Merge remote-tracking branch 'zini/master' into animation2	2013-02-24 15:30:46 -08:00
Chris Robinson	74b8095fc7	Use default parameters where appropriate	2013-02-24 14:43:20 -08:00
Chris Robinson	5267d17408	Revert "forgot to destroy child scene nodes" ... This reverts commit f1a3309392. Unneeded. The caller already calls this which destroys the children recursively	2013-02-24 14:14:08 -08:00
ChrisKCat	9e7b559b09	Merge pull request #6 from scrawl/lights ... For light objects without an AttachLight bone, attach the light to the c...	2013-02-24 14:12:53 -08:00
scrawl	f1a3309392	forgot to destroy child scene nodes	2013-02-24 19:03:25 +01:00
scrawl	1ae2d3c6ab	For light objects without an AttachLight bone, attach the light to the center of the object instead of the origin.	2013-02-24 19:00:06 +01:00
Nathan Jeffords	7ea1f6a02a	fixes for using FFMPEG on windows	2013-02-24 09:42:08 -08:00
scrawl	a3afb91485	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-24 18:04:51 +01:00
Chris Robinson	94be45e07e	Merge remote-tracking branch 'zini/master' into animation2	2013-02-24 06:20:10 -08:00
ChrisKCat	aab7cf137b	Merge pull request #5 from greye/cross-cell ... fix and unify object cell change update in mwrender	2013-02-24 05:32:52 -08:00
Marc Zinnschlag	fa880e3274	Merge remote-tracking branch 'lazydev/master'	2013-02-24 14:07:52 +01:00
Chris Robinson	db9a3aeddf	Merge remote-tracking branch 'zini/master' into animation2	2013-02-24 03:32:35 -08:00
Chris Robinson	89d4c245e9	Better calculate jump velocity ... The fatigue term isn't currently used correctly	2013-02-24 03:30:33 -08:00
greye	6a8c532244	fix and unify object cell change update in mwrender	2013-02-24 15:04:56 +04:00
scrawl	0d6a3367d3	Water shader no longer depends on object shaders being enabled	2013-02-24 10:28:50 +01:00
scrawl	3135482cee	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-24 10:06:04 +01:00
Pieter van der Kloet	919d1ee572	Some fixes to the settings handlers	2013-02-24 04:14:18 +01:00
Pieter van der Kloet	4737b20e4c	Fixed a bug in the combobox popup font size, items overlapping	2013-02-24 04:00:22 +01:00
Pieter van der Kloet	be43fa334f	Added support for non-latin characters, fixes Bug #515	2013-02-24 03:14:19 +01:00
Pieter van der Kloet	9198afeefb	Improved context menu, added context menu for masters and added multi-selection support	2013-02-24 03:10:27 +01:00
Chris Robinson	90cb9ee0ac	Don't set a vertical velocity when on the ground	2013-02-23 16:30:11 -08:00
lazydev	a5ff8181b7	fix for https://bugs.openmw.org/issues/569	2013-02-24 03:35:43 +04:00
Chris Robinson	8e59ea4941	Use a separate method to handle animation events	2013-02-23 14:39:01 -08:00
Pieter van der Kloet	150d4a7a72	Added support for multiple ini files	2013-02-23 23:18:42 +01:00
Chris Robinson	d77d035d3a	Handle the "sound" events in runAnimation	2013-02-23 14:15:11 -08:00
Chris Robinson	df8889dcc4	Limit maximum frame time to 200ms ... This effectively slows game time when it drops below 5 fps. Something like this is desirable when dealing with time-based animations, which can jump forward after a lengthy cell transition.	2013-02-23 13:15:37 -08:00
Marc Zinnschlag	9a03b17b2d	Merge branch 'localworkaround'	2013-02-23 20:50:22 +01:00
Marc Zinnschlag	a95431c387	fix	2013-02-23 20:20:40 +01:00
Marc Zinnschlag	9e8d0128e0	Merge remote-tracking branch 'blunted2night/size_t-warnings_v2'	2013-02-23 20:06:27 +01:00
Nathan Jeffords	44b1c66c4b	fixed various warnings about converting size_t to int	2013-02-23 10:23:38 -08:00
Chris Robinson	d208422ca7	Add a method to update an Animation's Ptr object	2013-02-23 10:12:36 -08:00
Marc Zinnschlag	d98ec67671	Merge remote-tracking branch 'graffy76/recentfiles'	2013-02-23 18:53:33 +01:00
Chris Robinson	a2eaec7878	Avoiding holding the InventoryStore in the NpcAnimation class	2013-02-23 08:03:52 -08:00
Chris Robinson	0d0e75fe0b	Don't set animation sources for models that don't have a skeleton	2013-02-23 07:36:11 -08:00
graffy76	89dace3cc3	Fix for operations widget - hides when no operations are running.	2013-02-23 09:07:13 -06:00
Chris Robinson	0148db8ccf	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/npcanimation.hpp	2013-02-23 05:59:35 -08:00
Marc Zinnschlag	3472a6f180	workaround for infinite recursion during local variable access	2013-02-23 14:40:56 +01:00
scrawl	4b51184ec4	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-23 14:37:28 +01:00
Chris Robinson	e6da9dfae5	Specify the animation key to stop playing at	2013-02-23 05:15:10 -08:00
Marc Zinnschlag	59748a7647	Merge remote-tracking branch 'greye/cross-cell'	2013-02-23 13:55:31 +01:00
Sergey Shambir	a3adcf752d	TradeWindow: fixed coding style ... Mentioned here: https://github.com/zinnschlag/openmw/pull/554	2013-02-23 13:51:21 +01:00
greye	ac7095537f	remove insertMesh() call on object cell change	2013-02-23 16:50:37 +04:00
greye	d983ed5c78	fix invalid SceneNode pointer on cell change	2013-02-23 16:45:55 +04:00
greye	9659b4a95e	update NpcAnimation inventory reference on cell change	2013-02-23 16:45:55 +04:00
Marc Zinnschlag	868916a9a2	added add-on global variables in the same way add-on GMSTs were added	2013-02-23 12:51:45 +01:00
Marc Zinnschlag	6f5a772d02	fixed another case handling problem	2013-02-23 12:35:05 +01:00
Chris Robinson	b8f5813609	Set all animation sources at once	2013-02-23 03:34:03 -08:00
Marc Zinnschlag	c9ca565462	removed a redundant function call	2013-02-23 12:05:09 +01:00
Chris Robinson	f841576bba	Don't override animations played with playgroup	2013-02-23 01:54:46 -08:00
scrawl	7e816c826b	Fix lights without a mesh	2013-02-23 09:17:12 +01:00
scrawl	01102f9c73	Don't emit if there wasn't enough movement	2013-02-23 05:53:20 +01:00
graffy76	6f89d453a5	Operations widget height fix and abort button feature. Successfully ... tested resizing of Operations QDockWidget for multiple concurrent operations.	2013-02-22 21:53:32 -06:00
scrawl	5b099393fa	Fix time factor	2013-02-23 04:43:51 +01:00
scrawl	db9e49968e	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-23 04:13:51 +01:00
scrawl	f17ea109ca	Fix light positions	2013-02-23 04:06:05 +01:00
Chris Robinson	b12c6a4c16	Fix character preview	2013-02-22 11:16:00 -08:00
Chris Robinson	ecbf1568a1	Fix NPC part attachment	2013-02-22 10:15:29 -08:00
Chris Robinson	9dee2a72cd	Use a separate method to calculate animation velocity	2013-02-22 09:22:06 -08:00
Chris Robinson	3c0b29de45	Merge remote-tracking branch 'zini/master' into animation2	2013-02-22 01:34:22 -08:00
Chris Robinson	84227caa0c	Cleanup Npc::getSpeed a little	2013-02-22 01:30:06 -08:00
Chris Robinson	7ec73c29f2	Do not return the player's Animation object for non-players	2013-02-22 01:27:26 -08:00
Chris Robinson	9c3af5f344	Do not interpret noclip mode as flying	2013-02-22 01:26:30 -08:00
lazydev	71e5369f04	Loading translation data for all the plugin files, not only for the first one	2013-02-22 02:18:54 +04:00
Chris Robinson	7fcca180b6	Implement rudimentary jumping	2013-02-20 20:08:04 -08:00
Pieter van der Kloet	63a13cf9ca	Whoops, removed an include	2013-02-20 19:29:12 +01:00
Pieter van der Kloet	18d01cd65a	Implemented a first-run dialog to import Morrowind.ini settings	2013-02-20 19:27:04 +01:00
Chris Robinson	bbde0146a7	Merge remote-tracking branch 'zini/master' into animation2	2013-02-20 08:27:40 -08:00
Chris Robinson	4eb8ea0c95	Fix stepping and vertical force accumulation	2013-02-20 07:51:36 -08:00
Chris Robinson	b14def7c09	Set the character as being on the ground when colliding with a shallow enough slope	2013-02-20 05:24:38 -08:00
Chris Robinson	fe6fa9ebe7	Simplify newtrace a bit	2013-02-20 04:14:52 -08:00
Chris Robinson	617158afcd	Ensure updated skeleton bone placement matches in world space ... Objects attached to actors (shirts, robes, etc) do not require the same node hierarchy as the character root. So to ensure proper placement, we need to set the bone target's derived transformation using the source bone's derived transformation (which in turn means we need to work up from the root, to ensure the bone's parents are properly placed).	2013-02-20 02:41:46 -08:00
Chris Robinson	cfdc820a1f	Make an actor fly when it has a levitate effect	2013-02-20 01:55:12 -08:00
Emanuel Guevel	3dc28baa28	Remove "PinToggle" event from layout file	2013-02-20 01:31:10 +01:00
Emanuel Guevel	3ba3c71556	Make the "lock window" button to change state visually	2013-02-20 01:30:39 +01:00
Emanuel Guevel	43d6392921	Change the way pinnable window are made visible ... This ensure pinned window are not displayed in main menu, dialogue and container mode.	2013-02-20 01:00:13 +01:00
Pieter van der Kloet	2172fb4229	Added checkable message box class	2013-02-19 16:41:33 +01:00
Pieter van der Kloet	35b68a3c40	Fixed accidental profile deletion and added sorting by date	2013-02-19 15:58:01 +01:00
Chris Robinson	8196694c08	Avoid applying the animation when resetting it	2013-02-19 06:04:25 -08:00
Chris Robinson	f8349a04bf	Use the looping portion of the animation to calculate the velocity	2013-02-19 05:26:58 -08:00
Chris Robinson	5d55b41714	Remove a now-unneeded(?) hack	2013-02-19 04:59:38 -08:00
Chris Robinson	89fabdb3a9	Update the PhysicActor's RigidBody when moving ... This works, but is less than ideal. As it is now, the rigid body gets updated twice as the position and rotation are set separately. They should instead be updated together.	2013-02-19 04:18:15 -08:00
Chris Robinson	1399a06c76	Update animation looping when setting the same state	2013-02-19 04:01:33 -08:00
Chris Robinson	a510adc572	Allow stepping when not being affected by gravity	2013-02-19 02:25:57 -08:00
Chris Robinson	8255a64bfe	Handle levitate and swift swim effects	2013-02-19 02:10:36 -08:00
Chris Robinson	c694161272	Don't try to step if not on the ground	2013-02-19 01:28:02 -08:00
Chris Robinson	5a1a0b7338	Add and use an MWWorld::isFlying method	2013-02-18 22:39:43 -08:00
Chris Robinson	17200cb226	Don't try to move when there's no speed	2013-02-18 20:43:55 -08:00
scrawl	5d403ebdd3	Fix collision debug drawer (tcg)	2013-02-19 04:03:24 +01:00
scrawl	427152c518	Disabled ripples until we can properly trigger them from the new character controller.	2013-02-19 03:15:31 +01:00
scrawl	6cceb04adf	When a custom near clip plane is used, we need to fix up a second viewproj matrix manually to get proper depth values in the vertex shader. This fixes fog on reflections.	2013-02-19 03:08:00 +01:00
Pieter van der Kloet	37fe31e858	Merge remote-tracking branch 'upstream/next' into settings_selwidget	2013-02-19 01:12:47 +01:00
scrawl	32b837ebd4	Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics	2013-02-19 00:15:54 +01:00
Pieter van der Kloet	bcf4f96209	Added writing masters/plugins to openmw.cfg	2013-02-18 23:10:50 +01:00
Pieter van der Kloet	178cf2154e	Made checking/unchecking work with the new datafiles model	2013-02-18 17:59:08 +01:00
Chris Robinson	627b866744	Don't try to set a new state when dead	2013-02-18 06:29:16 -08:00
Chris Robinson	f2948ced23	Allow diagonal movement	2013-02-18 03:07:31 -08:00
Marc Zinnschlag	0713afb97d	Merge branch 'gmstfixing' into next	2013-02-18 09:24:22 +01:00
Marc Zinnschlag	a50ff34774	better default value for string GMSTs	2013-02-18 09:23:14 +01:00
scrawl	42883ec64b	cleanup	2013-02-18 02:33:53 +01:00
Chris Robinson	bea460955d	Merge remote-tracking branch 'zini/next' into animation2	2013-02-17 16:03:39 -08:00
Marc Zinnschlag	1343c2c22b	Merge remote-tracking branch 'scrawl/next' into next	2013-02-17 20:29:45 +01:00
scrawl	b52df83d84	Pressing Enter should skip _one_ message box, not skip all message boxes until the key is released again	2013-02-17 20:23:22 +01:00
Marc Zinnschlag	e5149e57ac	Merge remote-tracking branch 'scrawl/next' into next	2013-02-17 20:04:18 +01:00
Marc Zinnschlag	475f4f9311	implicitly add Tribunal/Bloodmoon GMSTs to base, if present neither in base nor in modified	2013-02-17 20:03:39 +01:00
scrawl	52d0f0b750	Fixed OpAddItem, OpRemoveItem	2013-02-17 19:44:00 +01:00
Marc Zinnschlag	abd307d70e	Issue #567: workaround for crash with non-English ESX files	2013-02-17 19:26:01 +01:00
scrawl	e1ca0a15ae	Add message box when item is added to player's inventory	2013-02-17 18:58:54 +01:00
scrawl	170a9762ac	Fix travel services not actually costing gold.	2013-02-17 18:30:21 +01:00
scrawl	791d16bbdb	Use infinite AAB for sky meshes to fix them from disappearing from underwater refraction, while still taking advantage of CPU culling for other meshes	2013-02-17 18:12:38 +01:00
Marc Zinnschlag	31bfe62bbc	Merge remote-tracking branch 'scrawl/bug_562' into next	2013-02-17 17:41:19 +01:00
Marc Zinnschlag	9221c861c5	Merge remote-tracking branch 'graffy76/next' into next ... Conflicts: apps/opencs/CMakeLists.txt	2013-02-17 17:38:33 +01:00
Marc Zinnschlag	bb990b96bf	Merge branch 'globaltype' into next	2013-02-17 17:27:41 +01:00
Marc Zinnschlag	50d61a5b6e	proper implementation of gmst type column	2013-02-17 17:27:25 +01:00
scrawl	7ffcfa3622	Water and clouds no longer depend on timescale.	2013-02-17 16:23:55 +01:00
scrawl	5a11ddc485	Pressing F1 again hides the quick keys menu.	2013-02-17 16:01:36 +01:00
scrawl	d899f33444	Race/Class/Birth dialogs: immediately enable OK buttons since they have a preselected entry now.	2013-02-17 16:00:31 +01:00
scrawl	00db13be32	Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.	2013-02-17 15:56:22 +01:00
graffy76	ceefae81e8	fix for the opencs icon	2013-02-17 07:46:50 -06:00
Chris Robinson	e2d7cc49e3	Merge remote-tracking branch 'zini/next' into animation2	2013-02-17 03:42:37 -08:00
Marc Zinnschlag	44d66cbf5a	Merge remote-tracking branch 'scrawl/bug_562' into next	2013-02-17 09:09:31 +01:00
Marc Zinnschlag	448293f270	Merge remote-tracking branch 'scrawl/bug_559' into next	2013-02-17 09:09:06 +01:00
Marc Zinnschlag	b8c0c94d5f	Merge remote-tracking branch 'wareya/master' into next	2013-02-17 08:58:41 +01:00
scrawl	c4f17f5596	playercontrols switch now disables activation in general (Chris' suggestion)	2013-02-17 03:03:41 +01:00
scrawl	373de19aee	Removed dialogue fix again, now on separate branch	2013-02-17 03:02:47 +01:00
scrawl	df8e502f8c	Ouch, I used && instead of &, this broke actions without a sound	2013-02-17 02:52:49 +01:00
Wareya	c98a815581	Remove debug printing from previous commit	2013-02-16 13:37:25 -05:00
Wareya	f0220fb06b	Implement "Rest Until Healed" ... Fixes: https://bugs.openmw.org/issues/563	2013-02-16 13:35:03 -05:00
scrawl	a5c8d5748f	fix FailedAction.	2013-02-16 18:05:25 +01:00
scrawl	0bc34c1c0d	Action::executeImp returns a bool value to indicate if the sound should be played.	2013-02-16 16:40:44 +01:00
scrawl	7d918caa93	Don't allow dialogue if player controls are disabled.	2013-02-16 16:26:40 +01:00
Marc Zinnschlag	910858c300	Merge remote-tracking branch 'sergeyshambir/guiconvience' into next	2013-02-16 14:50:42 +01:00
Douglas Mencken	eb09662f1d	Don't include boost/filesystem/v3/operations.hpp, use boost/filesystem/operations.hpp instead. ... It is boost headers' job to deal with their internals.	2013-02-16 14:49:11 +01:00
Douglas Mencken	a3e421167b	esmtool/labels: bodyPartLabel, meshPartLabel, meshTypeLabel ... Signed chars, unsigned chars... Just use int for index everywhere.	2013-02-16 14:48:44 +01:00
Chris Robinson	158e18b98d	Remove an unused method	2013-02-16 00:30:07 -08:00
Chris Robinson	c965bd8e18	Increase step size to 30	2013-02-15 17:22:55 -08:00
Douglas Mencken	df5919f2c5	Use `signed char' explicitly where needed. It is important because: ... - It is implementation-dependent if plain `char' signed or not. - C standard defines three *distinct* types: char, signed char, and unsigned char. - Assuming that char is always unsigned or signed can lead to compile-time and run-time errors. You can also use int8_t, but then it would be less obvious for developers to never assume that char is always unsigned (or always signed). Conflicts: components/esm/loadcell.hpp	2013-02-15 20:28:14 +01:00
scrawl	4da11a96a5	Fixed gold ref count always becoming 1 when dropped on the ground	2013-02-15 17:34:55 +01:00
Pieter van der Kloet	fd430dc5a9	Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget ... Conflicts: apps/launcher/datafilespage.cpp components/fileorderlist/datafileslist.cpp	2013-02-15 15:38:30 +01:00
Pieter van der Kloet	ee27e3bb58	Merge remote-tracking branch 'upstream/next' into settingsnext ... Conflicts: apps/launcher/CMakeLists.txt apps/launcher/datafilespage.cpp apps/launcher/datafilespage.hpp apps/launcher/graphicspage.cpp components/fileorderlist/utils/filedialog.cpp components/fileorderlist/utils/filedialog.hpp	2013-02-15 15:21:14 +01:00
Pieter van der Kloet	0e143b1926	Merge remote-tracking branch 'upstream/master' into settingsparser	2013-02-15 14:45:19 +01:00
Pieter van der Kloet	43e9ad8733	The text color of the profiles dialog now turns red on invalid names	2013-02-15 14:26:09 +01:00
Pieter van der Kloet	990895fd2b	Mainwindow size and position now gets saved/restored	2013-02-15 14:12:25 +01:00
Chris Robinson	c57001e3bd	Remove an unused field	2013-02-15 05:11:06 -08:00
Chris Robinson	e4341525c8	Add a jump state ... Currently unused	2013-02-15 04:45:28 -08:00
Chris Robinson	ff0099fa6e	Scale the animation speed based on the animation velocity and movement speed ... This may not be totoally correct since it takes the whole animation into account, rather than just the looping portion. But it's good enough for now.	2013-02-15 02:15:39 -08:00
Chris Robinson	e1a1530774	Better implement Npc::getSpeed	2013-02-15 01:27:57 -08:00
Chris Robinson	3348e8a436	Clarify a comment	2013-02-14 22:41:14 -08:00
Chris Robinson	ac717373b1	Add a method to check if an object is on the ground	2013-02-14 22:35:15 -08:00
Chris Robinson	18b606fddf	Use the PhysicActor's set/getOnGround method	2013-02-14 20:10:04 -08:00
Chris Robinson	15dc82f454	Increase step size to 15	2013-02-14 18:59:05 -08:00
Chris Robinson	a729b1b12a	Snap to the ground after moving ... Depends on two factors: * End up close enough above to a walkable plane (it's within sMaxStep units down and is angled sMaxSlope or less) * Started out on the ground without any upward movement This also reduces the distance needed to be to the ground to 4 (from 10), and ensures the actor is 2 units above the ground when on it. Downward force is also removed when starting on the ground.	2013-02-14 18:34:51 -08:00
Pieter van der Kloet	1b9cf8c23f	More work on integrating the settings parser, profiles are handled correctly	2013-02-15 01:20:48 +01:00
scrawl	7604fb51b6	CG no longer listed in the settings if the plugin isn't loaded.	2013-02-14 23:17:21 +01:00
Pieter van der Kloet	5d1bede9e5	Forgot to add two files	2013-02-14 11:20:47 +01:00
scrawl	6a49ea9b4f	Cleaning out some old bits	2013-02-13 18:39:36 +01:00
Chris Robinson	6a9755778e	Merge remote-tracking branch 'zini/next' into animation2	2013-02-12 18:14:46 -08:00
scrawl	de90b911c9	Near clip plane corrections	2013-02-12 20:56:00 +01:00
scrawl	d213ff680f	Disabled terrain LOD	2013-02-12 20:55:45 +01:00
Marc Zinnschlag	5e3529783d	Merge remote-tracking branch 'ace/win-fixes' into next	2013-02-12 15:42:45 +01:00
Alexander "Ace" Olofsson	bbb845824d	Added typedef for ssize_t in windows and fixed a use of __PRETTY_FUNCTION__	2013-02-12 13:59:24 +01:00
Alexander "Ace" Olofsson	0ae01794f1	Fixed build errors in OpenCS	2013-02-12 13:57:16 +01:00
Sergey Shambir	7d7a1119da	Fixed book text misalignment, at least in some cases ... https://bugs.openmw.org/issues/284	2013-02-12 11:49:20 +04:00
Sergey Shambir	03803f19b5	BookTextParser: moved to Ogre::UTFString ... Font height and unicode characters glyph width now accounted correctly.	2013-02-12 11:22:19 +04:00
Sergey Shambir	3b64389668	BookTextParser: fixed infinitive loop	2013-02-12 11:14:30 +04:00
Marc Zinnschlag	1a079ec8d3	Merge branch 'master' into next	2013-02-11 19:53:51 +01:00
Marc Zinnschlag	1fd7d8ed2a	Merge remote-tracking branch 'graffy76/master' into next	2013-02-11 15:35:59 +01:00
Pieter van der Kloet	aa25471517	WIP: working on improving the config file handling	2013-02-11 15:01:00 +01:00
graffy76	55dd17c27c	Added setBarColor() function to CSVDoc::Operation. Created four color ... types for existing operations (save, verify, compile and search), with a default for future / undefined ops.	2013-02-11 04:30:16 -06:00
Michal Sciubidlo	f4d60ae7b2	Files sorting (masters then plugins). ... Remove unneeded includes.	2013-02-10 19:59:25 +01:00
Marc Zinnschlag	64d9d9e2ce	Merge remote-tracking branch 'wheybags/master' into next	2013-02-10 17:29:28 +01:00
Marc Zinnschlag	eb6590f7d8	added delegate factory	2013-02-10 17:21:25 +01:00
Tom Mason	c32c31f6d6	break after activating button	2013-02-10 15:41:02 +00:00
Tom Mason	158c6fc9fa	pressing enter when a messagebox is prompting for "ok", will activate ok button	2013-02-10 14:58:46 +00:00
Sergey Shambir	59808c3e10	GUI: Birth and Class dialogs now both select 1st item in list at first ... time.	2013-02-10 08:59:38 +04:00
Sergey Shambir	725bfe6372	TradeWindow: balance now changes per time if user holds +/- button ... pressed	2013-02-10 08:50:36 +04:00
Sergey Shambir	bba024d6ad	Right mouse button click now stops Container GuiMode.	2013-02-10 08:37:45 +04:00
Chris Robinson	4ee5857bae	Filter accumulation axis for mLastPosition as needed	2013-02-09 19:09:56 -08:00
Chris Robinson	8d6f017f17	Remove an unneeded Animation field	2013-02-09 13:25:39 -08:00
Chris Robinson	34ddf69a31	Merge remote-tracking branch 'zini/next' into animation2	2013-02-09 09:46:57 -08:00
scrawl	d47090b312	Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics	2013-02-09 16:40:10 +01:00
Marc Zinnschlag	f19fbaa293	Merge remote-tracking branch 'mark76/multiple_esm_esp' into next	2013-02-09 15:30:29 +01:00
Marc Zinnschlag	2d937cd9e2	Merge branch 'gmst' into next	2013-02-09 15:26:25 +01:00
Marc Zinnschlag	d40ee06897	fixed base/modified logic	2013-02-09 15:25:50 +01:00
Mark Siewert	55bd9eef66	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-02-09 13:03:35 +01:00
Mark Siewert	eefbdde6de	- For pull request: remove all instances of maps used to track refnumbers. ... - new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.	2013-02-09 13:00:57 +01:00
scrawl	6805c7bab4	Merge branch 'master' into graphics	2013-02-08 18:35:41 +01:00
Marc Zinnschlag	828695f295	added value column to gmst table	2013-02-08 14:48:38 +01:00
Marc Zinnschlag	cce2d63433	added type column to gmst table	2013-02-08 12:20:03 +01:00
Marc Zinnschlag	d5dd0640c7	basic gmst support	2013-02-08 09:58:19 +01:00
Chris Robinson	f5afa43db5	Remove an unneeded parameter	2013-02-07 17:45:41 -08:00
Chris Robinson	d47d2216f2	Use some const references where appropriate	2013-02-07 16:33:44 -08:00
Chris Robinson	cbdd459500	Remove unneeded playerMove from PhysicActor	2013-02-07 15:48:41 -08:00
Chris Robinson	ca6f8b6d88	Reorganize a bit of code in the movement solver	2013-02-07 13:18:16 -08:00
Chris Robinson	fe0e6c452d	Remove the unneeded playerMove object from PhysicsSystem	2013-02-07 12:11:10 -08:00
Nikolay Kasyanov	0d4b0bfd93	Trying to resolve sound issues on OS X with ffmpeg backend	2013-02-07 23:40:20 +04:00
Marc Zinnschlag	dd2b7d5c63	handle deleted records	2013-02-07 13:26:00 +01:00
Marc Zinnschlag	c1cd8305bc	a bit of cleanup for the previous commit	2013-02-07 13:13:06 +01:00
Marc Zinnschlag	21733e8181	hide startup dialogue when opening open dialogue	2013-02-07 13:11:41 +01:00
Marc Zinnschlag	adcaea464b	basic globals record loading	2013-02-07 12:52:01 +01:00
Marc Zinnschlag	7d112e4d5c	rewrote logic of content file loading	2013-02-07 11:33:08 +01:00
Chris Robinson	8de2d24d0e	Restore old ground check	2013-02-06 21:57:59 -08:00
Chris Robinson	923d0d6eb4	Fix up some header includes	2013-02-06 21:47:09 -08:00
Chris Robinson	e577ee2de8	Add a method to set/retrieve being on the ground	2013-02-06 21:44:58 -08:00
Chris Robinson	ebc7bc9427	Rename A_AlwaysRun to A_Run ... Note that there is an "always run" key, but its functionality is handled by A_ToggleWalk.	2013-02-06 18:22:16 -08:00
Chris Robinson	a8f0ce43a5	Add a run key	2013-02-06 17:51:47 -08:00
Chris Robinson	cbaf489eb6	Add running states	2013-02-06 16:53:52 -08:00
Chris Robinson	04524fbf92	Don't scale the movement vector up	2013-02-06 15:23:52 -08:00
Chris Robinson	bdda7278c4	Use 3/4ths of the physic actor's height to test if swimming	2013-02-06 12:56:30 -08:00
Chris Robinson	dfd16c4424	Fix movement rotations	2013-02-06 12:39:26 -08:00
Marc Zinnschlag	43912f927a	Merge remote-tracking branch 'potatoesmaster/importer' into next ... Conflicts: apps/openmw/mwworld/worldimp.cpp	2013-02-06 10:12:40 +01:00
Chris Robinson	9cf30f39bd	Don't apply gravity when swimming	2013-02-05 19:45:51 -08:00
Chris Robinson	fc307e64b0	Add swimming states	2013-02-05 19:05:07 -08:00
Chris Robinson	18b7008409	Better fix some scaling issues	2013-02-05 18:25:09 -08:00
Chris Robinson	535cd8360f	Load extra animations for NPCs	2013-02-05 18:09:43 -08:00
Chris Robinson	8b1e7b95ba	Attempt to load the skeleton source if it doesn't yet exist	2013-02-05 17:55:12 -08:00
Chris Robinson	c839502743	Setup base_anim.nif as an initial skeleton source for biped creatures	2013-02-05 17:16:45 -08:00
Chris Robinson	054ef3113a	Check existing skeleton sources if the current one has no animation root	2013-02-05 17:15:40 -08:00
Chris Robinson	16933e3926	Scale the accumulation root translation	2013-02-05 16:59:20 -08:00
Chris Robinson	600fe06f00	Use a vector of skeletons to handle animation sources	2013-02-05 16:29:51 -08:00
Chris Robinson	e217a3d25c	Silence some console spam	2013-02-05 15:51:26 -08:00
Emanuel Guevel	a4f051e85a	Fix game files import	2013-02-06 00:51:05 +01:00
Emanuel Guevel	6e3c016351	Add archives to settings imported by mwiniimporter ... Add Morrowind.bsa by default.	2013-02-06 00:51:05 +01:00
Chris Robinson	ee3764e9b3	Increase max slope to 60. 45 is too low.	2013-02-05 15:07:48 -08:00
scrawl	86d65519e3	Settings window fix	2013-02-05 23:57:30 +01:00
Chris Robinson	8c0bb1ff4d	Rotate movement in the movement solver	2013-02-05 14:02:14 -08:00
Michal Sciubidlo	347a734364	Move OpenDialog to editor and use it in startup dialogue. ... Remove debug output from DataFilesList.	2013-02-05 22:06:36 +01:00
Chris Robinson	f7f1adfb9d	Don't accumulate animations with activators	2013-02-05 12:55:06 -08:00
Chris Robinson	2c39760bd5	Move the movement solver code to mwworld's physics system	2013-02-05 12:45:10 -08:00
Michal Sciubidlo	f7e5ea24f4	Merge branch 'startup' into cs_load. ... Fix include in textinputdialog.cpp.	2013-02-05 21:23:49 +01:00
scrawl	608c112f34	Supply the new render window to mygui	2013-02-05 20:48:25 +01:00
scrawl	31f760ccce	Fixing issues from last commit: restored input and occlusion queries	2013-02-05 20:26:13 +01:00
Chris Robinson	0a4568bd11	Move the PtrMovementList typedef to MWWorld ... Use it for the doPhysics parameter, too	2013-02-05 11:03:39 -08:00
Chris Robinson	2cdda96798	Clear out some unneeded doPhysics stuff	2013-02-05 10:23:26 -08:00
scrawl	c4d518132f	With the 1x1 background window trick, we can apply VSync without restart. Some issues left though.	2013-02-05 19:22:08 +01:00
Chris Robinson	3251796ba0	Fix left/right movement	2013-02-05 09:57:08 -08:00
Chris Robinson	d50832081c	Remove the unneeded PhysicActor field from MovementSolver	2013-02-05 09:37:02 -08:00
Chris Robinson	a782a9109b	Store the vertical velocity in the physic actor	2013-02-05 09:24:22 -08:00
Chris Robinson	82e4da4e64	Get the half-extents from the physicactor	2013-02-05 07:41:57 -08:00
scrawl	499f3ac0d1	Slightly better ripple normal blending. Not physically accurate at all, but looks good.	2013-02-05 16:40:41 +01:00
Chris Robinson	1c604445ba	Store movement vectors as they get returned	2013-02-05 06:59:01 -08:00
scrawl	3772cd9257	Refraction can be disabled separately now	2013-02-05 14:29:46 +01:00
Chris Robinson	4bd1e63ac1	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: apps/openmw/mwworld/worldimp.cpp	2013-02-05 03:26:46 -08:00
Marc Zinnschlag	c409f1184e	cleaned up object movement and fixed a bug regarding local scripts	2013-02-05 12:19:06 +01:00
Chris Robinson	786cb6e928	Merge remote-tracking branch 'zini/master' into animation2	2013-02-05 02:57:02 -08:00
Marc Zinnschlag	86fb3574a0	Merge remote-tracking branch 'wheybags/master' into next	2013-02-05 11:55:47 +01:00
Chris Robinson	bd4fdf47a3	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: apps/openmw/mwrender/sky.cpp	2013-02-05 02:27:57 -08:00
scrawl	a29919d02d	restored global map	2013-02-05 00:39:56 +01:00
scrawl	35b5fdab5d	Merge branch 'terrainfix' into graphics	2013-02-05 00:28:59 +01:00
scrawl	09180666b2	Merge branch 'master' of git://github.com/zinnschlag/openmw into terrainfix	2013-02-05 00:21:42 +01:00
scrawl	58cf182db2	better place for syncing	2013-02-05 00:21:29 +01:00
scrawl	bb1f23875d	Merge branch 'terrainfix' into graphics	2013-02-04 23:16:11 +01:00
scrawl	596628d339	Fix terrain derived data update (bug 534, bug 544)	2013-02-04 23:13:01 +01:00
Chris Robinson	5ee298cdc1	Make sure the player updates last	2013-02-04 14:08:38 -08:00
Michal Sciubidlo	66ec4ca7d9	Split launcher specific code from DataFilesList back to DataFilesPage.	2013-02-04 22:14:14 +01:00
Chris Robinson	2f8affc955	Make sure the player's controller is properly updated when they change	2013-02-04 12:58:06 -08:00
scrawl	0f37c24d5f	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-02-04 21:55:41 +01:00
Chris Robinson	ee9b19d2ed	Make sure to remove a Ptr from the activators when requested	2013-02-04 12:04:06 -08:00
Chris Robinson	39cf7b0b42	Pass the Ptr of the object being moved to the move method ... This prevents having to store another copy of it, which risks getting out of sync.	2013-02-04 11:17:48 -08:00
Chris Robinson	1a5cb8760d	Rotate movement vector to world space before passing to the movement solver	2013-02-04 11:04:20 -08:00
Chris Robinson	6b32fa7999	Use the correct position for the actor	2013-02-04 09:48:21 -08:00
scrawl	bf037b7d29	Removed problematic ModVertexAlpha method, now done in shader	2013-02-04 18:03:03 +01:00
Chris Robinson	1747c1e01a	Integrate a new movement solver to handle object movement and collisions ... Temporary, and pretty breoken. Needs some serious integration fixes.	2013-02-04 07:10:14 -08:00
Marc Zinnschlag	ba0d13fc12	moved code for creating new base content records into the Document class	2013-02-04 13:50:38 +01:00
Marc Zinnschlag	4c973a0f67	constructing documents from a file list instead of a single name	2013-02-04 13:46:54 +01:00
Marc Zinnschlag	3f0a49a2f6	Merge branch 'master' into startup ... Conflicts: apps/opencs/CMakeLists.txt	2013-02-04 10:22:37 +01:00
Chris Robinson	91513206a0	Don't use per-animation accumulation values ... This breaks walking diagonally and "jumping" (which technically wasn't jumping anyway).	2013-02-03 12:02:51 -08:00
scrawl	fa07288b15	tweaked map light color	2013-02-03 20:29:50 +01:00
scrawl	5cc8af0f14	fix map positions	2013-02-03 20:06:03 +01:00
scrawl	a44dfcd2ac	Now that refraction is separated out, we don't have to worry about rendering order. Should fix transparency blending issues around water (eg waterfalls) for good.	2013-02-03 19:28:31 +01:00
scrawl	109d0a942f	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-02-03 19:02:57 +01:00
scrawl	979a874220	Fixed the custom near clip planes	2013-02-03 19:01:59 +01:00
scrawl	5334934612	Listen to render window updates and properly activate/deactivate occlusion queries pre/post update.	2013-02-03 18:03:09 +01:00
Chris Robinson	51d5efeeb2	Work out the state in the character controller update method	2013-02-03 07:15:34 -08:00
Mark Siewert	3e43db5f76	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-02-03 16:14:41 +01:00
scrawl	15e51b76de	Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth	2013-02-03 15:46:23 +01:00
Tom Mason	ac112ef972	refactored special variable code	2013-02-03 13:27:27 +00:00
Marc Zinnschlag	c97553703a	fixes for static build without cg	2013-02-03 13:47:55 +01:00
Marc Zinnschlag	a4872e3217	rewrote the opencs cmake scripts (more compact and no more annoying warnings)	2013-02-03 13:30:40 +01:00
Chris Robinson	23acf4b130	Don't break right away when the animation time remaining is 0	2013-02-03 01:38:42 -08:00
Chris Robinson	60a75cb5ee	Make sure to keep the character preview animation updated	2013-02-03 00:54:50 -08:00
Chris Robinson	7fe877d8ea	Add a couple more character states	2013-02-03 00:19:22 -08:00
Chris Robinson	007a5963de	Handle most state changes in the character controller when setting the movement vector	2013-02-02 23:39:43 -08:00
Tom Mason	f785659297	Implemented OnPCAdd special variable ... Had to edit OpAddItem in miscextensions.cpp, as local variables were not being initialised for items added through it. Does not get reset on drop, as per original morrowind.	2013-02-02 17:36:12 +00:00
Michal Sciubidlo	155cca0c9a	Upload missing files. ... Fix folder name. Keep Qt optional. Move open dialogue from doc to tools. Rename 'load' to 'open'. Deleted wrong comment.	2013-02-02 18:36:01 +01:00
Marc Zinnschlag	67a1ec5166	added provisional startup dialogue	2013-02-02 16:14:58 +01:00
Chris Robinson	c23a96d606	Run an aniamtion update after "playing" the inventory idle ... This is so all the NPC parts get updated correctly.	2013-02-02 06:08:03 -08:00
Chris Robinson	fc7590694d	Revert "Revert "Use a child scene node for the accumulation root"" ... This reverts commit 376dfed15b. I was wrong. It's needed at least for NPCs since they're attaching multiple animated skeletons to an object, and they all need to be offset correctly. Would be nice to use a Node, Bone, or TagPoint instead of a hefty SceneNode, though.	2013-02-02 05:43:37 -08:00
Marc Zinnschlag	85697e4628	reverted to C++03	2013-02-02 13:24:28 +01:00
Chris Robinson	7f87c1873b	Use an array to store the entity parts	2013-02-02 02:53:22 -08:00
scrawl	a461b282c1	water ripples (experimental)	2013-02-01 23:43:23 +01:00
Chris Robinson	376dfed15b	Revert "Use a child scene node for the accumulation root" ... This reverts commit d6f923f274. We don't need it for any of the NIFs we're currently handling. As long as there's no NIF files that would break it, we should require a stationary root if an animation wants to accumulate. If we must, a better idea may be to inject an extra bone into the skeleton instance and make that the accumulation root.	2013-02-01 08:50:32 -08:00
scrawl	3ec703e6af	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-02-01 16:25:54 +01:00
Michal Sciubidlo	492482de7f	Add "open" option in opencs.	2013-02-01 00:42:03 +01:00
Tom Mason	0f58e03343	Unequipping items will reset OnPCEquip variable	2013-01-31 19:04:39 +00:00
Tom Mason	9ad08520fd	Implemented OnPCDrop special variable ... Scripts are responsible for resetting to 0, as investigation showed that is how vanilla handled it.	2013-01-31 18:45:32 +00:00
Tom Mason	0fc5ee5149	allow OnPCEquip special variable to be of any type	2013-01-31 17:46:16 +00:00
Chris Robinson	d6f923f274	Use a child scene node for the accumulation root	2013-01-30 22:28:18 -08:00
Tom Mason	09f9557ecb	Implemented OnPCEquip special variable	2013-01-31 00:34:16 +00:00
Tom Mason	dc91211b12	Fixed Small bug where scripts were being removed when they shouldn't be. ... Scripts should only be removed when the item is being moved to another cell, otherwise they should remain active.	2013-01-31 00:21:04 +00:00
Michal Sciubidlo	ac62dd050d	Rename datafilespage to datafileslist	2013-01-30 21:08:27 +01:00
Michal Sciubidlo	f029a9011a	Move datafilespage to shared space.	2013-01-30 20:21:03 +01:00
Chris Robinson	b6354c6282	Don't share skeleton instances between bounded parts on an NPC ... However, a skeleton instance will still be shared between entities in an entity list.	2013-01-30 09:29:16 -08:00
Chris Robinson	5c3a7f7d52	Avoid handling animation states ... We don't need them anymore	2013-01-30 07:34:07 -08:00
Chris Robinson	360f7bfac8	Apply animations to bones manually ... Couple reasons for this: * This paves the way for allowing animations specified in other skeletons to be applied to the character (NPCs and certain creatures can have multiple animation sources, but Ogre is incredibly strict when it comes to sharing animations between skeletons). * It will allow for entities to be animated based on the character's skeleton, without having to duplicate the mesh for each skeleton it can be used on. This doesn't impact Ogre's ability to efficiently deform skinned meshes, nor does it get in the way of hardware skinning.	2013-01-30 07:04:18 -08:00
Chris Robinson	600d3bf9eb	Make sure the player node's visibility cascades	2013-01-30 02:38:50 -08:00
Chris Robinson	04d4c125ba	Print when an animation event is unhandled	2013-01-29 02:00:42 -08:00
Chris Robinson	d4ddaa3d95	Only register activators that have a MWRender::Animation object	2013-01-29 01:08:52 -08:00
Chris Robinson	99efe4e494	Remove an unnecessary class member	2013-01-29 01:02:55 -08:00
Chris Robinson	879359f39d	Set the animation state loop flag as appropriate	2013-01-29 00:50:52 -08:00
Chris Robinson	92d0c55f32	Add a flag to specify if an animation should be playing	2013-01-29 00:43:42 -08:00
Chris Robinson	fdabef65a1	Use a method to update an object's cell in the mechanics manager ... This prevents destroying and recreating the object's character controller (and messing up the current animation) when moving between cells.	2013-01-29 00:19:24 -08:00
Chris Robinson	8d98f3649c	Use a separate class to handle activator mechanics	2013-01-28 23:39:11 -08:00
Chris Robinson	7df4d0d19f	Remove an unnecessary cast	2013-01-28 21:41:51 -08:00
Pieter van der Kloet	25edba0887	Rewriting the config code of the pages to use the new settings classes	2013-01-27 16:39:51 +01:00
Chris Robinson	7b71b4eb31	Add a missing include	2013-01-27 03:03:48 -08:00
Pieter van der Kloet	5579df30ff	Implemented data/data-local support and added settingshandlers to main.cpp	2013-01-26 18:19:04 +01:00
Chris Robinson	0cd3880b20	Merge remote-tracking branch 'zini/master' into animation2	2013-01-26 04:54:52 -08:00
Chris Robinson	b1ffdf855f	Reset the initial state of animated nodes on the skeleton instances ... This is so the animation specifies node keyframe data based on the node's parent. This will also be necessary for applying animations from different skeleton sources, as they can have different binding positions (even native .skeleton resources will need to specify animation data this way).	2013-01-26 04:48:53 -08:00
Mark Siewert	dca8dc4fdb	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ... Conflicts: apps/openmw/engine.cpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/store.hpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm/esmreader.hpp - Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.	2013-01-25 18:22:01 +01:00
Pieter van der Kloet	6faf6f57e1	Added settings file reader/writers for openmw.cfg and settings.cfg	2013-01-25 05:19:06 +01:00
Emanuel Guevel	19dff822f4	Dialogue: do not filter on disposition for creatures	2013-01-24 19:43:21 +01:00
Emanuel Guevel	ed9a9904b4	Dialogue filter: search script variables case-insensitively	2013-01-24 19:39:31 +01:00
Marc Zinnschlag	90d05858ef	disabling dialogue sub-views for now	2013-01-22 11:50:08 +01:00
Marc Zinnschlag	cd662af634	Merge branch 'globals'	2013-01-22 11:47:24 +01:00
Chris Robinson	05f8b8c283	Specify the text key to reset animations to	2013-01-22 00:31:45 -08:00
Chris Robinson	37fe1bd3f0	Handle looping in the Animation object	2013-01-21 22:51:13 -08:00
Marc Zinnschlag	2756d3ee94	Merge remote-tracking branch 'wheybags/containerscripts'	2013-01-21 23:02:45 +01:00
Tom Mason	f5f3c2e62d	enabling / disabling should not affect scripts	2013-01-21 20:06:08 +00:00
Chris Robinson	e956a1cbc0	Merge SpecialIdle character state into Idle	2013-01-21 03:24:52 -08:00
Chris Robinson	6905bd18ba	Filter out the group name from the text keys ... It's already in the animation name, and the text keys are animation-specific anyway.	2013-01-21 02:59:12 -08:00
Chris Robinson	536f8104e6	Do not create an 'all' animation.	2013-01-20 17:24:43 -08:00
Chris Robinson	e1e76bde76	Combine a loop into another where it's used	2013-01-20 15:39:43 -08:00
Mark Siewert	713d324eeb	- Minor code cleanup	2013-01-20 19:07:33 +01:00
Tom Mason	31c71c029d	objects with scripts attached, that are inside containers will behave correctly when the container is moved	2013-01-20 17:01:30 +00:00
Emanuel Guevel	736e471613	Print a fallback text when no topic response is found	2013-01-20 17:44:09 +01:00
Emanuel Guevel	43e85ea0c6	Disallow redirection to info refusal for greetings	2013-01-20 17:44:09 +01:00
Emanuel Guevel	05796d85a4	NPC: take stats from NPDT12 into account ... Some available stats (level, reputation and disposition) were not used for NPC with auto-calculated stats.	2013-01-20 17:44:08 +01:00
Emanuel Guevel	951eb1b236	Dialogue: return a response from "Info Refusal" when disposition is not satisfied	2013-01-20 17:44:08 +01:00
Tom Mason	23dada0ee4	moved script handling on enable / disable into their own functions	2013-01-20 16:38:56 +00:00
Tom Mason	28c580d280	disabling and enabling containers causes scripts on contents to be disabled and enabled accordingly	2013-01-20 15:43:52 +00:00
Tom Mason	abe25c5f66	removed use of c++11 auto	2013-01-20 14:24:55 +00:00
Tom Mason	665a530e10	renamed realAdd to addImp	2013-01-20 14:14:34 +00:00
Tom Mason	3c6ddd7fa7	fixed isInCell method	2013-01-20 14:10:04 +00:00
Chris Robinson	85ca1e993f	Properly check if an animation exists before playing it	2013-01-19 21:55:04 -08:00
Nathan Jeffords	f55da17933	made some journal accessor methods constant	2013-01-19 16:21:41 -08:00
Nathan Jeffords	4c7ae3d1ff	prevent duplicate journal entries from being recorded	2013-01-19 16:21:15 -08:00
Nathan Jeffords	528c3da6da	record heard topics in journal	2013-01-19 16:20:22 -08:00
Chris Robinson	68779375b2	Implement WalkLeft and WalkRight character states	2013-01-19 16:19:47 -08:00
Nathan Jeffords	d6b956cdcf	fixed swapped day & month fields when created a stamped journal entry	2013-01-19 16:19:03 -08:00
Chris Robinson	a7b07ee5cf	Don't reset the animation when setting the same state ... Unless looping is being toggled on.	2013-01-19 15:46:22 -08:00
Chris Robinson	e0541b52c4	Use a list to store and get state information	2013-01-19 14:56:24 -08:00
Mark Siewert	a8e02779b2	- Add support for multiple plugins trying to modify the same reference ... - Fix a small signed/unsigned warning	2013-01-19 23:33:18 +01:00
Chris Robinson	de2d084e61	Add a looping property to handle if an animation should loop	2013-01-19 14:22:15 -08:00
Marc Zinnschlag	2d96f52864	select correct record when opening a dialogue sub view	2013-01-19 14:29:14 +01:00
Chris Robinson	0b68953f0d	Scale animation speed using the direction length ... The direction length doesn't currently give a good speed, but it's something.	2013-01-18 21:40:47 -08:00
Chris Robinson	aecfc0829a	Implement WalkForward and WalkBack character states	2013-01-18 18:04:00 -08:00
Chris Robinson	e33f59e0fe	Ensure the direction vector is initialized and copied properly	2013-01-18 17:41:36 -08:00
Chris Robinson	1cdd64cd9b	Return the animation movement from the character controller. ... Consequently, dead actors don't move anymore. The doPhysics call apparently isn't moving them.	2013-01-18 17:05:58 -08:00
Chris Robinson	9123f4f2af	Return the movement vector from runAnimation	2013-01-18 16:21:29 -08:00
Chris Robinson	9235fba770	Store the movement vector in the character controller	2013-01-18 16:00:51 -08:00
Chris Robinson	40f8e75763	Use a SpecialIdle state for PlayGroup/LoopGroup invoked animations ... Note that actors will *not* automatically resume a normal idle state afterward. Their AI will need to control what to do when the special idle is finished.	2013-01-18 15:39:28 -08:00
Chris Robinson	a527cb8349	Loop the current animation when not dead ... This should be better, but it's not perfect. It misses the case where start < loop start == loop stop <= stop	2013-01-18 15:22:14 -08:00
Chris Robinson	c7684cb979	Pass the key time to markerEvent	2013-01-18 14:50:55 -08:00
Chris Robinson	3e9b0a333c	Allow specifying the accumulation for animations ... Animations that move a character may do so either visually or physically. An axis' accumuluation value specifies whether the movement is visual (0) or physical (1). Idle animations, for instance, typically don't physically move a character, while death animations may physically move them along the X and Y planes, but not along Z (the vertical movement is purely visual).	2013-01-18 14:25:32 -08:00
Chris Robinson	5cafc24ee2	Rename CharState_Alive back to CharState_Idle	2013-01-18 13:43:45 -08:00
Chris Robinson	613529f1d6	Merge remote-tracking branch 'zini/master' into animation2	2013-01-18 01:02:53 -08:00
Chris Robinson	a94947029e	Check the marker name before deciding what to do with it ... Also, don't force 'idle' after a playgroup	2013-01-18 00:59:48 -08:00
Chris Robinson	9d7ccfda1f	Rename CharState_Idle to CharState_Alive	2013-01-17 21:07:36 -08:00
Chris Robinson	8720433fa9	Do not automatically loop animations ... There are 0 length idle animations that break this	2013-01-17 17:54:09 -08:00
Chris Robinson	8fa1b56efc	Loop the current animation if there's nothing more queued	2013-01-17 16:34:26 -08:00
Chris Robinson	00879ab20e	Fix player rendering	2013-01-17 15:48:09 -08:00
Chris Robinson	fef6284f15	Only reset the animation time if a new state was set	2013-01-17 15:47:25 -08:00
Chris Robinson	fc0f9e2159	The animation state tracks the animation time for us	2013-01-17 14:49:42 -08:00
Chris Robinson	7cce44290e	Handle the animation queue in mwmechanics	2013-01-17 13:18:40 -08:00
Chris Robinson	47c157303a	Filter events that do not belong to the current group	2013-01-17 11:03:58 -08:00
Chris Robinson	da4f17859e	Recognize soundgen animation markers	2013-01-17 10:16:36 -08:00
Marc Zinnschlag	82b790770d	Merge remote-tracking branch 'potatoesmaster/dialogue-creatures'	2013-01-17 10:21:01 +01:00
Chris Robinson	82d549e22f	Don't update the animation if time is the same	2013-01-16 21:39:14 -08:00
Chris Robinson	7ee389f3b2	Handle animation skipping in the character controller	2013-01-16 21:25:50 -08:00
Chris Robinson	852aa214cc	Store the available animation names in the character controller	2013-01-16 21:16:22 -08:00
Chris Robinson	afbc9f3e41	Keep track of the animation group currently playing	2013-01-16 20:44:37 -08:00
Chris Robinson	4dd01b81c6	Update mTime when updating or reseting the animation, and refactor the animation loop	2013-01-16 20:14:49 -08:00
Chris Robinson	685f219560	Return a movement vector from the character controller update	2013-01-16 18:56:13 -08:00
Chris Robinson	daad8d9859	Don't update the character controller while paused	2013-01-16 18:03:39 -08:00
Chris Robinson	d2f5a886c7	Handle playgroup and skipanim through mwmechanics	2013-01-16 17:53:18 -08:00
Emanuel Guevel	4feaa66897	Do not open the dialogue window if no greeting is found	2013-01-17 01:58:44 +01:00
Chris Robinson	46fc61a4c1	Run animations from the character controller	2013-01-16 16:31:09 -08:00
Chris Robinson	46728ab27f	Handle "sound:" animation events	2013-01-16 15:52:03 -08:00
Chris Robinson	3c32385e17	Avoid trying to animate things that don't have animations	2013-01-16 15:00:06 -08:00
Chris Robinson	94b93227d3	Treat activators as actors for rendering and mechanics ... Kinda hacky, but it's the only way to get animated activators (flags, silt striders, etc) to work properly.	2013-01-16 14:37:32 -08:00
Chris Robinson	d2fc3c7b33	Add a method to tell the character controller of new text keys	2013-01-16 13:09:21 -08:00
Marc Zinnschlag	7b568cbb15	Merge remote-tracking branch 'potatoesmaster/dialogue'	2013-01-16 22:03:40 +01:00
Chris Robinson	0a2f92f679	Keep track of the current text key in the animation	2013-01-16 11:57:08 -08:00
Chris Robinson	f46587c383	Store an character controller in the animation	2013-01-16 11:01:08 -08:00
Chris Robinson	3c487e6019	Play an animation when changing states	2013-01-16 10:45:18 -08:00
Chris Robinson	b378bc92a0	Store an animation object in the character controller	2013-01-16 10:16:37 -08:00
Chris Robinson	63e685ea39	Add a method to get the Animation from a Ptr	2013-01-16 09:59:19 -08:00
Chris Robinson	c1b32d6006	Remove outdated comments	2013-01-16 08:24:20 -08:00
Chris Robinson	3c02e1ccc9	Run physics right after updating the actors	2013-01-16 08:22:38 -08:00
Chris Robinson	1ce8eaf52c	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: apps/openmw/mwrender/actors.cpp apps/openmw/mwrender/actors.hpp	2013-01-16 07:36:56 -08:00
Marc Zinnschlag	312f68bf9c	Merge remote-tracking branch 'thoronador/fix-spelling'	2013-01-16 12:28:33 +01:00
scrawl	df602553d1	Reworked MWRender::Water to be more OOP-ish and possibly allow other reflection types.	2013-01-16 09:13:36 +01:00
Thoronador	3220330ce0	fix spelling in comment	2013-01-16 04:19:16 +01:00
Chris Robinson	94e30199d1	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: components/nifogre/ogre_nif_loader.cpp	2013-01-15 14:59:30 -08:00
Emanuel Guevel	9e00c6694f	Allow only ID filtered topics for dialogue with creatures	2013-01-15 21:40:44 +01:00
Chris Robinson	8a073c113e	Use const references where appropriate	2013-01-15 12:07:15 -08:00
Chris Robinson	8361192b64	Use typedefs for some maps and some cleanup	2013-01-15 11:10:41 -08:00
Marc Zinnschlag	3053440462	Issue #539: fixed AiWander	2013-01-15 12:40:44 +01:00
Emanuel Guevel	82287445af	DialogueWindow: do not execute onFrame() when not visible	2013-01-15 00:59:48 +01:00
Emanuel Guevel	f1f9173f24	Prevent closing dialogue window when an answer is expected	2013-01-15 00:53:32 +01:00
Jordan Milne	10a3caa504	more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine	2013-01-13 23:38:46 -04:00
Jordan Milne	9b485a86ef	resize the window in a slightly less bad way, fix my check in setUseHardwareCursors to be the right way round	2013-01-13 22:38:22 -04:00
Jordan Milne	043e29c620	Have SDL manage the window instead of OGRE to work around SDL Windows bugs (grumble)	2013-01-13 21:32:45 -04:00
scrawl	6c6ce4a05c	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-01-14 00:10:57 +01:00
Jordan Milne	d26e33eb26	Merge branch 'master' into sdl_input	2013-01-13 17:06:39 -04:00
Tom Mason	6fc64e8a4e	scripts run for items added to containers, and scripted items in player inv handled correctly	2013-01-13 19:49:56 +00:00
Tom Mason	7c8b3f1239	Merge remote-tracking branch 'real/master'	2013-01-13 17:07:18 +00:00
Tom Mason	c138e00aa2	objects scripts are now stopped when they are removed from a container	2013-01-13 17:05:12 +00:00
Marc Zinnschlag	654cd3ab9b	Issue #479: Use magnitude specified when adding disease	2013-01-13 14:52:55 +01:00
Jordan Milne	b6ec64485c	fix includes for Windows	2013-01-12 17:52:26 -04:00
Tom Mason	d4ca954d47	scripts on items in containers added to script list on cell change	2013-01-12 18:31:57 +00:00
Chris Robinson	94b24f07e1	Keep track of the state in the character controller, and don't remove dead actors from the map	2013-01-12 10:10:27 -08:00
Chris Robinson	4890d901a2	Store an MWWorld::Ptr in the character controller	2013-01-12 08:49:08 -08:00
Jordan Milne	5a6589af01	extract cursor management to a separate class, have windowmanager communicate with it. Initialize SDL during engine start	2013-01-12 11:57:29 -04:00
Chris Robinson	35d17fdaf6	Associate a character controller with each MWWorld::Ptr	2013-01-12 07:12:12 -08:00
Marc Zinnschlag	f4ee8e2642	Issue #479: Added additional magnitude parameter to known spells	2013-01-12 13:10:20 +01:00
scrawl	e4f140841e	Make OpenMW work with Ogre 1.9	2013-01-12 08:23:15 +01:00
scrawl	2c3719a6f5	Disabling PSSM feature to make sure we can fit the max. amount of terrain textures in Morrowind.esm in a single pass.	2013-01-12 07:02:12 +01:00
scrawl	30136eb449	Update settings UI	2013-01-12 06:36:48 +01:00
scrawl	52516ca4b4	Merge branch 'master' into graphics	2013-01-12 01:22:01 +01:00
scrawl	ed3c23ad9a	Fixed crash on changing cell due to Utf8Encoder going out of scope	2013-01-12 01:18:36 +01:00
Jordan Milne	eeacb04fe2	Fully working hardware cursors (if you compile SDL2 with XCursor support)	2013-01-11 09:32:29 -04:00
Jordan Milne	3fb920a66f	Merge branch 'master' into sdl_input	2013-01-11 08:29:01 -04:00
Jordan Milne	f9b064d1bc	add preliminary hardware cursor support into sdl4ogre and windowmanagerimp, handle alt-tabbing away from fullscreen gracefully	2013-01-11 08:27:59 -04:00
Marc Zinnschlag	101810d1e8	Merge remote-tracking branch 'scrawl/ingredients'	2013-01-11 11:12:07 +01:00
Nathan Jeffords	d5ebd6654d	cache loaded NIF files to eliminate reloads ... Created a NIF file caching mechanism to prevent the system from reloading a NIF during a startup and cell changes.	2013-01-10 21:47:02 -08:00
Nathan Jeffords	d469415e59	factored out two function from OMW::Engine::go ... The initialization code inside Engine::go is now in two function it calls prior to running the main loop.	2013-01-10 21:32:24 -08:00
Jordan Milne	a030c03513	support the printscreen button properly	2013-01-10 23:53:19 -04:00
Jordan Milne	403b6756f5	remove dependency on boost::locale, use system mouse position in in-game menus	2013-01-10 23:29:51 -04:00
scrawl	c71656493d	Ingredient effects now correctly hide until the player has discovered them	2013-01-11 01:23:24 +01:00
Jordan Milne	eff26159d9	Merge branch 'master' into sdl_input	2013-01-10 18:03:35 -04:00
Jordan Milne	601d79ef3f	fix the mouse wheel in mygui	2013-01-10 17:59:49 -04:00
Jordan Milne	ed644259ce	Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling	2013-01-10 17:21:47 -04:00
Chris Robinson	97f8c73d91	Remove some useless parameters ... SceneNode::setVisibility merely passes the value to its attached object, of which there are none at the point it would be called. Additionally, the method is always called with enabled=true anyway.	2013-01-10 11:09:33 -08:00
scrawl	6ef85c46fd	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-01-10 19:35:40 +01:00
Chris Robinson	771a5f7316	Add the beginnings of a character controller	2013-01-10 08:35:24 -08:00
Chris Robinson	e8ac3976b5	Fix some subentity assumptions	2013-01-10 06:35:06 -08:00
Chris Robinson	7f2d71554e	Use the correct offset when building static geometry from an entity	2013-01-10 04:16:18 -08:00
Marc Zinnschlag	274ff530dc	Merge remote-tracking branch 'wheybags/master'	2013-01-10 11:53:42 +01:00
Chris Robinson	23ac1c2de5	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: components/nifogre/ogre_nif_loader.cpp	2013-01-09 20:52:12 -08:00
scrawl	55769aaf91	Fix selection buffer (i.e. item selection on the inventory character preview) when object shaders were disabled	2013-01-10 01:46:00 +01:00
Marc Zinnschlag	6e0b86c6f9	Merge remote-tracking branch 'potatoesmaster/getdisposition'	2013-01-10 01:29:02 +01:00
Tom Mason	8486a51535	fixed drop amounts thanks to zinnschlag	2013-01-09 22:55:28 +00:00
Tom Mason	3517635cfd	added Drop and DropSoulGem functions	2013-01-09 21:16:45 +00:00
Marc Zinnschlag	4defb1a476	Merge remote-tracking branch 'trombonecot/lowerstring' ... Conflicts: apps/openmw/mwgui/loadingscreen.cpp	2013-01-09 22:13:59 +01:00
scrawl	d3c0851aa7	Changed light attenuation back to linear in all cases, this seems to be what MW does.	2013-01-09 22:08:42 +01:00
scrawl	b8c6f6640b	Fixing water <-> waterfall blending issues (Sort of... the second part will follow later)	2013-01-09 21:56:26 +01:00
eduard	2dc0064cc2	more string lowercase	2013-01-09 20:51:52 +01:00
Chris Robinson	a14132b5a0	Merge remote-tracking branch 'zini/master' into animation2	2013-01-09 11:12:26 -08:00
scrawl	bc73c5b1ec	enable directional lighting for character previews	2013-01-09 20:08:59 +01:00
Tom Mason	5bfdb2449d	allowed dropObjectOnGround to be used on npcs, not just player	2013-01-09 18:53:14 +00:00
Chris Robinson	c4c8295e0b	Rename NIFLoader to Loader, and update some comments	2013-01-09 09:10:59 -08:00
Nathan Jeffords	6ca87e108f	updated loading screen to use the resource managers pattern matching when finding files	2013-01-09 08:54:03 -08:00
Nathan Jeffords	44031ec3d7	fleshed out BSAArchive and DirArchive. ... Implemented both lists & finds, with pattern matching. Conflicts: components/bsa/bsa_archive.cpp	2013-01-09 08:53:27 -08:00
Chris Robinson	be74859f05	Avoid some unnecessary copying when calling addPartGroup	2013-01-09 08:03:28 -08:00
Marc Zinnschlag	6567bf38f8	Merge remote-tracking branch 'wheybags/master'	2013-01-09 17:01:47 +01:00
Chris Robinson	9fedaf18d6	Make some methods private	2013-01-09 07:55:55 -08:00
Chris Robinson	625a538f03	Combine part selection into a single loop	2013-01-09 07:43:10 -08:00
Jordan Milne	cb01df49c0	begin to support text input	2013-01-09 11:30:33 -04:00
Jordan Milne	5fa77da9d4	Merge branch 'master' into sdl_input	2013-01-09 10:56:15 -04:00
Emanuel Guevel	3e41a1118a	GetDisposition: return calculated disposition instead of base disposition	2013-01-09 15:14:17 +01:00
Tom Mason	375961fe5e	small fix	2013-01-09 13:27:12 +00:00
Tom Mason	b035a5aa4a	beast races cannot equip anything they oughtn't to be able to equip	2013-01-09 13:18:05 +00:00
Jordan Milne	53cff0ba68	use native relative mouse movements where available, have the cursor follow the hardware cursor in the main menu	2013-01-09 09:05:47 -04:00
Chris Robinson	1e38e381a4	Use text keys for each animation	2013-01-09 03:30:55 -08:00
Marc Zinnschlag	649ae645f3	Merge remote-tracking branch 'blunted2night/bug_495_v2'	2013-01-09 12:12:41 +01:00
Jordan Milne	02ccb75894	Wrap the mouse to the window (except in debug mode) ... Grab the mouse when not in the main menu (except in debug mode) Always hide the cursor when it's over the window Allow warping the mouse around Handle ^C properly	2013-01-09 06:10:05 -04:00
Jordan Milne	1bf36c686c	add ability to check if a window is on the stack (to see if we're in the main menu)	2013-01-09 06:09:47 -04:00
Chris Robinson	bb98542c5a	Build separate animations for each group	2013-01-09 01:40:38 -08:00
Chris Robinson	e44729cd43	Make the text keys lower-case when extracting them ... I think it's safe to assume all text keys are treated in a case-insensitive manner. So far the only known NiTextKeyExtraData records are for animation keys, which effectively are.	2013-01-09 00:17:42 -08:00
Jordan Milne	857bb42297	Create a separate scenemanager for each CharacterPreview instance	2013-01-09 01:44:15 -04:00
Jordan Milne	f85679db93	Merge branch 'master' into sdl_input	2013-01-09 00:04:55 -04:00
Nathan Jeffords	719663d86e	added option to override the activation distance ... The command line option '--activate-dist <int>' can be used to override the in game activation distance.	2013-01-08 20:00:06 -08:00
Tom Mason	62a2ba1cc6	beast races cannot equip shoes/boots	2013-01-09 03:03:14 +00:00
Tom Mason	135f0870f7	in actionequip, was ignoring actor param, and always using player	2013-01-09 02:16:17 +00:00
Jordan Milne	6b49b8ab47	MyGUI doesn't care for SDL's mouse button ordering, send it what it expects	2013-01-08 22:14:30 -04:00
Jordan Milne	3b1d285cf3	fix compile errors, work with unmodified SDL	2013-01-08 21:01:58 -04:00
Nathan Jeffords	39d27b87c9	fixed build error with Audiere coded enabled	2013-01-08 09:14:56 -08:00
Marc Zinnschlag	d4a9236ae5	hocking up dialogue sub view to a widget mapper	2013-01-08 14:59:40 +01:00
Marc Zinnschlag	c0fb46384c	Merge branch 'master' into globals	2013-01-08 11:32:53 +01:00
Chris Robinson	9675a6d04a	Merge remote-tracking branch 'zini/master' into animation2	2013-01-08 02:25:37 -08:00
Jordan Milne	6449f68d61	Merge branch 'master' into sdl_input	2013-01-08 06:24:31 -04:00
Jordan Milne	884d3ea4d8	Rip out OIS, fill the holes with SDL goodness. WIP.	2013-01-08 06:19:05 -04:00
Marc Zinnschlag	c6ff58d5b5	Merge remote-tracking branch 'scrawl/videoplayback' ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2013-01-08 11:17:19 +01:00
Nathan Jeffords	b3932e3dea	added a separate activation distance for NPCs	2013-01-07 23:40:17 -08:00
Nathan Jeffords	b9fbd6ae4b	Factored faced object lookups into MWRender::World ... * Renamed MWWorld::World::getFacedHandle to getFacedObject. * Changed it to return an object pointer * Updated clients to use return object directly.	2013-01-07 23:38:08 -08:00
Nathan Jeffords	05dad29005	update MWWord::World to track distances while performing occlusion queries. ... This allows checking the activation distance against what is stored in GameSettings. Experimentation suggests that a second distance is required for NPCs.	2013-01-07 23:11:15 -08:00
Nathan Jeffords	0108be2e4f	updated MWWorld::PhysicsSystem::getFacedXXX functions ... * changed the names and return values to be consistent * made the distance to search a parameter * change the distance returned to world units instead of percentage of query distance	2013-01-07 23:00:00 -08:00
Nathan Jeffords	86f691d3d5	split MWWord::World::update into multiple functions	2013-01-07 22:48:24 -08:00
Chris Robinson	2a9dc5ad94	Ensure mCurGroup always has valid iterators, and only get the animation state when animation keys exist	2013-01-07 21:00:21 -08:00
Tom Mason	9ee823d8f8	fixed typo in vmformat.txt	2013-01-07 21:09:03 +00:00
Tom Mason	4c5ed43cc9	added removesoulgem, and fixed addsoulgem	2013-01-07 21:08:04 +00:00
Tom Mason	c2901fe6cc	added addsoulgem scripting function	2013-01-07 18:16:50 +00:00
Chris Robinson	d8dbd5e206	Store text key iterators for the start and stop times	2013-01-07 05:56:03 -08:00
Chris Robinson	d3e949f5c6	Make the animation text keys lower case to help lookup	2013-01-07 05:23:44 -08:00
Chris Robinson	05dfafa777	Avoid an unnecessary lookup when moving the scene node	2013-01-07 05:09:15 -08:00
Chris Robinson	5f668976a8	Improve resetting the animation position	2013-01-07 04:48:59 -08:00
scrawl	f1b138d0a8	Merge branch 'master' into videoplayback ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2013-01-07 13:25:15 +01:00
scrawl	c2b75e28e9	Merge branch 'videoplayback' of github.com:scrawl/openmw into videoplayback	2013-01-07 13:20:50 +01:00
scrawl	282601d6e9	support the allowSkipping extra parameter for playBink command.	2013-01-07 13:19:52 +01:00
scrawl	35f4d09288	swscale handled better (cmake)	2013-01-07 13:06:16 +01:00
Marc Zinnschlag	2557ef4d7d	post merge fixes and some misc clean up	2013-01-07 12:17:46 +01:00
Marc Zinnschlag	41767f8dfa	Merge remote-tracking branch 'blunted2night/better_flicker'	2013-01-07 12:06:21 +01:00
Chris Robinson	648e3331f5	Don't try to move objects that aren't in a cell	2013-01-06 23:20:20 -08:00
Chris Robinson	921ae76ea9	Merge remote-tracking branch 'zini/master' into animation2	2013-01-06 21:20:49 -08:00
Chris Robinson	5b3a20ef69	Update the object position as the animation moves	2013-01-06 21:18:48 -08:00
Chris Robinson	910619eb21	Store the NonAccum animation root from the skeleton instance ... Currently this is assumed to be the node with the animation text keys.	2013-01-06 17:31:53 -08:00
Chris Robinson	b96a979719	Store an MWWorld::Ptr with the Animation	2013-01-06 17:05:48 -08:00
Nathan Jeffords	0f3712f284	change flickering light's brightness pattern	2013-01-06 14:29:22 -08:00
Chris Robinson	2b1fe7dc44	Add part info for weapons and shields	2013-01-06 05:39:39 -08:00
Marc Zinnschlag	25815ab8f7	Merge remote-tracking branch 'potatoesmaster/to_utf8-rewrite'	2013-01-06 13:31:01 +01:00
Chris Robinson	976b042cca	Use a list to reduce some repeating code	2013-01-06 02:14:19 -08:00
Chris Robinson	99769879e3	Fix some createEntities calls	2013-01-06 00:32:38 -08:00
Chris Robinson	efca5ded47	Clean up some header includes to reduce nesting	2013-01-05 21:12:08 -08:00
Emanuel Guevel	63f09462fd	to_utf8, Utf8Encoder: pass encoding as constructor parameter ... Edit other files accordingly.	2013-01-06 01:37:58 +01:00
Chris Robinson	58d35dbfcf	Have createEntities' caller retrieve the text keys as needed	2013-01-05 04:01:11 -08:00
Chris Robinson	818a24cdd6	Hold on to the AnimationState being used for animating	2013-01-05 00:03:14 -08:00
Chris Robinson	6e84d4bcdd	Add a helper method to load entity objects	2013-01-04 23:19:48 -08:00
Marc Zinnschlag	fbb59302d9	Merge remote-tracking branch 'blunted2night/loading_screen_fix'	2013-01-04 10:50:59 +01:00
Emanuel Guevel	67273fc177	mwiniimporter: use Utf8Encoder	2013-01-04 01:52:02 +01:00
Nathan Jeffords	9afe4467d8	cache results of query for spash screen names ... ResourceGroupManager::listResourceNames returns a list of all resource accessable which is expensive, this change caches the result of the processed query so additional splash screen changes are quicker.	2013-01-03 15:45:09 -08:00
Mark Siewert	d6377fb2e3	- Support deleting references from a plugin ... - Add preliminary support for loading some unique fields appearing only in savegames - Add a few lines required for supporting respawning references. Incomplete.	2013-01-03 18:51:04 +01:00
Marc Zinnschlag	b7b51f24d6	added new Role for table headers (Role_Display)	2013-01-03 11:20:25 +01:00
Marc Zinnschlag	0af7a2888a	Merge remote-tracking branch 'scrawl/ai_script'	2013-01-03 09:56:36 +01:00
Marc Zinnschlag	25d9918765	post merge fix: bringing code more in line with our naming standards and fixing an invalid name (names starting with double underscore are reserved in C++)	2013-01-03 09:55:48 +01:00
Marc Zinnschlag	c0260697c2	Merge remote-tracking branch 'scrawl/master'	2013-01-03 09:52:46 +01:00
Marc Zinnschlag	ce5d27b07b	Merge remote-tracking branch 'scrawl/button_fixes'	2013-01-03 09:50:24 +01:00
scrawl	42e0501c67	fix typo	2013-01-03 02:40:21 +01:00
scrawl	a5ef669eb6	Merge branch 'master' of git://github.com/zinnschlag/openmw into HEAD ... Conflicts: apps/openmw/mwscript/aiextensions.cpp apps/openmw/mwscript/docs/vmformat.txt	2013-01-03 02:34:31 +01:00
scrawl	ba7086cadf	Use race/class names (instead of ID) in replaced escape sequences	2013-01-03 02:05:05 +01:00
scrawl	1718d735b5	Fix menu/journal/book/scroll buttons when using localised MW-installations ... This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.	2013-01-03 01:09:03 +01:00
scrawl	ddbe13e569	Workaround for http://bugs.openmw.org/issues/475	2013-01-03 01:07:17 +01:00
Marc Zinnschlag	ff74f687fb	Merge remote-tracking branch 'lazydev/master'	2013-01-02 16:04:44 +01:00
lazydev	04cca2a1ce	fix for http://bugs.openmw.org/issues/517	2013-01-02 18:58:52 +04:00
Marc Zinnschlag	83fe128e87	Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'	2013-01-02 10:05:27 +01:00
scrawl	86f30992d7	fix message boxes not appearing properly when e.g. trading	2013-01-01 22:00:14 +01:00
Emanuel Guevel	2a7336c310	mwiniimporter: handle ini file encodings ... Use components/to_utf8 to handle encodings. Add an --encoding option for choosing between win1250, win1251 and win1252 encodings for the imported ini file.	2013-01-01 21:59:30 +01:00
Marc Zinnschlag	4a8bf40a83	Merge remote-tracking branch 'lazydev/master'	2013-01-01 20:45:09 +01:00
lazydev	7cd1e87fe8	Merge branch 'master' of git://github.com/zinnschlag/openmw ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.cpp	2013-01-01 22:18:21 +04:00
Emanuel Guevel	e9a464c9f7	mwiniimporter: remove fallback values for Cursors	2012-12-31 16:45:24 +01:00
Emanuel Guevel	e2b348de96	mwiniimporter: fix line ending problem	2012-12-31 16:44:22 +01:00
Marc Zinnschlag	65c7c7f60e	Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'	2012-12-31 14:47:05 +01:00
greye	7e0713f6c4	fix string case update	2012-12-31 11:22:40 +04:00
lazydev	cd5d95ed22	1. Dialogs in Russian version now works. ... 2. Destination names it travel window are now translated	2012-12-31 04:15:47 +04:00
Marc Zinnschlag	8b2785400b	Merge remote-tracking branch 'trombonecot/comparestring'	2012-12-30 20:11:18 +01:00
eduard	69d9d22579	comparestring	2012-12-30 19:56:38 +01:00
Marc Zinnschlag	e577731a06	Merge remote-tracking branch 'scrawl/master'	2012-12-30 18:31:35 +01:00
scrawl	f56182cac2	fix journal window not rendering any text	2012-12-30 17:06:17 +01:00
Emanuel Guevel	cb71efc427	mwiniimporter: clean up	2012-12-30 16:44:52 +01:00
Emanuel Guevel	38e7dbb970	mwininimporter: add more fallback values	2012-12-30 16:43:05 +01:00
Marc Zinnschlag	714b1924a5	partial dialogue subview implementation	2012-12-30 14:01:52 +01:00
eduard	98103e15eb	conflict resolution	2012-12-30 13:46:07 +01:00
eduard	fb25f407fb	dialoguemanager conflict	2012-12-30 13:37:19 +01:00
eduard	c85400b809	Merge https://github.com/zinnschlag/openmw into comparestring ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.cpp apps/openmw/mwworld/worldimp.cpp components/esm_store/reclists.hpp components/misc/stringops.hpp	2012-12-30 13:09:37 +01:00
Emanuel Guevel	9d043d0193	mwiniimporter: fix string cutting	2012-12-29 18:16:03 +01:00
Emanuel Guevel	b2203d22fc	mwiniimporter: added fallback values ... Ugly comments included. I will merge it on another branch to clean this up later.	2012-12-29 18:15:32 +01:00
scrawl	1dcc0f10ee	Merge pull request #6 from ChrisKCat/videoplayback ... Videoplayback	2012-12-28 15:28:58 -08:00
Marc Zinnschlag	8d4afe3bf5	post merge fix	2012-12-28 23:45:13 +01:00
Marc Zinnschlag	e2a8e2107b	Merge branch 'globals'	2012-12-28 23:42:02 +01:00
Marc Zinnschlag	334588bf1c	Merge branch 'editor2'	2012-12-28 23:31:43 +01:00
Tom Mason	bed8fb69e6	added bounty related scripting functions	2012-12-28 22:26:21 +00:00
Chris Robinson	1dd9276ceb	Add missing decoder method declarations	2012-12-28 11:26:41 -08:00
scrawl	ade4ec0453	fix texture edge bleeding due to wrong addressing mode	2012-12-28 19:01:47 +01:00
eduard	c75a5ae212	string compare and tolower	2012-12-28 18:05:52 +01:00
eduard	8545667bbd	string compare and tolower	2012-12-28 17:54:56 +01:00
Tom Mason	ad9b86058b	replaced explicit text with GMST entries, thanks to zinnschlag	2012-12-27 15:28:13 +00:00
Tom Mason	ba2301a156	removed redundant code thanks to scrawl	2012-12-27 00:49:39 +00:00
Tom Mason	299a1f32ed	cleanup	2012-12-26 23:52:16 +00:00
Tom Mason	51fce62b69	Merge branch 'messageboxes'	2012-12-26 23:06:27 +00:00
Tom Mason	716fbbbd74	messageboxes during dialogue show up in dialogue window, and messageboxes are generated when an item is removed from inventory	2012-12-26 22:57:53 +00:00
Tom Mason	a14b7e4a0f	small fixes on text defines	2012-12-26 18:07:56 +00:00
Marc Zinnschlag	afc2e840ae	renamed namespace TranslationData to Translation	2012-12-26 17:06:33 +01:00
Marc Zinnschlag	206c613b52	moved translation storage from GUI manager to engine	2012-12-26 17:03:37 +01:00
Marc Zinnschlag	2d468fec02	made previous commits naming standard compliant	2012-12-26 16:19:59 +01:00
Marc Zinnschlag	4c28f3211b	Merge remote-tracking branch 'lazydev/master'	2012-12-26 15:50:03 +01:00
Mark Siewert	8ccec17481	- Restore ability for plugins deleting records defined in parent files ... - Don't throw a runtime_error when trying to load a reference based on a deleted record (just a warning for now, should be closer to MW)	2012-12-26 10:34:59 +01:00
Mark Siewert	049b0e66e0	- Restore ability to generate references in the same cell from multiple plugins ... - Disable some code related to deleting entries in the store so that it builds again	2012-12-25 20:27:30 +01:00
lazydev	1f71395660	renaming of translation component; removing of C++11 features	2012-12-25 23:20:39 +04:00
lazydev	74ae479780	Cell names localization fix	2012-12-23 23:23:24 +04:00
Tom Mason	8ac8fdff47	implemented all text defines except a few for keybindings that don't exist yet	2012-12-21 18:09:31 +00:00
Tom Mason	f2c6907244	Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work	2012-12-20 23:16:34 +00:00
Chris Robinson	85850c7440	Fix DEFAULT_OUTPUT declaration	2012-12-18 10:43:04 -08:00
scrawl	64210e6efa	Revert "New Game button" ... This reverts commit c5dd0e1968.	2012-12-18 19:09:27 +01:00
scrawl	1c73a3f2fb	Revert "remove commandline switch for new game" ... This reverts commit 86671096ec.	2012-12-18 19:09:08 +01:00
Chris Robinson	7b2c3e6cd3	Pass a proper PlayMode enum to playSound and playSound3D	2012-12-18 06:01:21 -08:00
Chris Robinson	3b7edae7c3	Don't hold a list of all sound sources	2012-12-18 05:19:32 -08:00
Chris Robinson	fe36cc1de7	Don't try to resume sound types that aren't paused	2012-12-18 04:35:24 -08:00
Chris Robinson	2f8daec379	Allow pausing only certain types of sounds	2012-12-18 04:19:35 -08:00
Marc Zinnschlag	1cf019a007	post merge fix	2012-12-18 12:36:26 +01:00
Chris Robinson	b4e36d4f31	Add a method to get the volume from the sound type	2012-12-18 02:01:04 -08:00
Chris Robinson	a5356e194e	Allow specifying a type for the playTrack method	2012-12-18 01:35:20 -08:00
Chris Robinson	72ffceb206	Add type flags to the sound play mode	2012-12-18 00:57:57 -08:00
Chris Robinson	dd3e568a00	Set the sound properties at initialization	2012-12-17 23:35:20 -08:00
Chris Robinson	20321c4552	Keep track of the actual active sounds	2012-12-17 21:50:01 -08:00
Chris Robinson	d348435a1d	Improve audio open error message	2012-12-17 21:09:57 -08:00
Chris Robinson	67485d3454	Store the AVStream in the decoder for easy referencing	2012-12-17 07:15:53 -08:00
Chris Robinson	4373218746	Fix audio stream check	2012-12-17 06:56:30 -08:00
Chris Robinson	58ab3407b7	Constify a couple fields	2012-12-17 04:17:06 -08:00
Chris Robinson	9e842a0bbb	Fix for trying to play videos when not supported	2012-12-17 00:41:04 -08:00
Chris Robinson	26660110e5	Allow building the video player without ffmpeg (playVideo will always throw an exception)	2012-12-17 00:20:56 -08:00
Chris Robinson	06fd66e99d	Move some fields to the class they're used in	2012-12-16 11:49:46 -08:00
scrawl	f0f521a4e0	enableRestMenu -> enableRest	2012-12-16 16:55:59 +01:00
Chris Robinson	9c805483b0	Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback	2012-12-16 07:17:06 -08:00
scrawl	86671096ec	remove commandline switch for new game	2012-12-16 16:14:49 +01:00
scrawl	c5dd0e1968	New Game button	2012-12-16 16:05:31 +01:00
Chris Robinson	c92cde2be9	Properly flush packet queues when at EOF ... Note: the previous flush method was renamed to clear. Flushing a queue allows consumers to retrieve queued packets, but not expect any more to come in.	2012-12-16 05:50:20 -08:00
Chris Robinson	6bc526b74d	Avoid another loop for decoding audio	2012-12-16 05:30:38 -08:00
Marc Zinnschlag	77852439ce	moved ColumnBase and Column struct into a separate translation unit	2012-12-16 12:52:23 +01:00
Chris Robinson	254a623319	Remove a redundant check	2012-12-16 03:09:24 -08:00
Chris Robinson	dd20db5dc2	Remove the stream indices from the VideoState	2012-12-16 03:05:44 -08:00
Chris Robinson	3f6d36c712	Avoid double-setting the material texture	2012-12-16 02:19:19 -08:00
Chris Robinson	e9d833be03	Use the packet pts to calculate the decoder sample offset	2012-12-16 01:56:52 -08:00
Chris Robinson	0edc87825d	Move audio_clock to the decoder where it's used	2012-12-16 01:17:58 -08:00
Chris Robinson	4561c22e2b	More fixes for the audio clock ... The audio_clock for the decoder represents the end of the current packet, so it needs to be adjusted back to match the position that's actually going to be read next.	2012-12-16 00:07:56 -08:00
Chris Robinson	1a771ae671	Merge the stream struct into the parent decoder	2012-12-15 23:46:32 -08:00
Chris Robinson	5fff1c4e47	Update the ffmpeg decoder to use avcodec_decode_audio4	2012-12-15 23:22:37 -08:00
Chris Robinson	5f4c33f896	Only store one packet at a time	2012-12-15 22:54:54 -08:00
Chris Robinson	9d86890d9d	Only use one stream for the ffmpeg decoder	2012-12-15 22:13:19 -08:00
scrawl	a3bd3a40ca	fix 2 unrelated leaks	2012-12-16 00:47:29 +01:00
scrawl	18623a5efe	Merge branch 'videoplayback' of https://github.com/ChrisKCat/openmw into videoplayback	2012-12-16 00:43:34 +01:00
scrawl	edf18a7d6e	change destruction order to fix crash on exit when a video is playing	2012-12-15 22:01:45 +01:00
Chris Robinson	c869444dcf	Don't leak the IO context if avformat_open_input fails	2012-12-15 11:31:50 -08:00
scrawl	63e86555b6	use sample_aspect_ratio if available	2012-12-15 19:40:59 +01:00
scrawl	5ed04ae53e	added black bars	2012-12-15 19:23:03 +01:00
Chris Robinson	e6d27cd6d0	Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback	2012-12-15 09:15:47 -08:00
Chris Robinson	9b3cf5c159	Use a looping thread to trigger refreshes	2012-12-15 09:14:58 -08:00
Chris Robinson	fa1ad381da	Make sure packets are cleaned up properly	2012-12-15 08:42:54 -08:00
scrawl	7477345481	fixed video material	2012-12-15 17:10:21 +01:00
Chris Robinson	db23c8152e	Only duplicate AVPackets as needed ... Packets that don't have a destruct method are using static memory, which will only be valid until the next av_read_frame call. Otherwise, it's already dynamically allocated and will remain valid.	2012-12-15 07:47:03 -08:00
Chris Robinson	6008cf0d15	Remove unneeded video_current_pts field	2012-12-15 05:02:01 -08:00
Chris Robinson	da44141b95	Avoid creating extra texture unit states on the video material	2012-12-15 04:17:28 -08:00
Chris Robinson	d50698d7d1	Clean up the rectangle and scene node used for displaying the video	2012-12-15 04:01:52 -08:00
Chris Robinson	eb0e8d9e37	Simplify PacketQueue::get	2012-12-15 02:50:59 -08:00
Chris Robinson	b41a77648e	Avoid re-reading the source sample to duplicate, to avoid pointer aliasing	2012-12-15 02:33:59 -08:00
Chris Robinson	62a995d492	Calculate audio sync once per read	2012-12-15 00:18:42 -08:00
Chris Robinson	32b0a5d96e	Update the queued sample count immediately	2012-12-14 23:42:49 -08:00
Chris Robinson	cbdf6ad595	Move more stuff to where it should be, and improve cleanup	2012-12-14 09:07:59 -08:00
Chris Robinson	71ff90aaee	Don't use sub-frame timing for the video clock	2012-12-14 08:42:37 -08:00
Chris Robinson	582efcdb9b	Always try to resync if the clock difference is large	2012-12-14 07:40:19 -08:00
Chris Robinson	f97eaec7ab	Consolidate some code	2012-12-14 07:29:58 -08:00
Chris Robinson	d66d8a3118	Don't assume we can write beyond the end of the sample buffer	2012-12-14 06:43:51 -08:00
Chris Robinson	7332ffb0f8	Let the wanted sample size go down to 0	2012-12-14 06:02:34 -08:00
Chris Robinson	05c6483257	Fix external clock	2012-12-14 04:35:57 -08:00
Chris Robinson	2f37d31108	Move some definitions into the source file they're used in	2012-12-14 04:12:34 -08:00
Chris Robinson	a6e627001a	Avoid a for(;;) construct	2012-12-14 03:23:04 -08:00
Chris Robinson	4d6c05f6cc	Tighten audio skew allowance	2012-12-14 03:19:32 -08:00
Chris Robinson	8db5d10f10	Avoid showing a video picture if we're late ... Ideally we should skip decoding, or at least YUV->RGB conversion, too.	2012-12-14 03:11:59 -08:00
Chris Robinson	157cb10f56	Fix a 16-bit audio assumption	2012-12-14 02:39:46 -08:00
Chris Robinson	c2b711d195	Move some more methods to the class they're part of	2012-12-14 02:36:29 -08:00
Chris Robinson	26a09ee7ba	Move some methods into their respective class	2012-12-14 01:38:00 -08:00
Chris Robinson	5221298a7f	Move a couple packet queue methods into the struct	2012-12-14 01:14:14 -08:00
Chris Robinson	90294c589b	Use a volatile bool for the refresh	2012-12-13 18:24:57 -08:00
Chris Robinson	f555dc60eb	Reduce some indentation	2012-12-13 18:12:17 -08:00
Chris Robinson	6cedd64509	Fix audio sync correction sizes	2012-12-13 18:05:27 -08:00
Chris Robinson	e291d0943d	Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback	2012-12-13 17:53:50 -08:00
Chris Robinson	606fb982a8	Update to use avcodec_decode_audio4	2012-12-13 17:53:22 -08:00
scrawl	82564e07c7	fix crash when video file doesn't exist	2012-12-14 01:44:00 +01:00
scrawl	27cd9ff732	Revert "Use the decoded frame pts when available" ... This reverts commit cab68df257.	2012-12-14 01:03:49 +01:00
scrawl	9d6f656822	fixed ogre resource functions	2012-12-14 00:10:54 +01:00
Chris Robinson	43481ad117	Use the external clock by default	2012-12-13 06:11:32 -08:00
Marc Zinnschlag	f95e72166c	hide type column in non-mixed type tables	2012-12-13 15:03:35 +01:00
Marc Zinnschlag	faa5ef0874	rewrote column class	2012-12-13 14:53:16 +01:00
Chris Robinson	0a5ab977b7	Use the decoder's sample offset for calculating the stream offset	2012-12-13 05:04:53 -08:00
Marc Zinnschlag	640c218df3	made record state uneditable again	2012-12-13 13:52:26 +01:00
Marc Zinnschlag	3d4c8c5444	added dialogue sub view (editing of a single record; not functional yet); fixed a bug in Universal to string conversion	2012-12-13 13:35:08 +01:00
Chris Robinson	cab68df257	Use the decoded frame pts when available	2012-12-13 04:25:41 -08:00
Chris Robinson	1ea1407707	Support quad, 5.1, and 7.1 with OpenAL and ffmpeg ... The other decoders don't guarantee any channel ordering, which makes them useless.	2012-12-13 04:10:19 -08:00
Chris Robinson	600494eed8	More cleanup of unused code	2012-12-13 03:37:04 -08:00
Chris Robinson	f7ff8b3374	A bit more cleanup	2012-12-13 03:13:44 -08:00
Chris Robinson	7e8b844b2e	Clean up some unused code	2012-12-13 03:05:37 -08:00
Chris Robinson	d2fbae9760	Init and deinit the VideoState synchronously, and re-enable audio playback	2012-12-13 02:52:37 -08:00
Chris Robinson	f067b22b3f	Use a recursive mutex for the OpenAL stream thread	2012-12-13 02:33:35 -08:00
Chris Robinson	ba9c5f5b4e	Don't initially fill buffers in OpenAL_SoundStream::play	2012-12-13 02:32:21 -08:00
Marc Zinnschlag	02184526e6	moved two helper classes from view/world/table into a separate translation unit	2012-12-13 11:24:39 +01:00
Chris Robinson	1ffaf6625a	Remove SDL for playing movie audio and prepare for using an audio track ... This breaks audio playback on movies	2012-12-13 01:42:20 -08:00
Chris Robinson	779ced0889	Add a method to play an audio track with a custom decoder	2012-12-13 00:05:57 -08:00
Chris Robinson	1571243ef0	Implement getTimeOffset for OpenAL_SoundStream	2012-12-12 23:16:45 -08:00
Chris Robinson	86bf6388c6	Pass a decoder to the playStream sound output method	2012-12-12 22:32:02 -08:00
Chris Robinson	9c831d3039	Add a decoder method to get the "file" name	2012-12-12 22:19:44 -08:00
Chris Robinson	1fb9eef27b	Detach the thread used for frame timing	2012-12-12 22:02:33 -08:00
Chris Robinson	34e36fb852	Add a method to get the time offset from sounds	2012-12-12 16:50:35 -08:00
Marc Zinnschlag	cc18b30e17	open sub view on double click in report view	2012-12-12 22:36:20 +01:00
scrawl	7fd9e1d212	Merge branch 'videoplayback' of https://github.com/ChrisKCat/openmw into videoplayback ... Conflicts: apps/openmw/mwrender/videoplayer.cpp	2012-12-12 22:24:38 +01:00
scrawl	18d8c767bd	fix a bunch of warnings, improved error handling, initialize texture to black	2012-12-12 15:15:55 +01:00
Chris Robinson	2c1eceb9f0	Add methods to pause and stop all playing sounds (and music)	2012-12-12 02:33:12 -08:00
Chris Robinson	973b5faf25	Keep track of all allocated sources	2012-12-12 01:32:16 -08:00
Chris Robinson	e82c4afd50	close SDL when closing the video, not after the video loop is finished	2012-12-12 00:36:52 -08:00
Chris Robinson	a62d5bbfe4	Sleep using the absolute time, so the thread creation doesn't add to the wait	2012-12-11 23:54:41 -08:00
Chris Robinson	c2e1595445	Treat paused sounds as still playing	2012-12-11 21:01:32 -08:00
Chris Robinson	2efdafecd9	Indentation fixes	2012-12-11 20:11:48 -08:00
Chris Robinson	277248cdcb	Fix some "comparison between signed and unsigned" warnings	2012-12-11 19:43:07 -08:00
Chris Robinson	3519934f27	Add a missing return value	2012-12-11 19:36:04 -08:00
Chris Robinson	9e2d4f8b7c	Avoid potential NULL dereference	2012-12-11 19:32:10 -08:00
scrawl	fe384a1600	pause 3d rendering while the video plays	2012-12-12 01:30:34 +01:00
scrawl	faad64b254	Esc cancels the video	2012-12-12 01:13:53 +01:00
scrawl	0ce5ade6d8	DataStreamPtr fix, indentation fixes	2012-12-11 23:06:06 +01:00
scrawl	c49966dd29	started over	2012-12-11 22:49:31 +01:00
scrawl	5f676f9c6b	Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwscript/miscextensions.cpp	2012-12-11 22:28:23 +01:00
Marc Zinnschlag	c75563c184	report model and view	2012-12-11 15:35:47 +01:00
Marc Zinnschlag	2db930a5cf	rewrote subview factory system	2012-12-11 13:22:43 +01:00
Marc Zinnschlag	0ed378dfb2	changed sub view factory method signature	2012-12-11 11:24:30 +01:00
Marc Zinnschlag	de4a03081c	fixed skill level type in skill level up message	2012-12-10 11:04:21 +01:00
scrawl	e3dd3d565c	fix 2 leaks	2012-12-10 00:59:39 +01:00
Marc Zinnschlag	832fc56d34	changed UniversalId to string conversion	2012-12-09 11:10:35 +01:00
Marc Zinnschlag	5f5addf052	fixed an enum	2012-12-09 00:12:24 +01:00
Marc Zinnschlag	9fe7ff9690	added mandatory ID check stage	2012-12-08 23:27:59 +01:00
Marc Zinnschlag	72623652e4	addded messages interface for operations/stages	2012-12-08 18:38:36 +01:00
Marc Zinnschlag	89b4497331	added missing edit locks for create/revert/delete	2012-12-08 18:15:00 +01:00
Marc Zinnschlag	6c18be39f0	added stage class	2012-12-08 17:53:45 +01:00
Marc Zinnschlag	8b7f342641	removed last remains of old verify implementation	2012-12-08 17:00:58 +01:00
Marc Zinnschlag	af9b48f4d3	added operations base class	2012-12-08 15:25:50 +01:00
Marc Zinnschlag	a2b4f43176	moved document state enum to a separate file	2012-12-08 14:44:03 +01:00
Marc Zinnschlag	0e7ba008ad	another skill gain fix	2012-12-08 14:28:56 +01:00
Marc Zinnschlag	caaffd1ec2	handle persuasion records properly	2012-12-08 14:24:15 +01:00
Marc Zinnschlag	a70a5282f4	fixed an overzealous skill gain error check	2012-12-08 13:37:43 +01:00
Marc Zinnschlag	fdc7e93835	preliminary multi-threaded verify implementation (does not actually perfom any document verification yet)	2012-12-08 11:59:13 +01:00
Marc Zinnschlag	386eec51c1	some skill usage fixes	2012-12-07 11:36:38 +01:00
eduard	e50b9aca86	tradding skill use, spechcraft use	2012-12-06 20:58:33 +01:00
eduard	2d62649dc9	tradding skill use, spechcraft use	2012-12-06 18:30:19 +01:00
eduard	b2a0e4b1fd	tradding skill use, spechcraft use	2012-12-06 18:19:35 +01:00
Marc Zinnschlag	1c80390bce	Merge branch 'master' into editor2	2012-12-06 15:26:03 +01:00
Marc Zinnschlag	2b53cf6547	do not list actions in the pop up menu that do not apply to any of the selected records	2012-12-06 15:25:31 +01:00
Marc Zinnschlag	c12ee129f7	added delete command	2012-12-06 15:18:41 +01:00
Marc Zinnschlag	b41cc5e9e9	added revert command	2012-12-06 14:56:04 +01:00
eduard	ea8ee11ff7	tradding skill use	2012-12-06 14:25:53 +01:00
eduard	5332546541	tradding skill use	2012-12-06 13:58:52 +01:00
Marc Zinnschlag	8bcd7d8fb1	fixed a type in a script instruction	2012-12-04 20:56:45 +01:00
Marc Zinnschlag	f07b7d17cd	improved exception handling	2012-12-04 20:43:47 +01:00
Marc Zinnschlag	8e1a2e3a13	Issue #474: adjust global variable pcrace	2012-12-04 10:58:43 +01:00
Marc Zinnschlag	5cd2fe00ab	initialise blank global records	2012-12-03 22:16:02 +01:00
Marc Zinnschlag	8e93bfa607	turned the global class into a general purpose table subview class	2012-12-03 22:03:02 +01:00
Marc Zinnschlag	0a8b7602d3	fixed edit lock	2012-12-03 21:51:42 +01:00
Marc Zinnschlag	49d6239004	added pop-up menu with create record action	2012-12-03 21:44:16 +01:00
scrawl	7cc28c3eb9	Merge branch 'videoplayback' of github.com:scrawl/openmw into videoplayback	2012-12-03 17:43:00 +01:00
scrawl	3106db0379	commented out debug output	2012-12-03 17:41:38 +01:00
scrawl	bc90c75176	more clean up, video played with correct speed, videos without sound working too (mw_credits.bik)	2012-12-03 17:33:02 +01:00
scrawl	a77d910aaf	audio codec is opened, some cleanup	2012-12-03 16:44:41 +01:00
Marc Zinnschlag	db29e411c4	added merge functions; temporarily merge on document creation	2012-12-03 13:56:02 +01:00
scrawl	3db850a7d1	Don't crash if no loading screens are found	2012-12-03 05:45:04 +01:00
scrawl	ea2bbec76e	better fix for bed activation	2012-12-03 05:32:12 +01:00
Tom Mason	a6fd369e4e	Fixed wait window reappearing after sleeping	2012-12-02 22:10:47 +00:00
greye	682fd23aea	fix wrong increment	2012-12-02 21:18:59 +04:00
Marc Zinnschlag	b25f2e88ce	Issue #492: fixed double alchemy ingredients removal	2012-12-02 15:07:22 +01:00
Marc Zinnschlag	556d737f65	Merge remote-tracking branch 'trombonecot/windowformatting'	2012-12-02 14:36:36 +01:00
eduard	30d0e93cf4	Fix window formatting on tool tip with too log titles	2012-12-02 14:12:18 +01:00
eduard	7e7e6e2bcb	Fix window formatting on tool tip with too log titles	2012-12-02 14:08:22 +01:00
scrawl	d432420a32	fix FindFFmpeg.cmake	2012-12-01 20:53:28 +01:00
Marc Zinnschlag	bd5e364ac1	display record state in table	2012-12-01 13:42:12 +01:00
scrawl	c4facc233e	Merge branch 'master' into videoplayback ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-12-01 11:30:51 +01:00
Marc Zinnschlag	ec1f957e54	edit lock for sub views	2012-11-30 13:58:10 +01:00
rpopovici	7079b9062f	add AI script functions	2012-11-30 02:16:16 +02:00
Marc Zinnschlag	8dd76b49af	factored out table widget from globals sub view	2012-11-29 19:09:06 +01:00
Marc Zinnschlag	fd55c0cae2	record IDs are no longer handled as a special case	2012-11-29 18:56:28 +01:00
Marc Zinnschlag	4086b556d2	use commands for modifying globals	2012-11-29 16:05:28 +01:00
Marc Zinnschlag	8a09e03d5c	global variable editing (no undo support yet)	2012-11-29 14:45:34 +01:00
scrawl	398eecc35e	GetWeaponType fix	2012-11-28 02:51:46 +01:00
scrawl	00e46addc2	GetArmorType fix	2012-11-28 02:48:21 +01:00
scrawl	8e857587d7	fix a text coloring bug	2012-11-28 02:36:33 +01:00
scrawl	1def60dbe1	PcExpell, PcExpelled, PcClearExpelled, RaiseRank, LowerRank	2012-11-28 02:15:34 +01:00
scrawl	9f720ccbc9	Merge branch 'master' of https://github.com/zinnschlag/openmw into scripting	2012-11-28 02:14:37 +01:00
scrawl	644dacf603	suggestion by Zini for SetDelete	2012-11-28 01:30:18 +01:00
Marc Zinnschlag	5eb0f489e2	Issue 476: fixed auto-move bypassing disabled player controls	2012-11-27 18:39:12 +01:00
Greendogo	8b18d195bd	Update apps/openmw/main.cpp ... Edited the description for the --script-run switch.	2012-11-27 04:50:49 -06:00
Marc Zinnschlag	92f70635a2	improved selection behaviour	2012-11-27 10:42:46 +01:00
scrawl	d6dd212ce8	GetWerewolfKills, ModScale, SetDelete, GetSquareRoot	2012-11-27 06:54:13 +01:00
Marc Zinnschlag	ef9575498f	basic (non-editable) subview for global variables	2012-11-26 12:29:22 +01:00
Mark Siewert	b103426cf0	- Partially reimplement deleting objects defined in a parent esX file. ... - Try to reimplement multiple esX files dropping references in the same file. NOTE: None of these features works. Maybe the code itself does not build. Anyway, after 12 hours of hacking, I am just tired and want to get a snapshot of the code out.	2012-11-25 19:07:16 +01:00
Mark Siewert	896ab44d1e	- Add some updated files missing from last commit. ... - Move plugin dependency test from esmreader.cpp to esmstpre.cpp; fixes crash in omwlauncher.	2012-11-25 17:19:29 +01:00
Mark Siewert	8ea9f00e6f	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ... Conflicts: apps/openmw/mwrender/terrain.cpp apps/openmw/mwworld/cells.cpp apps/openmw/mwworld/cells.hpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/cellstore.hpp apps/openmw/mwworld/containerstore.cpp apps/openmw/mwworld/localscripts.cpp apps/openmw/mwworld/scene.cpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm_store/reclists.hpp components/esm_store/store.cpp extern/shiny - Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp. - NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.	2012-11-25 14:12:44 +01:00
Marc Zinnschlag	1dd63e9fb6	Merge branch 'master' into editor2	2012-11-25 10:50:34 +01:00
scrawl	1ccad32877	GetWeaponType	2012-11-25 02:06:43 +01:00
scrawl	e68dc19256	GetCurrentTime, HasSoulGem	2012-11-25 01:54:37 +01:00
scrawl	0db48b29c7	GetSpellEffects, GetRace	2012-11-25 01:26:29 +01:00
scrawl	4b830e5c7a	Merge branch 'scripting' of github.com:scrawl/openmw into scripting	2012-11-25 00:44:38 +01:00
Marc Zinnschlag	eece4226c0	basic sub view system (very incomplete)	2012-11-24 13:30:43 +01:00
Marc Zinnschlag	4c0dcd46a1	added UniversalId class	2012-11-24 11:01:53 +01:00
Marc Zinnschlag	019146756f	minor documentation changes regarding future improvements and additions	2012-11-24 10:14:43 +01:00
scrawl	70aa7459f5	GetWeaponDrawn	2012-11-24 03:04:26 +01:00
scrawl	be82d1452f	HasItemEquipped	2012-11-24 02:59:44 +01:00
scrawl	600ed5f38a	GetAttacked	2012-11-24 02:48:53 +01:00
scrawl	50baf6dac7	moved to controlextensions	2012-11-24 02:45:25 +01:00
scrawl	a596d23203	GetArmorType	2012-11-24 02:38:10 +01:00
scrawl	d7811624d5	GetEffect	2012-11-24 02:15:55 +01:00
scrawl	e8ef4dba1e	getPcRunning, getPcSneaking, getForceRun, getForceSneak	2012-11-24 02:02:49 +01:00
scrawl	10329c780d	GetLocked	2012-11-23 21:31:10 +01:00
Marc Zinnschlag	a6c7f16a7b	Merge remote-tracking branch 'scrawl/reputation'	2012-11-23 21:26:44 +01:00
scrawl	d418e21371	<Mod|Get><Flee|Fight|Hello|Alarm>	2012-11-23 21:14:32 +01:00
scrawl	9c170af30c	SameFaction	2012-11-23 20:57:08 +01:00
scrawl	d54ed557bf	Equip	2012-11-23 20:48:59 +01:00
scrawl	064cb80c0a	fix wait dialog fading	2012-11-23 20:48:53 +01:00
scrawl	0af869c816	GetReputation	2012-11-23 20:22:51 +01:00
scrawl	eb29b1593b	ModReputation, SetReputation	2012-11-23 19:56:45 +01:00
scrawl	f218ef2675	fix separator	2012-11-23 19:21:13 +01:00
scrawl	1d7e92b6b3	dialogue fixes	2012-11-23 19:05:40 +01:00
Marc Zinnschlag	303506d24b	added new document function	2012-11-23 14:08:20 +01:00
Marc Zinnschlag	997386d873	implemented world verify function (doesn't do anything yet; mostly meant as a test for multi-operation interface)	2012-11-23 13:15:45 +01:00
Marc Zinnschlag	2fc183d595	added operations progress bar	2012-11-23 12:20:35 +01:00
Marc Zinnschlag	eaa58e0530	preparations for multiple parallel progress-type operations	2012-11-23 10:52:46 +01:00
Marc Zinnschlag	04158d03b0	clean up properly after closing a top level window	2012-11-23 10:30:14 +01:00
Marc Zinnschlag	03aacd3263	added progress tracking	2012-11-23 10:25:34 +01:00
Marc Zinnschlag	931eb08114	implemented edit locking (used during saves)	2012-11-23 00:51:04 +01:00
Marc Zinnschlag	5838929371	implemented a dummy save function (does not actually save anything)	2012-11-23 00:36:01 +01:00
Marc Zinnschlag	d7c63d4c74	track document modification state and display it in the top level window title bar	2012-11-22 23:42:17 +01:00
Marc Zinnschlag	d7af9fbec6	various fixes	2012-11-22 17:24:28 +01:00
Marc Zinnschlag	6643674b13	ESM tool fix	2012-11-22 17:23:25 +01:00
Marc Zinnschlag	8e546ebd30	added test command	2012-11-22 16:00:23 +01:00
Marc Zinnschlag	ed3d8b8ca2	added undo stack and undo/redo actions	2012-11-22 15:54:31 +01:00
Marc Zinnschlag	1ddcea1f07	display view indices in title bar	2012-11-22 15:25:16 +01:00
Marc Zinnschlag	789cecb9df	added main menu and implemented new view function	2012-11-22 14:51:38 +01:00
Marc Zinnschlag	758371d7e4	implemented view/document closing	2012-11-22 14:10:23 +01:00
Marc Zinnschlag	9834bb3ad5	basic document handling	2012-11-22 13:30:02 +01:00
Marc Zinnschlag	9201baebf9	template fix	2012-11-22 10:19:11 +01:00
Marc Zinnschlag	c3cd6e8a8a	new attempt at the editor	2012-11-21 17:31:18 +01:00
scrawl	c8562d8442	toggleCollisionBoxes actually does something useful now	2012-11-20 02:20:54 +01:00
Marc Zinnschlag	5d45bcd03a	Merge remote-tracking branch 'trombonecot/master' ... Conflicts: apps/openmw/mwclass/light.cpp	2012-11-19 21:21:00 +01:00
eduard	4e4d15f8ac	Failed action	2012-11-19 21:04:49 +01:00
scrawl	693eeabeca	shiny: fix GLSL texture units when shaders were disabled	2012-11-19 13:55:26 +01:00
Mark Siewert	31fb715bd7	- Add support for moving existing references by plugin files. No cell changing yet. ... - Change CellRefList::list from list<> to map<int,> so we can identify live references by their Refnumber. - Introduce ContainerRefList, a clone of the original CellRefList. It is now used for containers, which do not track Refnumbers. - Many small tweaks so that the new CellRefList does not conflict with existing code.	2012-11-17 21:50:25 +01:00
eduard	82ea547ce4	Failed action	2012-11-17 18:17:08 +01:00
Mark Siewert	2175f13b67	- Add tracking for dependencies between plugins. ... - Add reference number mangling required for moving references around.	2012-11-17 00:21:51 +01:00
scrawl	8ef3edd416	Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap	2012-11-16 22:28:00 +01:00
scrawl	f5355e3e92	512x512 map, slightly faster	2012-11-16 22:26:00 +01:00
Marc Zinnschlag	a092deaee8	various fixes	2012-11-16 20:28:20 +01:00
Marc Zinnschlag	3dc013ceae	Merge remote-tracking branch 'gohan/Gohan'	2012-11-16 20:15:58 +01:00
scrawl	dc67a547b0	global map explored overlay	2012-11-16 19:34:09 +01:00
marcin	51027c541e	Feature #391 Dummy AI package classes	2012-11-16 18:38:15 +01:00
Marc Zinnschlag	9193f3b0ae	implemented getCommon/BlightDisease script instructions	2012-11-16 13:32:40 +01:00
Marc Zinnschlag	89c7936534	fixed dialogue script error reporting	2012-11-16 12:47:09 +01:00
Marc Zinnschlag	fd5671e6db	fixed argument lists for setpcfacrep and modpcfacrep	2012-11-16 12:45:07 +01:00
marcin	bed0280ba1	Feature #391 Dummy AI package classes	2012-11-15 22:33:50 +01:00
marcin	99ddc63e2c	Feature #391 Dummy AI package classes	2012-11-15 22:32:15 +01:00
marcin	515419ae0b	Feature #391 Dummy AI package classes	2012-11-15 22:22:44 +01:00
marcin	4b939c7521	Feature #391 Dummy AI package classes	2012-11-15 22:15:20 +01:00
Marc Zinnschlag	82d62eb95a	Merge branch 'script'	2012-11-15 20:00:37 +01:00
Marc Zinnschlag	9669eed083	Issue #219: added last missing function filters	2012-11-15 20:00:27 +01:00
scrawl	aefde3f5bc	Merge branch 'master' into globalmap	2012-11-15 13:21:24 +01:00
marcin	e6c8e1f0d7	Feature #391 Dummy AI package classes	2012-11-14 18:42:04 +01:00
marcin	698afbec3e	Feature #391 Dummy AI package classes	2012-11-14 18:40:32 +01:00
scrawl	5f7d349126	several missing includes	2012-11-14 05:32:23 +01:00
Marc Zinnschlag	b046687f46	added PCFacRep script instructions	2012-11-13 16:11:03 +01:00
Marc Zinnschlag	2a1727d4c5	improved error reporting for dialogue scripts (enabled via --script-verbose)	2012-11-13 15:35:46 +01:00
Marc Zinnschlag	c621a9f7e4	added missing disposition script instructions	2012-11-13 14:29:00 +01:00
Marc Zinnschlag	8aa1fd921b	fixed some stats related script instructions	2012-11-13 14:19:43 +01:00
Marc Zinnschlag	cbb0fd5792	Merge branch 'dialogue'	2012-11-13 10:04:08 +01:00
Marc Zinnschlag	409d15576b	Merge remote-tracking branch 'greye/player-model'	2012-11-12 14:18:38 +01:00
Marc Zinnschlag	e2ccec99f0	Issue #219: added another missing PC stats filter	2012-11-12 14:02:49 +01:00
Marc Zinnschlag	586ac3f5c6	Issue #219: added some more stats filters; fixed two filters	2012-11-12 13:56:51 +01:00
Marc Zinnschlag	77ba8c5117	Issue #219: implemented rank requirement filter	2012-11-12 13:23:25 +01:00
scrawl	8e847fdc6e	fix speechcraft skill increasing when persuade didn't succeed	2012-11-11 19:18:41 +01:00
Mark Siewert	42eefaf36f	- Add support for loading references from multiple esm/esp files. Full reference ID mangling coming soon (currently, moved references are simply cloned). ... - Reference loader now (partially) supports MVRF tag.	2012-11-10 21:43:41 +01:00
scrawl	11a8d5d70a	Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap	2012-11-10 21:19:41 +01:00
scrawl	7c22690116	Merge branch 'next' into globalmap	2012-11-10 21:19:10 +01:00
greye	623e00531d	fix reentering race selection	2012-11-10 21:54:43 +04:00
greye	0d33d005a5	head/hair selection	2012-11-10 21:30:16 +04:00
greye	50867e8d87	fix gender selection update, main model visibility and couple of crashes	2012-11-10 19:57:50 +04:00
Marc Zinnschlag	75f64aa38b	Merge branch 'master' into dialogue ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.hpp apps/openmw/mwmechanics/npcstats.cpp apps/openmw/mwmechanics/npcstats.hpp	2012-11-10 15:44:44 +01:00
Marc Zinnschlag	7b1788b03b	minor fix	2012-11-10 15:11:21 +01:00
Marc Zinnschlag	0ab4068fbd	Merge remote-tracking branch 'scrawl/persuasion' into next	2012-11-10 14:59:52 +01:00
Marc Zinnschlag	6dc2214502	Issue #219: more DialogueManager refactoring	2012-11-10 14:52:44 +01:00
Marc Zinnschlag	79706bf60f	Issue #219: dialogue manager cleanup	2012-11-10 14:31:58 +01:00
Marc Zinnschlag	d24e3eec9f	Issue #219: added filters for various player stats	2012-11-10 14:02:52 +01:00
Marc Zinnschlag	f8fcca64b6	Issue #219: Proper implementation of talked to PC filter	2012-11-10 13:31:10 +01:00
Marc Zinnschlag	7e8d4bb3c9	Issue #219: added various creature and NPC stats; implemented respective filters	2012-11-10 13:21:38 +01:00
Marc Zinnschlag	d15eb6cd17	Merge remote-tracking branch 'greye/player-model' into next	2012-11-10 12:36:01 +01:00
Marc Zinnschlag	e97f3003ab	Issue #219: added expelled status tracking; implemented expelled filter	2012-11-10 12:28:40 +01:00
Marc Zinnschlag	bd2c772dae	Issue #219: implemented player skill and attribute filter	2012-11-10 12:08:04 +01:00
Marc Zinnschlag	d6961c0246	Issue #219: made all unimplemented filters return false	2012-11-10 11:42:03 +01:00
Marc Zinnschlag	ceaf1677ce	Issue #219: rewrote AI settings and implemented AI settings filters	2012-11-10 11:38:37 +01:00
Marc Zinnschlag	eb4e72aaa7	Issue #219: implemented disease filters	2012-11-10 11:08:36 +01:00
Marc Zinnschlag	c425b3f4a3	Issue #219: fixed function decoding and moved choice function from DialogueManager to Filter	2012-11-10 09:48:20 +01:00
Marc Zinnschlag	a752536cea	Issue #219: added function decoding and moved same faction function from DialogueManager to Filter	2012-11-10 09:35:50 +01:00
greye	235b565bb7	update main character model	2012-11-10 11:51:48 +04:00
greye	b1ef0026a9	race selection/inventory preview character model update	2012-11-10 11:41:12 +04:00
scrawl	92bba18218	removed useless member	2012-11-10 00:47:24 +01:00
scrawl	553ea08eae	consider temporary disposition change when trading	2012-11-10 00:42:31 +01:00
scrawl	94aeb15220	bartering disposition change	2012-11-10 00:38:45 +01:00
scrawl	33b4b29fbc	persuasion mechanics, added reputation	2012-11-10 00:29:36 +01:00
scrawl	ace9ee9c83	persuasion dialog	2012-11-09 20:18:38 +01:00
scrawl	f6a9029c4b	bounty & disease disposition effect	2012-11-09 18:33:11 +01:00
Marc Zinnschlag	4994a253da	Merge branch 'bountydisease' into dialogue	2012-11-09 18:17:14 +01:00
Marc Zinnschlag	be1334b202	disease tests	2012-11-09 18:16:29 +01:00
Marc Zinnschlag	0727d943b1	Merge branch 'next' into bountydisease ... Conflicts: apps/openmw/mwmechanics/npcstats.cpp	2012-11-09 18:04:44 +01:00
scrawl	d53a7ade1e	method names, disposition uint->int	2012-11-09 14:42:09 +01:00
Marc Zinnschlag	39ff2f06ce	added bounty to NpcStats	2012-11-09 14:31:38 +01:00
scrawl	ae78eaeb28	fixed training, fixed todo comments	2012-11-08 23:21:03 +01:00
scrawl	b2afb1fd5c	Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement ... Conflicts: apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwclass/npc.cpp apps/openmw/mwdialogue/dialoguemanagerimp.cpp apps/openmw/mwgui/spellbuyingwindow.cpp apps/openmw/mwgui/trainingwindow.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp	2012-11-08 23:16:40 +01:00
scrawl	322faf13e4	cleanup	2012-11-08 22:37:59 +01:00
scrawl	bf4e855260	fixed creatures	2012-11-08 22:31:08 +01:00
Marc Zinnschlag	e6021a3fe3	Issue #219: moved checks for local and global variables from DialogueManager to Filter	2012-11-08 22:11:50 +01:00
gugus	4634227f1c	notify the user when the merchant doesn't accept the offer	2012-11-08 21:50:56 +01:00
Marc Zinnschlag	e68bb3481e	Issue #219: moved over the second batch of functions (boolean and one integer I forgot last time)	2012-11-08 21:48:17 +01:00
Marc Zinnschlag	91afef140b	Issue #219: moved first batch of integer type functions from DialogueManager to Filter	2012-11-08 21:16:49 +01:00
greye	c3f0dc0dfb	m prefix for NpcAnimation members	2012-11-08 23:11:43 +04:00
scrawl	3d7146cd50	don't allow opening a window multiple times, primarily the console	2012-11-08 19:34:54 +01:00
Marc Zinnschlag	2be60041f3	Merge remote-tracking branch 'greye/player-dynamics' into next	2012-11-08 18:32:25 +01:00
Marc Zinnschlag	e912b5bed2	Merge remote-tracking branch 'greye/next' into dialogue	2012-11-08 18:19:52 +01:00
greye	af5fb7916f	fix searching in store	2012-11-08 21:07:14 +04:00
Marc Zinnschlag	235397dde8	Issue #219: added missing implemented for isInverted function	2012-11-08 17:29:10 +01:00
Marc Zinnschlag	f5972a3080	Issue #219: Support for boolean select structs	2012-11-08 17:04:44 +01:00
Marc Zinnschlag	b412ebd0af	Issue #219: Supoort for inverted select structs	2012-11-08 17:01:26 +01:00
Marc Zinnschlag	4614d2bc8e	Issue #219: added basic select struct analysis and type checking	2012-11-08 16:49:38 +01:00
greye	b5a59c3a07	minor doxygen comments update	2012-11-08 19:01:42 +04:00
greye	2a86432887	store birthsign in MWWorld::Player	2012-11-08 18:50:23 +04:00
Marc Zinnschlag	662054acf4	Issue #219: moved checks for various dialogue info fields from DialogueManager to Filter	2012-11-08 14:55:31 +01:00
Marc Zinnschlag	1502b3f6f8	Issue #219: Begin of refactoring; added filter class (doesn't do anything yet)	2012-11-08 14:09:40 +01:00
Marc Zinnschlag	6c6c0dd1e3	Merge branch 'next' into dialogue	2012-11-08 13:45:20 +01:00
gugus	0a883f4492	The player can now barter with merchants	2012-11-08 13:38:20 +01:00
greye	83e758ee50	clean up interfaces	2012-11-08 16:37:57 +04:00
greye	2a06d72e32	remove unused custom character classes	2012-11-08 02:27:01 +04:00
greye	9dc9098fa7	update MWBase::World interface since records contains own id	2012-11-08 01:52:34 +04:00
greye	f818fa1ebf	minor update since records contains own id	2012-11-08 01:39:24 +04:00
greye	5b9621bca5	store player record data in ESMStore	2012-11-08 01:36:43 +04:00
greye	9ab2c16055	store created character classes as dynamic records	2012-11-08 01:22:44 +04:00
greye	78740306db	non-const access to Store<T> from ESMStore	2012-11-08 01:21:54 +04:00
Marc Zinnschlag	c5a6171aab	cleanup	2012-11-07 19:43:42 +01:00
Marc Zinnschlag	918316168f	Merge remote-tracking branch 'greye/store' into next ... Conflicts: apps/openmw/mwclass/light.cpp apps/openmw/mwworld/worldimp.cpp	2012-11-07 19:34:28 +01:00
greye	11c0e6382f	make ESMStore setting up itself after loading	2012-11-07 15:41:59 +04:00
greye	bc218759e9	forgotten module	2012-11-07 15:38:25 +04:00
Marc Zinnschlag	0805301922	Merge remote-tracking branch 'bwrsandman/master' into next	2012-11-07 10:40:40 +01:00
Mark Siewert	7f77bf76c7	- Add support for multiple esm contexts in cell store. This will allow to generate references from multiple esX files. Currently, only the first context is used. ... - Add many TODOs to mark points where more work is required to fully implement this feature.	2012-11-06 22:13:19 +01:00
Mark Siewert	64c08eada4	Merge remote-tracking branch 'upstream/next' into multiple_esm_esp	2012-11-06 20:37:29 +01:00
bwrsandman	7911f08c53	Issue #438: set 0 a.m. to be 12 a.m.	2012-11-06 13:19:35 -05:00
Marc Zinnschlag	81a2c629d8	Merge remote-tracking branch 'scrawl/master' into next	2012-11-06 18:21:24 +01:00
scrawl	21e0cde914	changed OIS includes since OIS_INCLUDE_DIR is already an include directory	2012-11-06 15:26:51 +01:00
greye	58b7927a36	move 'player' record to dynamic	2012-11-06 18:17:32 +04:00
greye	83f5b1df81	change to static --> dynamic search order	2012-11-06 17:58:49 +04:00
greye	9f1733a415	move record insertion to ESMStore	2012-11-06 17:51:38 +04:00
gugus	bf98b95955	bugfix	2012-11-06 13:10:54 +01:00
Marc Zinnschlag	6d5333be05	some code cleanup	2012-11-06 13:08:25 +01:00
Marc Zinnschlag	d661d4f6d6	Merge remote-tracking branch 'emoose/bug-368' into next	2012-11-06 13:04:38 +01:00
greye	dccc157f4c	setting up	2012-11-06 15:26:55 +04:00
greye	18bb5960e4	let's rescue linker	2012-11-06 15:10:57 +04:00
greye	620184a009	fix typos	2012-11-06 14:44:56 +04:00
greye	0fd22ce4b0	CellRefList<X>::find(CellRef &, Y &list) -> ::load(CellRef &, ESMStore &)	2012-11-06 14:23:21 +04:00
greye	242a9b5a59	various interface fixes, commented unused code	2012-11-06 14:03:36 +04:00
greye	b3ad872845	new interface in manualref, fix various typos	2012-11-06 13:43:48 +04:00
greye	e74b2c060d	disable createRecord(), Land constness hack, various fixes with Store<T> interface	2012-11-06 13:14:03 +04:00
greye	ff8da265ed	applying new interface vol.9, inconsistent	2012-11-06 12:36:21 +04:00
greye	932a9dc6f9	applying new interface vol.8, inconsistent	2012-11-06 11:53:00 +04:00
greye	a9c1ce412a	applying new interface vol.7, inconsistent	2012-11-06 11:29:18 +04:00
gugus	2841d831a6	Disposition is now updated everyframe	2012-11-05 23:16:37 +01:00
Marc Zinnschlag	a7da929496	Merge remote-tracking branch 'scrawl/master' into next	2012-11-05 22:46:42 +01:00
emoose	3e5b396b56	Changed: world: cleanup	2012-11-05 21:10:04 +00:00
emoose	5c1b3fc043	Fixed: scene: adjust rotation/scale when creating objects	2012-11-05 20:45:04 +00:00
greye	4637503680	applying new interface vol.6, inconsistent	2012-11-06 00:34:11 +04:00
emoose	e8e3c211a4	Changed: MWRender::player: make camera rotation functions public; world: fix/clean scaleObject and rotateObject; rendering: add scaleObject code, fix rotateObject so it stores correct rotation	2012-11-05 19:56:20 +00:00
scrawl	646e689239	clear name edits when opening alchemy / spell creation	2012-11-05 20:47:28 +01:00
greye	42aae566a7	applying new interface vol.5, inconsistent	2012-11-05 23:41:26 +04:00
emoose	7a7825577a	Changed: use MWWorld::Ptr for PhysicsSystem arguments	2012-11-05 19:37:27 +00:00
gugus	9ebe9cb40c	Disposition is now calculated according to the Wiki. But: bouty and deacease are not implemented (for disposition at least), and there is still no temporary/permanent dispositons changes	2012-11-05 19:55:06 +01:00
gugus	aaf1b66c7e	BarterOffer is used in other trading services too	2012-11-05 19:53:55 +01:00
greye	11567663a7	applying new interface vol.4, inconsistent	2012-11-05 22:34:08 +04:00
greye	e628b23da6	applying new interface vol.3, inconsistent	2012-11-05 21:45:35 +04:00
greye	86ad7a96f4	applying new interface vol.2, inconsistent	2012-11-05 21:19:22 +04:00
Marc Zinnschlag	61942c9c4a	Issue #440: Make day numbers start at 1 instead of 0	2012-11-05 18:01:50 +01:00
greye	bd1bb2e55d	applying new interface vol.1, inconsistent	2012-11-05 18:39:42 +04:00
greye	7cf0b8a680	just replace esmstore, inconsistent	2012-11-05 18:09:58 +04:00
greye	d205723a17	resolving m prefix/ESMStore movement	2012-11-05 18:02:47 +04:00
greye	8691eac557	resolve Script::mData.mName -> mId, resolve moving ESMStore	2012-11-05 17:41:36 +04:00
greye	10ae5d3365	dynamic storage for cells	2012-11-05 17:18:02 +04:00
greye	0f524e4a60	dynamic storage for records with string id	2012-11-05 17:18:01 +04:00
greye	9995fd324d	split record comparator from store	2012-11-05 17:18:01 +04:00
greye	558e0557d0	basic static esmstore	2012-11-05 17:18:01 +04:00
greye	dd8f5e1a91	stores for records indexed with int, basic resolving	2012-11-05 17:18:01 +04:00
greye	ce91c5636d	load() method for records with string id	2012-11-05 17:18:01 +04:00
greye	5ac54d1fff	alter ESM::Script for storing id as std::string	2012-11-05 17:18:01 +04:00
greye	f0ecbbb056	basic Pathgrid store	2012-11-05 17:18:01 +04:00
greye	3b86955d37	basic Cell store	2012-11-05 17:18:01 +04:00
greye	e1f2f190d4	base record containers	2012-11-05 17:18:01 +04:00
greye	2057f5619e	move ESMStore to MWWorld	2012-11-05 17:18:01 +04:00
greye	3c2ce25f5f	m prefix for mwworld/cellstore.hpp	2012-11-05 16:07:59 +04:00
gugus	f72f898bd9	implement barterOffer. It's used for travel only. ... I've started to implement disposition, but it's very basic for now.	2012-11-05 11:07:43 +01:00
emoose	accf8b2f71	Updated Bug #430 fix so it only moves the player now	2012-11-04 23:26:26 +00:00
Marc Zinnschlag	6f7a621b6f	disabled enchanting unfinished enchantment GUI for now	2012-11-04 23:15:20 +01:00
Marc Zinnschlag	aabb1b8f3f	Issue #219: implemented death count filter	2012-11-04 13:26:04 +01:00
scrawl	38828acac9	transparent overlay	2012-11-04 12:13:04 +01:00
scrawl	b7aa7e4cef	pause all animations	2012-11-04 11:57:51 +01:00
scrawl	ba2fc2d6f8	better fix for chargen button colors	2012-11-04 11:37:47 +01:00
emoose	cadc753216	Fixed: engine: Bug #437 Stop animations when paused better fix; scene: Bug #430 Teleporting and using loading doors linking within the same cell reloads the cell ... Bug #437 fix only pauses the RenderingManager, and still updates the mOcclusionQuery Bug #430 fix is only tested in interiors (ToddTest)	2012-11-03 19:29:55 +00:00
emoose	c8cc6b6e65	Fixed: engine: Bug #437 Stop animations when paused; tooltips: capitalize first letter (eg paper -> Paper)	2012-11-03 16:39:32 +00:00
emoose	b70b8cc4bc	Fixed: character creation: make OK button grayed out/disabled (loses the hoverover when it's re-enabled though...)	2012-11-03 06:02:33 +00:00
emoose	1c8e941f0d	fix kdevelop indentation again...	2012-11-02 21:21:32 +00:00
emoose	96b56d9803	fixes: containers: key id case comparison	2012-11-02 21:18:37 +00:00
emoose	4a9821dc65	fix kdevelop indentation...	2012-11-02 20:43:07 +00:00
emoose	15f972cc62	fixes: compile: cast error; doors: key id case comparison; character creation: going from CharacterCreation to BirthDialog loses data; character creation: Class/Race/BirthDialog allowing no data; code: clean up a bit ... todo: going from CharacterCreation back to CreateClassDialog loses data	2012-11-02 20:33:08 +00:00
pvdk	8cdd1e5539	Fixed problem with sorting of the masters in the launcher	2012-11-02 15:06:14 +01:00
Marc Zinnschlag	4bc4ca775c	Issue #432: fixed MWWorld::ContainerStore::clear	2012-11-01 15:11:13 +01:00
Marc Zinnschlag	648b53ef93	removed unused launcher.cfg file	2012-10-31 10:09:27 +01:00
pvdk	b0647d6c8a	Fix for Bug #413: resolutions no longer appear multiple times on Windows	2012-10-30 19:05:44 +01:00
pvdk	60aea3653f	Modified sorting, should not crash anymore	2012-10-30 18:58:17 +01:00
Pieter van der Kloet	64c348c39e	Added support for different encodings	2012-10-30 11:26:48 +01:00
Pieter van der Kloet	433773e0ea	Fixed segfault in datafilesmodel because of invalid modelindex row	2012-10-30 11:10:06 +01:00
Pieter van der Kloet	6920958e16	Oops, forgot to add timestamps for master files	2012-10-30 10:08:24 +01:00
Pieter van der Kloet	6e758af05c	Launcher cfg is stored in the user location only, fixes Bug #414	2012-10-30 06:51:22 +01:00
Pieter van der Kloet	1c06a06f91	Files are now sorted by modified timestamp, fixes Bug #415	2012-10-30 06:47:39 +01:00
Pieter van der Kloet	2b25178aef	Merge remote-tracking branch 'upstream/master' into launcher-model	2012-10-30 05:04:31 +01:00
Pieter van der Kloet	ef11a32fee	Fixed a bug where a non-existant openmw.cfg would crash the launcher	2012-10-30 05:03:58 +01:00
Pieter van der Kloet	d065b56948	Fixed default profile adding and made switching profiles more efficient	2012-10-30 04:21:31 +01:00
scrawl	a04df37f83	implemented looting corpses	2012-10-28 16:04:33 +01:00
Marc Zinnschlag	d7add0b9e6	Issue #61: fixed alchemy skill	2012-10-28 14:07:36 +01:00
Marc Zinnschlag	c635447cea	Merge branch 'death'	2012-10-27 13:34:20 +02:00
Marc Zinnschlag	ed3641b214	Issue #68: check for essential actors	2012-10-27 13:33:54 +02:00
Marc Zinnschlag	2e63ca5e0a	Merge branch 'death'	2012-10-27 11:33:26 +02:00
Marc Zinnschlag	453f347ee8	Issue #68: added getdeadcount script function	2012-10-27 11:33:18 +02:00
Marc Zinnschlag	f72c35fc17	Issue #68: tally deaths	2012-10-27 11:15:52 +02:00
Marc Zinnschlag	6b09b3ad61	Issue #68: Play death animations	2012-10-27 10:36:42 +02:00
bwrsandman	5d45d328b8	Fixed uninitialized variable that caused a segfault when going to previous page.	2012-10-26 21:28:22 -04:00
greye	9f923e7963	fix crashing if /home/greye/.cache not exist	2012-10-25 15:14:34 +04:00
Marc Zinnschlag	21c24dedb6	Issue #68: Stop player from dying (temporary workaround)	2012-10-25 12:28:45 +02:00
Marc Zinnschlag	0ab432b074	Issue #68: fixed death detection	2012-10-25 12:22:48 +02:00
Marc Zinnschlag	9172c3ec4d	Issue #68: stop NPCs from instantly dropping dead	2012-10-23 13:54:36 +02:00
scrawl	234716daa6	finished spell creation	2012-10-23 11:42:38 +02:00
scrawl	33361e6539	Merge branch 'master' into spellcreation	2012-10-23 10:38:53 +02:00
Pieter van der Kloet	fe9120bcb3	Added support for the profiles and made creation/editing them more user friendly	2012-10-23 01:47:07 +02:00
Pieter van der Kloet	a4855186c5	Merge remote-tracking branch 'upstream/master' into launcher-model	2012-10-22 15:00:19 +02:00
Pieter van der Kloet	ab8894e07a	Merge remote-tracking branch 'origin/launcher-model' into launcher-model ... Conflicts: apps/launcher/datafilespage.cpp	2012-10-22 14:59:43 +02:00
Pieter van der Kloet	6433b1e022	Some minor fixes	2012-10-22 02:25:10 +02:00
Marc Zinnschlag	0547f11564	Issue #68: Remove dead actors from actor list	2012-10-20 10:54:51 +02:00
Marc Zinnschlag	f2e25b8a47	Issue #68: Keep dead actors out of the actor list for the current scene	2012-10-20 10:49:48 +02:00
scrawl	59560e84eb	small addition	2012-10-19 20:48:15 +02:00
scrawl	b2b9254718	improved the ingredient GUI code (this didnt fix anything, though)	2012-10-19 20:44:53 +02:00
scrawl	475163bd4a	Merge branch 'master' of https://github.com/zinnschlag/openmw	2012-10-19 20:21:34 +02:00
scrawl	fbe3538f32	bug #412: sort birth signs	2012-10-19 20:13:37 +02:00
Marc Zinnschlag	3f6afb13f1	Merge remote-tracking branch 'scrawl/alchemy'	2012-10-19 20:09:45 +02:00
scrawl	8d7514e341	corrected chance	2012-10-19 19:48:54 +02:00
scrawl	d76522e7a4	searchPtrViaHandle	2012-10-19 19:48:02 +02:00
Marc Zinnschlag	7884a927c9	Issue #68: added dead flag to CreatureStats	2012-10-19 18:56:22 +02:00
Marc Zinnschlag	a8f294c9ae	fixed types of dynamic stats script instructions	2012-10-19 18:01:45 +02:00
Marc Zinnschlag	bdca5aff87	Issue #68: simplified the dynamic stats interface	2012-10-19 13:10:06 +02:00
Marc Zinnschlag	3f833af46a	Issue #407: Fortyfy attribute effects were ignored for the last 3 attributes	2012-10-19 10:07:27 +02:00
scrawl	28cc480ce1	fix some alchemy issues and make the gui use the new implementation	2012-10-18 22:21:39 +02:00
Marc Zinnschlag	18686614db	Merge remote-tracking branch 'scrawl/splashscreen_dirlisting' ... Conflicts: apps/openmw/mwgui/loadingscreen.cpp	2012-10-18 15:46:43 +02:00
Marc Zinnschlag	1864dbe031	Issue #61: potion creation	2012-10-18 15:33:27 +02:00