3391 commits

Author	SHA1	Message	Date
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
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
Marc Zinnschlag	bd5e364ac1	display record state in table	2012-12-01 13:42:12 +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
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
eduard	82ea547ce4	Failed action	2012-11-17 18:17:08 +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
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