7130 commits

Author	SHA1	Message	Date
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
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
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
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
Nikolay Kasyanov	9fabae5198	OS X: force Cocoa API for Ogre windows in OpenCS	2013-12-25 00:26:15 +04: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
Nikolay Kasyanov	fc21dd1f3a	Music playback on OS X >= 10.9 works again. Fixes bug #1041.	2013-12-14 17:26:09 +04: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
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
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
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