11945 commits

Author	SHA1	Message	Date
scrawl	44e96fcaaa	Implement Charm magic effect	2014-01-05 01:56:36 +01:00
scrawl	14b70a3ce6	Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead)	2014-01-05 01:34:35 +01:00
scrawl	634a53211c	Make sure materials are built before trying to determine their transparency	2014-01-04 22:56:06 +01:00
pvdk	92234cf783	Changed crashcatcher's uname system info retrieval and cleaned indentation	2014-01-04 21:46:38 +01:00
scrawl	c4e4a8fb57	Closes #1083: Fix werewolf change handling	2014-01-04 20:50:18 +01:00
scrawl	f4517c8221	For dialogue filtering, use the Vampirism magic effect instead of the untouched NpcStats::mVampire	2014-01-04 20:50:18 +01:00
mrcheko	7002412760	resolve conflict in character.cpp	2014-01-04 17:55:09 +02:00
Marek Kochanowicz	e860717105	replaced raw values with enums.	2014-01-04 15:28:08 +01:00
Marek Kochanowicz	558690b571	implemented list of magical bolts for skipping.	2014-01-04 15:19:17 +01:00
Marek Kochanowicz	dfd1058551	Various style corrections.	2014-01-04 14:49:01 +01:00
Marek Kochanowicz	aa05ffcf60	Splited some long argument lists to the multiple lines.	2014-01-04 13:05:19 +01:00
Marc Zinnschlag	356b53bd22	Merge remote-tracking branch 'scrawl/master'	2014-01-04 11:38:31 +01:00
Dmitriy 'Endorph' Shkurskiy	7023395012	Windows-specific definition to omit inclusion of unused stuff from Windows.h	2014-01-04 07:46:29 +02:00
Dmitriy 'Endorph' Shkurskiy	18d4cdb2ac	Fix for VS2010-Debug: manual assignment operator and cctor added for MMWorld::ContainerStoreIterator	2014-01-04 07:46:29 +02:00
scrawl	16838595a3	Another console fix: discard text markup when getting the command line's text	2014-01-04 05:24:32 +01:00
scrawl	1b96c5d266	Console improvements: Show scrollbar, allow copying text from the history	2014-01-04 05:13:53 +01:00
scrawl	710a1e2f37	Smash case for manual reference IDs as well, consistent with references in data files	2014-01-04 04:39:06 +01:00
scrawl	557652112f	Show the target HP bar also when casting a heal effect (same as MCP)	2014-01-04 04:21:44 +01:00
scrawl	12691040d1	Fix incorrect disposition testing and get rid of of a related hack that is no longer needed.	2014-01-04 02:49:10 +01:00
scrawl	09d491d1ba	Move a piece of functionality to its appropriate place	2014-01-04 01:13:19 +01:00
scrawl	be2ebc5cac	Closes #1081: Implement disease contraction	2014-01-03 23:33:14 +01:00
scrawl	2a7d610f87	Implement GetSpellReadied instruction	2014-01-03 22:55:17 +01:00
scrawl	c0fbcf413f	Use the playermagic and playerfighting control switches	2014-01-03 22:44:35 +01:00
scrawl	e9bd43e2da	Use GMSTs for bound items/creatures	2014-01-03 20:54:14 +01:00
Marek Kochanowicz	1c3296fb64	Some changes in weapons check.	2014-01-03 18:25:06 +01:00
scrawl	617a65cdd2	Print message to dialogue window after successful trade	2014-01-03 17:40:14 +01:00
scrawl	b22dd40b41	Implement Paralyze magic effect	2014-01-03 17:06:05 +01:00
Marc Zinnschlag	ee621245bb	Merge remote-tracking branch 'scrawl/master'	2014-01-03 15:59:06 +01:00
scrawl	55c5d7cee4	Implement Resurrect instruction	2014-01-03 15:54:23 +01:00
Marek Kochanowicz	7b63e1942c	style corrections	2014-01-03 11:42:49 +01:00
Marek Kochanowicz	24f090ca98	Finishing stuff.	2014-01-03 11:31:54 +01:00
Marek Kochanowicz	8201c97abf	Inventory item template.	2014-01-03 09:16:41 +01:00
scrawl	b4230f716e	Implement RemoveEffects instruction	2014-01-03 05:19:10 +01:00
scrawl	7d8ca91286	Implement RemoveSpellEffects instruction	2014-01-03 05:18:44 +01:00
scrawl	366801f3d5	Implement explodeSpell instruction (like Cast, with caster = target)	2014-01-03 04:44:50 +01:00
scrawl	93e1a2df73	Implement Cast script instruction (shrines work now)	2014-01-03 04:09:52 +01:00
scrawl	b42240be6d	Implement Damage/restore skill/attribute effects. Use dedicated classes for skill and attribute values (instead of Stat<T>) since there are some important differences.	2014-01-03 03:48:43 +01:00
scrawl	32ff3b530c	Change all instances of skill/attribute values to use an appropriate typedef.	2014-01-03 01:59:15 +01:00
scrawl	623cdef69f	Code cleanup	2014-01-02 21:49:12 +01:00
scrawl	eba60858dd	Closes #1078: Show stat bar text even when 0	2014-01-02 21:48:33 +01:00
Marc Zinnschlag	3b75f6676c	Merge remote-tracking branch 'scrawl/openmw-0.28' into openmw-28	2014-01-02 21:27:08 +01:00
scrawl	299690631f	Implement SoulTrap magic effect	2014-01-02 21:21:28 +01:00
mrcheko	79e972bdb6	resolved accompanying minor problems	2014-01-02 21:54:41 +02:00
Lukasz Gromanowski	b017a3be3e	Bug #1074: Inventory paperdoll obscures armour rating ... Changed size of inventory paperdoll. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-01-02 20:20:57 +01:00
scrawl	596e0c8a49	Correct Dispel effect (use magnitude as chance)	2014-01-02 20:15:07 +01:00
scrawl	94d2ec8e4e	Add missing spells update	2014-01-02 20:02:28 +01:00
Marc Zinnschlag	5d3b696eb6	Merge remote-tracking branch 'scrawl/master' into openmw-28	2014-01-02 19:52:47 +01:00
scrawl	12de351feb	Check if levitation is enabled before levitating	2014-01-02 16:38:23 +01:00
scrawl	0990ca4b75	Closes #1072: Fix extra light being added multiple times when showCarriedLeft(true) is called repeatedly	2014-01-02 15:58:00 +01:00
scrawl	e6c0e187bc	Closes #1073: Check for all gold types in canSell. For containers, only gold_001 is relevant, but items in the world can be sold as well.	2014-01-02 15:44:58 +01:00
Marc Zinnschlag	0d3e67dafc	Merge branch 'master' into openmw-28	2014-01-02 13:39:36 +01:00
Marc Zinnschlag	a6e6411686	Merge remote-tracking branch 'scrawl/master'	2014-01-02 12:12:52 +01:00
scrawl	c558e12212	Don't try to move objects that are not in a cell	2014-01-02 03:06:48 +01:00
scrawl	993edf0384	Bug #1063: Safety check in moveObject. Required when items in containers execute script commands like setAtStart etc.	2014-01-02 02:27:48 +01:00
scrawl	0f2b2fabdb	Implement water walking	2014-01-02 02:03:44 +01:00
scrawl	783c501d70	Some checks to prevent bound item abuse	2014-01-02 01:36:08 +01:00
scrawl	590c8cb4a0	Implement Disintegrate effects. When an armor/weapon breaks, unequip it and do not allow equipping it again.	2014-01-02 01:03:44 +01:00
scrawl	899214a906	Use fVanityDelay	2014-01-02 00:13:23 +01:00
scrawl	c6421276bd	Closes #841: Correct activation distance in third person mode	2014-01-01 23:59:17 +01:00
scrawl	24aa743573	Add function for converting feet to game units	2014-01-01 23:34:18 +01:00
scrawl	f6387d5979	Implement Telekinesis magic effect. Remove some duplicate code.	2014-01-01 23:30:58 +01:00
pvdk	691e007524	Redid the unshield thread stuff, this time the way it should be done	2014-01-01 22:46:29 +01:00
scrawl	531bef6193	Shorter Vector3 initialisation	2014-01-01 22:46:10 +01:00
scrawl	5729672262	Show marked position on map. Implement Detect X magic effects.	2014-01-01 22:37:52 +01:00
mrcheko	16e10cc702	error fix	2014-01-01 22:46:29 +02:00
scrawl	bfc9fcf2cd	Add starting spells when building player (F_PCStart flag)	2014-01-01 21:34:00 +01:00
mrcheko	09a0a69b04	more improvements	2014-01-01 21:40:31 +02:00
Marc Zinnschlag	1f4c192bf6	Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting'	2014-01-01 19:47:11 +01:00
Marc Zinnschlag	e1355be47c	Merge remote-tracking branch 'lgro/valgrind_warnings'	2014-01-01 19:41:52 +01:00
scrawl	eab7ffd6b4	Remove redundant finding of default exterior position height	2014-01-01 18:05:28 +01:00
pvdk	a2ca7b92a2	Working on the unshield implementation, added support for moving temp files	2014-01-01 17:15:34 +01:00
scrawl	8e5cae1081	Implement mark/recall magic effects	2014-01-01 17:06:21 +01:00
Lukasz Gromanowski	2d4e06cd50	Updated comments about freeing format_ctx->pb->buffer. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-01-01 17:05:49 +01:00
Lukasz Gromanowski	722469d57b	Correction to the e9844e1 commit. ... Restored interrior check in WeatherManager::update(). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-01-01 16:45:39 +01:00
scrawl	69ba8a40bf	Fix weird formatting added during the merge	2014-01-01 16:13:20 +01:00
scrawl	b3cd10dbea	Remove redundant setTeleported calls	2014-01-01 15:18:25 +01:00
Marc Zinnschlag	b19b277f18	temporarily disable OGRE-integration in OpenCS (need to sort out path problem first)	2014-01-01 15:16:51 +01:00
Marc Zinnschlag	c3482b6f24	Merge remote-tracking branch 'scrawl/master' ... Conflicts: apps/openmw/mwmechanics/spellcasting.cpp	2014-01-01 15:05:42 +01:00
Marc Zinnschlag	5fa9aa5d1e	Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting' ... Conflicts: apps/openmw/mwworld/weather.cpp apps/openmw/mwworld/worldimp.cpp	2014-01-01 14:57:14 +01:00
scrawl	ea3b88951a	Implement divine/almsivi intervention magic effects	2014-01-01 02:22:11 +01:00
scrawl	c86760e3cd	Remember the last known exterior position of the player in case we fail to map the interior to a world position.	2014-01-01 01:10:55 +01:00
Lukasz Gromanowski	101813fd0d	Fixes #417: Apply weather instantly when teleporting ... Correction to previous commit - WeatherManager->update() will always be called. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-31 21:18:10 +01:00
Lukasz Gromanowski	e9844e1b37	Fixes #417: Apply weather instantly when teleporting ... Changed teleporting detection from "position tracking" to manually setting "teleportation" flag ( player->setTeleported(true) ). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-31 20:40:23 +01:00
scrawl	b02b966c44	Closes #994: Don't cap skills to 100 when set via console (except for modX variants)	2013-12-31 19:11:16 +01:00
Marc Zinnschlag	c34b586b65	Merge remote-tracking branch 'ace/fix'	2013-12-31 18:37:12 +01:00
scrawl	3604b9d171	Closes #566: In interior cells, update global map position marker using the first exterior teleport door	2013-12-31 18:35:46 +01:00
scrawl	be1938ee90	Closes #805: Don't add entities that are supposed to be invisible to static geometry	2013-12-31 18:32:46 +01:00
Lukasz Gromanowski	1ce4663065	Updated compiler opcodes for COE, and setHello. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-31 18:13:38 +01:00
mrcheko	a8fb1ae51c	improved, added knockdown after falling	2013-12-31 17:55:04 +02:00
Alexander "Ace" Olofsson	8381cad5a4	Don't try to set a cursor before one exists	2013-12-31 14:13:42 +01:00
mrcheko	d6345bce91	added npc hit reactions	2013-12-31 13:24:20 +02:00
scrawl	94cdc1efd2	Enable mipmap generator for 1.9+	2013-12-31 00:54:40 +01:00
Lukasz Gromanowski	cb04f43384	Fixes for "Conditional jump or move depends on uninitialised value(s)" ... and memleaks reported by valgrind. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-30 23:08:53 +01:00
Lukasz Gromanowski	6107d5bad2	Updated ffmpeg decoder fix ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-30 22:16:06 +01:00
Lukasz Gromanowski	5c5f87445b	Fixes for "Conditional jump or move depends on uninitialised value(s)" ... and memleaks reported by valgrind. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-30 21:47:06 +01:00
Marek Kochanowicz	cb723710fe	Corrected stupid typo.	2013-12-30 19:24:53 +01:00
scrawl	b8ac37347c	Code cleanup for Class::canBeEquipped	2013-12-30 19:04:35 +01:00
Marek Kochanowicz	79bc149c73	reverting refidata.hpp	2013-12-30 18:47:19 +01:00
Marek Kochanowicz	a7de04d0a4	reverting refiddata.cpp	2013-12-30 18:46:18 +01:00
Marek Kochanowicz	4a1987ddec	correcting	2013-12-30 18:41:16 +01:00
scrawl	79a440e94a	Many additions to 900bc06d2c: ... - Fix indentation - Consider any kind of light, not just torch_infinite_time - Hostile NPCs should also wear lights, if they have nothing else that could use the slot (or a twohanded weapon) - Remove redundant code and don't add additional lights to the inventory - World::isDark returns false for interiors which are unaffected by weather	2013-12-30 17:57:41 +01:00
Marek Kochanowicz	3758fe3834	reformatted	2013-12-30 13:23:16 +01:00
Marek Kochanowicz	c89608f390	Check for head and hair. Correct faction check.	2013-12-30 11:39:03 +01:00
Scott Howard	2f082ef796	remove unneeded libraries	2013-12-29 16:25:49 -05:00
Marek Kochanowicz	842e26b8e5	added comment	2013-12-29 21:53:33 +01:00
Marek Kochanowicz	13637e7166	Dynamic_casting, checking rank. Commented out faction check, since it will not work.	2013-12-29 21:45:09 +01:00
Marek Kochanowicz	e321d571e1	Added faction check.	2013-12-29 21:06:08 +01:00
Marek Kochanowicz	9df6d23afc	removing member size values, since this does not work properly.	2013-12-29 20:15:00 +01:00
Lukasz Gromanowski	c65f018760	Fixes #417: Apply weather instantly when teleporting ... Corrected constant name. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-29 15:09:49 +01:00
Marc Zinnschlag	6de39a7329	Merge remote-tracking branch 'lgro/issue845_NPCs_hold_torches_whole_day' ... Conflicts: apps/openmw/mwmechanics/character.cpp	2013-12-29 15:00:31 +01:00
Lukasz Gromanowski	faf8011c48	Fixes #417: Apply weather instantly when teleporting ... Removed changing speed of weather transition introduced in previous commit. Instead try to detect player "teleporting" (ie. coc), and then switch instantly to the next weather type. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-29 12:47:44 +01:00
scrawl	04f9f7af56	Closes #990: Add option to unlock mouse cursor when in any menu	2013-12-29 00:58:48 +01:00
scrawl	17ff8165d2	Closes #1065: Don't apply fall damage when landing in water	2013-12-29 00:36:36 +01:00
Marek Kochanowicz	bf0383fe05	Last fixes.	2013-12-28 18:07:01 +01:00
Marek Kochanowicz	147ee0ace3	small oops + added new variables to the constructor	2013-12-28 17:35:04 +01:00
scrawl	2a8ab932ef	Bug #951: Only recalculate derived stats when attributes change	2013-12-28 17:19:35 +01:00
Marek Kochanowicz	b9d1047ad6	Small fix for lights.	2013-12-28 16:18:16 +01:00
Lukasz Gromanowski	100edda8c0	Fixes #417: Apply weather instantly when teleporting ... Change speed of weather transition from blight to other (twice fast as normal) and from other to blight (four times faster than normal). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-28 16:15:34 +01:00
Marek Kochanowicz	be6e47bcb6	Corrections	2013-12-28 15:51:38 +01:00
Marek Kochanowicz	5406a70fdd	still working on npc check	2013-12-28 11:34:51 +01:00
Marek Kochanowicz	da3dda896a	Code compiles now	2013-12-27 22:57:36 +01:00
scrawl	596c9b80a9	Check if threads are joinable before joining (issue with boost 1.52)	2013-12-27 22:38:30 +01:00
Marek Kochanowicz	03235bf0a2	NPC. Still WIP.	2013-12-27 22:13:55 +01:00
scrawl	85ec80100c	Bug #1005: Hide torches/shields during spellcasting and hand-to-hand combat	2013-12-27 22:00:16 +01:00
scrawl	7265b427fe	Bug #1013: Rewrote fall height detection	2013-12-27 21:21:18 +01:00
scrawl	02277db685	Bug #1052: Don't use set/getOnlyText which discards escape characters	2013-12-27 19:52:10 +01:00
scrawl	686d9efac3	Bug #1060: Fix incorrect spell type checks	2013-12-27 18:58:35 +01:00
scrawl	27092a4494	flagAsModified should be private	2013-12-27 18:58:35 +01:00
scrawl	6400f23ab0	Use the material controller manager for effects with overridden texture	2013-12-27 14:54:36 +01:00
scrawl	d262d9e6b0	Bug #1054: Set render queue group for effects	2013-12-27 14:51:59 +01:00
scrawl	1c60a781a5	Add header to CMakeLists	2013-12-27 14:42:22 +01:00
scrawl	561c661156	Reset starting angle / position when adding world item to a container	2013-12-27 01:57:08 +01:00
scrawl	608bd0f525	Don't copy the base node pointer when adding a world object to a container. Fixes bug #1028	2013-12-27 01:34:56 +01:00
scrawl	30b1da996b	Issue #1029 - Quick keys menu: Select compatible replacement when tool used up	2013-12-27 00:51:29 +01:00
scrawl	5a287a7e01	Remove no longer accurate flagAsModified calls. Container items are now modified via ContainerStore, not RefData.	2013-12-27 00:41:19 +01:00
scrawl	d09a86e208	Issue #1018: Don't allow view mode switching while performing an action	2013-12-27 00:36:06 +01:00
scrawl	a3017e16d4	Don't allow changing the spell that is being cast mid-animation	2013-12-26 22:32:39 +01:00
scrawl	5054d8e6c1	Bug #1055: Check power use and mana before starting cast animation	2013-12-26 22:06:13 +01:00
scrawl	71d9755ef1	Bug #991: Don't autoequip items with harmful permanent enchantments	2013-12-26 21:26:59 +01:00
scrawl	5931fdcbde	Implement NiBillboardNode. Flags not handled yet.	2013-12-26 20:53:52 +01:00
scrawl	a3ff9e5be8	Change destruction order - fixes a shutdown crash discovered with mesa	2013-12-26 20:53:52 +01:00
scrawl	fb845e81a4	Rename nosound to no-sound for consistency	2013-12-26 20:53:52 +01:00
scrawl	85ed21dbd2	Remove unused command line option	2013-12-26 20:53:51 +01:00
scrawl	33389b9b63	XDG compliant paths	2013-12-26 20:53:51 +01:00
scrawl	a9e1e89bbc	Bug #1007: Fix the console getting key focus when a reference becomes unavailable, even if the console is not visible	2013-12-26 20:53:51 +01:00
scrawl	31c1f484ed	Slight performance improvement for WindowManager::updateVisible	2013-12-26 20:53:51 +01:00
scrawl	b6bad969a0	Fix an issue with items that have no UI icon	2013-12-26 20:53:51 +01:00
scrawl	81ec8c2f55	Handle --version and --help before reading configuration - putting these options into openmw.cfg makes no sense	2013-12-26 20:53:51 +01:00
scrawl	6d27ebabb6	Integrate AddGlow with material controllers	2013-12-26 20:53:45 +01:00
Marek Kochanowicz	f04a727af6	removed set sizes, consted sizes, added itemleveledlist check	2013-12-26 18:40:47 +01:00
Marek Kochanowicz	1da56e1790	checkin leveled items lists	2013-12-26 18:28:24 +01:00
Marek Kochanowicz	c2993909cf	added creature leveled list check	2013-12-26 18:16:54 +01:00
pvdk	3a55d88bac	Working on the installshield thread	2013-12-26 18:02:34 +01:00
Marek Kochanowicz	360a939aa0	Working on leveled lists now.	2013-12-26 15:35:58 +01:00
Marek Kochanowicz	6c95cea4c4	Added ingredient check	2013-12-26 15:24:52 +01:00
Marek Kochanowicz	c1715779fa	Added door check with related methods.	2013-12-26 12:59:43 +01:00
pvdk	40486370d9	Working on the Unshield functionality	2013-12-25 18:52:34 +01:00
pvdk	dddd9cba57	Added data path retrieval from openmw.cfg, to use as existing installs	2013-12-25 15:50:02 +01:00
pvdk	095ff4e17a	Moved launcher settings stuff into components, so they can be reused in the wizard	2013-12-25 00:50:25 +01:00
pvdk	3a37761d76	Some minor cleanups	2013-12-24 23:47:04 +01:00
pvdk	445f96434e	Added Morrowind.ini detection logic	2013-12-24 23:09:31 +01:00
Nikolay Kasyanov	9fabae5198	OS X: force Cocoa API for Ogre windows in OpenCS	2013-12-25 00:26:15 +04:00
pvdk	8ea31e5050	Working on a Morrowind.ini reader	2013-12-24 19:38:21 +01:00
Marek Kochanowicz	e4e7d50623	Added creatureCheck. I don't know meaning of all data fields here.	2013-12-23 12:32:35 +01:00
Marek Kochanowicz	94fcea4d4d	added mCreaturesSize	2013-12-22 14:46:07 +01:00
Marek Kochanowicz	32046070d5	Added getCreatures	2013-12-22 14:44:22 +01:00
Marek Kochanowicz	16af9e6986	added container check	2013-12-22 14:42:17 +01:00
Marek Kochanowicz	1a7f023237	added mContainersSize.	2013-12-22 14:35:40 +01:00
Marek Kochanowicz	dc594da0de	added getContainers	2013-12-22 14:34:29 +01:00
Marek Kochanowicz	bbcaef8e42	Added armor check and related stuff.	2013-12-22 14:32:42 +01:00
Marek Kochanowicz	97fc8acbdb	Added armor check	2013-12-22 14:22:03 +01:00
Marek Kochanowicz	955fe3e8cf	Added check for non-positive quality of alchemical apparatus	2013-12-22 10:00:04 +01:00
Marek Kochanowicz	1811f0a71b	Works, but it seems that I miss something in referencables. I will write post on the forum.	2013-12-21 15:40:39 +01:00
Marek Kochanowicz	a27441720e	Added enchantmnet check for books.	2013-12-21 12:07:40 +01:00
Marek Kochanowicz	ee5dfd1cc8	Adde potionCheck method	2013-12-21 11:15:46 +01:00
Marek Kochanowicz	21ee2a6d2e	Getting size of potions.	2013-12-21 11:02:58 +01:00
Marek Kochanowicz	a6c36e2377	Small optimization.	2013-12-21 11:01:40 +01:00
Marek Kochanowicz	385824aee0	Renamed getActivator to getActivators.	2013-12-21 10:59:13 +01:00
Marek Kochanowicz	4842c56cb5	added getpotions	2013-12-21 10:58:05 +01:00
Lukasz Gromanowski	900bc06d2c	Fixes #845: NPCs hold torches during the day ... Moved 'equipping torches at night and unequipping at day' code from Character to Actors class. Removed unneeded showLights method (introduced in previous commits) from animation/npcanimation classes. Since this commit autoEquip() method doesn't automatically equip lights. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-20 22:38:23 +01:00
Marek Kochanowicz	f69465d7e0	Added aditional checks for books. Activator check.	2013-12-20 22:31:17 +01:00
Marek Kochanowicz	8085fcc792	Added Referencable checks class, added method to get refidcontainer, added method to get mBooks. ... Currently only books are checked, and only if name is present.	2013-12-20 20:02:42 +01:00
Marc Zinnschlag	18e7e83585	Merge remote-tracking branch 'mrcheko/savedgame' into savedgame	2013-12-20 13:13:06 +01:00
mrcheko	8eb2696f6c	using gmst string	2013-12-20 14:04:59 +02:00
Lukasz Gromanowski	abc126e2af	Fixes #845: NPCs hold torches during the day ... Added check for Player character so it won't be affected by showing, or hidding torches. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-20 01:01:30 +01:00
Lukasz Gromanowski	6eb674e4e5	Fixes #845: NPCs hold torches during the day ... Added equipping/unequipping torches. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-20 00:18:34 +01:00
Lukasz Gromanowski	92072d968b	Fixes #845: NPCs hold torches during the day ... Simplified a bit code which shows and hides light. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-19 21:11:07 +01:00
mrcheko	3816a09c6f	bug 428 ask to load recent saved game	2013-12-19 22:08:34 +02:00
Marc Zinnschlag	16b3927f17	Merge remote-tracking branch 'scrawl/master'	2013-12-19 14:26:41 +01:00
scrawl	9afdf71af3	Fix crash with player->position command	2013-12-19 00:37:57 +01:00
scrawl	a0d38dfb63	Fix highlighted topics being selectable when in a choice	2013-12-19 00:26:08 +01:00
scrawl	876fb9a899	Addition to bb4bd999ba : adjust position for objects placed from inventory	2013-12-19 00:11:14 +01:00
Marc Zinnschlag	c22e38f825	removing 255 content file limitation	2013-12-17 21:19:05 +01:00
Marc Zinnschlag	09fadd446b	Merge remote-tracking branch 'mrcheko/savedgame' into savedgame	2013-12-17 19:33:32 +01:00
pvdk	da9b67b6d2	Fix for Bug #922: Launcher writing merged openmw.cfg files	2013-12-16 20:40:58 +01:00
mrcheko	a854eb73db	StateRunning check returns	2013-12-16 21:02:21 +02:00
scrawl	eb5e4ecec2	Remove more unused code	2013-12-16 15:35:38 +01:00
mrcheko	f50ff0b1c4	reworked http://bugs.openmw.org/issues/428	2013-12-16 15:40:47 +02:00
scrawl	19e5978a01	Merge branch 'master' of https://github.com/zinnschlag/openmw ... Conflicts: apps/openmw/main.cpp	2013-12-16 13:35:31 +01:00
scrawl	56893a097d	Don't stack used torches	2013-12-16 13:31:03 +01:00
scrawl	cd756a8a39	Fix incorrect value for partially used items (missing float casts). Make sure the correct value is displayed in tooltips.	2013-12-16 13:22:27 +01:00
Marc Zinnschlag	1cf1d49bc4	fix to content file reading error reporting in case of missing dependency	2013-12-16 11:39:24 +01:00
mrcheko	fd9f8c34f6	bug fix http://bugs.openmw.org/issues/428	2013-12-15 18:50:25 +02:00
Marc Zinnschlag	3590fa40bd	store global script state in saved game files	2013-12-15 16:16:50 +01:00
pvdk	30710bad70	Modified components widget so the checked items can be stored for all pages to access	2013-12-15 15:13:49 +01:00
pvdk	77fe73799a	Enabled language setting to be accessable from different pages	2013-12-15 13:12:48 +01:00
Nikolay Kasyanov	fc21dd1f3a	Music playback on OS X >= 10.9 works again. Fixes bug #1041.	2013-12-14 17:26:09 +04:00
pvdk	7132b9b0c5	Implement default installation path support for all platforms	2013-12-13 23:48:55 +01:00
Marc Zinnschlag	0890fa66b0	Merge remote-tracking branch 'mrcheko/master'	2013-12-13 18:47:11 +01:00
mrcheko	8b3a393a6b	bug fix at http://bugs.openmw.org/issues/985	2013-12-13 19:33:01 +02:00
mrcheko	c8bf69b91a	Revert "bug fix http://bugs.openmw.org/issues/985" ... This reverts commit 7a9b64c6f4.	2013-12-13 19:02:25 +02:00
pvdk	c82f0ec35f	Implemented the language selection page	2013-12-13 15:30:49 +01:00
pvdk	d7f9604140	WIP: Working on the installation selection and added the ui for the language page	2013-12-13 13:38:49 +01:00
scrawl	39eea24dc3	Don't try to show exceptions in a message box if SDL was not initialized	2013-12-13 03:50:01 +01:00
mrcheko	7a9b64c6f4	bug fix http://bugs.openmw.org/issues/985	2013-12-12 16:09:38 +02:00
Marc Zinnschlag	2a35c7d33a	fixed running global scripts a second time after they have been stopped	2013-12-12 13:16:32 +01:00
Marc Zinnschlag	74793c1c2f	globals script cleanup; fixed potential case folding bug	2013-12-12 13:15:38 +01:00
Marc Zinnschlag	fc37c77a91	store global variables in saved game files	2013-12-12 12:19:25 +01:00
Lukasz Gromanowski	91a4d9a2eb	Fixes #845: NPCs hold torches during the day ... Added method in WeatherManger and World which returns true if it is night. This method is used later in character controller to show torches (or other sources of light) at night and hide them at day. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-10 23:48:49 +01:00
Marc Zinnschlag	b38bfe1f21	removed a redundant function for listing global variables	2013-12-10 15:22:38 +01:00
Marc Zinnschlag	51bfa5cde3	rewrote global variable storage (using ESM variant type now)	2013-12-10 15:09:58 +01:00
Marc Zinnschlag	1fdd43bbb7	removed a redundant new	2013-12-10 12:31:18 +01:00
Emanuel Guevel	357ecd92b2	Do not display negative stat values ... Display zero instead of negative values. Also remove useless for loops and some unused attributes.	2013-12-10 00:41:36 +01:00
Emanuel Guevel	fc8bd1aacb	Allow fatigue stat to become negative when fatigue damages are taken	2013-12-09 21:53:04 +01:00
Marc Zinnschlag	77a2179d1e	Merge remote-tracking branch 'scrawl/master'	2013-12-09 18:39:34 +01:00
scrawl	0bc3a13c0f	Break invisibility on Use or Activate	2013-12-08 23:36:37 +01:00
scrawl	5fd2df5546	Ignore invisible targets for combat AI	2013-12-08 23:21:23 +01:00
scrawl	37a7ee8fcd	Set alpha value of character animations according to Invisibility / Chameleon effects.	2013-12-08 23:05:21 +01:00
pvdk	0e1d3237fe	Added some logic to the page switching	2013-12-08 22:58:29 +01:00
Lukasz Gromanowski	594cc693b2	Fixes #1006: Many NPCs have 0 skill ... Added calculation of skill values for NPC with mNpdtType set to NPC_WITH_AUTOCALCULATED_STATS (their NPDT is 12). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-08 21:47:43 +01:00
pvdk	8162f8370b	Added all the pages to the wizard	2013-12-08 21:35:57 +01:00
pvdk	f458f0c6c1	Added the Wizard .ui/resource files and some basic source to get started	2013-12-07 23:17:50 +01:00
Lukasz Gromanowski	8d63f8eea2	Fixes #998: Setting the max health should also set the current health ... Added setting current value of dynamic stat in OpSetDynamic class. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-07 21:00:46 +01:00
scrawl	1624e0fd8a	Rename ObjectList to ObjectScene. Wrap it in a SharedPtr so we can automate the destruction routine.	2013-12-07 20:15:39 +01:00
Marc Zinnschlag	ef8c0fab73	Merge remote-tracking branch 'scrawl/master'	2013-12-07 16:26:52 +01:00
scrawl	742e0e014d	Remove more cruft in MessageBox. Fixes inconsistent sizing when close to a newline.	2013-12-07 14:15:51 +01:00
scrawl	bb70deabb1	Add an incomplete implementation of SayAnimationValue (lip animation)	2013-12-07 14:15:45 +01:00
Marc Zinnschlag	1c13a9037a	save and load dynamic records	2013-12-07 13:17:28 +01:00
Marc Zinnschlag	030c733e2d	Merge branch 'master' into savedgame ... Conflicts: apps/openmw/mwmechanics/actors.cpp apps/openmw/mwworld/worldimp.cpp files/settings-default.cfg	2013-12-07 12:27:06 +01:00
Lukasz Gromanowski	e01085cac5	Fixes #1015: Player status window scroll state resets on status change ... Removed resetting scroll state position. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-07 02:57:30 +01:00
Marc Zinnschlag	48b779af80	Merge remote-tracking branch 'ace/win-fix'	2013-12-06 15:17:34 +01:00
Alexander "Ace" Olofsson	baacf91de4	Another windows build fix	2013-12-06 11:37:29 +01:00
Marc Zinnschlag	14eff87339	removed some junk from ESM store	2013-12-06 11:34:24 +01:00
Lukasz Gromanowski	bfd79bfbe6	Various fixes for CppCheck warnings. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-06 07:36:16 +01:00
Marc Zinnschlag	07f692bdd2	Merge remote-tracking branch 'scrawl/master'	2013-12-05 16:04:50 +01:00
scrawl	845bc5f7eb	Show fatal exceptions in a message box instead of cerr when running without a terminal	2013-12-05 15:51:07 +01:00
scrawl	afa71bb622	Throw an exception if a BSA is not found	2013-12-05 15:51:07 +01:00
scrawl	9ab8fe1038	Fix bsatool warning	2013-12-05 15:46:33 +01:00
scrawl	f695deb29d	Remember window positions	2013-12-05 15:46:23 +01:00
Marc Zinnschlag	ee6ddc3404	block saving while chargen is in progress	2013-12-05 14:56:30 +01:00
Marc Zinnschlag	8b7889f8e5	setup player after loading a saved game	2013-12-05 14:22:08 +01:00
Marc Zinnschlag	a7b42b867b	more cleanup	2013-12-05 14:18:43 +01:00
Marc Zinnschlag	ce624e024b	make sure player record stays in place across cleanups	2013-12-05 14:03:25 +01:00
Marc Zinnschlag	e818d43bc3	removed an outdated typedef and some dead code	2013-12-05 13:21:26 +01:00
Marc Zinnschlag	537b2efe8e	first round of cleaning up world cleanup	2013-12-05 12:49:25 +01:00
scrawl	8f4ffe4ddc	Fix new window size not being written to settings when manually resizing window	2013-12-03 15:55:31 +01:00
Marc Zinnschlag	63721682f6	GUI fix: previous character was selected when saving new character	2013-12-03 15:19:13 +01:00
Marc Zinnschlag	34cdd2bb1f	deal with dialogue/info records that don't exist anymore	2013-12-03 14:39:54 +01:00
Marc Zinnschlag	2293b92efe	storing and loading the journal	2013-12-03 14:28:46 +01:00
Marc Zinnschlag	2fe135d85f	journals subview was bound to the wrong universal ID type	2013-12-02 16:25:26 +01:00
Marc Zinnschlag	0f971163f7	use Entry instead of plain string for topic and quest entries	2013-12-01 14:50:25 +01:00
Marc Zinnschlag	b273f9e387	splitting JournalEntry into Entry and JournalEntry	2013-12-01 14:44:27 +01:00
Marc Zinnschlag	16e2d67b1f	added overloaded start/endRecord functions to ESMWriter	2013-12-01 13:32:11 +01:00
Marc Zinnschlag	c94f006307	Merge remote-tracking branch 'scrawl/master'	2013-11-30 15:06:09 +01:00
scrawl	8391891a5b	Ignore case for content file extensions	2013-11-30 14:25:29 +01:00
Marc Zinnschlag	43f5f16731	removed a todo comment	2013-11-30 12:54:44 +01:00
Marc Zinnschlag	177aab536d	storing topic name in MWDialogue::Topic (avoids a lookup in the GUI and also serves as preparation for better localisation support in OpenMW 1.1)	2013-11-30 12:41:18 +01:00
pvdk	46973e8e82	Fix for Bug #982: unchecking addons is now saved to profile	2013-11-30 12:08:37 +01:00
Marc Zinnschlag	eed46960fe	some spelling fixes	2013-11-30 12:02:56 +01:00
Marc Zinnschlag	9d64c92d33	store text in journal entries	2013-11-30 11:57:33 +01:00
Marc Zinnschlag	8b3e852ffc	Merge remote-tracking branch 'scrawl/master'	2013-11-30 11:09:38 +01:00
Marc Zinnschlag	aebc2791a5	fixed selecting current character based on value stored in settings	2013-11-30 11:08:41 +01:00
scrawl	4b4025ed0f	Keep the player's CharacterController when changing cells. Fixes several glitches.	2013-11-30 11:01:45 +01:00
Marc Zinnschlag	016500af98	Merge remote-tracking branch 'scrawl/master'	2013-11-30 09:45:46 +01:00
Marc Zinnschlag	04b1657d98	Merge branch 'openmw-27' ... Conflicts: apps/opencs/CMakeLists.txt apps/opencs/main.cpp	2013-11-30 09:45:41 +01:00
scrawl	e1e9de0f02	Don't hide tooltips on mouse click. Probably wasn't such a bright idea.	2013-11-30 09:04:52 +01:00
scrawl	6aa9e18915	Reset filter when starting a trade	2013-11-30 08:33:18 +01:00
scrawl	bb4bd999ba	PlaceAt: Copy the rotation when placing a non-actor. Don't modify placement position by bounding box for non-actors. Fixes placement in Graphic Herbalism mod.	2013-11-30 08:29:22 +01:00
scrawl	0e267b79ec	Don't heal dead actors when resting	2013-11-29 20:21:57 +01:00
scrawl	bcf61331ab	Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger.	2013-11-29 20:06:54 +01:00
scrawl	ce2d521b8f	Always apply queued movement, even when there's no duration. Fixes crash with --start="bal isra". ... When a script disables a reference that still has movement queued, trying to apply that movement will then fail due to the reference not being in the scene. Therefore, we should make sure that movement is always applied in the frame that it's queued in.	2013-11-29 20:03:50 +01:00
scrawl	ffc885853a	Fix bolt for magic effects that don't have one specified	2013-11-29 10:39:37 +01:00
scrawl	b82ee4b44f	Fix some problems with the previous commit	2013-11-28 21:49:15 +01:00
scrawl	076cc9230b	First try at handling target magic	2013-11-28 17:31:17 +01:00
scrawl	20ccfe2324	Play sound when enchanting	2013-11-28 11:37:30 +01:00
Marc Zinnschlag	5aea6ef80f	some clean up for the cleanup code	2013-11-28 11:22:34 +01:00
Marc Zinnschlag	35e8e23037	keep track of total play time per character	2013-11-28 09:33:50 +01:00
Marc Zinnschlag	7e2819c62e	store year in saved game profile	2013-11-28 09:27:10 +01:00
Marc Zinnschlag	b0eb5938bf	removed some redundant code	2013-11-28 09:13:54 +01:00
Marc Zinnschlag	71436b1160	changed interface for global variable access	2013-11-28 09:10:38 +01:00
scrawl	97fadb24ca	Update the Ptr in mObjects in Objects::updateObjectCell	2013-11-27 18:49:04 +01:00
scrawl	03c4b680ca	Fix changePointer	2013-11-27 18:49:04 +01:00
scrawl	a8c838b53a	Don't list deleted refs in CellStore::foreach	2013-11-27 18:49:04 +01:00
scrawl	49ea1aae67	Use GMST for sun damage reduction	2013-11-26 15:01:22 +01:00
Marc Zinnschlag	99ea63dc4a	factored out code for generating month names	2013-11-26 12:47:30 +01:00
Marc Zinnschlag	e6dc927f11	removed duplicates of the cell name function	2013-11-26 11:49:07 +01:00
Marc Zinnschlag	bc6fe682c9	replaced getCurrentCellName function with a more general getCellName function	2013-11-26 11:39:58 +01:00
Marc Zinnschlag	eea433f141	restore last played character selection across sessions	2013-11-26 10:37:58 +01:00
scrawl	eba068149d	Fix AIWander crash	2013-11-25 15:38:18 +01:00
Marc Zinnschlag	ad143e0524	case fix (content file names)	2013-11-25 14:56:05 +01:00
Marc Zinnschlag	616e3aa32f	store content file list in saved games and reject saved games not matching the current game	2013-11-25 13:00:05 +01:00
Marc Zinnschlag	55544e931c	reject newer formats when scanning saved games	2013-11-25 10:21:49 +01:00
Marc Zinnschlag	e3670cff8a	improved character selection logic	2013-11-24 16:58:41 +01:00
Marc Zinnschlag	67cd0887e6	added description field to saved game record; make use of description in GUI	2013-11-24 15:19:56 +01:00
Marc Zinnschlag	7efac4c9a5	fixed handling of characters without a valid slot	2013-11-24 15:05:00 +01:00
Marc Zinnschlag	18a3b38fb4	when scanning saved game directory, reject characters without a valid saved game	2013-11-24 14:42:58 +01:00
scrawl	14c9a4e1d3	Cap enchantment casting cost to 1 as displayed in enchanting window. Display current enchantment charge in spell window.	2013-11-23 23:12:54 +01:00
scrawl	07408a4652	Don't allow selling gold (again - when did this get broken?)	2013-11-23 22:52:20 +01:00
scrawl	4aa9f3bcef	Don't set the enchanted item in HUD for "WhenStrikes" enchantments	2013-11-23 22:48:56 +01:00
scrawl	f3e89e9168	Fix arrow down in console	2013-11-23 22:48:39 +01:00
scrawl	d2ed77f3f2	Fix shields being visible during spellcasting	2013-11-23 20:24:52 +01:00
Marc Zinnschlag	d8c40562ae	Merge remote-tracking branch 'scrawl/light'	2013-11-23 12:44:42 +01:00
scrawl	a1fe07181c	Fix rotation offset of some lights (bug 955)	2013-11-23 05:55:03 +01:00
scrawl	0e254aa7c7	Fix startNewGame assigning an already freed CellStore to the player Ptr supplied to WindowManager. Fixes a crash when equipping lights after starting a new game (bug 967). Side note: The inventory preview's Ptr being assigned a cell at all doesn't make sense, as that is used to determine the light setting which should be the same no matter which cell you're in.	2013-11-23 03:25:55 +01:00
scrawl	39de0510a0	Fix another case of container scripts not getting re-added	2013-11-22 02:12:37 +01:00
scrawl	829512ded4	Fix container scripts not getting re-added when the player changes cells	2013-11-22 01:02:12 +01:00
scrawl	2e87cbc231	Add basic functionality to SaveGameDialog	2013-11-21 20:34:34 +01:00
scrawl	cf79a83d4f	Avoid recreating widgets in MainMenu::updateMenu. Fix crash when pressing new game due to the button being destroyed from within it's own delegate.	2013-11-21 19:07:54 +01:00
scrawl	b490e56ba1	Remove redundant setLocals (already done by ContainerStore::add)	2013-11-21 17:19:41 +01:00
scrawl	61ab6e1739	Use fWortChanceValue for making ingredient/potion effects visible	2013-11-21 17:19:41 +01:00
scrawl	320ba98097	Correct getDerivedDisposition according to wiki (check if player expelled)	2013-11-21 17:19:41 +01:00
scrawl	6451b687d9	Adjust value for several item types as according to wiki	2013-11-21 17:19:41 +01:00
scrawl	b6c22ad5d9	Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount.	2013-11-21 17:19:30 +01:00
scrawl	bab657fe2b	Add a utility function to add items to a ContainerStore by RefID	2013-11-21 17:14:30 +01:00
scrawl	6641fd4635	Fix bug when enchanting: only the mBase pointer was updated, not the CellRef mRefID, which is used for container stacking. The new (enchanted) item was stacking with the old item when it was added, so the enchantment completely disappears.	2013-11-21 17:14:30 +01:00
scrawl	800a2845b0	Add Bound & Summon effects (will need some adjustments later)	2013-11-21 17:14:23 +01:00
Marc Zinnschlag	2702d10911	more comments	2013-11-21 12:31:04 +01:00
Marc Zinnschlag	b5f99522c7	added a few comments	2013-11-21 12:29:24 +01:00
Marc Zinnschlag	c165894869	load saved game record	2013-11-21 12:24:24 +01:00
Marc Zinnschlag	5ba56a5ea5	character signatures	2013-11-21 11:18:56 +01:00
Marc Zinnschlag	cbbdf390ad	added function for inspection of saved characters and character slots	2013-11-21 11:10:18 +01:00
Marc Zinnschlag	fc1501a510	store character profile information in saved game file	2013-11-21 10:53:42 +01:00
Marc Zinnschlag	e938c5a0ee	changed character creation logic (create on save instead of on new game)	2013-11-21 10:20:50 +01:00
scrawl	bf153e1c8e	Fix bug applying instant effects	2013-11-21 00:41:52 +01:00
scrawl	4ed4c1e319	Add Vampirism and Sun Damage effects. Some fixes.	2013-11-21 00:41:31 +01:00
scrawl	7f735c2c4c	Release and show the cursor when focus lost	2013-11-20 16:07:14 +01:00
scrawl	5a4bd9b202	Remove software cursor option, hw cursors seem to be working well enough	2013-11-20 06:20:16 +01:00
scrawl	fa63924884	Simplify message box manager, should fix a random bug with boxes not disappearing	2013-11-20 05:49:05 +01:00
scrawl	3452bd2e0b	Add glow effect for enchanted items	2013-11-20 00:13:12 +01:00
scrawl	0b9676aaa3	Fix an issue with the AI code	2013-11-19 18:43:32 +01:00
scrawl	38a82c4b0b	Add a todo comment	2013-11-19 18:43:21 +01:00
scrawl	8b095982e9	Don't auto equip for dead actors	2013-11-19 18:42:43 +01:00
scrawl	f3ff2e4260	Handle Unreflectable flag	2013-11-19 17:33:02 +01:00
scrawl	c03c82c78a	Apply disease resistance manually as according to wiki	2013-11-19 17:15:17 +01:00
Marc Zinnschlag	8190fdb16c	Merge remote-tracking branch 'scrawl/master'	2013-11-19 16:56:18 +01:00
scrawl	654b7d9ba5	Apply disease resistance manually as according to wiki	2013-11-19 16:52:26 +01:00
scrawl	e8dcd74741	Recharge enchanted items in player's inventory over time	2013-11-19 16:42:24 +01:00
Marc Zinnschlag	9487bd33c3	removed broken save function from ESMWriter	2013-11-19 16:07:36 +01:00
Marc Zinnschlag	5e64888227	added basic save slot management and connected main menu save to save function (bypassing the save GUI for now)	2013-11-19 15:38:26 +01:00
Marc Zinnschlag	11e254aac8	Merge remote-tracking branch 'gus/AICombat' ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp	2013-11-19 09:10:48 +01:00
scrawl	74e42a2d02	Add missing skill increases for Enchant skill	2013-11-19 07:39:07 +01:00
scrawl	cab535dd69	Implement magic item recharging via soulgem use	2013-11-19 06:48:47 +01:00
scrawl	16e5477c60	Fix an uninitalized member	2013-11-19 02:17:44 +01:00
gus	dff3cf162d	ToggleAI script instruction	2013-11-18 23:03:44 +01:00
Marc Zinnschlag	1c7a4d4b3a	adjust availability of main menu items based on game state	2013-11-18 15:52:25 +01:00
Marc Zinnschlag	f45cff8aff	flag game as ended when player dies	2013-11-18 15:38:08 +01:00
Marc Zinnschlag	82c8495338	removed boolean running flag with state enum	2013-11-18 15:15:47 +01:00
Marc Zinnschlag	e55691096c	Merge remote-tracking branch 'ace/win-fixes'	2013-11-18 13:46:28 +01:00
Alexander "Ace" Olofsson	4baaf9463e	Remove crashcatcher.cpp from windows builds, it can't be built or used there.	2013-11-18 12:34:25 +01:00
gus	4559e932ae	AI packages have priority and combat is triggered in actor.cpp using the Hostile setting in CreaturesState	2013-11-18 12:33:09 +01:00
scrawl	6902569d03	Implement Absorb effects (AbsorbHealth, etc)	2013-11-18 05:01:36 +01:00
scrawl	a420698237	Don't try to absorb or reflect for self casted spells	2013-11-17 23:41:24 +01:00
scrawl	0dc2e829dd	Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX.	2013-11-17 23:31:08 +01:00
scrawl	fc268bf302	Initialize mFallHeight	2013-11-17 23:31:08 +01:00
scrawl	47fc3f81f5	Don't update actors while paused	2013-11-17 23:31:08 +01:00
scrawl	2a11618ee7	Make sure the equipped weapon HUD icon is updated properly	2013-11-17 23:31:07 +01:00
scrawl	b8c358df63	Fix a bug with equipping using the quick keys: when item is already equipped, equipping it again would cause the slot to get unequipped first, possibly restacking and destroying the Ptr that was supposed to be equipped in the first place	2013-11-17 23:31:07 +01:00
Marc Zinnschlag	d32fcb99b5	Merge remote-tracking branch 'scrawl/master'	2013-11-17 13:39:04 +01:00
scrawl	e7993ced69	Fix invalid casts	2013-11-17 04:33:04 +01:00
scrawl	07251f0fa4	Don't apply spells to dead actors	2013-11-17 04:32:56 +01:00
scrawl	b8f5cd6cb7	Forgot to apply the same fix to companion window	2013-11-16 23:55:54 +01:00
Sebastian Wick	4a816b6c17	fix context menu	2013-11-16 23:08:03 +01:00
scrawl	eb46de54e4	Merge branch 'master' of https://github.com/zinnschlag/openmw	2013-11-16 22:48:59 +01:00
scrawl	7eb1dcb682	Fix trade windows crashing after a new game	2013-11-16 22:29:40 +01:00
scrawl	e32c73725c	Merge branch 'crashcatcher'	2013-11-16 20:56:07 +01:00
scrawl	f990ba09f0	gdb detection doesn't seem to work for the forked process	2013-11-16 20:55:41 +01:00
Marc Zinnschlag	a19242b4ec	fixed expression in if statement	2013-11-16 19:31:35 +01:00
vorenon	b2d2a3dd17	Closing message boxes with numpad enter	2013-11-16 19:15:47 +00:00
Marc Zinnschlag	985ce7c552	Merge remote-tracking branch 'scrawl/crashcatcher'	2013-11-16 18:34:08 +01:00
scrawl	20d806b40c	Change is_debugger_attached to a different hack	2013-11-16 18:15:54 +01:00
Marc Zinnschlag	c5f81e3508	don't run udpates if no game is running	2013-11-16 17:46:48 +01:00
scrawl	883140babf	Add missing include for signals to make travis happy	2013-11-16 17:00:26 +01:00
scrawl	b9899696e3	Add a crash catcher for unix. When encountering a fatal signal, attach gdb and log backtrace.	2013-11-16 15:56:15 +01:00
scrawl	aa84ce3f0d	Copy paste mistake (oops)	2013-11-16 14:44:31 +01:00
Marc Zinnschlag	ec5b2e9a7e	added running flag; moved new game code to MWState	2013-11-16 12:22:28 +01:00
Marc Zinnschlag	31ec973c9c	removed default value for --start	2013-11-16 12:08:00 +01:00
Marc Zinnschlag	b3a7c8c098	removed --new-game switch	2013-11-16 11:36:32 +01:00
Marc Zinnschlag	7a4b604376	added --skip-menu switch	2013-11-16 11:33:20 +01:00
Marc Zinnschlag	f19973450f	moved exit game flag from Environment to StateManager	2013-11-16 11:07:23 +01:00
Marc Zinnschlag	79b7fa258b	added new mwstate subsystem	2013-11-16 10:31:46 +01:00
scrawl	7474e87edc	Implement RestoreHealth/Magicka/Fatigue	2013-11-16 05:06:54 +01:00
scrawl	bb43ec9b35	Implement damage tick effects	2013-11-16 03:16:21 +01:00
scrawl	b1a29eb27e	Implement Resist & Weakness effects	2013-11-16 02:34:43 +01:00
scrawl	d49b6f19ff	Don't advance acrobatics skill for NPCs	2013-11-16 02:11:11 +01:00
scrawl	aa4b2d9504	Fix uninitialized mSkill/mAttribute for spellmaker spells	2013-11-16 01:19:39 +01:00
scrawl	c73217627e	Move code for listing effect sources to the spell management classes	2013-11-15 20:29:47 +01:00
Marc Zinnschlag	eddd6bf48d	enabled load and save items in main menu	2013-11-15 10:29:53 +01:00
scrawl	d619d0fa25	Don't grab the cursor while the console is opened	2013-11-15 03:39:25 +01:00
scrawl	065f14579f	Fix a container window regression (oops)	2013-11-15 02:57:21 +01:00
scrawl	f7befa3e54	Remove a no longer required method	2013-11-15 02:20:04 +01:00
scrawl	00af6b5617	Use an inventory store listener for animation parts and VFX update instead of updating them directly. Slightly more flexible, reduces InventoryStore dependencies and solves a crash during character creation due to the preview doll's animation not being registered in World.	2013-11-15 02:08:36 +01:00
scrawl	427de69b79	Allow stacking enchanted items when charge is full	2013-11-14 21:02:37 +01:00
scrawl	49125fa26e	Fix restacking unequipped items	2013-11-14 19:54:00 +01:00
scrawl	da85f3e575	Use the formula from the wiki for spell success.	2013-11-14 19:19:32 +01:00
scrawl	4083c55848	Make sure NpcAnimation base exists before runAnimation. Not sure yet why this is needed.	2013-11-14 19:18:27 +01:00
scrawl	5458207325	Reduce fatigue when casting. Has no effect in the vanilla game due to the GMSTs being 0.	2013-11-14 18:41:34 +01:00
scrawl	9c5847e2f4	Fix VFX not getting removed when an actor dies	2013-11-14 14:52:30 +01:00
scrawl	e26cc31e3b	Disable projectiles for now	2013-11-14 14:45:08 +01:00
scrawl	992a8e9c36	Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore.	2013-11-14 14:41:10 +01:00
scrawl	956d8adb99	Merge branch 'master' of https://github.com/zinnschlag/openmw into magic ... Conflicts: apps/openmw/mwgui/inventoryitemmodel.cpp	2013-11-14 14:25:22 +01:00
scrawl	0b5f5351b5	Fix continuous FX getting removed instantly	2013-11-14 13:30:48 +01:00
Marc Zinnschlag	1c020b74c8	hid ID column in info tables (not relevant for the user)	2013-11-14 13:14:37 +01:00
Marc Zinnschlag	9f0dac00ec	silenced a warning	2013-11-14 12:22:24 +01:00
Marc Zinnschlag	2af7f60488	flag reordered records as modified	2013-11-14 12:21:10 +01:00
Marc Zinnschlag	a44fad4c59	disabled revert for info tables (no easy way to make this work)	2013-11-14 11:55:02 +01:00
Marc Zinnschlag	d49b8e7443	Merge branch 'dialogue'	2013-11-14 11:40:50 +01:00
Marc Zinnschlag	780ea3a41f	added support for record reordering to model (only implemented in info collection)	2013-11-14 11:39:14 +01:00
scrawl	da5c59c8af	addEffect should check effectId, not model.	2013-11-13 19:07:44 +01:00
scrawl	ff7e4174f9	Fix some leftover code that still calculated random magnitude per spell rather than per effect. Major cleanup of InventoryStore: Magic effects are now updated when needed, rather than cached. Also allows to get rid of 'mutable' hacks and non-const method that should be const. Play sounds and particles when equipping a permanent enchantment item.	2013-11-13 18:51:28 +01:00
scrawl	a6e2f43b75	Stop continuous VFX when the effect is no longer active.	2013-11-13 15:44:43 +01:00
Marc Zinnschlag	68598f9b63	fixed handling of user directory defaultfilters file; some cleanup	2013-11-13 14:56:04 +01:00
scrawl	9b0e82a37f	Projectile models are now spawned (no movement or impact yet). Refactored trap activation to apply range types properly. Handle ContinuousVFX for magic effects (note they aren't stopped yet when the effect ends)	2013-11-13 14:02:15 +01:00
Marc Zinnschlag	a8274e5c86	Merge remote-tracking branch 'potatoesmaster/inventory-fix'	2013-11-13 13:55:24 +01:00
Marek Kochanowicz	821d0c5c2d	Corrected filter template loading.	2013-11-13 11:38:29 +01:00
scrawl	0627e23d3c	Fix wrong skill level for spell success formula.	2013-11-13 01:26:25 +01:00
Emanuel Guevel	baf13483c0	Update actor model only when in the current cell	2013-11-13 00:04:04 +01:00
scrawl	60bec03987	Rename variables called 'slots' to work around wrong code parsing in QT Creator.	2013-11-12 23:23:19 +01:00
scrawl	027f4152e4	Missing flagAsModified()	2013-11-12 23:17:03 +01:00
scrawl	3c6a391507	Rename arguments again	2013-11-12 23:12:56 +01:00
scrawl	700d06764c	Order of arguments for ContainerStore::stacks shouldn't matter. Supplying them in the correct order is error prone, and also caused a bug where equipped items would incorrectly stack.	2013-11-12 22:58:56 +01:00
scrawl	0dab7031c0	Make sure effects are destroyed with the animation	2013-11-12 02:22:44 +01:00
scrawl	eccb8f38ba	Apply "cast when strikes" enchantments when hitting with a weapon	2013-11-12 02:07:51 +01:00
scrawl	5f209b120b	Use the new ContainerStore::remove method.	2013-11-12 01:26:16 +01:00
scrawl	ffdb91bb21	Add particles for Cast + Hit. Not looking quite right yet.	2013-11-11 23:43:28 +01:00
Marc Zinnschlag	2fff7fc843	save info records	2013-11-11 12:21:26 +01:00
scrawl	6f3d737498	Missing const, thanks to jeaye	2013-11-10 23:27:11 +01:00
scrawl	1773c70455	Merge branch 'master' of https://github.com/zinnschlag/openmw into magic	2013-11-10 22:03:17 +01:00
Marc Zinnschlag	ef8360f346	silenced a warning	2013-11-10 21:45:27 +01:00
Marc Zinnschlag	cfbf444628	Merge remote-tracking branch 'potatoesmaster/inventory-remove'	2013-11-10 21:30:19 +01:00
Nikolay Kasyanov	05e19b37e3	Removed obsolete comment	2013-11-10 22:25:29 +04:00
Nikolay Kasyanov	dafe80874a	Added empty line	2013-11-10 22:24:31 +04:00
Nikolay Kasyanov	96714fc2c1	OpenCS: proper working dir & library path on OS X	2013-11-10 22:19:32 +04:00
Nikolay Kasyanov	fa13818360	OS X: OpenCS packaging	2013-11-10 22:04:13 +04:00
Nikolay Kasyanov	dfa900e4e3	OS X: Fixed “macro redefined” warning	2013-11-10 20:59:10 +04:00
Nikolay Kasyanov	0494fa543f	OpenCS: set current directory to bundle location on OS X, like in OpenMW binary	2013-11-10 20:39:35 +04:00
Nikolay Kasyanov	df5b52b45b	OpenCS.app icon & bundle properties	2013-11-10 20:11:53 +04:00
Nikolay Kasyanov	04edd25add	OpenCS as a separate app bundle	2013-11-10 19:09:05 +04:00
scrawl	6cd373c5c6	Only allow using powers once every 24 h. Apply on touch effects.	2013-11-10 15:40:31 +01:00
scrawl	71828351e6	Code cleanup: use enum instead of integer	2013-11-10 15:28:26 +01:00
Marc Zinnschlag	8c4303399f	Merge branch 'master' into dialogue ... Conflicts: apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/esm/loadinfo.hpp	2013-11-10 13:21:39 +01:00
Marc Zinnschlag	583f1ae9c2	fixed info record ordering and performance problems by determining topic ranges in the record collection instead of in the index collection	2013-11-10 13:00:46 +01:00
Marc Zinnschlag	ec6018928c	some fixes to info record sorting (doesn't address the main problem)	2013-11-10 12:09:49 +01:00
Marc Zinnschlag	b7bb7d6902	Merge remote-tracking branch 'scrawl/master' ... Conflicts: apps/opencs/editor.cpp	2013-11-10 11:49:48 +01:00
Emanuel Guevel	bbfd7f4c9d	Disable equipped item re-stacking when the item is removed from inventory ... The item was not removed if it was re-stacked.	2013-11-10 02:45:17 +01:00
Emanuel Guevel	d2dcf0b203	Add a warning comment to RefData::setCount()	2013-11-10 02:45:17 +01:00
Emanuel Guevel	467bd91651	Update actor model on inventory change	2013-11-10 02:45:17 +01:00
Emanuel Guevel	f428921b93	Always update the source container view on drag&drop ... This fix the indicator not being displayed for items auto-equipped after an other item is removed.	2013-11-10 02:45:17 +01:00
Emanuel Guevel	4fcf427e1f	InventoryWindow: call InventoryStore::unequipItem() when an equipped item is dragged ... The unequipped item is also re-stacked if needed.	2013-11-10 02:45:17 +01:00
Emanuel Guevel	37e91a278e	Add InventoryStore::unequipItem()	2013-11-10 02:45:17 +01:00
Emanuel Guevel	12dbbde1e3	InvStore::unequipSlot: return an iterator to the unequipped item	2013-11-10 02:45:17 +01:00
Emanuel Guevel	59c963b6cc	Auto-equip items when a clothe or an armor is removed from inventory ... This fix auto-equip on corpses.	2013-11-10 02:45:16 +01:00
Emanuel Guevel	750f1fd760	Edit ContainerStore::stacks for clarifications and correctness ... Rename arguments and fix some potential errors (add checks).	2013-11-10 02:45:16 +01:00
Emanuel Guevel	26e4ccb8c2	Cosmetic changes ... Rename ContainerStore::addImpl to addNewStack (it was confusing, since ContainerStore had methods named 'addImp' and 'addImpl').	2013-11-10 02:45:16 +01:00
Emanuel Guevel	aefa54d72d	Pass item count to ManualRef constructor ... This remove the need to call setCount in multiple places.	2013-11-10 02:45:16 +01:00
Emanuel Guevel	0691978603	Add item count to ManualRef constructor as optional argument	2013-11-10 02:45:16 +01:00
Emanuel Guevel	f4f2586e8c	Remove duplicate code for PlaceAtMe/PlaceAtPC using a template	2013-11-10 02:45:16 +01:00
Emanuel Guevel	8ff747fbef	Move some deleteObject logic from OpDelete to MWWorld::deleteObject	2013-11-10 02:45:16 +01:00
Emanuel Guevel	2786530430	Edit InventoryStore::equip() to call the new unequipSlot function… ... …to unequip previously equipped item.	2013-11-10 02:45:16 +01:00
Emanuel Guevel	52cef19982	Update weapon/magic icons when items are removed from player inventory	2013-11-10 02:45:16 +01:00
Emanuel Guevel	d05baa8c22	Add method InventoryStore::unequipSlot() ... This will permit to do run a treatment when an item is unequipped.	2013-11-10 02:45:16 +01:00
Emanuel Guevel	10abb9d297	Call ContainerStore::remove() to remove items from inventory ... Make placeObject() and dropObjectOnGround() in MWWorld to copy objects (and indicate it clearly). Enchanting an item now unequips it.	2013-11-10 02:45:16 +01:00
Emanuel Guevel	23b8206bdc	Add remove methods to MWWorld::ContainerStore	2013-11-10 02:45:16 +01:00
Marc Zinnschlag	a198751f21	Merge remote-tracking branch 'scrawl/magic'	2013-11-09 17:00:27 +01:00
Marc Zinnschlag	935d9241d8	first attempt at proper info record loading: partially incorrect and way too slow	2013-11-09 11:42:19 +01:00
scrawl	5c148a3d41	Fix effect source display	2013-11-09 11:09:44 +01:00
Marc Zinnschlag	8be3ffc2a0	Merge remote-tracking branch 'scrawl/magic' ... Conflicts: apps/openmw/mwworld/worldimp.cpp	2013-11-09 10:54:51 +01:00
scrawl	3e58655a90	Implemented Fortify/Drain skill magic effects. Scroll of icarian flight works!	2013-11-09 10:49:00 +01:00
scrawl	3ea7d58ca8	Advance skill on successfull spell cast	2013-11-09 10:34:46 +01:00
scrawl	976344f0a3	Handle CastOnce enchantments	2013-11-09 08:07:40 +01:00
scrawl	1051611ffa	Added spell failure sound	2013-11-09 07:59:17 +01:00
scrawl	cbe96a2170	Refactor ActiveSpells to track range type. Added basic self range magic.	2013-11-09 07:51:46 +01:00
Marc Zinnschlag	3d8da2b9e0	proper sorting for newly created records and some case smashing fixes	2013-11-08 12:16:41 +01:00
Marc Zinnschlag	a06aa881cb	make sure case handling in info IDs is consistent	2013-11-08 12:03:03 +01:00
Marc Zinnschlag	982024a328	Topic range access in InfoCollection	2013-11-08 11:52:30 +01:00
Marc Zinnschlag	0745a86039	added InfoCreator	2013-11-08 11:51:59 +01:00
Bret Curtis	5a071b0f81	necessary dpkg rules to get opencs building and packaged on dpkg systems	2013-11-08 09:08:56 +01:00
Bret Curtis	36efe9605f	necessary dpkg rules to get opencs building and packaged on dpkg systems	2013-11-07 23:05:45 +01:00
Marc Zinnschlag	fb417f9880	Merge remote-tracking branch 'scrawl/openmw-27' into openmw-27	2013-11-07 09:19:55 +01:00
Jordan Ayers	3fbf918751	Chargen Review Dialog: Init fix. ... Load the starting Health/Magicka/Fatigue from the player stats when creating the Review Dialog, and remove the extra copy of these stats. In some cases, the old stat values were never updated from 0/0.	2013-11-06 23:19:53 -06:00
Jordan Ayers	d48cc27a89	Chargen fix: Back sequence control. ... Related to bug #894. Eliminate double windows when using 'Back' from the review screen. Force consistent back behavior (handling was changing after a individual change button had been used).	2013-11-06 23:19:53 -06:00
Jordan Ayers	e94da61ff0	Chargen cleanup. ... Move common gui state pop out of if checks. Move health update before gui state push (used as input for some windows).	2013-11-06 23:19:53 -06:00
Marc Zinnschlag	d85360e7fd	Merge remote-tracking branch 'scrawl/ui'	2013-11-06 10:21:41 +01:00
Marc Zinnschlag	418ccf705d	Merge branch 'openmw-27' ... Conflicts: apps/launcher/graphicspage.hpp components/CMakeLists.txt	2013-11-06 10:21:25 +01:00
scrawl	9e2b1942fc	Fix journal for not installed tribunal (Options button should become Topics). Don't log an error when optional journal buttons (Tribunal) are not found.	2013-11-05 22:50:53 +01:00
scrawl	bf5529819d	Added combo box widget and use it in options menu. Fixes to VBox / HBox. Added savegame dialog.	2013-11-05 19:50:24 +01:00
Marc Zinnschlag	c545b3682a	compose info record IDs from actual record ID and parent topic ID (to make sure IDs are unique)	2013-11-05 12:57:55 +01:00
Marc Zinnschlag	2d4a6c0edf	cleaned up ID handling in INFO record (including a ESMTool bug fix)	2013-11-05 12:56:20 +01:00
Marc Zinnschlag	9d7695ea88	added missing columns to topic info table	2013-11-05 11:41:48 +01:00
Marc Zinnschlag	245d7b0ae4	Merge remote-tracking branch 'scrawl/windowclosefix'	2013-11-05 08:19:53 +01:00
Marc Zinnschlag	f4e6f31658	Merge remote-tracking branch 'scrawl/openmw-27'	2013-11-05 08:19:29 +01:00
scrawl	c3d9bc31bb	Fix exiting OpenMW via the window close button (regression)	2013-11-05 03:02:28 +01:00
scrawl	3a827d9c12	Deleted Obliviontt.zip	2013-11-05 00:32:06 +01:00
Alexander "Ace" Olofsson	468e8e3635	Missing iostream include	2013-11-04 10:36:22 +01:00
Marc Zinnschlag	dec1483fa4	Merge branch 'saving' into openmw-27	2013-11-04 08:57:32 +01:00
graffy76	6d439d032f	Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector	2013-11-03 21:38:10 -06:00
graffy76	ed913936f8	Eliminated game & addon keys from profile configuration	2013-11-03 21:36:41 -06:00
graffy76	dace904490	changed game/addon to content for writing to openmw.cfg from launcher	2013-11-03 16:45:18 -06:00
Marc Zinnschlag	3ac58b387b	fixed wording of an error message	2013-11-03 22:08:38 +01:00
graffy76	1d4b5a2425	Fix broken launcher content file display / selection scheme ... Disable selection of content files with missing dependencies (grayed out)	2013-11-03 14:02:41 -06:00
graffy76	12c06a5615	Fixed broken dependency check	2013-11-03 06:21:28 -06:00
Marc Zinnschlag	4724df7e9b	added topic/journal column to info tables	2013-11-03 10:48:50 +01:00
graffy76	973803eb2f	Fixed pathing issues in launcher	2013-11-03 00:02:46 -05:00
Lukasz Gromanowski	afce10cf37	Fixes #597: Assertion `dialogue->mId == id' failed in esmstore.cpp ... It seems that assertion was unnecessary, after removing it, dialogs related to moon-and-star in "Path of the Incarnate" quest were correctly loaded (dumped DialInfo records were correct). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-11-02 16:39:05 +01:00
graffy76	8d12e2b99d	fixed merge conflicts ... Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector Conflicts: apps/launcher/datafilespage.cpp apps/launcher/settings/gamesettings.hpp components/contentselector/model/contentmodel.cpp	2013-11-02 09:31:23 -05:00
graffy76	cddece4f9e	Another stab at fixing the pathing problem...	2013-11-01 21:47:26 -05:00
scrawl	e6960d915a	Add simple Ogre widget	2013-11-02 02:51:38 +01:00
Marc Zinnschlag	15b7d3263c	subclass ESM::DialInfo to keep track of parent topic	2013-11-01 17:43:45 +01:00
graffy76	0cb591e4f6	Fixed path problem with adjuster widget and local data path.	2013-10-31 18:12:13 -05:00
Marc Zinnschlag	ea0e8be0d3	disallow sorting (via column headers) in info tables	2013-10-31 13:40:14 +01:00
Marc Zinnschlag	90aa8f9db6	fixed dialogue record loading with multiple content files	2013-10-31 13:11:15 +01:00
Marc Zinnschlag	767cb54e7c	added missing columns to journal info table	2013-10-31 12:54:55 +01:00
Marc Zinnschlag	69f28ee4be	split info records between journal and topic info tables	2013-10-31 12:16:45 +01:00
gus	683b8d77dd	build fix (thanks travis)	2013-10-31 11:02:26 +01:00
gus	d587f3c946	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat ... Conflicts: apps/openmw/mwmechanics/actors.cpp apps/openmw/mwscript/docs/vmformat.txt	2013-10-31 09:51:17 +01:00
gus	02ded18fc5	Linux backslash fix	2013-10-31 09:43:12 +01:00
gus	2a927f65d3	perfomances optimisations (pathfinding is computed less often, max 4 times per sec)	2013-10-30 20:52:23 +01:00
gus	650a112e2e	better timer	2013-10-30 20:42:50 +01:00
scrawl	636d399c7f	Refactored Ogre initialisation into a component	2013-10-30 14:04:33 +01:00
scrawl	4f35fd8184	Removed a workaround from Renderer, some cleanup	2013-10-30 13:05:28 +01:00
Marc Zinnschlag	ba88c94d58	first attempt at an info record collection	2013-10-29 13:18:22 +01:00
Marc Zinnschlag	45f5a66bcc	use result of getAppendIndex instead of always appending at the end	2013-10-29 09:27:23 +01:00
gus	a6e7c6c104	disable AI combat for creatures	2013-10-28 23:04:46 +01:00
gus	5b20cce849	CMake fix	2013-10-28 18:36:09 +01:00
gus	0e86209224	linux fix :p	2013-10-28 18:33:10 +01:00
gus	b7a9243173	fighting should stop when the target is dead	2013-10-28 18:22:36 +01:00
gus	12d8b4e0f8	bugfix	2013-10-28 18:13:07 +01:00
gus	2d84f7d33d	NPC run	2013-10-28 18:10:00 +01:00
gus	d7584f9df7	getLineOfSight, no script instruction yet	2013-10-28 18:01:40 +01:00
Marc Zinnschlag	f5fbe7361f	Merge remote-tracking branch 'lgro/saving' into saving	2013-10-28 08:35:51 +01:00
graffy76	b51bef0d98	fixed missing adjuster widget in file dialog open view	2013-10-27 20:21:19 -05:00
Lukasz Gromanowski	d51c9b64dd	Issue #913: Merge --master and --plugin switches ... Launcher part of master/plugin switches merge. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-10-27 20:03:12 +01:00
Lukasz Gromanowski	489475a32f	Corrected compilation error (g++ 4.8.2) triggered by not found declaration ... in argument-dependent lookup at the point of instantiation. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-10-27 19:57:05 +01:00
Marc Zinnschlag	c2bbbef637	Merge remote-tracking branch 'rainChu/drowning-gauge'	2013-10-27 16:10:11 +01:00
gus	2515a1239e	improved combat conditions	2013-10-27 14:22:51 +01:00
Marc Zinnschlag	9a80e11182	reimplemented add and appendBlankRecord via insertRecord	2013-10-27 14:13:10 +01:00
gus	968968502e	NPC always face you when fighting	2013-10-27 14:03:58 +01:00
Marc Zinnschlag	525d6fadec	added Collection insert function for arbitrary position and reimplemented appendRecord in via this function	2013-10-27 14:00:25 +01:00
gus	a0edb55f60	only NPC with fight over 80 will attack you now	2013-10-27 13:50:29 +01:00
gus	882b136b35	bugfix of bugfix ^^	2013-10-27 13:21:16 +01:00
Alex "rainChu" Haddad	23eaf90846	Breath meter flashes when drowning	2013-10-27 04:05:01 -04:00
graffy76	ea7a8eb2a4	last commit	2013-10-26 23:04:39 -05:00
graffy76	5e123d3f52	Hide adjusterwidget for open files view	2013-10-26 22:57:22 -05:00
graffy76	9b483c3ae3	Fix for file path issues	2013-10-26 22:55:44 -05:00
graffy76	ba365ff49e	Fixed merge conflicts with saving branch	2013-10-25 19:23:03 -05:00
scrawl	8c9a5de26f	Fix an irritating error message	2013-10-25 23:47:53 +02:00
graffy76	9ce4a04a2d	merge from saving ... Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector Conflicts: apps/launcher/datafilespage.cpp apps/opencs/editor.cpp apps/opencs/view/doc/filedialog.cpp apps/opencs/view/doc/filedialog.hpp	2013-10-25 14:44:22 -05:00
graffy76	1a23cccce3	Implemented Launcher namespace	2013-10-25 11:17:26 -05:00
graffy76	16d87ea1d1	Merge branch 'master' into esxSelector	2013-10-25 08:11:24 -05:00
graffy76	2ca7f24731	Fixed filedialog new / edit content path issue	2013-10-24 17:33:28 -05:00
graffy76	b48f066f33	Reimplemented content selector for filedialog and datafilespage classes	2013-10-23 17:39:17 -05:00
graffy76	ba3589bc76	Revert "Implemented ContentSelector as a singleton "charm" modifier for" ... This reverts commit 24b167b755. Conflicts: apps/launcher/datafilespage.cpp apps/opencs/editor.cpp apps/opencs/view/doc/filedialog.cpp apps/opencs/view/doc/filedialog.hpp components/contentselector/view/contentselector.cpp components/contentselector/view/contentselector.hpp	2013-10-22 22:20:21 -05:00
graffy76	f9591ddda6	Reimplemented constentselector view class	2013-10-22 21:52:35 -05:00
Marc Zinnschlag	67bc0a0c70	additional modification to the IDValidator (restricting relaxed mode slightly more)	2013-10-22 11:32:10 +02:00
Marc Zinnschlag	dc473221e7	added ID-argument to CollectionBase::getAppendIndex (required for info record collection)	2013-10-22 11:21:12 +02:00
Marc Zinnschlag	aa61948801	relaxed rules for new IDs when ID is also a user visible text	2013-10-22 11:08:37 +02:00
Marc Zinnschlag	3146af34d6	some fixes for the merged filter branch	2013-10-21 19:28:57 +02:00
Marc Zinnschlag	fdba029566	Merge remote-tracking branch 'sirherrbatka/filters' into saving	2013-10-21 18:59:12 +02:00
Marek Kochanowicz	70602c2c36	Removed changes in the unimplemented copy ctor.	2013-10-21 18:24:16 +02:00
Marek Kochanowicz	5e1bdd605b	Corrected formatting in document.hpp	2013-10-21 18:15:26 +02:00
Marc Zinnschlag	88e09159c4	splitting off characters menu from mechanics menu (was getting too big)	2013-10-21 18:04:40 +02:00
Marc Zinnschlag	743c6ea5b1	save dialogue records	2013-10-21 16:47:32 +02:00
Marc Zinnschlag	c995533e07	Merge branch 'dialogue' into saving ... Conflicts: apps/opencs/model/world/columnimp.hpp apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/esm/loaddial.hpp	2013-10-21 16:45:43 +02:00
Marek Kochanowicz	b23df42817	Removed old comment. Changed to set resources path correctly.	2013-10-21 16:06:16 +02:00
Marc Zinnschlag	3b85d97087	handle deleted dialogue records	2013-10-21 15:38:13 +02:00
Marc Zinnschlag	dc12648a3e	add fixed dialogue records when creating a new omwgame file	2013-10-21 14:26:54 +02:00
Marc Zinnschlag	c0e5501431	disallow the deletion of non-topic, non-journal dialogue records	2013-10-21 13:58:47 +02:00
Marc Zinnschlag	0be157efea	set dialogue type for newly created dialogue records	2013-10-21 13:39:13 +02:00
Marc Zinnschlag	75c5316ad7	added dialogue type column to topics table	2013-10-20 17:26:09 +02:00
Marc Zinnschlag	adf3a41a83	added topic and journal tables	2013-10-20 17:15:32 +02:00
Marc Zinnschlag	ebf7732912	some cleanup	2013-10-20 15:48:39 +02:00
Marek Kochanowicz	96b6787255	Getting rid of extension. Correcting tiny mistake in filters file.	2013-10-20 10:56:27 +02:00
Marek Kochanowicz	184456892b	Added check to load custom filters set when present.	2013-10-19 18:43:47 +02:00
Marek Kochanowicz	4e26a61db3	Removed command line handling. Maybe zini will let me to implement it later. Implemented switch to handle resources directory. TODO: check for defaultfilters on data path.	2013-10-18 22:11:14 +02:00
Marek Kochanowicz	a7002e8a09	Implements switch (--help and --resources), and copying defaultfilters.omwaddon.project. Seems to work.	2013-10-17 18:21:41 +02:00
scrawl	3a3f2a37c8	Add cut, copy & paste of text	2013-10-17 12:47:49 +02:00
Marc Zinnschlag	8c139783b7	silenced a warning	2013-10-16 21:33:11 +02:00
Marc Zinnschlag	19bd0f90b9	Merge remote-tracking branch 'rainChu/torches'	2013-10-16 21:24:45 +02:00
Alex "rainChu" Haddad	65818155d8	Fixed punctuation consistency	2013-10-16 15:14:35 -04:00
Alex "rainChu" Haddad	e11da5c0a3	Added a constructor to Light CustomData	2013-10-16 15:13:36 -04:00
Marek Kochanowicz	3000386443	failed attempt on switch adding.	2013-10-16 13:07:26 +02:00
Alex "rainChu" Haddad	2643214ca6	Lights extinguish underwater	2013-10-15 21:50:32 -04:00
Alex "rainChu" Haddad	30ee3c5cf6	Equipped torches and lights run out of fuel	2013-10-15 21:50:14 -04:00
Emanuel Guevel	ba4b8a37e2	Remember pressed message box button longer ... Remember which button was pressed until a new interactive message box is displayed or until the pressed button number is read. Before that, it was not possible to get the pressed button after the message box was hidden/destroyed.	2013-10-14 12:55:06 +02:00
Marc Zinnschlag	db7ea30483	allow float values in cell for value tests	2013-10-14 11:15:36 +02:00
Marc Zinnschlag	679754b305	corrected an error message	2013-10-14 11:06:59 +02:00
Marc Zinnschlag	9b0766b678	minor fix in ValueNode::toString	2013-10-14 10:58:11 +02:00
Marc Zinnschlag	4905f1c8ab	make testing empty cells against an empty string yield true	2013-10-13 21:54:36 +02:00
Marc Zinnschlag	ce8694c84e	Merge remote-tracking branch 'scrawl/master'	2013-10-13 18:55:49 +02:00
scrawl	683ad40e21	No need for this ifdef since there is a default argument.	2013-10-13 18:28:22 +02:00
scrawl	fa264935ff	We can apply vsync at runtime now that the Ogre bug is fixed.	2013-10-13 17:56:26 +02:00
scrawl	f504ab42fe	Turn off vsync while in the loading screen	2013-10-13 17:52:14 +02:00
Marc Zinnschlag	b8ae195a46	Merge branch 'scene'	2013-10-13 15:42:27 +02:00
Marc Zinnschlag	4624bed899	changed handling of scene toolbar button icons	2013-10-13 15:41:48 +02:00
Marc Zinnschlag	fc5afe430b	Merge remote-tracking branch 'potatoesmaster/fatigue-restoration'	2013-10-13 14:40:48 +02:00
Emanuel Guevel	dcfff79460	Regenerate fatigue over time	2013-10-13 00:40:27 +02:00
Marc Zinnschlag	708cde2688	Merge remote-tracking branch 'jordan-ayers/topic/COC-Exterior-Cell-Selection'	2013-10-12 23:18:19 +02:00
Jordan Ayers	141382b8c0	COC Command: Exterior cell selection fix. ... Return the northernmost cell of the easternmost matching column for Ext. cells.	2013-10-12 14:48:37 -05:00
Marc Zinnschlag	608d154ad7	Merge remote-tracking branch 'rainChu/master'	2013-10-12 20:31:33 +02:00
Alex "rainChu" Haddad	cfc3093320	Reverted conditional compiling	2013-10-12 10:46:44 -04:00
Marc Zinnschlag	b5d620a8dc	fixed string filter on enum column when column is empty	2013-10-12 16:35:59 +02:00
Marc Zinnschlag	a29b8667ef	fixed string filter on boolean columns when testing against the value false	2013-10-12 16:29:36 +02:00
Marc Zinnschlag	a77044cda4	fixed column numbering	2013-10-12 16:15:47 +02:00
Marc Zinnschlag	2606feec3a	Merge remote-tracking branch 'lgro/cfg_without_data_path'	2013-10-12 13:52:38 +02:00
Marc Zinnschlag	3c580fbc59	Merge remote-tracking branch 'jordan-ayers/topic/MagicEffectDisplayFormat'	2013-10-12 13:40:29 +02:00
Marc Zinnschlag	458c752425	Merge remote-tracking branch 'mckibbenta/tgm'	2013-10-12 13:38:10 +02:00
Marc Zinnschlag	87cd5d4267	Merge remote-tracking branch 'potatoesmaster/DisableLevitation'	2013-10-12 13:31:06 +02:00
Marc Zinnschlag	9c4d88cd76	Merge remote-tracking branch 'potatoesmaster/acrobatics'	2013-10-12 13:20:12 +02:00
Marc Zinnschlag	c8dc6a70b7	Merge remote-tracking branch 'greye/master'	2013-10-12 13:14:47 +02:00
Marc Zinnschlag	c8695db66f	Merge remote-tracking branch 'wheybags/unshield_fixes'	2013-10-12 13:03:38 +02:00
Lukasz Gromanowski	5ce1f50fab	Cleanup in MWGui::WindowManager constructor initialzation list. ... Corrected order of initialization list, and added missing member field initializations - without this openmw crashes when installer is interrupted and there are no valid data path in openmw.cfg, as reported by BrotherBrick in: https://forum.openmw.org/viewtopic.php?f=20&p=19501#p19499 Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-10-10 23:06:37 +02:00
Jordan Ayers	6e4978643c	Magic Effect descriptions: support feet / level modes. ... Show proper suffixes for all magnitudes. Drop extra 'times' symbol in 'timesInt format (not consistent with other magnitude displays).	2013-10-09 00:08:11 -05:00
Jordan Ayers	6ab7002908	MagicEffect: Put magnitude type into ESM::MagicEffect helper.	2013-10-07 22:28:55 -05:00
Jordan Ayers	065f435225	Format fix: remove extra spaces from ranged TimesINT formatting.	2013-10-07 20:02:20 -05:00
gus	94069e3a7e	bugfix	2013-10-07 20:30:12 +02:00
graffy76	17950210fa	Merge branch 'master' into esxSelector	2013-10-07 06:52:20 -05:00
Marc Zinnschlag	74cee66273	consolidated magic numbers for button size	2013-10-07 11:24:53 +02:00
gus	1ac3d99c78	pathfinding now works in AICombat.	2013-10-07 10:20:02 +02:00
Marc Zinnschlag	4d6c3cdf09	removed more garbage	2013-10-07 08:55:04 +02:00
graffy76	4c72a9ffdf	Fixed non-loading files	2013-10-06 22:10:38 -05:00
graffy76	217a4d75b4	Implemented profile function in launcher datafiles page ... Implemented dependency sorting to ensure dependent files appear latest in the list.	2013-10-06 21:13:47 -05:00
Jordan Ayers	6303e56ce4	Magic Effect Display cleanup: Don't put spaces in percentages.	2013-10-06 20:35:59 -05:00
Jordan Ayers	707f45aa8e	Magic Effect Display improvement. ... Related to Bug #794. Always show one decimal point precision for Fortify Max. Magicka effect.	2013-10-06 20:26:39 -05:00
Jordan Ayers	6983a55a16	Magic effect display improvement. ... Related to Bug #794. Show the "x INT" notation for Fortify Max. Magicka. Show "%" notation for weakness / resistance effects.	2013-10-06 19:32:40 -05:00
Emanuel Guevel	2abe5c1c9a	Acrobatics: do not apply fall damages when slowfalling spell effect is active ... If spell effect ends up in mid-air, calculate fall height from then.	2013-10-02 23:34:25 +02:00
Emanuel Guevel	4265dddc40	Add MWWorld::isSlowFalling(Ptr)	2013-10-02 23:34:25 +02:00
Emanuel Guevel	6e09a5fb4a	Acrobatics: reinit fall height at current height rather than zero ... To prevent problems.	2013-10-02 23:34:25 +02:00
Emanuel Guevel	2b992ef3b5	Acrobatics: use calculated fatigueTerm	2013-10-02 23:34:24 +02:00
Emanuel Guevel	4c151e59a2	Acrobatics: do not touch modified stats	2013-10-02 23:34:24 +02:00
Emanuel Guevel	4860514865	Acrobatics: cosmetic changes	2013-10-02 23:34:24 +02:00
mckibbenta	857deb3723	Merge branch 'master' into tgm	2013-10-02 13:54:03 -04:00
mckibbenta	073f64c8bb	stop weapon condition degredation (for the player) with tgm on	2013-10-02 13:46:33 -04:00
Emanuel Guevel	496f786c2a	Implement Disable/EnableLevitation script functions ... Totally copied on Disable/EnableTeleporting implementation. Thanks KittyCat!	2013-10-02 15:33:20 +02:00
Alex "rainChu" Haddad	f1b4c2e400	Fixed first person offset to use world transform ... It slipped my mind that some necks might not be perfectly vertical.	2013-10-02 07:03:39 -04:00
Alex "rainChu" Haddad	ed0c31b485	Refactored, moved logic out of NpcAnimation ... The logic is now handled by RenderingManager, and Camera sets its animation's first person offset height. Due to how NpcAnimation seems to be updated, it has to be the one to actually set its own nodes, in the case of the hands. Otherwise, the hands would not move without a messier hack.	2013-10-02 05:16:52 -04:00
graffy76	a5a0f61533	Fixed missing profiles combobox	2013-10-01 22:36:49 -05:00
graffy76	00c78a4aa1	Implementing ContentSelector class in DataFilesPage ... Moved AdjusterWidget / FileWidget to ContentSelectorView	2013-10-01 21:29:45 -05:00
Emanuel Guevel	b8c60dabb3	Reintroduce Acrobatics changes made by Glorf ... Advance Acrobatics skill on jump and on landing, apply fall damage on landing.	2013-10-01 23:35:34 +02:00
Alex "rainChu" Haddad	0ddb5097fc	Revert "Bug #840, First Person Sneaking Camera Height" ... This reverts commit 296abfd48f.	2013-10-01 11:44:45 -04:00
Alex "rainChu" Haddad	296abfd48f	Bug #840, First Person Sneaking Camera Height ... Also, added comments to existing code in the area.	2013-10-01 10:48:34 -04:00
Alex "rainChu" Haddad	4496244b14	Tabs to spaces ... My own code uses only tabs - I forgot to change the setting on my IDE, sorry!	2013-10-01 05:36:13 -04:00
Alex "rainChu" Haddad	eae02ea00d	Cleaned up my hackish code for WinMain	2013-09-30 03:33:31 -04:00
Alex "rainChu" Haddad	00a776a1a8	Fixed compilation failure on my machine ... Fixed shared records not being populated before the player record is moved.	2013-09-30 02:54:20 -04:00
greye	4cdb57e388	workaround segfault on --new-game switch	2013-09-30 10:30:40 +04:00
Alex "rainChu" Haddad	bffbfff41c	My own fix to make it hackily compile	2013-09-30 00:32:06 -04:00
graffy76	24b167b755	Implemented ContentSelector as a singleton "charm" modifier for ... FileDialog...	2013-09-29 12:19:07 -05:00
Tom Mason	dd0a416249	cleaned up bloodmoon_fix_ini	2013-09-29 16:59:52 +01:00
Tom Mason	fd169c2399	fixed issue with cds where subfolders of Data Files were contained outside the Data Files folder	2013-09-29 15:49:47 +01:00
Lukasz Gromanowski	ef617d408b	Issue #913: Merge --master and --plugin switches ... Merged master/plugin switches in launcher. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-09-29 09:14:40 +02:00
Lukasz Gromanowski	9c2145eda1	Issue #913: Merge --master and --plugin switches ... Merged master/plugin switches into content in openmw and mwiniimporter. Extension in content files is now required. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-09-29 09:11:57 +02:00
gus	83a375b55d	AI now continue to hit you. ... TODO: change the way time is handled	2013-09-28 21:17:06 +02:00
Marc Zinnschlag	7be1f1afc2	implemented SceneToolMode as a horizontal panel with radiobutton-type buttons	2013-09-28 13:10:42 +02:00
gus	2537384c50	bug fix	2013-09-28 12:25:37 +02:00
Marc Zinnschlag	0c5f07a65a	added SceneToolMode class	2013-09-28 11:27:24 +02:00
Marc Zinnschlag	84cadc10f4	added scene toolbar buttons (still not doing anything)	2013-09-28 11:06:56 +02:00
Marc Zinnschlag	9ea092927f	added basic scene subview (no functionality yet)	2013-09-28 09:25:54 +02:00
Marc Zinnschlag	6143ec33e0	giving Documents direct access to ConfigurationManager	2013-09-27 15:24:58 +02:00
Marc Zinnschlag	e7c48cbe58	load project files	2013-09-27 15:04:30 +02:00
Marc Zinnschlag	62148b3247	moved implementation of searchColumnIndex and findColumnIndex functions from IdTable to CollectionBase	2013-09-27 15:04:09 +02:00
Marc Zinnschlag	baae548106	added project scope filter saving	2013-09-27 13:56:40 +02:00
Marc Zinnschlag	6ac4dedfbe	added missing column enum	2013-09-27 13:56:23 +02:00
Marc Zinnschlag	31346dde58	fixed uninitialise scope value for filters	2013-09-27 13:55:28 +02:00
Marc Zinnschlag	6f2c418a5c	(slightly) improved error reporting during save operations	2013-09-27 13:54:51 +02:00
Marc Zinnschlag	23095ec3ec	added missing scope column to filter table	2013-09-27 13:54:21 +02:00
Marc Zinnschlag	5779f799ab	create project file when saving content file	2013-09-27 11:36:06 +02:00
Marc Zinnschlag	1363e86828	made verifier ignore deleted records	2013-09-27 10:08:09 +02:00
gus	9353f4d14f	WIP AI combat	2013-09-25 18:01:36 +02:00
Marc Zinnschlag	96fd1c35bf	preserve author/descriptin meta data	2013-09-24 17:17:01 +02:00
Marc Zinnschlag	830530bd06	set record count in TES3 header	2013-09-24 17:08:24 +02:00
Marc Zinnschlag	e4fdebc85b	added saving for referenceable records	2013-09-24 13:53:19 +02:00
Marc Zinnschlag	c42e74dadf	make 4 byte record type accessable from record struct	2013-09-24 13:17:28 +02:00
graffy76	3b40192e90	Merge branch 'master' into esxSelector	2013-09-23 22:03:42 -05:00
Marek Kochanowicz	ae5e8b95ff	Solving Issue912	2013-09-23 20:12:04 +02:00
Marc Zinnschlag	0f1c4cb00e	cleanup	2013-09-23 15:34:52 +02:00
Berulacks	91d7291c0c	Switched to using proper enums as opposed to ints.	2013-09-23 08:31:36 -04:00
graffy76	d7cff6361e	Fixed filter issue (all addons for a gamefile are enabled for checking). ... Note: Other dependencies are not yet automatically selected when an addon is checked.	2013-09-23 06:51:49 -05:00
Berulacks	0c518fb047	Replaced tabs with spaces.	2013-09-23 07:36:50 -04:00
Berulacks	c423479f20	Fixed bug #887	2013-09-23 07:31:14 -04:00
Marc Zinnschlag	6d9ff39390	set dependencies when saving (requires further refinements)	2013-09-23 12:16:56 +02:00
Marc Zinnschlag	74d683b530	fixed save path for newly created addons	2013-09-23 11:58:11 +02:00
Marc Zinnschlag	63e0cf5154	fixed missing initialisation of adjuster widget in file dialogue	2013-09-23 11:26:29 +02:00
Marc Zinnschlag	d4b2a6b9f1	Merge remote-tracking branch 'graffy76/esxSelector' into saving	2013-09-23 10:09:43 +02:00
graffy76	513f0c4b3e	Implemented file/adjuster widgets into new addon creation dialog	2013-09-22 23:52:53 -05:00
Marc Zinnschlag	a6ea670255	use IdTypeDelegate in report table	2013-09-22 13:54:01 +02:00
Marc Zinnschlag	1c4a4b4f26	generalised RefIdTypeDelegate into IdTypeDelegate	2013-09-22 13:39:44 +02:00
Marc Zinnschlag	f2875e234c	added missing position columns to reference table	2013-09-22 10:43:09 +02:00
graffy76	70ac14b8ba	Merge branch 'master' into esxSelector	2013-09-21 23:07:53 -05:00
graffy76	cfdc19c427	Renamed esxSelector to contentSelector ... Fixed datafilespage model implementation in launcher Filtered addons in table view by selected game file	2013-09-21 23:06:29 -05:00
Marc Zinnschlag	94bb97e766	replacing tabs with spaces	2013-09-21 08:40:00 +02:00
Marc Zinnschlag	96b181bb54	Merge remote-tracking branch 'xethik/master'	2013-09-21 08:07:00 +02:00
Xethik	094e4d93b7	Generally speaking, you should never compare iterators from two different compilers ... http://stackoverflow.com/questions/4657513/comparing-iterators-from-different-containers It seems like this was just an overlook that happened to work on most systems. I was not able to thoroughly test this change, but it fixed an issue I was having in VC10. It's possible the prev.end() was a copy paste error that was meant to be new.end() anyways.	2013-09-20 21:38:10 -04:00
Xethik	58bb0b8773	Bug #907 ... Added a check to make sure playerview is allowed when attempting to scroll, locking out zooming before character creation.	2013-09-20 21:26:12 -04:00
graffy76	7b7dfa122d	Merge branch 'master' into esxSelector	2013-09-19 16:24:28 -05:00
Marc Zinnschlag	99fe6e68c7	Merge remote-tracking branch 'mckibbenta/tgm'	2013-09-19 15:14:35 +02:00
Marc Zinnschlag	8d4f4e395f	update syntax highlighting when ID list changes	2013-09-19 14:26:09 +02:00
Marc Zinnschlag	ba5e2a0330	changed ID listing to include deleted records by default	2013-09-19 13:42:19 +02:00
Marc Zinnschlag	9c751ae370	separate highlight colour for IDs	2013-09-19 12:30:42 +02:00
Marc Zinnschlag	3d2281fe80	added signals and functions to Data for handling ID list changes	2013-09-19 12:11:27 +02:00
Marc Zinnschlag	78f7f80fc3	configured script highlighting with extensions	2013-09-19 08:58:27 +02:00
graffy76	0eb06ada39	Implemneting drag and drop	2013-09-18 02:36:23 -05:00
scrawl	d5ef843f56	Fix a missing model update	2013-09-16 19:22:08 +02:00
Marc Zinnschlag	acfd78c62a	implemented saving for all supported record types except cells, referencables and references	2013-09-16 14:17:04 +02:00
Marc Zinnschlag	03054c8160	forgot to write record ID	2013-09-16 14:10:05 +02:00
Marc Zinnschlag	bf0fba68af	added save stage for globals	2013-09-16 12:51:57 +02:00
mckibbenta	6bb6ba6372	added god mode comment	2013-09-15 16:12:59 -04:00
mckibbenta	3035675a26	Merge branch 'master' of https://github.com/zinnschlag/openmw	2013-09-15 15:49:18 -04:00
mckibbenta	644f081c60	minor changes	2013-09-15 15:48:32 -04:00
Marc Zinnschlag	db70095148	write TES3 header	2013-09-15 15:31:44 +02:00
Marc Zinnschlag	231419028d	minor fix	2013-09-15 15:03:17 +02:00
Marc Zinnschlag	fa25a068a8	basic saving (no data is written to file yet)	2013-09-15 15:00:41 +02:00
Marc Zinnschlag	8326ac9b6f	replaced dummy save implementation with a threaded dummy save implementation	2013-09-15 12:53:59 +02:00
Marc Zinnschlag	d71d282952	more Operation enhancements in preparation for save operation	2013-09-15 12:03:36 +02:00
Marc Zinnschlag	414e6abb95	more signal cleanup	2013-09-15 11:35:12 +02:00
Marc Zinnschlag	a5aebfb760	minor cleanup	2013-09-15 09:32:20 +02:00
mckibbenta	c9f1bd8735	Merge branch 'master' of https://github.com/zinnschlag/openmw	2013-09-14 16:38:46 -04:00
Marc Zinnschlag	b7bffc8a79	removed Verifier class (using Operation class without subclassing now)	2013-09-14 15:16:31 +02:00
Marc Zinnschlag	f4c03c6a29	added ordered-flag to Operation (currently ignored)	2013-09-14 15:12:24 +02:00
Marc Zinnschlag	077a157841	moved Operation and Stage from model/tools to model/doc	2013-09-14 14:56:23 +02:00
Marc Zinnschlag	c961abce96	added warning message to startup window	2013-09-14 14:00:07 +02:00
Marc Zinnschlag	9637e1641b	fix for building with system tinyxml	2013-09-14 13:33:49 +02:00
Marc Zinnschlag	07ff0a8de9	possible build fix for Windows	2013-09-12 20:52:05 +02:00
Marc Zinnschlag	bf8a25c2c6	Merge remote-tracking branch 'mckibbenta/tgm'	2013-09-12 19:07:35 +02:00
mckibbenta	89b7d6121d	Initial toggleGodMod/tgm instruction. Currently only affects player health.	2013-09-12 08:30:00 -04:00
mckibbenta	85b8af6262	Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm	2013-09-12 08:08:07 -04:00
scrawl	09e692f1f6	Fixed polish font	2013-09-10 22:11:57 +02:00
Marc Zinnschlag	554c44892a	Merge branch 'newgame'	2013-09-10 16:45:09 +02:00
Marc Zinnschlag	e9f14449eb	added AdjusterWidget	2013-09-10 16:45:01 +02:00
gus	f9bfbc8764	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat	2013-09-10 16:18:39 +02:00
gus	46a734852b	adding script instruction getLOS + some test about AI	2013-09-10 16:16:13 +02:00
Marc Zinnschlag	2dc3c0ae4f	integrated startup icons	2013-09-09 09:41:43 +02:00
Marc Zinnschlag	25b7cd33ea	added FileWidget; fixed OpenCS configuration	2013-09-08 14:31:20 +02:00
Marc Zinnschlag	ecedb60169	splitting new game and new addon functions (new game currently not working)	2013-09-08 12:06:28 +02:00
Marc Zinnschlag	f7940d7d1a	focus load document button by default in startup window	2013-09-08 11:24:06 +02:00
Marc Zinnschlag	2d9e9fe3e1	Merge branch 'startup'	2013-09-08 09:34:41 +02:00
Marc Zinnschlag	cae5eb424d	cleaned up opening the settings dialogue from a view	2013-09-08 09:33:45 +02:00
Marc Zinnschlag	efdf2961f0	open user settings dialogue centered	2013-09-08 09:28:43 +02:00
Marc Zinnschlag	0e81fb32dd	hooked up edit config signal from startup window	2013-09-08 09:26:43 +02:00
Marc Zinnschlag	17bf7e59a4	added proper startup dialogue (still missing icons)	2013-09-08 09:15:26 +02:00
graffy76	a6e7cf9a8c	Implementing drag and drop	2013-09-07 15:57:40 -05:00
Tom Mason	7b9c5c75e7	silenced unshield	2013-09-07 16:16:09 +01:00
Tom Mason	2b50e34566	Fixed issue with copy_file ... from: https://forum.openmw.org/viewtopic.php?f=20&t=1718&hilit=0.26&start=50#p18705	2013-09-07 15:41:51 +01:00
Marc Zinnschlag	9b7cd5958f	Merge remote-tracking branch 'scrawl/master'	2013-09-07 08:23:25 +02:00
scrawl	10c21579bc	Item stacking case sensitivity fix	2013-09-07 01:00:38 +02:00
Marc Zinnschlag	3d66f7521e	Merge remote-tracking branch 'marcrbouvier/master'	2013-09-06 08:44:59 +02:00
Marc Bouvier	784cba21f2	[Feature #881] Change Tabs to Spaces ... Some of the tabs were not made of spaces, so Git defaults tabs to the length of 8 spaces. OpenMW uses 4 spaces per tab.	2013-09-05 23:02:51 -05:00
Marc Zinnschlag	dc345dd43d	Merge branch 'filter'	2013-09-05 15:47:52 +02:00
Marc Zinnschlag	8f0ab29a9f	allow the use of keywords for strings without quotation marks	2013-09-05 15:47:38 +02:00
Marc Zinnschlag	645b50ef36	added support for half-sided intervals to filter parser	2013-09-05 15:38:28 +02:00
Marc Zinnschlag	f3ce9c22a1	rewrote value node to support half-sided intervals (meaning infinity or -infinity for the missing half)	2013-09-05 15:22:14 +02:00
Marc Zinnschlag	9332684335	allow the use of value types in string filters	2013-09-05 15:05:49 +02:00
Marc Zinnschlag	f2e86e860e	allow the use of record types in string filters	2013-09-05 14:39:56 +02:00
Marc Zinnschlag	8bebe7179c	some UniversalId fixes	2013-09-05 13:58:36 +02:00
Alexander "Ace" Olofsson	5e42c73356	Better fix for unshield, comments on changes, no more commented out code.	2013-09-05 10:39:17 +02:00
mckibbenta	ae02499eff	Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm	2013-09-04 21:15:44 -04:00
Alexander "Ace" Olofsson	22a5f7198f	A few fixes to build on Windows	2013-09-04 23:25:47 +02:00
Marc Zinnschlag	842a616909	more cleanup	2013-09-03 14:18:34 +02:00
Marc Zinnschlag	6cd7da6547	Merge remote-tracking branch 'marcrbouvier/master'	2013-09-03 13:47:07 +02:00
Marc Bouvier	6b11f59ed4	[Feature #881] Rename QLocalServer ... The server name should be more unique to the project so there isn't a interprocess clash.	2013-09-03 06:24:11 -05:00
Marc Zinnschlag	80f8024da7	allow specifying record modification status column enum via strings	2013-09-03 13:03:02 +02:00
Marc Zinnschlag	f80373a849	removed two unused files	2013-09-03 12:53:45 +02:00
Marc Zinnschlag	1744a64f77	in filters allow specifiying boolean columns as strings	2013-09-03 12:32:06 +02:00
Marc Bouvier	0ae2bb2fae	[Feature #881] Code Formatting ... Code formatted to the OpenMW policy.	2013-09-03 05:22:48 -05:00
Marc Bouvier	563bd0b430	[Feature #881] Raise OpenCS New Window After Re-execution ... The OpenCS startup window of the existing exist is raised when trying to start a new instance. This is done by the new instance connection to the existing instance's QLocalServer. Once the connection is established the existing instance raises the startup window.	2013-09-03 04:12:19 -05:00
Marc Bouvier	51332b86a1	[Feature #811] Only 1 Instance of OpenCS is Allowed ... If another instance of OpenCS is started, then it will terminate. This is done by creating a QLocalServer with a unique ID. If another QLocalServer with the same ID attempts to be opened, then the creation of the QLocalServer will fail and the application will terminate.	2013-09-03 01:44:21 -05:00
mckibbenta	e545f49807	Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm	2013-09-02 18:40:37 -04:00
Marc Zinnschlag	9cb121bd04	allow specifying enums as text in filters	2013-09-02 12:23:19 +02:00
Marc Zinnschlag	649ef6f120	moved list of enum literals from ViewManager to Columns (which makes them available to the rest of model now)	2013-09-02 11:58:05 +02:00
Marc Zinnschlag	e03de11fa8	Merge remote-tracking branch 'corristo/master'	2013-09-02 10:57:01 +02:00
Marc Zinnschlag	7076ea9467	Merge remote-tracking branch 'scrawl/map'	2013-09-02 10:55:12 +02:00
Marc Zinnschlag	5f380bc085	Merge remote-tracking branch 'lgro/unittests'	2013-09-02 10:54:51 +02:00
Nikolay Kasyanov	f9cfe654f2	Workaround for https://bugreports.qt-project.org/browse/QTBUG-22154 ... (Qt redefines min OS X version and SDL in turn checks this version and doesn't accept version set by Qt)	2013-09-01 23:17:41 +04:00
scrawl	3ddeb075fb	Fix a cell border seam on the map	2013-08-31 04:36:23 +02:00
Lukasz Gromanowski	2c49458b6c	Added unittests for FileFinder::FileFinderStrict class. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-08-31 00:13:42 +02:00
Lukasz Gromanowski	0e83b50659	Changed test dir for SearchTest. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-08-30 23:24:33 +02:00
Lukasz Gromanowski	2baaef7d87	Added unittests for FileFinder::FileFinder class. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-08-30 23:23:34 +02:00
Lukasz Gromanowski	303e02cab5	Added unittests for FileFinder::find function. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-08-30 22:45:30 +02:00
Lukasz Gromanowski	515a865daa	Changed ASSERT_EQ to ASSERT_TRUE/FALSE. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-08-30 22:44:03 +02:00
Lukasz Gromanowski	da0b90ee45	Converted tests from components/misc into google unittests. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-08-30 21:57:06 +02:00
Chris Robinson	82a09a988b	Minor pathfinding cleanup	2013-08-29 19:17:27 -07:00
Chris Robinson	8f23b330d3	Remove unnecessary initialization	2013-08-29 17:41:20 -07:00
Chris Robinson	9499ac4fd5	Increase the distance for reaching a path node	2013-08-29 17:41:20 -07:00
Chris Robinson	f9dbce685a	Avoid killing AIWander and AITravel when far away ... This fixes the problem of certain NPCs not wandering because they happened to spawn near a cell border away from the player, which immediately "completed" the wander package. AIWander can't cause NPCs to cross cell boundaries, so there's no risk of them walking into an unloaded to. AITravel will now simply stop moving, and resume later when the cell is loaded.	2013-08-29 17:41:20 -07:00
mckibbenta	f65172bdca	Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm	2013-08-29 20:26:36 -04:00
mckibbenta	eef9df504a	fiddlings	2013-08-29 20:25:36 -04:00
scrawl	c8e31725dc	Fix weather sounds persisting on a new game	2013-08-29 15:16:08 +02:00
Marc Zinnschlag	9f0b34eae0	fixed reference loading code (editor)	2013-08-29 13:27:54 +02:00
Marc Zinnschlag	ce90c2f3be	Merge remote-tracking branch 'kcat/master'	2013-08-28 21:05:07 +02:00
Chris Robinson	e589d0ec91	Werewolves can't activate activators	2013-08-28 11:36:22 -07:00
Chris Robinson	84d259ab8e	Avoid reconstructing strings for updating the dynamic stats ... Attributes still do this, but they change infrequently enough that it doesn't matter.	2013-08-28 10:50:29 -07:00
scrawl	5918b84666	Don't crash on resize events during load	2013-08-28 17:05:28 +02:00
Marc Zinnschlag	94e255ea47	Merge branch 'filter'	2013-08-28 12:42:03 +02:00
Chris Robinson	92082dae66	Modify the current magicka and fatigue when the base changes	2013-08-27 22:44:52 -07:00
Chris Robinson	305b5fec0f	Avoid needlessly copying the MagicEffects	2013-08-27 21:40:31 -07:00
Chris Robinson	281fdbd81b	Cleanup some redundancy	2013-08-27 17:56:47 -07:00
Chris Robinson	33c173a23a	Update the watched Ptr when changing it	2013-08-27 17:22:07 -07:00
Chris Robinson	39af9a13fa	Remove some unused functions	2013-08-27 17:13:49 -07:00
Chris Robinson	189541aa72	Apply drowning damage based on the update duration ... 1 damage every 0.33 seconds is 3 damage a second. Applying it this way avoid having to track another stat.	2013-08-27 17:08:23 -07:00
Chris Robinson	f216b25be8	Slightly randomize time between environment sounds ... We should use the "Minimum Time Between Environmental Sounds" and "Maximum Time Between Environmental Sounds" INI/fallback settings, but we don't have them.	2013-08-27 16:04:19 -07:00
Chris Robinson	02df8ab841	Store the underwater sound to easily stop it	2013-08-27 13:48:20 -07:00
Chris Robinson	16331bf1ed	Avoid a hack to play the underwater sound properly	2013-08-27 13:26:57 -07:00
Marc Zinnschlag	26b3d93293	streamlined filter syntax	2013-08-27 18:58:23 +02:00
scrawl	839d251cc5	Renamed Terrain::Terrain to Terrain::World to make VC happy	2013-08-27 16:01:16 +02:00
scrawl	d3d6dfbde8	Refactored loading screen ... - Add loading progress for data files, global map, terrain - Refactored and improved cell loading progress	2013-08-27 15:48:13 +02:00
Marc Zinnschlag	2e9948e86a	improved one-shot filter handling; allow empty pre-defined filters	2013-08-26 14:40:34 +02:00
Marc Zinnschlag	aa935ff03d	update tables on filter record changes	2013-08-26 12:49:13 +02:00
Marc Zinnschlag	20bd0707dc	avoid use of column number literals	2013-08-26 12:25:52 +02:00
Marc Zinnschlag	937f5b11a2	fixed broken record deletion	2013-08-26 12:25:19 +02:00
Marc Zinnschlag	dcc55b60c3	Merge remote-tracking branch 'kcat/misc-cleanup'	2013-08-26 08:51:19 +02:00
mckibbenta	60fa69139e	minor changes	2013-08-25 19:20:14 -04:00
Chris Robinson	f2889e4bb5	Remove unused functions and parameters	2013-08-25 16:08:45 -07:00
Chris Robinson	3843357cd2	Fix actor stepping	2013-08-25 16:08:43 -07:00
Chris Robinson	0463dc0653	Use a smaller static geometry size for interior cells	2013-08-25 16:08:43 -07:00
Chris Robinson	bd6dd071aa	Use the non-accumulation root's parent as the accumulation root ... This relies on the non-accumulation root not being the skeleton root. I haven't found an instance where this isn't the case.	2013-08-25 16:08:42 -07:00
scrawl	3f8a69b4ad	Don't crash when trying to delete a reference that doesn't exist anymore	2013-08-26 00:14:02 +02:00
scrawl	5af89a9e8f	Fix an AABB assert for loading empty exterior cells	2013-08-26 00:13:42 +02:00
scrawl	c6d2d1999a	Fix an item duplication glitch	2013-08-25 17:40:08 +02:00
mckibbenta	06701467ab	Merge branch 'master' into tgm	2013-08-24 21:28:26 -04:00
mckibbenta	8998b90e8b	initial do-nothing implementation; registered opcode	2013-08-24 21:19:12 -04:00
Marc Zinnschlag	d007d4dc9a	allow colons in names (filter)	2013-08-24 19:12:47 +02:00
Marc Zinnschlag	7e02c9acf2	added filter text column to filter table	2013-08-24 18:53:11 +02:00
Marc Zinnschlag	25e6380884	implemented use of predefined filters	2013-08-24 17:40:00 +02:00
Marc Zinnschlag	d1516792ce	made document data available to filter parser	2013-08-24 17:17:22 +02:00
Marc Zinnschlag	7aee1da5c6	fixed some columns	2013-08-24 16:51:49 +02:00
Marc Zinnschlag	51fbb0f3f4	fixed a segfault when opening views for tables that do not allow the creation of new records	2013-08-24 15:33:46 +02:00
Marc Zinnschlag	948cb0ef34	Merge remote-tracking branch 'marcrbouvier/master'	2013-08-24 15:13:07 +02:00
Marc Zinnschlag	f605dcdd24	Merge branch 'filter'	2013-08-24 14:51:05 +02:00
Marc Zinnschlag	78c7de440d	simplified filter nodes even more	2013-08-24 14:49:05 +02:00
Marc Zinnschlag	cf58670c85	removed global filter scope (would have caused sync problems between projects)	2013-08-24 14:46:42 +02:00
Marc Zinnschlag	3cf60da5a7	added numeric value filter node	2013-08-24 14:43:38 +02:00
Chris Robinson	ca24a809fc	Use the position of the actor to determine if they're swimming	2013-08-23 13:44:16 -07:00
Chris Robinson	3fa65f21dd	Use a proper cone shape with a contact test to check for melee hits	2013-08-23 12:27:40 -07:00
Chris Robinson	f5d03a16c1	Rename getFacedObject and getFacedHandle for melee hits	2013-08-23 12:27:39 -07:00
Marc Zinnschlag	537ab38985	fixed type in error message	2013-08-23 14:49:41 +02:00
Marc Zinnschlag	c56007cceb	fixed a record counting bug (was using the wrong model)	2013-08-23 14:11:33 +02:00
Marc Zinnschlag	2823e5693d	Merge remote-tracking branch 'scrawl/hit'	2013-08-22 15:35:17 +02:00
Marc Zinnschlag	63b1df85e7	fixed string parsing	2013-08-22 15:22:39 +02:00
Marc Zinnschlag	f615a9397b	made text node filter case-insensitive	2013-08-22 15:16:22 +02:00
Marc Zinnschlag	de956737fe	added text filter node	2013-08-22 14:50:42 +02:00
Marc Zinnschlag	decd826208	fixed an include guard	2013-08-22 14:00:55 +02:00
Marc Zinnschlag	ba6edc55d4	added not filter node	2013-08-22 13:45:50 +02:00
Marc Zinnschlag	806e9a2888	added and and or filter nodes	2013-08-22 13:14:35 +02:00
scrawl	22d5598082	Fix bad_cast exception when hitting creatures	2013-08-22 12:17:12 +02:00
scrawl	1adce8afb3	Fix ambient light getting set from the cell data for non-interior cells	2013-08-22 10:47:48 +02:00
Marc Zinnschlag	50041fc211	simplified filter system by taking out filter references and user values for now (these are post-1.0 features anyway)	2013-08-22 09:17:57 +02:00
Marc Bouvier	2e8b0cf502	Remove Directory Paths in Qt Classes Includes ... Qt recommends that the path location not be used when including a class. Also, this is how other files include Qt classes in the OpenCS app. This change is for consistency only.	2013-08-21 17:14:29 -05:00
Marc Zinnschlag	e03e2f0817	Merge remote-tracking branch 'scrawl/master'	2013-08-21 19:50:08 +02:00
scrawl	758d989a03	If multiple plugins have land data for the same cell, the last plugin should win	2013-08-21 17:26:11 +02:00
scrawl	ce5ea6d7d2	Use a proper node hierarchy; disconnect the root when entering interior	2013-08-21 17:26:11 +02:00
Chris Robinson	c855ab65cf	Non-colliding objects are considered flying	2013-08-21 07:24:54 -07:00
Chris Robinson	602be9bbe7	Avoid swimming into the air from underwater	2013-08-21 07:24:54 -07:00
Chris Robinson	9f09bb6f6f	Use separate inputs for swimming and flying	2013-08-21 07:24:54 -07:00
Chris Robinson	a546ace94d	Remove an unused method	2013-08-21 07:24:54 -07:00
vorenon	3bf3bd4b8c	Silenced some warnings	2013-08-21 13:53:49 +02:00
Chris Robinson	1a9672e31b	Don't update player physics more than 60 times a second ... Bullet and/or our collision handling code doesn't like timesteps much smaller than that. Ideally we should do physics in 60fps (or even 30fps) steps and use prediction and interpolation to get more, but that's not straight forward and needs a fixed timestep loop to lock physics and logic together.	2013-08-20 11:31:49 -07:00
graffy76	e6fdc7e7fd	...	2013-08-20 12:34:39 -05:00
Marc Zinnschlag	a61215dab1	some general filter parser cleanup	2013-08-20 16:04:06 +02:00
graffy76	6898321676	Reenabling features ... Profile functions enabled New/load file functions partially enabled Layout reorganized	2013-08-20 08:16:56 -05:00
Chris Robinson	0e56b2facb	Merge remote-tracking branch 'zini/master' into physics	2013-08-20 04:42:28 -07:00
Chris Robinson	d9040df9d6	Increase the max number of physics iterations ... Should help with highly tessellated collision meshes with high framerates.	2013-08-20 04:41:52 -07:00
scrawl	ecf7786d11	terrain_num_lights was removed	2013-08-20 12:31:47 +02:00
scrawl	fa76d1631b	Some terrain fixes	2013-08-20 12:08:46 +02:00
scrawl	0545622f5a	Fix werewolf state not getting completely reset when starting a new game	2013-08-20 11:24:19 +02:00
Chris Robinson	a993af53e7	Merge remote-tracking branch 'zini/master' into physics	2013-08-20 02:21:44 -07:00
Chris Robinson	a17997a973	Continually add bits of input velocity to inertia when falling	2013-08-20 02:10:18 -07:00
Marc Zinnschlag	0c8f85f17d	Merge remote-tracking branch 'wheybags/master'	2013-08-20 11:05:50 +02:00
graffy76	24e38846da	Fixed broken profile actions	2013-08-20 03:53:23 -05:00
graffy76	b52645bf2a	Fixes to accommodate master/plugin loading	2013-08-20 03:23:32 -05:00
scrawl	8c8653160d	Crash fix, material fix	2013-08-20 09:52:27 +02:00
Tom Mason	7f0f9037be	fix for older versions of unshield	2013-08-19 22:57:21 +01:00
scrawl	13afcc9324	Don't link to OgreTerrain	2013-08-19 22:22:14 +02:00
Tom Mason	06ff40eda7	only use unshield on not windows	2013-08-19 20:20:08 +01:00
Tom Mason	865a7c63df	cmake for system libunshield	2013-08-19 20:20:00 +01:00
Tom Mason	d3748cd5bb	Install uncompressed data files from cd	2013-08-19 20:19:53 +01:00
Tom Mason	9d1daf7dc2	enum was unnecessary	2013-08-19 20:19:47 +01:00
Tom Mason	641b7b0336	anonymous namespace	2013-08-19 20:19:41 +01:00
Tom Mason	454b64974d	filenames	2013-08-19 20:19:35 +01:00
Tom Mason	3264b5974e	fix invalid syntax	2013-08-19 20:19:25 +01:00
Tom Mason	90a892d304	unshield fixes	2013-08-19 20:19:11 +01:00
Tom Mason	ceb3317807	Integrate unshield with launcher	2013-08-19 20:19:01 +01:00
scrawl	ebf9debb80	Enabled terrain self shadows, implemented getHeightAt, some optimizations	2013-08-19 20:39:37 +02:00
Chris Robinson	d727b15580	Fix tracing down	2013-08-19 20:39:37 +02:00
Chris Robinson	394fc75697	Clean up the trace struct	2013-08-19 20:39:37 +02:00
Chris Robinson	b351109649	Get rid of the old newtrace method	2013-08-19 20:39:37 +02:00
Chris Robinson	14acacf401	Use a better method to do actor physics traces	2013-08-19 20:39:37 +02:00
Chris Robinson	76b812f75f	Improve actor movement collision handling	2013-08-19 20:39:37 +02:00
Chris Robinson	584eec3743	Store the object class in the LiveCellRef	2013-08-19 20:39:37 +02:00
scrawl	e27437f8ed	New terrain renderer - improvements: ... - Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now. - Fixes several blending issues and cell border seams - Fix map render to use the terrain bounding box instead of an arbitrary height - Different LODs are now properly connected instead of using skirts - Support self shadowing - Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better - Support a fixed function fallback (though the splatting shader usually performs better) - Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance	2013-08-19 20:34:20 +02:00
Chris Robinson	cf6e3ab933	Fix a potential divide-by-zero	2013-08-19 09:36:51 -07:00
Chris Robinson	dca599b8c5	Add NPC landing sounds for soundgen keys	2013-08-19 08:58:50 -07:00
Chris Robinson	2ec39f3622	Don't start the jump animation until after the actor is airborn ... A bit counter-intuitive, but otherwise certain jump animations will improperly add an offset to the initial inertia.	2013-08-19 08:24:47 -07:00
Chris Robinson	ac3d3df9fc	Implement jumping animations	2013-08-19 08:10:18 -07:00
Chris Robinson	48e594b7c4	Improve stepping down when starting on the ground	2013-08-19 08:09:23 -07:00
Chris Robinson	3ca4d54bf9	Better handle animations with a 0-length loop	2013-08-19 07:26:42 -07:00
Chris Robinson	1aa92067c2	Fix tracing down	2013-08-19 04:56:02 -07:00
Chris Robinson	6e9f15793d	Implement a jumping state	2013-08-18 23:42:56 -07:00
graffy76	e614ec3353	Fixing profile code in progress...	2013-08-18 17:11:23 -05:00
graffy76	f6217f9c6a	Moved esx selector classes out of global namespace	2013-08-18 15:11:29 -05:00
Marc Zinnschlag	c87a279444	added error reporting in the filter edit widget (change the text colour for now)	2013-08-18 17:54:18 +02:00
Marc Zinnschlag	c7e97a83e1	automatically build column map on filter change	2013-08-18 17:28:04 +02:00
Chris Robinson	7770203dff	Some physics cleanup ... Gets rid of some unneeded/unused variables, and halves the 'on ground' offset.	2013-08-18 08:24:39 -07:00
Marc Zinnschlag	ea8b9ce45b	apply filter to table after filter text change	2013-08-18 16:53:28 +02:00
Marc Zinnschlag	470f890a9a	fixed BooleanNode constructor	2013-08-18 16:52:51 +02:00
graffy76	a14e0b32d8	Restructured esxselector directory ... Added ./view Removed ./utils and ./model/esm Relocated code accordingly.	2013-08-18 09:48:13 -05:00
graffy76	45277c0082	Minor changes ... Stretched table columns to fit widget width Reduced width of opencs file dialog Hid the file size column for launcher Added alternating row colors in table view	2013-08-18 09:34:33 -05:00
Chris Robinson	b0f8045c72	Improve mid-air control	2013-08-18 05:59:06 -07:00
Chris Robinson	8c3564326e	Improve movement inertia ... Handles all 3 axis. Incoming velocity is only added to inertia when leaving the ground, and does not continually add to it.	2013-08-18 05:38:50 -07:00
Marc Zinnschlag	c38860fa72	added parser and custom filter edit widget (parser not functional yet; always returns a false boolean node)	2013-08-18 14:17:18 +02:00
Chris Robinson	9d56e2d86d	Apply movement by queueing it to do later	2013-08-17 22:34:38 -07:00
graffy76	2878f51cd3	Reimplemented dependency selection feature ... Moved more code to ContentSelector Added support for omwgame and omwaddon files	2013-08-17 19:40:28 -05:00
Chris Robinson	96bab88da6	Add physics methods to queue and apply movements	2013-08-17 07:48:45 -07:00
Chris Robinson	0481e64b02	Fix tracing down	2013-08-17 05:09:34 -07:00
Chris Robinson	8bcce0fb55	Clean up the trace struct	2013-08-17 05:09:33 -07:00
Chris Robinson	62c7b3698d	Get rid of the old newtrace method	2013-08-17 05:09:33 -07:00
Chris Robinson	65ce3c6ba5	Use a better method to do actor physics traces	2013-08-17 05:09:32 -07:00
Chris Robinson	d82f54c771	Improve actor movement collision handling	2013-08-17 05:09:30 -07:00
graffy76	b24dd5c6ac	Continued migration of code to ContentSelector	2013-08-17 05:55:43 -05:00
graffy76	61602789e1	Began migrating code to ContentSelector base	2013-08-16 22:23:21 -05:00
graffy76	4c8c6d6971	Moved init code to master / plugin proxy classes	2013-08-16 21:20:48 -05:00
graffy76	7389507eb5	Created masterproxylist class	2013-08-16 21:12:30 -05:00
graffy76	2bc56d0b5c	Fixed missing item list in launcher combobox	2013-08-16 20:59:58 -05:00
graffy76	b850fe0289	Removed vertical headers from plugin view	2013-08-16 18:59:01 -05:00
graffy76	49c4e1bf9e	Removed master table widget	2013-08-16 18:23:02 -05:00
graffy76	84e5c2610a	Implemented combobox for game file selection	2013-08-16 18:00:23 -05:00
graffy76	bfb71f23c9	Changed filter mechanism for game / addons ... Filters by number of master references, regardless of extension	2013-08-16 17:26:23 -05:00
Marc Zinnschlag	236dc9fc43	replaced binary filter node with a n-ary node	2013-08-16 14:18:31 +02:00
Marc Zinnschlag	528e047fd5	repalced std::auto_ptr with boost::shared_ptr in filter nodes	2013-08-16 13:57:54 +02:00
Chris Robinson	21121d5ba5	Store the object class in the LiveCellRef	2013-08-16 04:18:48 -07:00
Chris Robinson	08d1d486a4	Merge remote-tracking branch 'zini/master' into ptr-improvements	2013-08-15 17:42:16 -07:00
Marc Zinnschlag	d122699b2f	and another fix for the same issue :(	2013-08-15 18:29:09 +02:00
Chris Robinson	58481ec7c3	Merge remote-tracking branch 'zini/master' into ptr-improvements	2013-08-15 07:11:38 -07:00
Marc Zinnschlag	7b4d8afde7	fix to previous commit	2013-08-15 15:53:50 +02:00
Chris Robinson	fdbf09ed40	Merge remote-tracking branch 'zini/master' into ptr-improvements ... Conflicts: apps/openmw/mwworld/containerstore.cpp	2013-08-15 05:56:24 -07:00
Marc Zinnschlag	e94fcce622	accessing references via their ID now also works for references in containers in active cells	2013-08-15 14:45:13 +02:00
Chris Robinson	2853b56ed5	Throw an exception when trying to get an empty Ptr's type	2013-08-15 04:52:01 -07:00
Chris Robinson	0f2b2ff1ce	Small header cleanup	2013-08-15 01:21:43 -07:00
Chris Robinson	86f2cd5848	Use dynamic_cast to get the LiveCellRef	2013-08-14 20:26:50 -07:00
Chris Robinson	48c07fbd98	Remove some unnecessary fields from Ptr	2013-08-14 17:05:42 -07:00
Chris Robinson	74f855e948	Move common LiveCellRef fields to the base class	2013-08-14 01:55:51 -07:00
Chris Robinson	11166a1a17	Don't store the type name string in the Ptr ... This should get rid of all heap allocations caused by constructing or copying Ptr objects.	2013-08-14 00:45:28 -07:00
Chris Robinson	b6d2888c48	Avoid using boost::any in MWWorld::Ptr ... Reduces dependency on Boost, and should improve performance a bit when copying or constructing Ptr objects.	2013-08-14 00:45:27 -07:00
Marc Zinnschlag	aee0336780	Merge remote-tracking branch 'kcat/script-functions'	2013-08-14 09:05:40 +02:00
Chris Robinson	73437dfdca	GetEffect can accept an effect ID string as well	2013-08-13 19:18:21 -07:00
Chris Robinson	c1dfa980bf	Combine ShowVarsImplicit and ShowVarsExplicit ... Also removes an unnecessary else statement	2013-08-13 17:31:15 -07:00
Marc Zinnschlag	e2e76147c8	Merge remote-tracking branch 'potatoesmaster/magic'	2013-08-13 15:36:43 +02:00
Chris Robinson	30973352e8	Implement ShowVars (SV) console function	2013-08-13 04:54:41 -07:00
Chris Robinson	2353ac1739	Properly implement SetWerewolfAcrobatics	2013-08-13 04:54:41 -07:00
Emanuel Guevel	ad3646cb15	Fix spell icons displayed when effect ended	2013-08-13 04:57:45 +02:00
Emanuel Guevel	a47c76001c	Apply trap magic effects	2013-08-13 04:56:15 +02:00
Emanuel Guevel	37ea0f3fb9	Display refusal message when weapon/magic icons are clicked as werewolf	2013-08-12 15:36:16 +02:00
Emanuel Guevel	997f37700d	Display HUD icons for hidden windows	2013-08-12 15:06:09 +02:00
Emanuel Guevel	c27c33f542	Fix pinned windows hiding ... They were always displayed in console mode and in game (even if they were force hidden).	2013-08-12 15:04:41 +02:00
Marc Zinnschlag	789a66eaa7	added filter box and basic record filter UI (not functional yet; only supporting on-the-fly filters for now)	2013-08-11 20:39:21 +02:00
Chris Robinson	6fd4cdb5fb	Play randomized werewolf sounds	2013-08-11 00:53:17 -07:00
Chris Robinson	00d6690b4d	Ignore encumbrance in werewolf form ... According to UESP, inventory weight is ignored. Not sure if this includes feather and burden effects.	2013-08-10 20:25:18 -07:00
Chris Robinson	180f0d0fe9	Restart from the loop point if replaying the same animation	2013-08-09 21:25:28 -07:00
Chris Robinson	5968165de0	Merge remote-tracking branch 'zini/master' into werewolf ... Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp	2013-08-09 07:00:00 -07:00
Chris Robinson	a28c36de17	Don't count as running if not actually moving along (local) X/Y	2013-08-09 06:53:07 -07:00
Chris Robinson	c2d8eb377f	Play some appropriate sounds in werewolf form	2013-08-09 06:40:16 -07:00
Marc Zinnschlag	f5b06d5d52	basic filter tree structure	2013-08-09 14:49:05 +02:00
Chris Robinson	db1036e5e5	Handle SetWerewolfAcrobatics	2013-08-09 05:37:56 -07:00
Chris Robinson	ae183cb3e4	Handle werewolf stats	2013-08-09 05:14:58 -07:00
Marc Zinnschlag	a95715b61d	added description field to filter record	2013-08-09 13:45:50 +02:00
Chris Robinson	72a399054f	Don't assume only players activate doors	2013-08-09 01:35:29 -07:00
Chris Robinson	46bc7bd9c8	Some cleanup since NpcStats is now also CreatureStats ... This isn't a thorough cleaning, so keep an eye out for more	2013-08-09 01:14:08 -07:00
Marc Zinnschlag	fb0b57efaa	Merge remote-tracking branch 'vorenon/bug876'	2013-08-09 09:38:10 +02:00
Chris Robinson	75b6515915	Inherit NpcStats from CreatureStats	2013-08-08 23:28:02 -07:00
Chris Robinson	89c7f5bc70	Handle object activation as a werewolf	2013-08-08 22:34:53 -07:00
Chris Robinson	6110a0ee3b	Don't allow resting as a werewolf	2013-08-08 18:30:47 -07:00
Chris Robinson	75131e6a48	Rebuild the actor after switching between werewolf forms	2013-08-08 17:16:24 -07:00
Chris Robinson	5fbfce6d1e	Don't show WerewolfRobe objects in the inventory ... Pretty ugly hard-coding, but this is likely what vanilla does since it has no option to mark clothes or armor as unplayable like Oblivion does.	2013-08-08 16:05:26 -07:00
Chris Robinson	d77d60cbc2	Remove an unneeded forceUpdate method	2013-08-08 15:37:08 -07:00
vorenon	a718a62ef5	Fix for bug 876	2013-08-09 00:06:34 +02:00
PLkolek	86020ad94d	Added underwater and drowning sounds.	2013-08-08 20:57:15 +02:00
Marc Zinnschlag	f6226e4859	added Creator class for filters	2013-08-08 15:55:23 +02:00
Chris Robinson	e3d5a1b38d	Dialog function 72 is not player-specific ... It's used to force any NPC in werewolf form to play the appropriate growls for combat.	2013-08-08 06:02:16 -07:00
Chris Robinson	960ea3d96c	Add/remove a WerewolfRobe when werewolf form is toggled	2013-08-08 04:40:31 -07:00
Chris Robinson	3cff7b1e42	Don't assume icons have a period in their filename	2013-08-08 04:40:31 -07:00
Chris Robinson	1f6055d54b	Don't try to apply body skins for werewolves ... They instead use a hidden WerewolfRobe object for their body	2013-08-08 04:40:31 -07:00
Chris Robinson	946ca7f931	Return the appropriate name for werewolf NPCs	2013-08-08 04:40:31 -07:00
Chris Robinson	dfdd2dc308	Handle swimleft and swimright soundgen keys	2013-08-08 04:40:31 -07:00
Chris Robinson	109df46590	Fix werewolf claw damage multiplier	2013-08-08 04:40:31 -07:00
Chris Robinson	9694b18d1b	Update part skeletons immediately when added	2013-08-08 04:40:30 -07:00
Chris Robinson	f73578a832	Remove unnecessary mBodyPrefix field	2013-08-08 04:40:30 -07:00
Chris Robinson	5051544144	Remove some duplicate code	2013-08-08 04:40:30 -07:00
Chris Robinson	ceed2e30b8	Handle NPCs being a werewolf in NpcAnimation ... Note that the body mesh comes from having a WerewolfRobe force-equipped.	2013-08-08 04:40:30 -07:00
Chris Robinson	5ac82a50b7	Remove unused function	2013-08-08 04:40:30 -07:00
Marc Zinnschlag	e9521dc8f1	Merge remote-tracking branch 'potatoesmaster/pinning'	2013-08-08 13:06:58 +02:00
Marc Zinnschlag	bf839d19cf	Merge branch 'columns'	2013-08-08 12:50:57 +02:00
Marc Zinnschlag	0944338c27	avoid the use of hardcoded column numbers	2013-08-08 12:49:30 +02:00
Emanuel Guevel	1cbfcc3910	Fix HUD weapon icon when turning from werewolf to normal ... The werewolf hand icon remained until the inventory menu was opened.	2013-08-08 10:56:44 +02:00
Chris Robinson	2bac4566c0	Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf ... Conflicts: apps/openmw/mwmechanics/actors.cpp apps/openmw/mwscript/statsextensions.cpp	2013-08-08 00:09:29 -07:00
Chris Robinson	4985e17865	Fix werewolf claw damage multiplier	2013-08-07 19:15:36 -07:00
Chris Robinson	4641737fc4	Update part skeletons immediately when added	2013-08-07 19:15:36 -07:00
Chris Robinson	dc0360b1f6	Remove unnecessary mBodyPrefix field	2013-08-07 19:15:36 -07:00
Chris Robinson	0f52ed9a9b	Remove some duplicate code	2013-08-07 19:15:36 -07:00
Chris Robinson	deee14ccfd	Handle NPCs being a werewolf in NpcAnimation ... Note that the body mesh comes from having a WerewolfRobe force-equipped.	2013-08-07 19:15:36 -07:00
Chris Robinson	ab44cd63a1	Remove unused function	2013-08-07 19:15:35 -07:00
Emanuel Guevel	b2e5e8dd0d	Saner inventory window pinning/hiding ... Hide inventory window pin button in container, companion and barter mode. Restore the pinned inventory window position when exiting these modes. Allow toggling windows visibility in inventory mode only.	2013-08-07 23:30:08 +02:00
Alex	b9579e085f	cleanup	2013-08-07 15:40:57 -04:00
Alex	a0931b01fe	Merge branch 'master' of https://github.com/zinnschlag/openmw into compiler-reorg	2013-08-07 13:19:23 -04:00
Alex	c3ca5b7c32	mild cleanup	2013-08-07 13:16:20 -04:00
PLkolek	8f4506f5b6	Implemented drowning. ... Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one), the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red.	2013-08-07 16:46:46 +02:00
Emanuel Guevel	48d2554ac3	Auto-equip when items are added to the inventory ... We limit that to armor pieces and clothing items. No auto-equiping for the player nor werewolves.	2013-08-07 15:17:55 +02:00
Emanuel Guevel	e0d0cdd18a	Do not auto-equip items continuously ... This was called every couple of frames.	2013-08-07 14:30:13 +02:00
Chris Robinson	076e7d8e16	Make insertBegin internal	2013-08-07 03:56:07 -07:00
Chris Robinson	2b2101958d	Destroy the scene node we create	2013-08-07 03:56:07 -07:00
Chris Robinson	0458fd5531	Remove unused/unneeded parameters	2013-08-07 03:56:06 -07:00
Emanuel Guevel	fd0a159a64	MWScript: update first unused opcode number	2013-08-07 12:05:53 +02:00
Emanuel Guevel	47b8a31317	Fixes suggested by KittyCat	2013-08-07 12:05:53 +02:00
Marc Zinnschlag	932fffd1a7	Merge remote-tracking branch 'kcat/light-objects'	2013-08-07 11:21:01 +02:00
Chris Robinson	b4b095ca72	Don't try to get the center of a null bounding box	2013-08-07 01:32:36 -07:00
Chris Robinson	80d271aeb1	Remove unused stuff	2013-08-07 01:31:01 -07:00
Marc Zinnschlag	76b9d3dbc1	columns are now identified via an enum instead the name string	2013-08-07 09:36:05 +02:00
Chris Robinson	3555476dfd	Use Animation-derived objects for generic objects	2013-08-06 19:49:07 -07:00
Chris Robinson	a9dca21d05	Create the Animation SceneNode in the constructor	2013-08-06 19:49:05 -07:00
Chris Robinson	48784c7e2f	Use for_each and functors to avoid some for loops	2013-08-06 19:49:05 -07:00
Chris Robinson	de95926e9f	Use controllers to animate lights in ObjectLists	2013-08-06 19:49:04 -07:00
Chris Robinson	8984d8f8ee	Use a map to simplify NPC part referencing	2013-08-06 19:49:02 -07:00
Chris Robinson	e976bb16c5	Add a light for torches	2013-08-06 19:49:02 -07:00
Chris Robinson	57fb065a86	Add Ogre::Light objects to the object list ... Note that NIFs actually have NiLight-based light records which could be used to create Ogre::Light objects. However, no Morrowind NIF uses them, as far as I can tell.	2013-08-06 19:49:01 -07:00
Chris Robinson	a9cc3a2844	Ensure a valid CellStore for Ptr::isInCell	2013-08-06 19:49:01 -07:00
Chris Robinson	1f436f9886	Render torches	2013-08-06 19:49:01 -07:00
Chris Robinson	8f69c51b24	Avoid some unnecessary references	2013-08-06 19:49:00 -07:00
Chris Robinson	2c03fec4bb	Use the fatigue term for jumping	2013-08-06 19:49:00 -07:00
Chris Robinson	eab4e09566	Handle the pick/probe in the character controller	2013-08-06 19:48:59 -07:00
scrawl	3f7daa4884	Forgot to change initTerrainTextures	2013-08-07 02:58:03 +02:00
Alex	de1f423bd7	initial move of script opcodes and registerExtensions functions to components/compiler	2013-08-06 20:38:41 -04:00
scrawl	76e538c22a	Unused variable fix	2013-08-07 02:03:23 +02:00
scrawl	726c93c365	Terrain fixes to match vanilla better - vertices need to be mapped directly to texels for colormap and blendmap (this also caused seams at cell borders), layer uv scale appears to be 8 not 10	2013-08-07 01:34:17 +02:00
Marc Zinnschlag	03af7175dd	Merge remote-tracking branch 'potatoesmaster/bug-839'	2013-08-06 17:39:29 +02:00
Emanuel Guevel	c59ad62c57	Fix UndoWerewolf script instruction	2013-08-06 14:30:01 +02:00
Emanuel Guevel	5188a1c2cd	Implement script instructions Become/UndoWerewolf	2013-08-06 12:34:35 +02:00
Emanuel Guevel	20d40c4368	Implement MWWorld::World::setWerewolf()	2013-08-06 12:34:35 +02:00
Emanuel Guevel	aa563e947e	Implement MWWorld::InventoryStore::unequipAll()	2013-08-06 12:34:35 +02:00
Emanuel Guevel	ddc92d1fbd	Set appropriate weapon icon when player is a werewolf	2013-08-06 12:34:35 +02:00
Emanuel Guevel	d054366460	Permit to force hiding GUI windows	2013-08-06 12:34:35 +02:00
scrawl	4caac0d859	Fix idle animations repeating	2013-08-05 02:06:23 +02:00
vorenon	76a1abe9fa	Don't allow the use of the "jump" key while sneaking - Update	2013-08-04 20:10:33 +02:00
vorenon	56cb36caf1	Don't allow the use of the "jump" key while sneaking	2013-08-04 19:45:41 +02:00
Emanuel Guevel	71da2f0a12	Do not allow magic/combat stance unless magic/inventory window are accessible	2013-08-04 00:21:27 +02:00
Marc Zinnschlag	41b2fa985b	silenced some warnings	2013-08-03 15:26:53 +02:00
Marc Zinnschlag	9123afa863	Merge remote-tracking branch 'gus/MeleeCombat2'	2013-08-03 15:23:36 +02:00
Marc Zinnschlag	3170490a8e	silenced some warnings	2013-08-03 15:21:11 +02:00
Marc Zinnschlag	253e00e3a0	Merge remote-tracking branch 'gus/MeleeCombat2' into columns	2013-08-03 15:18:39 +02:00
Marc Zinnschlag	501753c01b	Merge remote-tracking branch 'scrawl/master' into columns	2013-08-03 15:06:30 +02:00
gus	a23e7fac93	clean up	2013-08-03 13:58:16 +02:00
scrawl	982f743ddd	Fix wrong idle animations played	2013-08-03 13:13:33 +02:00
gus	c8bb32c40d	small maths correction	2013-08-03 12:29:18 +02:00
gus	a25ee360dc	use angles and GMST. not sure this work as it should	2013-08-03 12:16:51 +02:00
Marc Zinnschlag	8f330e7e3c	Merge remote-tracking branch 'potatoesmaster/sneak'	2013-08-03 11:49:20 +02:00
gus	830762722d	first attempt: hit detection with a sphere (not finished)	2013-08-03 11:26:36 +02:00
Emanuel Guevel	a9483dbdf1	Show sneak indicator when sneaking ... Temporary solution, as the indicator should be shown only when the player is not detected by any other actor.	2013-08-03 03:03:29 +02:00
Emanuel Guevel	8f8362d2c4	Expose sneak indicator widget through WindowManager	2013-08-03 03:03:29 +02:00
Emanuel Guevel	9757694060	Update sneaking indicator position with other widgets	2013-08-03 02:43:56 +02:00
Emanuel Guevel	4685aea2a1	mwiniimport: ignore empty values	2013-08-03 00:21:05 +02:00
vorenon	aa45127895	Adjusted swish sounds ... Sorry Chris, I was wrong. The game actually uses SwishM for every attack, but at a different pitch depending on the force of the attack. I realized it after testing your changes.	2013-08-02 16:33:39 +02:00
Marc Zinnschlag	d2f96deb98	renamed columns.hpp to columimp.hpp	2013-08-02 10:42:52 +02:00
Chris Robinson	f57c829cba	Play the appropriate swish sound and follow-up animation	2013-08-02 00:21:02 -07:00
Chris Robinson	b70975a74d	Move getEvasion to CreatureStats	2013-08-02 00:21:01 -07:00
Chris Robinson	9e7d670745	Inline Class::get(const Ptr& ptr)	2013-08-02 00:20:59 -07:00
Marc Zinnschlag	ca94d1a2fb	Merge remote-tracking branch 'swick/inventorypos' ... Conflicts: apps/openmw/mwgui/inventorywindow.cpp	2013-07-31 22:16:56 +02:00
Marc Zinnschlag	24273f338b	Merge remote-tracking branch 'scrawl/master'	2013-07-31 22:12:07 +02:00
Sebastian Wick	7ed763262f	GUI mode dependent position	2013-07-31 21:40:29 +02:00
scrawl	fe51a00112	Fix the initial player inventory being added twice when starting a new game	2013-07-31 21:00:58 +02:00
scrawl	f1f6336a4a	Fixed screenshot keybinding, and make it bindable	2013-07-31 20:24:44 +02:00
Marc Zinnschlag	5cafe65cd7	Merge remote-tracking branch 'scrawl/cppcheck'	2013-07-31 20:00:35 +02:00
scrawl	d106ed3b08	Fixed alchemy	2013-07-31 19:03:51 +02:00
Marc Zinnschlag	4dfd5282ab	Merge remote-tracking branch 'kolek/enchantingwindow'	2013-07-31 19:01:49 +02:00
Marc Zinnschlag	25917b00ec	Merge remote-tracking branch 'scrawl/master'	2013-07-31 19:00:24 +02:00
scrawl	7dc30a01cd	Some changes suggested by cppcheck	2013-07-31 18:46:32 +02:00
scrawl	43e0df479e	Make NPCs auto-equip after their inventory is loaded, this fixes NPCs that start as dead not auto-equipping	2013-07-31 16:30:22 +02:00
PLkolek	f297c21e4d	Old door sound fades out on door open/close. Door sound is synchronised to angle on action.	2013-07-31 15:46:23 +02:00
PLkolek	8bc8c38f2d	Spell cost is updatedon every change in enchanting and spellmaking.	2013-07-31 13:33:30 +02:00
PLkolek	7fd7621458	Fixed area slider in self enchantments.	2013-07-31 12:26:34 +02:00
Marc Zinnschlag	6ce2b962e1	Merge remote-tracking branch 'scrawl/inventory'	2013-07-31 09:15:22 +02:00
Marc Zinnschlag	eedced729f	Merge remote-tracking branch 'scrawl/master'	2013-07-31 09:14:12 +02:00
Marc Zinnschlag	7639506e49	Merge remote-tracking branch 'scrawl/ai'	2013-07-31 09:07:46 +02:00
scrawl	16cacb338a	Initialize MWMechanics::AiSequence from ESM::AiPackageList	2013-07-31 00:55:08 +02:00
scrawl	45006ea193	Fix inventory/container content loading so that it's done for dynamically spawned objects as well	2013-07-31 00:02:24 +02:00
scrawl	90a5d8b6f5	Fix uninitialized AL listener position/orientation when the game is paused during the first frame	2013-07-30 23:24:18 +02:00
Marc Zinnschlag	958b0c4915	Merge remote-tracking branch 'scrawl/untilhealed'	2013-07-30 22:41:05 +02:00
scrawl	da01ec4f52	Only show the "Rest until healed" button when stats are not full	2013-07-30 22:07:27 +02:00
scrawl	04b90b7d14	Other actors no longer collide with an actor that has collision disabled	2013-07-30 22:00:48 +02:00
scrawl	472a381263	Fix health meter (again)	2013-07-30 16:09:12 +02:00
Marc Zinnschlag	adb05737ee	Merge branch 'master' into filter ... Conflicts: apps/opencs/model/world/universalid.cpp apps/opencs/view/doc/view.cpp apps/opencs/view/world/subviews.cpp	2013-07-30 15:55:50 +02:00
Marc Zinnschlag	2e667f1d94	Merge branch 'bottombar'	2013-07-30 12:55:12 +02:00
Marc Zinnschlag	434f97c95c	fixed two missing icons	2013-07-30 12:55:02 +02:00
Marc Zinnschlag	102700a498	added specialised Creator for references	2013-07-30 12:53:03 +02:00
Marc Zinnschlag	57be764cce	added specialised Creator for referenceable records	2013-07-30 12:34:18 +02:00
Marc Zinnschlag	3642562959	Merge remote-tracking branch 'scrawl/master'	2013-07-30 08:11:40 +02:00
scrawl	426e3ec6c6	Fix enemy health meter for creatures	2013-07-30 06:17:21 +02:00
scrawl	3961c276b8	Added enemy health meter	2013-07-30 06:00:20 +02:00
Marc Zinnschlag	e27ba55541	Merge remote-tracking branch 'swick/countdialog'	2013-07-29 21:38:04 +02:00
Sebastian Wick	40d3efc671	use cancel methid	2013-07-29 18:35:23 +02:00
Sebastian Wick	7b40e57ba1	Allow the 'Activate' key to close the countdialog window; cleanups	2013-07-29 18:27:00 +02:00
Marc Zinnschlag	90ab7b2bf5	Merge remote-tracking branch 'swick/viewmodetransission'	2013-07-29 17:08:49 +02:00
Sebastian Wick	7c24c0a64e	fix uninitialized variables	2013-07-29 16:45:35 +02:00
Sebastian Wick	d2b7cb5bb2	First/Third person transitions with mouse wheel	2013-07-29 16:43:16 +02:00
Marc Zinnschlag	34c825ce52	added icons and type listing to UniversalId class	2013-07-29 16:21:42 +02:00
Marc Zinnschlag	661b290c49	automatically scroll table to the position of a newly created record	2013-07-29 15:00:41 +02:00
Sebastian Wick	1b310c5c5b	use SDL resolutions in the ingame settings	2013-07-29 13:34:56 +02:00
Marc Zinnschlag	3fa4a194a7	Merge remote-tracking branch 'scrawl/master'	2013-07-29 09:59:23 +02:00
scrawl	6164e5bae6	Restored window resizing	2013-07-29 02:32:08 +02:00
Chris Robinson	3744850545	Fix hand-to-hand health damage reduction	2013-07-28 16:07:09 -07:00
Chris Robinson	39507e3f0f	Decrease armor condition on successful hits	2013-07-28 15:51:17 -07:00
Chris Robinson	1af48ab6e0	Decrease weapon condition on successful hits	2013-07-28 15:17:01 -07:00
Chris Robinson	465f4d2063	Properly handle starting an animation at the end	2013-07-28 09:56:03 -07:00
Marc Zinnschlag	82958e6514	added custom creator for cell records	2013-07-28 18:08:57 +02:00
Chris Robinson	54f91d4b3a	Implement hand-to-hand attacks	2013-07-28 06:48:25 -07:00
Marc Zinnschlag	899e18b2cf	report ID errors also via input field tool tips	2013-07-28 15:28:35 +02:00
Marc Zinnschlag	5ec9d370cb	check if ID is already in use when creating new IDs	2013-07-28 15:27:15 +02:00
Marc Zinnschlag	124a70906f	added creator edit lock	2013-07-28 14:51:47 +02:00
Marc Zinnschlag	32c697abc6	validate IDs entered by the user	2013-07-28 14:40:11 +02:00
Marc Zinnschlag	4f6e99c391	more compact layout for the bottom box	2013-07-28 14:00:26 +02:00
Marc Zinnschlag	00fcb79f08	moved record creation to GenericCreator class (now taking ID from user instead of using a procedurally generated one)	2013-07-28 13:43:16 +02:00
Marc Zinnschlag	2d46a1db2f	changed CreateCommand to work directly on the model instead of the proxy	2013-07-28 13:39:33 +02:00
Chris Robinson	a34f0de3e1	Play the correct medium armor foot sounds	2013-07-28 04:17:36 -07:00
Chris Robinson	db4f34b332	Play hit sounds when hitting creatures and NPCs	2013-07-27 11:20:39 -07:00
Chris Robinson	1a40d01afa	Fix NPC armor rating calculation and reduce redundant lookups	2013-07-27 09:31:16 -07:00
Chris Robinson	f73008546f	Keep a sound updated with its object's position	2013-07-27 07:24:18 -07:00
Chris Robinson	c94653dc49	Implement the ModRegion script function	2013-07-27 07:10:18 -07:00
Marc Zinnschlag	f93af52486	handling down a reference to Data and the undo stack to the creators	2013-07-27 13:28:12 +02:00
Chris Robinson	1174b85ac8	Implement Disable/EnableTeleporting script functions	2013-07-27 00:14:55 -07:00
Marc Zinnschlag	fee748d4b5	added creator bar UI and cancel button	2013-07-26 21:09:23 +02:00
Chris Robinson	3298eb1b37	Implement HitOnMe script function	2013-07-26 10:50:23 -07:00
Chris Robinson	5379e607cb	Handle the OnPCHitMe script variable	2013-07-26 10:50:23 -07:00
Chris Robinson	f215d2cc30	Only raise weapon skills for the player	2013-07-26 10:50:23 -07:00
Chris Robinson	bec420c69b	Add Class::onHit for creatures	2013-07-26 10:50:23 -07:00
Chris Robinson	dd6edd21f8	Add a separate on-hit method to handle objects being hit	2013-07-26 10:50:23 -07:00
Marc Zinnschlag	b8ac45defe	added creator to bottom box layout and re-routed add record event to bottom box	2013-07-26 18:22:31 +02:00
Marc Zinnschlag	d899cbb449	removed some junk	2013-07-26 18:14:34 +02:00
Marc Zinnschlag	ed83e2e70a	added creator to bottom box; more cleanup	2013-07-26 12:51:45 +02:00
Marc Zinnschlag	6c4bdc0101	minor cleanup; less pointer usage	2013-07-26 12:42:15 +02:00
Marc Zinnschlag	ba5ca5beed	replaced createAndDelete flag with a new class hierarhy (Creator)	2013-07-26 12:35:17 +02:00
Emanuel Guevel	aa14656ff2	esmtool: fix swapped comparison operators	2013-07-26 10:24:15 +02:00
Marc Zinnschlag	3fbbbdc64b	Merge remote-tracking branch 'scrawl/master'	2013-07-26 08:06:53 +02:00
Chris Robinson	a569ae367e	Fix hit chance calculation	2013-07-25 13:09:26 -07:00
Chris Robinson	6195062d72	Try to figure out what gets hit ... This isn't the greatest. The distance multiplier is a guess, and a sphere cast may be better.	2013-07-25 12:58:43 -07:00
Chris Robinson	b3a057d679	Handle hit chance and damage calculation ... Math is based on what the UESP describes, with some tweaks (using fatigue term, and the fCombatCriticalStrikeMult GMST): http://www.uesp.net/wiki/Morrowind:Combat	2013-07-25 08:15:42 -07:00
Marc Zinnschlag	4327b81bc3	fixed column handling in table (had problems with filtered out columns before)	2013-07-25 14:38:53 +02:00
Marc Zinnschlag	55e7e71c11	added optional per-subview status bar	2013-07-25 14:29:56 +02:00
Chris Robinson	1dcc893703	Merge remote-tracking branch 'zini/master' into combat	2013-07-25 01:16:49 -07:00
Chris Robinson	4ad28ed369	Don't play a weapon-down sound when unreadying a spell	2013-07-25 00:46:20 -07:00
Chris Robinson	92cc566fdc	Rename the Class::attack method to Class::hit	2013-07-25 00:30:01 -07:00
Chris Robinson	0db02af807	Set up the weapon state in the CharacterController constructor	2013-07-24 21:08:16 -07:00
Chris Robinson	d9a9c3d6bd	Handle the "land" soundgen type	2013-07-24 10:36:04 -07:00
Chris Robinson	705498ec24	Play a swish sound when attacking	2013-07-24 10:34:53 -07:00
Chris Robinson	d8ec813939	Say something from the "hit" dialog topic when losing health	2013-07-24 10:02:50 -07:00
Chris Robinson	59f1bc7542	Use time values for the aniamtion's start, stop, and loop points ... This seems to be closer to the expected behavior. This more cleanly handles 0- length animations, especially where the start marker comes after the stop marker while still being on the same time key.	2013-07-24 08:38:36 -07:00
Chris Robinson	bf1d907d07	Don't play casting animations for enchantments	2013-07-24 05:39:15 -07:00
Chris Robinson	cc8e8c1272	Use the attack strength as determined by how long the attack was held	2013-07-24 03:18:53 -07:00
Chris Robinson	0c8d4d9be2	Add beginnings of melee hits	2013-07-24 02:51:42 -07:00
Chris Robinson	45302f9e25	Handle controllers in the NPC's bound object parts	2013-07-23 22:05:03 -07:00
Marc Zinnschlag	a80e80dd94	added layout to table sub view	2013-07-23 21:59:02 +02:00
Chris Robinson	11b094559f	Play the appropriate casting animation sound	2013-07-23 11:12:19 -07:00
Emanuel Guevel	70a5a83419	Change the formula used to calculate initial NPC health	2013-07-23 16:48:54 +02:00
Chris Robinson	17282c69b1	Handle spell-casting animation sequences	2013-07-23 07:30:54 -07:00
Chris Robinson	4d157cb19a	Handle marksmen weapon attack sequences	2013-07-23 06:13:08 -07:00
Chris Robinson	fecb8c1cc4	Fix the completion amount for 0-length anims	2013-07-23 05:30:37 -07:00
Chris Robinson	d5d832846e	Rename the follow-up upper character state enum	2013-07-23 04:56:49 -07:00
Chris Robinson	537d5c4934	Avoid trying to play animations without any animation sources	2013-07-23 04:36:25 -07:00
Chris Robinson	ad6d663e09	Remove some unnecessary debug messages	2013-07-23 03:44:52 -07:00
Chris Robinson	24567294ff	Move NPC state update handling into a separate method	2013-07-23 03:26:24 -07:00
Chris Robinson	22e07968af	Store the current weapon group name	2013-07-23 02:50:52 -07:00
Chris Robinson	0240efa6cf	Improve weapon attack logic to better handle picks, probes, and h2h	2013-07-23 02:28:58 -07:00
Chris Robinson	ef17fdeb15	Remove some unused methods	2013-07-23 01:37:41 -07:00
Marc Zinnschlag	ec575200e3	Merge remote-tracking branch 'gus/MeleeCombat2' ... Conflicts: apps/openmw/mwrender/animation.cpp	2013-07-23 09:12:23 +02:00
Marc Zinnschlag	7600d6c04b	basic filter table	2013-07-22 21:18:47 +02:00
Marc Zinnschlag	66534a45da	replaced double click in table with a context menu item (edit) because double click was interfering with basic table functionality	2013-07-21 17:53:39 +02:00
Emanuel Guevel	48f0e64ec3	Fix health calculation at character creation	2013-07-21 11:02:03 +02:00
Emanuel Guevel	1c330fc899	Use the correct formula for NPC health initialization	2013-07-21 10:13:46 +02:00
Emanuel Guevel	2356e6218e	Complete health increase on level up	2013-07-20 22:14:10 +02:00
Emanuel Guevel	2a0644a7c3	Move some levelup logic from mwgui to mwmechanics	2013-07-20 22:14:10 +02:00
Emanuel Guevel	7837dcdc19	Calculate NPC health on loading instead of updating it continually ... Only NPC with auto-calculated stats are concerned.	2013-07-20 22:14:10 +02:00
Emanuel Guevel	074e241c32	MWMechanics::DynamicStat: fix members initialization	2013-07-20 22:14:09 +02:00
Marc Zinnschlag	a8168c58c2	Merge remote-tracking branch 'kolek/thirdpersonzoom'	2013-07-20 18:29:59 +02:00
Kolzi	d12bac2d9e	Third person zoom - fixed code review issues.	2013-07-20 16:55:35 +02:00
Marc Zinnschlag	0fad2e7f40	restructured main menu	2013-07-20 13:46:56 +02:00
Marc Zinnschlag	2497c18702	replaced settings change notifications for columns with a more robust implementation	2013-07-20 13:19:27 +02:00
Kolzi	1b7966ca27	Can zoom in and out in third person view.	2013-07-19 16:12:01 +02:00
Chris Robinson	0cb7d186e7	Use Play_TypeFoot for 'left' and 'right' soundgen keys	2013-07-18 21:50:11 -07:00
Chris Robinson	14e0c182f3	Allow specifying the sound type to playSound and playSound3D	2013-07-18 21:50:11 -07:00
Chris Robinson	ac4dfd3b39	Play the appropriate foot sound based on footwear	2013-07-18 21:50:11 -07:00
scrawl	bf332b633e	Make VideoPlayer::playVideo block until the video finishes	2013-07-18 14:14:10 +02:00
Marc Zinnschlag	365ea11e86	Merge remote-tracking branch 'graffy76/RefIdTypeDelegate'	2013-07-18 13:51:24 +02:00
Marc Zinnschlag	fdd47e5b73	silenced a warning	2013-07-18 13:50:12 +02:00
graffy76	0ae254f6a8	Fixed segfault opening tables	2013-07-18 06:31:47 -05:00
Chris Robinson	9c13568bb7	Remove idles from the state list and rename it	2013-07-18 01:49:53 -07:00
Chris Robinson	e803cdbe7f	Handle swimdeath and missing death animations	2013-07-18 01:13:53 -07:00
Chris Robinson	f01b0b48cc	Don't start with an idle state if dead	2013-07-18 00:35:03 -07:00
Chris Robinson	e78bdd2a5d	Clear 'swim' from the animation name as a backup instead of 'sneak'	2013-07-18 00:22:40 -07:00
Chris Robinson	9ea6b22a83	Handle soundgen animation keys	2013-07-17 23:58:21 -07:00
Chris Robinson	d6324d71bf	Ensure mechanics actors/objects are cleared before adding them	2013-07-17 21:39:21 -07:00
Chris Robinson	c7692acb79	Update the player's Ptr in mwrender when changing cells	2013-07-17 19:11:03 -07:00
graffy76	6486f342b5	Fixed setting synchronization issue ... Moved default settings to CSMSettings::UserSettings. Other minor code changes / cleanup	2013-07-17 20:19:01 -05:00
Marc Zinnschlag	1b4cd787a5	Merge remote-tracking branch 'kcat/animation-state'	2013-07-17 11:33:04 +02:00
Chris Robinson	0cd4df3edf	Stop playing idles on death	2013-07-17 02:19:22 -07:00
Chris Robinson	e2e278d06d	Fix some animations not playing properly ... Default movement animation speed multiplier should be 1, not 0. Only randomize death1...death5 for NPCs.	2013-07-17 02:06:31 -07:00
scrawl	dfe912dcab	Enum renaming	2013-07-16 23:38:55 +02:00
scrawl	91e95e1404	Use the correct slash, chop or thrust animation	2013-07-16 23:32:41 +02:00
gugus	9043fe427f	Merge pull request #4 from scrawl/melee ... Fixes weapon input to use A_Use instead of hardcoding to mouse button	2013-07-16 07:35:21 -07:00
scrawl	9536b5050b	Fixes weapon input to use A_Use instead of hardcoding to mouse button	2013-07-16 16:25:41 +02:00
gus	66e3eacace	fix bows	2013-07-16 15:14:34 +01:00
gus	701ff94887	bugfix for lockpick	2013-07-16 14:46:44 +01:00
gus	20341ae8b7	simplification + taking into account weapon speed. Seems too fast, but i'm not sure	2013-07-16 14:10:14 +01:00
gus	8fc6e73649	post-merge fix	2013-07-16 11:51:18 +01:00
gus	ee47e99dad	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into MeleeCombat2 ... Conflicts: apps/openmw/mwmechanics/character.cpp apps/openmw/mwmechanics/character.hpp	2013-07-16 11:40:19 +01:00
Marc Zinnschlag	47f7bbd48a	fixed OpenCS crash during cell loading when loading multiple ESX files	2013-07-16 12:08:35 +02:00
gus	f6e3445414	Jittering gone + bugfix: chop animation works! ... TODO: fix this unequip stuff	2013-07-16 09:50:59 +01:00
Chris Robinson	e5e9c83ed5	Merge remote-tracking branch 'zini/master' into animation-state	2013-07-16 01:33:46 -07:00
Chris Robinson	a932a89e02	Specify the velocity-based animation speed multiplier when playing it	2013-07-16 01:30:03 -07:00
Chris Robinson	f296d13c20	Add a speed multiplier to the animation state	2013-07-16 00:43:31 -07:00
Chris Robinson	3a1facefdf	Store a pointer to the character controller for non-actor objects	2013-07-15 23:47:04 -07:00
Chris Robinson	06e631f213	Track death separately in the character controller	2013-07-15 23:43:33 -07:00
Chris Robinson	4ae65c20e6	Separate movement and idle states ... This allows us to better handle cases of "missing" animations. Mainly for first-person, but also for spells and certain weapon types.	2013-07-15 22:56:23 -07:00
scrawl	94d45e1518	Fix twohanded weapons not unequipping when equipping a torch	2013-07-15 23:21:01 +02:00
scrawl	daf9dca121	Fix exception when starting a new game	2013-07-15 20:37:36 +02:00
gus	f7f23ac5d8	improvement of the chop animation. Still some jittering.	2013-07-15 17:18:16 +01:00
gus	f7b711aabe	bugfix	2013-07-15 16:37:32 +01:00
gus	076f98cbba	change way animations keys are handled (thanks KittyCat!)	2013-07-15 16:37:25 +01:00
Marc Zinnschlag	fd9cc1c282	Merge remote-tracking branch 'vorenon/container'	2013-07-15 09:33:16 +02:00
Marc Zinnschlag	a0022e711b	Merge remote-tracking branch 'scrawl/raycast'	2013-07-15 09:20:16 +02:00
vorenon	66eb82b363	oops again	2013-07-15 02:26:22 +02:00
vorenon	33779ae23c	oops	2013-07-15 02:23:18 +02:00
vorenon	d4739a451a	added ability to close container windows with the activation key	2013-07-15 02:18:24 +02:00
scrawl	c81b852071	Fixes inaccurate ray casts; rely on getCameraToViewportRay	2013-07-15 00:39:37 +02:00
scrawl	8407e2b3aa	Fixes the console sometimes receiving text after it was closed	2013-07-14 23:54:28 +02:00
Marc Zinnschlag	1bc343f363	Merge remote-tracking branch 'kcat/first-person'	2013-07-14 21:28:09 +02:00
scrawl	fa5198d7b2	Fix an assertion	2013-07-14 14:59:24 +02:00
scrawl	61661c8653	Fix first person meshes casting shadows	2013-07-14 14:55:07 +02:00
scrawl	a049638e7f	Fixes character previews getting shadowed randomly	2013-07-14 14:54:40 +02:00
Marc Zinnschlag	6a5ab34971	Merge branch 'region'	2013-07-14 12:19:02 +02:00
Chris Robinson	3771e5839e	Allow some more third person fallbacks in first person	2013-07-13 17:03:10 -07:00
Chris Robinson	5ee889e8b6	Attach the camera to the Head node in first-person	2013-07-13 16:12:38 -07:00
gus	3947f44aa3	Porting old work	2013-07-13 22:24:52 +01:00
Chris Robinson	2d7620e774	Rotate the neck when looking up and down in first-person	2013-07-13 12:39:06 -07:00
Marc Zinnschlag	4cce466dc7	inverted region map y-axis	2013-07-13 16:34:10 +02:00
Chris Robinson	4df1f198a7	Avoid a map lookup for every skin body part when updating	2013-07-12 22:32:09 -07:00
Chris Robinson	6de56615aa	Avoid casting shadows in first-person view	2013-07-12 22:32:05 -07:00
Chris Robinson	025fa4e0d5	Use a multimap for the bodypart map	2013-07-12 22:32:04 -07:00
Chris Robinson	a5e4faaed2	Show arms and body parts in first person ... This isn't yet fully correct. The arms need to rotate up and down with the camera, and the mesh's bounding box is causing them to blink out at certain angles since they don't fit the animation.	2013-07-12 22:31:59 -07:00
Chris Robinson	908f010c74	Reset the NPC object root when switching POV ... When in first person, the skeleton in the .1st.nif file is used. In particular, these have extra finger bones that are used by the first person models.	2013-07-12 22:31:57 -07:00
Chris Robinson	7883087586	Store a pointer to the character controller in the map	2013-07-12 22:31:50 -07:00
Marc Zinnschlag	c26a6f884f	added region map tooltips	2013-07-12 12:55:14 +02:00
greye	29b7734b52	add qualifiers for names in templates to make gcc 4.7+ happy	2013-07-12 08:33:02 +04:00
Marc Zinnschlag	c808bf2b23	updating region map on changes to region and cell records	2013-07-11 15:05:28 +02:00
Marc Zinnschlag	b17f383c6d	Merge remote-tracking branch 'graffy76/RefIdTypeDelegate' ... Conflicts: apps/opencs/view/world/table.cpp	2013-07-11 09:09:52 +02:00
graffy76	11178cc470	Repo permissions commit fix #3	2013-07-10 21:44:25 -05:00
graffy76	bb049806df	Repo permissions commit fix #2	2013-07-10 21:13:59 -05:00
graffy76	ae4e3181d9	Fixing repo permissions commit #1	2013-07-10 17:29:07 -05:00
scrawl	bbb5d2b98a	Change tooltip positioning to resemble vanilla	2013-07-10 03:40:13 +02:00
Marc Zinnschlag	d389b70ec4	added missing case folding	2013-07-09 14:22:58 +02:00
Marc Zinnschlag	121978a69e	some cleanup; added handling of deleted cells (now displayed instead of ignored)	2013-07-09 14:20:28 +02:00
Marc Zinnschlag	116320cc0d	dealing with invalid regions and cells without regions	2013-07-08 17:13:58 +02:00
Marc Zinnschlag	6159724b04	build region map from records (only initial build; updates not implemented yet)	2013-07-08 16:53:08 +02:00
Marc Zinnschlag	4f05f2bddf	basic region map; non-interactive for now and working with dummy data instead of real cell/region records	2013-07-08 13:12:50 +02:00
Marc Zinnschlag	71a6955182	Merge remote-tracking branch 'scrawl/master'	2013-07-08 09:46:00 +02:00
scrawl	91f6d87126	Fix an uninitialized variable	2013-07-07 16:57:46 +02:00
Marc Zinnschlag	602e40e19d	Merge remote-tracking branch 'greye/coc'	2013-07-07 13:34:28 +02:00
greye	e553f285b8	update player position on engine start	2013-07-07 15:06:05 +04:00
greye	f3d54a7ba4	move finding default cell positions to World	2013-07-07 15:03:06 +04:00
greye	0c303aa285	fix fading on cell transition when cell is loaded	2013-07-07 14:30:11 +04:00
greye	6bb3942288	use Land height data for position in coc	2013-07-07 13:47:58 +04:00
greye	a3094b808e	update coc behaviour for interior cells	2013-07-07 13:47:58 +04:00
scrawl	744c5804ed	Simplified doors, now they will stop after hitting an obstacle instead of trying to back off.	2013-07-07 03:52:17 +02:00
Marc Zinnschlag	de5898c953	post merge fixes	2013-07-06 18:34:14 +02:00
Marc Zinnschlag	4986b7d65d	Merge branch 'master' into ref	2013-07-06 17:54:19 +02:00
Marc Zinnschlag	1c4b70805b	added missing reference table columns	2013-07-06 17:41:06 +02:00
Marc Zinnschlag	9a39f32c32	store ID of cell in reference struct	2013-07-06 17:06:06 +02:00
Marc Zinnschlag	9a49125281	added references table	2013-07-06 17:03:18 +02:00
scrawl	72600a16cf	Fix chargen race menu bug, updating a render target from within MyGUI's ControllerManager update is not a good idea	2013-07-06 17:02:40 +02:00
scrawl	58fce74620	Use the already existing mScrollPage as step size for scrollbar button repeats; increased precision of options menu sliders	2013-07-06 16:40:57 +02:00
scrawl	5c8950f91c	Merge branch 'master' of git://github.com/zinnschlag/openmw	2013-07-06 16:08:29 +02:00
Marc Zinnschlag	f9d7c7574e	Merge remote-tracking branch 'swick/scrollbar'	2013-07-06 13:13:27 +02:00
Marc Zinnschlag	3dc42fb948	Merge remote-tracking branch 'greye/master'	2013-07-06 12:28:01 +02:00
greye	76d95dffb6	special case for loading StartScript records	2013-07-05 23:52:46 +04:00
Sebastian Wick	26bd2a5301	use the new scrollbar; range dependent step size; fix	2013-07-05 20:28:46 +02:00
Sebastian Wick	b43f41c2bd	use a mygui controller for scrollbar repeat	2013-07-05 19:17:00 +02:00
Sebastian Wick	e3d8bdbafe	autorepeat scrollbar	2013-07-02 17:29:47 +02:00
graffy76	9f6d250463	QDebug reference removal	2013-07-01 07:40:47 -05:00
Marc Zinnschlag	847ec9fa56	Merge remote-tracking branch 'swick/master'	2013-07-01 10:16:39 +02:00
Sebastian Wick	8bdc9ff3ae	set position of the window for multiple monitors	2013-07-01 03:56:33 +02:00
graffy76	55b115935a	Implemented RefRecordTypeDelegate ... Added accessor functions to CSMWorld::UniversalId for static const sIdArg[]	2013-06-30 07:43:58 -05:00
graffy76	9d95a38934	Implementing delegate for referenceables table Type column ... Added delegate skeleton class Added delegate creation code in ViewManager Added Display_RefRecordType enum to columnbase.hpp Changed Type column'sDisplay type to Display_RefRecordType in refidcollection.cpp modified OpenCS CMakeLists.txt to incorporate RefRecordTypeDelegate class	2013-06-29 08:54:32 -05:00
Marc Zinnschlag	56637a39a3	Merge remote-tracking branch 'vheuken/master'	2013-06-29 12:27:01 +02:00
Marc Zinnschlag	cd538538b5	fixed weather code	2013-06-28 09:00:21 +02:00
Vincent Heuken	f43b48015e	remove actor's collisionbox on death	2013-06-27 19:42:27 -07:00
Vincent Heuken	b095c24854	resize actor collision boxes on death	2013-06-27 14:11:20 -07:00
scrawl	123a60581f	Only link to SDL2main on windows	2013-06-27 21:45:32 +02:00
Marc Zinnschlag	e88040662e	Merge remote-tracking branch 'glorf/master'	2013-06-27 12:24:09 +02:00
Marc Zinnschlag	afb120d5ce	Merge remote-tracking branch 'graffy76/recordStatusDelegate'	2013-06-27 08:11:27 +02:00
graffy76	6deddf7229	Fixed code conventions in user settings, changed top-level page names	2013-06-26 21:18:21 -05:00
Glorf	88f8637145	Bugfix #795	2013-06-26 22:20:24 +02:00
Glorf	5b81d124bb	Catched another exception	2013-06-26 18:43:27 +02:00
Glorf	f4d302501e	Bugfix #826	2013-06-26 18:29:09 +02:00
Marc Zinnschlag	623200b50e	Merge remote-tracking branch 'pakanek/libav_headers'	2013-06-26 10:58:43 +02:00
Marc Zinnschlag	8ffea60b72	some cleanup	2013-06-26 10:09:26 +02:00
Marc Zinnschlag	12cfe1fdfe	Merge remote-tracking branch 'graffy76/recordStatusDelegate'	2013-06-26 09:48:51 +02:00
Miroslav Puda	743b3dec99	Correction of libavutil version	2013-06-26 07:17:29 +02:00
graffy76	f0f895ad10	Fixed settings file error message ... Errors only occur if both global and local settings files are not found. All other file read errors fail silently.	2013-06-25 19:32:36 -05:00
Alexander "Ace" Olofsson	0a2ed8b0d7	Make OpenMW able to initialize SDL in windows builds	2013-06-25 15:05:10 +02:00
eroen	d75391de8e	libav-9 - fix missing includes ... With libav-9 and ffmpeg-1.0, libavcodec/avcodec.h no longer defines the AV_CH_LAYOUT_* constants. They have been defined in libavutil/channel_layout.h for a long time prior to this.	2013-06-24 21:08:28 +02:00
Marc Zinnschlag	05649a1654	Merge remote-tracking branch 'swick/master'	2013-06-24 14:35:32 +02:00
Vincent Heuken	09cca0bf80	more detailed error message when SDL fails to initialize	2013-06-23 16:45:23 -07:00
Marc Zinnschlag	99508a6eaa	minor cleanup	2013-06-23 22:52:02 +02:00
Sebastian Wick	20e591fe18	use index instead of string manipulation	2013-06-23 21:56:27 +02:00
Sebastian Wick	357974a429	more minor stuff	2013-06-23 21:34:41 +02:00
mckibbenta	1f4d1d3b57	Merge branch 'master' of https://github.com/zinnschlag/openmw	2013-06-23 15:29:35 -04:00
mckibbenta	5803726233	modified gmst addition during creation of new base file	2013-06-23 15:19:08 -04:00
Sebastian Wick	c97fac8116	use QMessageBox to show errors	2013-06-23 21:16:51 +02:00
Sebastian Wick	89dee80dcf	simpler remove of duplicates	2013-06-23 21:04:49 +02:00
Sebastian Wick	6abb5d5f75	small fixes	2013-06-23 20:53:50 +02:00
Sebastian Wick	dbfc39468b	better workaround	2013-06-23 20:45:24 +02:00
Marc Zinnschlag	0829548106	Merge remote-tracking branch 'swick/multimonitor' ... Conflicts: apps/launcher/graphicspage.cpp	2013-06-23 08:34:35 +02:00
Sebastian Wick	6f7a7b4714	remove old code	2013-06-23 05:02:19 +02:00
Sebastian Wick	bb39a85f16	remove double entries	2013-06-23 04:43:34 +02:00
Sebastian Wick	14d074e3e7	select first screen if none is in the setting	2013-06-23 04:21:32 +02:00
Sebastian Wick	a1fea97c3b	use SDL for resolution -> multimonitor support	2013-06-23 03:49:30 +02:00
mckibbenta	16a27e28f7	inluded gmsts with default values to creation of new base files	2013-06-22 21:01:27 -04:00
Marc Zinnschlag	d61c12ccfc	minor cleanup	2013-06-22 20:32:11 +02:00
Sebastian Wick	d364fd8561	Merge branch 'master' of https://github.com/zinnschlag/openmw	2013-06-22 19:17:39 +02:00
Sebastian Wick	0e29286856	fix custom resolution maximum	2013-06-22 19:15:13 +02:00
graffy76	62e164b2aa	Fixed load file error if no file is found	2013-06-22 07:43:28 -05:00
graffy76	a73b97d125	Fixed broken references and other bugs ... Removed references to CSVSettings::SamplePage class Removed multiple QDebug references Fixed custom LineEdits (window size user pref) would not accept data	2013-06-21 23:23:43 -05:00
Marc Zinnschlag	f5ba2b37e7	Merge remote-tracking branch 'vorenon/fixes'	2013-06-21 20:28:45 +02:00
vorenon	efdcd9649c	Fading for Exterior->Interior cell transitions	2013-06-21 20:19:35 +02:00
Marc Zinnschlag	8b909ff838	killed a stray srand	2013-06-21 08:58:52 +02:00
graffy76	b3d185e421	Unsaved changes missed in previous commits	2013-06-20 18:08:53 -05:00
graffy76	f4a2cf64c2	Removed CSVSettings::SamplePage class files	2013-06-20 18:07:34 -05:00
graffy76	101c147217	Final changes for record status icon feature, incl. window size user ... preference 1. Included updated status icons, added base.png 2. Added doxygen comments CSV / CSM Settings classes 3. Implemented Glorf's code for window size preference 4. Minor changes code that searches maps in CSV / CSM Settings classes 5. Removed CSVSettings::SamplePage class 6. Other minor code maintenance / improvements	2013-06-20 18:06:25 -05:00
Miroslav Puda	8da3494d74	Revert "Type of weather changed from string to enum." ... This reverts commit 04d90b4c47. Conflicts: apps/openmw/mwworld/weather.cpp apps/openmw/mwworld/weather.hpp	2013-06-20 21:51:07 +02:00
Miroslav Puda	26a6bdb27d	Correction of sigsegv.	2013-06-19 20:06:02 +02:00
Miroslav Puda	f9940413fd	Static for nextWeather()	2013-06-19 16:49:43 +02:00
Miroslav Puda	bf31e5385c	Removal of duplicit exterior checking and unneded string copiing.	2013-06-19 16:18:43 +02:00
Miroslav Puda	8a45686e0a	WeatherResult added as member variable.	2013-06-19 06:50:36 +02:00
Miroslav Puda	f01aa8f55e	Simpler statistical calculation of next weather; minus before parens.	2013-06-19 04:57:36 +02:00
Miroslav Puda	04d90b4c47	Type of weather changed from string to enum.	2013-06-19 03:24:30 +02:00
vorenon	4e8e048968	Added missing click sounds to dialogue	2013-06-19 01:46:38 +02:00
Marc Zinnschlag	94ec05c2c6	Revert "simplifying CSMWorld::CellRef" ... With the refactored collection class we can now handle the more complex load function This reverts commit 97f421df8a.	2013-06-18 11:27:05 +02:00
Marc Zinnschlag	9c6fa29938	Merge remote-tracking branch 'glorf/bugfix2'	2013-06-17 23:33:09 +02:00
Glorf	09cc57381a	Bugfix #809	2013-06-18 00:43:31 +02:00
Thoronador	d26e721d10	no const for int and bool	2013-06-17 18:47:12 +02:00
Thoronador	9313b2b3fe	better const correctness for MwIniImporter	2013-06-17 17:44:40 +02:00
Marc Zinnschlag	f0718c477f	Merge remote-tracking branch 'darkf/issue-812'	2013-06-17 15:02:18 +02:00
Marc Zinnschlag	5b3d2f5da1	gave Collection class its own header file and removed an unsed cpp file	2013-06-17 14:28:09 +02:00
Marc Zinnschlag	8f167a603c	split IdCollection into Collection and IdCollection class	2013-06-17 14:16:26 +02:00
Marc Zinnschlag	4b2d920f9d	rewrote IdCollection::load (not using private members of IdCollection anymore)	2013-06-17 13:49:32 +02:00
graffy76	f87eb67968	Fixed conflicts ... Merge branch 'cs-windows' of https://github.com/Glorf/openmw Conflicts: apps/opencs/model/settings/usersettings.cpp apps/opencs/model/settings/usersettings.hpp apps/opencs/view/settings/usersettingsdialog.cpp	2013-06-17 06:45:44 -05:00
Marc Zinnschlag	2968b96882	added a bit more documentation	2013-06-17 13:03:32 +02:00
Marc Zinnschlag	f4e7916ec4	moved IdCollection base into its own source file pair and renamed it to Collection	2013-06-17 11:42:02 +02:00
darkf	43455129d0	launcher: Instead of killing config writing due to no master files being selected, instead display a warning when Play is pressed.	2013-06-17 08:58:48 +00:00
Marc Zinnschlag	b5926257f5	Merge remote-tracking branch 'scrawl/sdl_input2'	2013-06-16 21:23:35 +02:00
scrawl	b16bc69479	Removed the no longer needed --debug switch	2013-06-16 20:39:40 +02:00
Marc Zinnschlag	57ce87bf12	Merge remote-tracking branch 'scrawl/sdl_input2'	2013-06-16 20:37:15 +02:00
scrawl	4fd7891d2c	Fix a message box issue	2013-06-16 20:26:27 +02:00
vorenon	76a2abcbe3	added missing line break in front of multiple choice questions	2013-06-16 19:46:55 +02:00
scrawl	b16c92c2f5	Better handle SDL_TEXTINPUT events	2013-06-16 19:43:59 +02:00
vorenon	ed6098388f	return false instead of std::exit	2013-06-16 18:13:14 +02:00
vorenon	b97a051dc6	Merge branch 'bug813' of https://github.com/vorenon/openmw into bug813	2013-06-16 18:12:09 +02:00
scrawl	03682184c6	Enable SDL_TEXTINPUT events only when a text input widget currently has key focus	2013-06-16 18:06:55 +02:00
Marc Zinnschlag	3e29506d5c	Merge remote-tracking branch 'vorenon/dialogue'	2013-06-16 17:03:50 +02:00
vorenon	9ac4a9c5eb	Don't start OpenMW if no master file is selected. This fixes bug #813	2013-06-16 04:59:34 +02:00
vorenon	4c0086b54c	Workaround for bug #820	2013-06-16 01:09:03 +02:00
scrawl	4c8a04d9cb	Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2 ... Conflicts: apps/openmw/mwinput/inputmanagerimp.cpp	2013-06-15 17:41:42 +02:00
scrawl	5252ffa104	More cleanup	2013-06-15 17:06:27 +02:00
scrawl	289587b1a9	Cleanup	2013-06-15 16:29:25 +02:00
scrawl	f1ff9b69b3	Mouse grab and relative input need to be disabled when the mouse leaves the window; Disabled resolution switching / window resizing for now due to several glitches	2013-06-15 15:33:47 +02:00
graffy76	700d55f1fb	Fixed / implemented missing features for RecordStatusDelegate ... Implemented updating editor application from preferences menu, loading settings when editor loads, adding Record Status Display prefernce. Fixed multiple bugs, made changes to CSM(V)Settings classes to make implementing new prefrences easier. Rewrote CSMSettings::UserSettings to retain last-loaded settings. Adjusted icon position in Record Status column Capitalized status text Added delegate to referenceables table	2013-06-15 06:40:18 -05:00
scrawl	9331a6380c	Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2	2013-06-15 13:25:27 +02:00
scrawl	4fb32f7f05	Moved window resize messages to sdlinputwrapper	2013-06-15 13:22:29 +02:00
Nikolay Kasyanov	9807eacb58	Removed obsolete OIS workaround	2013-06-15 15:17:29 +04:00
Nikolay Kasyanov	5984a15846	We don't need Carbon on OS X anymore	2013-06-15 14:47:33 +04:00
Rohit Nirmal	e5ddaaf676	Fix wrong indenting from my last commits.	2013-06-13 11:17:34 -05:00
Marc Zinnschlag	df016778be	Merge remote-tracking branch 'rohitnirmal/journal-open-sound'	2013-06-13 18:04:38 +02:00
scrawl	0880805559	Minor cleanup	2013-06-13 12:13:40 +02:00
Rohit Nirmal	9d4ecc3e73	replace tabs with spaces.	2013-06-13 00:52:26 -05:00
Rohit Nirmal	aac3ada14b	Use mousewheel to turn book pages.	2013-06-13 00:50:07 -05:00
scrawl	fcf35d3871	Removed the UI cursor sensitivity slider	2013-06-12 20:27:55 +02:00
scrawl	ab3634d692	Removed some remains of OIS	2013-06-12 20:13:19 +02:00
scrawl	14a2a26a56	Fullscreen resizing fix	2013-06-12 20:08:55 +02:00
scrawl	403704b92a	Use openmw.png for SDL_SetWindowIcon	2013-06-12 16:15:04 +02:00
scrawl	705488ddfb	Fix mouse movement events being discarded when there's more than one event in a frame	2013-06-12 16:07:46 +02:00
scrawl	cc077eaba6	Fix mouse wheel triggering a click event in mygui	2013-06-12 15:10:04 +02:00
scrawl	918a1655bb	Restored HW cursor rotation and resolution/fullscreen switching	2013-06-12 14:58:07 +02:00
scrawl	495aeb5d3b	Merge branch 'master' into HEAD ... Conflicts: CMakeLists.txt apps/openmw/engine.cpp apps/openmw/mwgui/cursorreplace.cpp apps/openmw/mwgui/cursorreplace.hpp apps/openmw/mwgui/windowmanagerimp.cpp apps/openmw/mwgui/windowmanagerimp.hpp apps/openmw/mwinput/inputmanagerimp.cpp libs/openengine/ogre/renderer.cpp	2013-06-12 12:34:33 +02:00
Marc Zinnschlag	df1f1bd5c8	Merge remote-tracking branch 'glorf/cs-windows'	2013-06-12 10:58:08 +02:00
Glorf	548f4d683f	Globalization of user settings	2013-06-12 12:36:35 +02:00
Marc Zinnschlag	bd08677a7f	Merge branch 'openmw24'	2013-06-12 10:37:33 +02:00
Marc Zinnschlag	c891e529f3	Merge remote-tracking branch 'rohitnirmal/launcher-fix-rohit'	2013-06-12 10:32:53 +02:00
Rohit Nirmal	2fd4d71774	trim whitespace from key and value while reading settings file - stops ugly buildup in settings.cfg, and correctly reads settings from it.	2013-06-11 23:00:12 -05:00
darkf	fc0f04324c	Remove some superfluous mSkyManager NULL checks	2013-06-11 20:56:40 -07:00
darkf	fb462f1b1a	launcher: Throw error if no data files are selected	2013-06-11 20:28:38 -07:00
darkf	fd25616cab	launcher: Properly quit if settings write fails.	2013-06-11 20:28:36 -07:00
Rohit Nirmal	fdeac21f22	Merge branch 'master' of https://github.com/zinnschlag/openmw into journal-open-sound	2013-06-11 21:36:00 -05:00
Rohit Nirmal	b5caa25e5c	Just move check if player owns journal to inputmanagerimp.cpp - prevents playing sound when going to main menu.	2013-06-10 19:42:38 -05:00
fstp	98e5cb6d7b	Added ifdef to keep backward compatibility with the FFmpeg library.	2013-06-10 15:10:39 +02:00
Rohit Nirmal	4eede86ce6	Moved journal open/close sound effect playback to JournalWindowImpl, and have opening sound play only if the player has the journal.	2013-06-09 23:27:47 -05:00
fstp	a3b2a76e60	Added virtual destructors to classes LocalMapBase and EffectEditorBase.	2013-06-09 23:08:57 +02:00
Glorf	10165d3c6b	Feature #468	2013-06-09 00:34:27 +02:00
Marc Zinnschlag	97f421df8a	simplifying CSMWorld::CellRef	2013-06-08 15:50:36 +02:00
Marc Zinnschlag	1e60ad3cd6	Promoted references to a top level record internally. ... Note: This does not change the structure of the ESX format.	2013-06-08 12:45:13 +02:00
Marc Zinnschlag	48496a644f	Merge remote-tracking branch 'scrawl/master'	2013-06-06 23:42:21 +02:00
scrawl	daab4f55a3	Use Morrowind's fonts	2013-06-06 22:26:06 +02:00
pvdk	b3595a6a2e	Fix for duplicate key/value pairs being written to settings.cfg, Bug #755	2013-06-02 21:43:22 +02:00
Marc Zinnschlag	f586eef604	Merge remote-tracking branch 'torben/pathfindingoverhaul'	2013-06-01 10:44:23 +02:00
Torben Carrington	09beafd044	Pathfinding Overhaul - Master cleanup! Cleaned pathfinding entirely, all AI packages that are implemented as well, Increased buffer! This makes the intro guard no longer walk into you or go to far into the room (not tested against vanilla distances but it seems accurate enough until the next itteration of pathfinding fixes).	2013-05-31 17:49:52 -07:00
Torben Carrington	a4caec56cf	Pathfinding Overhaul - Fixed selecting cells that are inaccessable from AIWander and pathfinding in general (sadly requires minor effort on the AI Packages implementation but it is the quickest way I can see), minor cleanup again (there is a lot to cleanup, this will prolly be in every commit).	2013-05-31 17:01:42 -07:00
scrawl	8bd712cc95	Fix being able to move slowly when over encumbered	2013-05-31 04:08:44 +02:00
Torben Carrington	73a9671742	Pathfinding Overhaul - Changed the name of checkIfNextPointReached to a more intuitive name considering what it does (checkPathCompleted) and fixed a minor bug in it, modified buildPath() to take one final parameter, a bool which dictates whether or not to always use pathfinding (like AIWander should be doing) or to allow for "shortcuts", modified all ai packages to work with these two changes.	2013-05-29 20:05:17 -07:00
graffy76	1d93cf09bc	Cell formatting and code optimization changes	2013-05-29 21:55:19 -05:00
Torben Carrington	c080785235	Pathfinding Overhaul - Finished cleaning, removed unnecessary parameter in one function, fixed use of the function in ai packages and added use of clearPath() function in aiwander, fixed algorithms and got rid of excess subtractions in getDistance functions (thanks to Chris!).	2013-05-29 19:26:45 -07:00
Torben Carrington	7b465ae4f1	Pathfinding Overhaul - Even more cleanup and spacing corrections, small renaming (more to come), removed a few unnecessary actions that wasted CPU time and tmp RAM.	2013-05-29 17:33:33 -07:00
Torben Carrington	96fdaf7410	Pathfinding Overhaul - More cleanup.	2013-05-29 16:10:15 -07:00
Torben Carrington	4838678944	Pathfinding Overhaul - Cleanup, removed unnecessary include, fixed spacing, added a function for clearing a path, overall preperation to begin working on fixing pathfinding.	2013-05-29 15:59:23 -07:00
graffy76	35fb9b669a	Final details implemented ... Png icons, alignments fixed.	2013-05-29 06:38:35 -05:00
Miroslav Puda	dc17fa1636	Removal of duplicit enumeration and unnecessary conditions.	2013-05-29 00:01:18 +02:00
Marc Zinnschlag	bbec3680c6	Merge remote-tracking branch 'pakanek/enchanting-mechanics'	2013-05-28 10:02:03 +02:00
Marc Zinnschlag	6e7416d8c5	Merge remote-tracking branch 'scrawl/master'	2013-05-28 09:59:41 +02:00
scrawl	9a43927078	Fix weapons not appearing in Enchantable filter	2013-05-28 03:15:13 +02:00
Miroslav Puda	7a4a386cbe	Removal of tab characters.	2013-05-27 20:47:53 +02:00
Torben Carrington	dbbc96f600	AIWander Segmentation Fault Fix - Fixes the segmentation fault that used to occur when there was no pathgrid in the cell and a range was passed to AIWander.	2013-05-27 11:44:46 -07:00
Miroslav Puda	b40e24c50c	Refactorization	2013-05-27 20:23:04 +02:00
Miroslav Puda	4e17bc1499	Fix for display of cast cost decimal value	2013-05-27 20:16:57 +02:00
Marc Zinnschlag	7927ac818c	Merge remote-tracking branch 'torben/aiwanderpatchpotential'	2013-05-27 18:29:15 +02:00
Miroslav Puda	9a9b075a02	Correct cast cost for enchantments.	2013-05-27 18:08:12 +02:00
Torben Carrington	ebc1fdd017	AIWander Patch - fixed another possibility of a bug occuring, best to fix it now then wait until it happens.	2013-05-27 09:05:42 -07:00
scrawl	0c7f48ec8a	Implement movement for creatures (formula is a stub)	2013-05-27 18:03:06 +02:00
Miroslav Puda	1c7b94e94f	Switching in nextCastStyle() is now based on enum CastingStyle.	2013-05-27 16:08:58 +02:00
Miroslav Puda	252a1d9223	Replacement of some magical constants	2013-05-27 15:50:47 +02:00
Miroslav Puda	9e1eb8b3b1	Merge branch 'master' of https://github.com/zinnschlag/openmw into enchanting-mechanics	2013-05-27 14:45:22 +02:00
Miroslav Puda	4788b5e226	Better formula for enchantment cost and code refactorization.	2013-05-27 14:42:08 +02:00
Miroslav Puda	56edc1b213	Correction of getting spell range "Target".	2013-05-27 12:26:06 +02:00
Torben Carrington	bd6d54cc8f	AIWander Minor Patch - Forgot an else statement and another check on an empty node vector, previously no nodes in range or only one would cause the AIWander to not do anything, now they will play idles correctly still.	2013-05-27 03:24:41 -07:00
Marc Zinnschlag	86dd6d0847	Merge remote-tracking branch 'eroen/libcxx'	2013-05-27 10:27:31 +02:00
Marc Zinnschlag	fa63ebce78	Merge remote-tracking branch 'scrawl/master'	2013-05-27 10:19:02 +02:00
Marc Zinnschlag	bd8344b387	Merge remote-tracking branch 'torben/aiwander'	2013-05-27 10:16:37 +02:00
Torben Carrington	3b43ee751e	AI Execute Fix - May as well not create the object either to save extra time.	2013-05-26 19:54:59 -07:00
Torben Carrington	feb180724c	AI Execution Fix - Preiovusly AiExecute was being called even when in a menu, this was not correct behavior.	2013-05-26 19:33:45 -07:00
scrawl	3a6e54c4f5	Sell owned items in the cell	2013-05-27 02:18:36 +02:00
Torben Carrington	fd96d47fe4	AIWander Completed. Replicates vanilla as best possible, pathfinding needs fixing before this looks correct but once the pathfinding files are edited this will behave pretty much exactly as vanilla. Major credit to Hrnchamd for major research.	2013-05-26 11:30:42 -07:00
Torben Carrington	96daad7a22	AIWander - shortened some if statements and made super minor optimizations to others, now using proper GMST to load proper idlechance instead of hacky set value."	2013-05-26 09:31:56 -07:00
Torben Carrington	e37324b967	AIWander everything works. only two things to do: Implement limiting selection on z axis, and correcting decision algorithm.	2013-05-26 08:49:44 -07:00
eroen	2850032d9e	libc++ fixes: avcodec/avformat workaround ... With libc++, string includes stdint.h, which breaks the fragile avformat.h workaround, which depends on __STDC_CONSTANT_MACROS being defined before stdint.h is included. Moving the string inclusion after that eyesore shouldn't break anything.	2013-05-26 12:01:01 +02:00
Marc Zinnschlag	5fac75845c	Merge remote-tracking branch 'torben/aiescortclean'	2013-05-25 15:35:56 +02:00
Torben Carrington	ddf28ca201	AIEscort Cleanup - Fixed spacing, removed unnecessary includes, fixed branch itself. The other pull requests were fine, it was just this one with the problem.	2013-05-25 04:36:21 -07:00
Marc Zinnschlag	94474e8952	Merge remote-tracking branch 'torben/checkidlecomplete'	2013-05-25 12:35:34 +02:00
Marc Zinnschlag	81cd1c6e30	Merge remote-tracking branch 'torben/aitravelcleanup'	2013-05-25 12:35:00 +02:00
Torben Carrington	c8c1ddd927	Adds functionality for checking if the animation group passed is currently playing on the actor passed. This is needed for AIWander.	2013-05-24 20:10:07 -07:00
scrawl	1e7cf4ae1c	GLES2 experiment	2013-05-25 04:15:24 +02:00
Torben Carrington	56b1384c90	AITravel Cleanup - Removed unnecessary includes and other varius cleanups.	2013-05-24 18:16:35 -07:00
riothamus	d9350be8da	Console Object Selection Fix	2013-05-24 09:31:56 -04:00
Marc Zinnschlag	b1a8dc35e0	minor adjustments	2013-05-24 15:03:46 +02:00
Marc Zinnschlag	62479cd885	Merge remote-tracking branch 'torben/aiwanderrepeat'	2013-05-24 14:58:10 +02:00
Torben Carrington	1cfe037d6b	AIWander - Added support for the Repeat parameter to mimic vanilla.	2013-05-24 04:49:20 -07:00
scrawl	32e90bb733	Fix chargen statssheet	2013-05-23 17:28:45 +02:00
Marc Zinnschlag	2d894fde57	Merge remote-tracking branch 'riothamus/riothamus-b788' into openmw24	2013-05-23 16:08:58 +02:00
riothamus	7187f50c40	Bug 788	2013-05-23 09:13:21 -04:00
Miroslav Puda	00866ef246	Merge branch 'master' of https://github.com/zinnschlag/openmw into esmtool_plain_script	2013-05-22 20:25:47 +02:00
Miroslav Puda	8a9ddcaa32	Plain output moved at the end of records output.	2013-05-22 20:24:23 +02:00
Miroslav Puda	d3d5cb4edf	New command line option --plain to print contents of scripts, books, dialogs.	2013-05-22 20:09:11 +02:00
Marc Zinnschlag	c40e753ea9	Merge remote-tracking branch 'pakanek/master'	2013-05-22 14:07:49 +02:00
Marc Zinnschlag	6d0b8f7bc8	added missing include	2013-05-22 10:14:12 +02:00
Miroslav Puda	3cebb41459	missing break	2013-05-21 21:04:15 +02:00
Edmondo Tommasina	f0482dd796	dialogue.cpp: fix build error "‘bind’ is not a member of ‘boost‘" ... /var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp: In constructor ‘MWGui::DialogueWindow::DialogueWindow()’: /var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp:271:44: error: ‘bind’ is not a member of ‘boost’	2013-05-20 23:51:01 +02:00
Marc Zinnschlag	5d4c311de7	Merge remote-tracking branch 'scrawl/master'	2013-05-20 15:01:25 +02:00
scrawl	d3effdf34c	Fix exception when trying to equip a shield while a lockpick is equipped	2013-05-20 13:32:38 +02:00
scrawl	d9dd02c610	Security fixes	2013-05-20 12:42:11 +02:00
Marc Zinnschlag	c1ceb32b28	Merge remote-tracking branch 'scrawl/master'	2013-05-20 12:10:51 +02:00
scrawl	2715520d6f	Cleanup Security class	2013-05-19 23:19:48 +02:00
scrawl	5173779f4b	Add sounds for security skill	2013-05-19 19:48:51 +02:00
scrawl	7a2d1cd8ce	Security skill	2013-05-19 18:40:37 +02:00
Marc Zinnschlag	c626e2b257	Merge branch 'ref' ... Conflicts: apps/opencs/view/doc/view.hpp	2013-05-19 14:59:01 +02:00
Marc Zinnschlag	ca33d66ed9	added missing columns for weapon records	2013-05-19 14:44:41 +02:00
Marc Zinnschlag	2123900db5	added missing columns for NPC records	2013-05-19 13:53:47 +02:00
scrawl	c7805e7dd2	Fix sun glare persisting after changing to an interior cell	2013-05-18 23:10:37 +02:00
scrawl	4983d08fe4	Fix a problem with statics disappearing sometimes on the map ... Ogre::StaticGeometry doesn't seem to like materials being changed at runtime. It stores raw pointers to Ogre::Technique objects also, which conflicts with shiny's way of managing "unloaded" materials as having zero techniques. If a static geometry object is baked from an unloaded material, it won't find any techniques to use and can't render. By moving the unload call afterwards, it will be detected as in use by a renderable and won't be unloaded. Ideally this needs fixing of Ogre::StaticGeometry to not hold on to Technique objects (they also currently need to be rebuilt whenever user settings are changed, which also causes "unloading" of materials)	2013-05-18 22:55:30 +02:00
Marc Zinnschlag	8d78bea4aa	added missing column for misc record	2013-05-18 18:55:23 +02:00
Marc Zinnschlag	862e568f9b	added missing columns for Light record	2013-05-18 18:46:41 +02:00
scrawl	60563afc10	Fix a new game crash, reset camera	2013-05-17 22:53:43 +02:00
Chris Robinson	53d1c3939c	Merge remote-tracking branch 'zini/master' into animations	2013-05-17 06:26:34 -07:00
Chris Robinson	e8bbb755c3	Play the left-arm torch animation when it's equipped	2013-05-17 06:21:59 -07:00
Marc Zinnschlag	749fd418b5	added missing columns for door record	2013-05-17 15:10:41 +02:00
Marc Zinnschlag	e2b8f9ea6d	Merge remote-tracking branch 'scrawl/master'	2013-05-17 14:37:41 +02:00
scrawl	d096b19307	Fix not being able to equip arrows/bolts	2013-05-17 14:11:19 +02:00
scrawl	3cadb5918f	Fix containers showing random items from my commit earlier	2013-05-17 14:11:02 +02:00
Chris Robinson	ee585046ac	Don't show weapons in first-person	2013-05-17 01:56:16 -07:00
Chris Robinson	4b9a888d74	Use the PickProbe animation group as appropriate	2013-05-17 01:46:51 -07:00
Marc Zinnschlag	f8c675a638	Merge remote-tracking branch 'graffy76/usersettings'	2013-05-17 10:24:52 +02:00
graffy76	3ce35e691c	Commented out sample editor settings page	2013-05-16 20:43:05 -05:00
Marc Zinnschlag	cc42b1ef48	Merge remote-tracking branch 'riothamus/riothamus-b752'	2013-05-16 20:07:48 +02:00
riothamus	d89dbde940	Bug 752, spacing fix	2013-05-16 14:05:22 -04:00
Marc Zinnschlag	ef9abda754	Merge remote-tracking branch 'glorf/weather'	2013-05-16 19:53:28 +02:00
Marc Zinnschlag	9fe5ff46cd	Merge remote-tracking branch 'riothamus/riothamus-b752'	2013-05-16 19:52:14 +02:00
riothamus	36f1197b51	Bug 752, cleanup	2013-05-16 13:51:54 -04:00
Glorf	19ce233667	Workaround for MOC compiler problem	2013-05-16 19:46:04 +02:00
riothamus	db981a72fe	Bug 752	2013-05-16 13:40:00 -04:00
Marc Zinnschlag	2c8a511179	Merge remote-tracking branch 'scrawl/persistence'	2013-05-16 19:37:41 +02:00
scrawl	8a3d3f954b	NPC/creature persistence flag	2013-05-16 18:50:26 +02:00
Marc Zinnschlag	54f56b0515	Merge remote-tracking branch 'graffy76/usersettings' ... Conflicts: apps/opencs/view/doc/view.cpp apps/opencs/view/doc/view.hpp	2013-05-16 18:04:55 +02:00
graffy76	13242c2bd5	Eliminated code centering the initial view in the middle of the screen	2013-05-16 10:14:13 -05:00
Marc Zinnschlag	889a87982e	added missing columns for creatures	2013-05-16 16:27:33 +02:00
Chris Robinson	6201cb0093	Add a method to clear the animation queue	2013-05-16 06:59:41 -07:00
Glorf	af28be915f	Use fallback video name	2013-05-16 13:47:27 +02:00
Glorf	0539ca6a9c	Bugfix #778	2013-05-16 13:35:28 +02:00
Chris Robinson	6c6200efef	Merge remote-tracking branch 'zini/master' into animations	2013-05-15 16:34:51 -07:00
Marc Zinnschlag	9fee99d56c	Merge remote-tracking branch 'scrawl/master'	2013-05-15 22:43:00 +02:00
scrawl	aaa9aba999	Some fixes	2013-05-15 22:38:53 +02:00
scrawl	c41f119ba6	Added new game button	2013-05-15 17:54:18 +02:00
Marc Zinnschlag	d794a62d19	added missing columns for container record	2013-05-15 17:02:34 +02:00
Chris Robinson	71d39c2fa0	Merge remote-tracking branch 'zini/master' into animations	2013-05-15 06:36:06 -07:00
Chris Robinson	e069215583	Don't clear the last queued animation when it stops	2013-05-15 06:32:20 -07:00
Marc Zinnschlag	28f2a7d2b4	added missing column for clothing records	2013-05-15 11:37:46 +02:00
Chris Robinson	66f55b3178	Play the item up/down sound when readying/unreadying weapons	2013-05-15 01:45:47 -07:00
Chris Robinson	b459a010b0	Fix vec.z being applied while not in the air	2013-05-14 23:03:28 -07:00
Chris Robinson	3c5c10144a	Remove a duplicate showWeapons call	2013-05-14 19:38:57 -07:00
Marc Zinnschlag	56b2b05f9a	Merge remote-tracking branch 'glorf/weather'	2013-05-14 22:56:26 +02:00
Glorf	39c7bc8363	Corrected celestical object sizes	2013-05-14 20:34:40 +02:00
Glorf	9fa2dd5277	Playing with moons part 2	2013-05-14 19:58:08 +02:00
Chris Robinson	e8661794fe	Avoid trying to find a state for non-actors. ... They're only ever play idles, unless PlayGroup is called.	2013-05-14 07:29:07 -07:00
Marc Zinnschlag	eba9d3e3ee	added missing columns for book record	2013-05-14 14:40:06 +02:00
Marc Zinnschlag	fce9939f83	added missing columns for armor record	2013-05-14 14:33:34 +02:00
Marc Zinnschlag	7c57f2c221	added AI-related actor columns	2013-05-14 13:20:59 +02:00
Chris Robinson	355f653614	Use AnimationAlloc instead of AnimationAllocatedObject	2013-05-14 01:30:01 -07:00
Chris Robinson	47a9a4cdff	Clean up a for loop	2013-05-14 01:29:15 -07:00
scrawl	96e3b3b7c2	Fix a compile error, OGRE_NEW only works for classes derived from AllocatedObject	2013-05-13 21:03:53 +02:00
Marc Zinnschlag	d684120f7a	Merge remote-tracking branch 'scrawl/master'	2013-05-13 20:47:50 +02:00
scrawl	ac4fa1941d	Fix the frame update not getting called on the first frame	2013-05-13 20:08:12 +02:00
Marc Zinnschlag	74d791e207	fixed auto calc column	2013-05-13 14:07:31 +02:00
Marc Zinnschlag	897e55391d	added columns for tool IDs	2013-05-13 13:36:24 +02:00
Marc Zinnschlag	52d81dc9fa	added columns for enchantments	2013-05-13 13:11:43 +02:00
Chris Robinson	822f130f79	Merge remote-tracking branch 'zini/master' into animations	2013-05-13 04:09:56 -07:00
Chris Robinson	8ec722ac92	Use std::find_if instead of ugly for loops	2013-05-13 04:08:36 -07:00
Marc Zinnschlag	90bae2bead	do not create editors for unused columns	2013-05-13 12:55:28 +02:00
Marc Zinnschlag	929b38ff6a	added missing columns for apparati records	2013-05-13 12:51:27 +02:00
Chris Robinson	f83ee5d316	Play ready/unready animations on the upper body	2013-05-13 03:32:00 -07:00
Torben Carrington	4d10a1c407	Fixed an additional 0 being sent into the AIWander idle parameters vector (Thanks to Chris)	2013-05-13 02:57:52 -07:00
Marc Zinnschlag	af191c7382	fixed AiWander arguments	2013-05-13 11:27:36 +02:00
Chris Robinson	a9928bb842	Split up the UpperBody group ... Also recognize the [un]equip start and stop text keys.	2013-05-13 02:09:22 -07:00
Chris Robinson	70dc2f77ad	Move the priority enum to MWMechanics	2013-05-13 00:54:44 -07:00
Chris Robinson	7ba2508556	add a priority for death animations, and store it in the state list	2013-05-12 19:19:21 -07:00
graffy76	c71d921f09	Moved signalUpdateEditorSettings from UserSettingsDialog to ... UserSettings. UserSettings is now derived from QObject.	2013-05-12 15:15:57 -05:00
graffy76	144be59735	Changed enum names to match OpenMW naming conventions	2013-05-12 14:28:36 -05:00
Marc Zinnschlag	7fd277b87a	added missing column for potions	2013-05-12 15:50:29 +02:00
Chris Robinson	4e389b5a8f	Store whether a given animation loops in the state table	2013-05-12 05:59:39 -07:00
Chris Robinson	bbb38c61cc	Fix queued animations	2013-05-12 05:08:01 -07:00
Chris Robinson	3988866ecd	Make sure active groups are updated after a state is auto-disabled	2013-05-12 04:34:37 -07:00
Chris Robinson	2c556e4036	Be smarter about handling non-moving animations ... Don't rely on being told by the play method, so the animation can automatically change without impacting the character controller.	2013-05-12 04:29:42 -07:00
Marc Zinnschlag	9835c6df11	Merge remote-tracking branch 'scrawl/tradefix'	2013-05-12 12:58:32 +02:00
Chris Robinson	4ea347ac52	Use shared pointers to store animation sources ... This ensures references to the sources stay valid as long it the object is, rather than becoming invalidated whenever one is added or removed.	2013-05-11 19:38:23 -07:00
graffy76	88df3b980f	Implemented UserSettings as a singleton.	2013-05-11 20:55:36 -05:00
scrawl	b56d50287e	Barter mechanic fix	2013-05-11 22:56:36 +02:00
Marc Zinnschlag	e14cb6853f	Merge remote-tracking branch 'scrawl/containerui'	2013-05-11 19:23:02 +02:00
Marc Zinnschlag	da92921387	added columns related to items in inventories	2013-05-11 19:21:16 +02:00
Marc Zinnschlag	ee2bc94698	added script column	2013-05-11 18:57:23 +02:00
Marc Zinnschlag	e24ecfd5d2	added name column	2013-05-11 18:43:16 +02:00
scrawl	0c4a963132	Container UI rewrite	2013-05-11 18:38:27 +02:00
Marc Zinnschlag	318ebe0cb6	added model column	2013-05-11 18:35:48 +02:00
Marc Zinnschlag	8ef2d04007	added type column	2013-05-11 17:49:38 +02:00
Marc Zinnschlag	c22f773f72	load all types of referenceable IDs	2013-05-11 17:45:28 +02:00
Marc Zinnschlag	d715cf5431	replaced static adapter with a template	2013-05-11 17:34:18 +02:00
Marc Zinnschlag	9426eda47a	small test with statics and two columns	2013-05-11 17:01:16 +02:00
Marc Zinnschlag	02ace69511	fixed RefID search	2013-05-11 16:55:10 +02:00
graffy76	d0b23a4786	Relocated "User Settings" to Edit->Preferences ... Removed <QDebug> reference from view.hpp	2013-05-11 07:40:10 -05:00
graffy76	a8b45e0a13	Three primary changes: ... 1. Declared QStringPair::isEmpty() const 2. Split the CsSettings namespace into two: CSMSettings and CSVSettings. (Required splitting the support.hpp file) 3. Declared several classes as _noqt in CMakeLists.txt for OpenCS	2013-05-11 05:55:46 -05:00
Chris Robinson	6b8a687a79	Add methods to disable an animation ... And rename WeaponState to WeaponType	2013-05-10 22:22:39 -07:00
Chris Robinson	6605aa7dec	Create three bone groups ... This still won't work as expected. Currently there is only one priority level, and only one animation state per priority level can be active at a time. It's close, though.	2013-05-10 20:45:09 -07:00
Chris Robinson	abc676eedd	Allow specifying which bone groups to play an animation on	2013-05-10 20:05:09 -07:00
Chris Robinson	56eede2610	Search more aggressively for an animation velocity	2013-05-10 19:31:33 -07:00
Chris Robinson	5a9c1e1245	Don't explicitly track the last position	2013-05-10 18:58:14 -07:00
Chris Robinson	7c3b014193	Figure out which animations to play based on priority ... Bone group will also be taken into account later.	2013-05-10 18:37:44 -07:00
Chris Robinson	921f534980	Parameterize the number of bone groups	2013-05-10 16:35:43 -07:00
Chris Robinson	8a9b0eb5f7	Store the AnimSource in the animation state	2013-05-10 15:27:29 -07:00
Glorf	6aaa8d6dc0	Fixed fading problem	2013-05-10 19:33:43 +02:00
Glorf	9cc85cbe81	Playing with moons part 1	2013-05-10 18:55:56 +02:00
graffy76	8d0f350446	New file structure separating view classes from model classes. Deleted ... .ui file.	2013-05-10 10:00:58 -05:00
Chris Robinson	58efce5008	Rename animation layers to animation states	2013-05-10 04:01:30 -07:00
Chris Robinson	ccff364b52	Use a map of active layers instead of an array ... A bit of an upheaval. Each animation is now a "layer", instead of each layer having an animation. Incidentally, this is much closer to how Ogre handles animation states. In the future, each layer will have a priority, which will be used to determine which one affects a given bone group (which we currently only have one of).	2013-05-10 03:08:07 -07:00
kpp	24d619d6b4	Changes the logic of WindowManager::messageBox() ... Fixes removeItem Fixes addItem	2013-05-10 14:06:25 +04:00
Chris Robinson	d5490b0f8f	Fix an outdated comment	2013-05-09 23:07:50 -07:00
Chris Robinson	74ed1f73b4	Merge remote-tracking branch 'zini/master' into animations	2013-05-09 13:53:38 -07:00
Marc Zinnschlag	5c99f15ad3	Merge remote-tracking branch 'torben/aiescort'	2013-05-09 14:27:22 +02:00
Glorf	6417fa504e	Fixed constness	2013-05-09 13:56:13 +02:00
Torben Carrington	4928c9d079	Removed sqrt function call (minor optimization thanks to Chris)	2013-05-08 20:47:31 -07:00
Torben Carrington	d20178dd56	Removed unnecessary std::cout messages	2013-05-08 20:05:45 -07:00
Torben Carrington	133964f0e4	AIEscort complete	2013-05-08 20:02:24 -07:00
Torben Carrington	c03dca47f5	AIEscort implemented and working - only touchups are needed.	2013-05-08 17:19:47 -07:00
Glorf	c605f15a15	Another weather cleanup	2013-05-09 00:36:58 +02:00
Torben Carrington	10840765d9	Framework - duration and pathing implemented, no waiting for follower yet.	2013-05-08 15:27:20 -07:00
Marc Zinnschlag	51067698a8	minor cleanup	2013-05-08 21:26:39 +02:00
Marc Zinnschlag	c80ffa0a16	Merge remote-tracking branch 'gus/AIFix'	2013-05-08 20:31:57 +02:00
scrawl	90b7df439f	Fix image buttons	2013-05-08 13:55:15 +02:00
graffy76	cb9c82324c	UserSettings system	2013-05-07 20:36:34 -05:00
graffy76	f6203cac2a	update for master	2013-05-07 20:33:42 -05:00
Chris Robinson	8e38dc410f	Allow loading multiple animation sources ... Animation sources are treated differently from base objects. When given "path\file.nif", base objects will look for "path\xfile.nif" and use that if it exists (falling back to the original name if not found). Animation sources will instead use "path\xfile.kf", ignoring it if the file doesn't exist.	2013-05-07 16:59:32 -07:00
gus	603af21715	little interface improvement	2013-05-07 19:42:21 +01:00
gus	a328a03bd3	more fix. Fargoth quest almost work as in vanilla now.	2013-05-07 19:35:10 +01:00
scrawl	301efb411e	Fix exit crash	2013-05-07 19:15:28 +02:00
scrawl	8845c0cee1	Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera.	2013-05-07 17:38:24 +02:00
Marc Zinnschlag	0f29ab8cf9	fixed the interface of the adapter class	2013-05-07 14:19:02 +02:00
Marc Zinnschlag	f7f56a1a1f	added a RefIdCollection to Data	2013-05-07 11:23:18 +02:00
Glorf	68f249e8f4	Small weather cleanup	2013-05-07 10:27:37 +02:00
Chris Robinson	e85bc8b2cd	Only load one Nif for Animation objects ... This breaks quite a bit, but it's needed for the transition to using the .kf files.	2013-05-06 23:11:26 -07:00
Chris Robinson	6a3ba41170	Don't store camera nodes, we don't need them.	2013-05-06 21:46:11 -07:00
Chris Robinson	90e29c83c0	Merge remote-tracking branch 'zini/master' into animations ... Conflicts: apps/openmw/mwmechanics/character.cpp	2013-05-06 19:17:39 -07:00
scrawl	007a3cf9bd	rename IInterface to Interface	2013-05-06 16:05:56 +02:00
scrawl	b5071ced23	Removed using namespace	2013-05-06 16:04:28 +02:00
scrawl	757a26794a	Merge branch 'master' of https://github.com/zinnschlag/openmw into journal	2013-05-06 15:35:38 +02:00
scrawl	c6edb0288a	Remove unused file	2013-05-06 15:30:23 +02:00
scrawl	1315432322	Handle @# links in journal	2013-05-06 15:14:39 +02:00
Marc Zinnschlag	e9f1aac7bd	added data structures for referenceable records	2013-05-06 14:11:55 +02:00
scrawl	d43adbaa7c	Topic link fixes for russian version, thanks to greye for testing	2013-05-06 13:13:14 +02:00
scrawl	166eac2e25	Cleanup	2013-05-06 11:31:34 +02:00
gus	006f25d1c0	First try to improve AI. Does not work yet due to strange bug in physicsystem	2013-05-06 00:46:50 +01:00
scrawl	38c399a698	Fix duplicate sounds	2013-05-05 10:51:17 +02:00
scrawl	062ff189a2	Merge branch 'master' into memory	2013-05-04 23:04:33 +02:00
scrawl	0f2866dc15	Text replace fix	2013-05-04 18:49:51 +02:00
scrawl	48c5e33c79	Fix a limitation of the keyword search. It can now highlight keywords that have longer child variations correctly.	2013-05-04 17:40:00 +02:00
scrawl	a33e6b9c35	Fast forward to the last page in the journal when opening it	2013-05-04 16:06:48 +02:00
scrawl	d16bb26a48	Added text colors, goodbye, message	2013-05-04 15:15:44 +02:00
scrawl	f07497bbde	Fix lockup	2013-05-04 14:18:13 +02:00
scrawl	78e6dab9d2	Dialogue history rewrite WIP	2013-05-04 14:15:47 +02:00
scrawl	6cd28d1156	Fix a bug in getPCNextRank	2013-05-04 12:28:12 +02:00
scrawl	0bb51fd91d	Retrieve the correct case for topics in the journal	2013-05-03 22:53:29 +02:00
scrawl	1f58edb9db	Merge branch 'master' of https://github.com/zinnschlag/openmw into journal	2013-05-03 18:17:27 +02:00
gus	7fe7111c19	Fargoth quest almost works. There is still a sall problem as the path taken is not exactly the same. I need to copy the exact way morrowind do pathfinding...	2013-05-03 17:09:09 +01:00
Marc Zinnschlag	2e6594f8f7	Merge remote-tracking branch 'glorf/bugfix-5'	2013-05-03 14:55:00 +02:00
scrawl	75dcf52552	Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made)	2013-05-03 13:55:57 +02:00
Glorf	517dfb4d75	Bugfix #732 part 2	2013-05-03 13:24:34 +02:00
Marc Zinnschlag	13e7abd7df	added assign function to Record class	2013-05-03 12:52:45 +02:00
Glorf	57f22c77c0	Bugfix #732 part 1	2013-05-03 12:44:27 +02:00
greye	a8b1706678	init pointer value to prevent segfault	2013-05-03 10:51:42 +04:00
kpp	dcccfd9f22	Initialize values	2013-05-02 22:43:21 +04:00
Marc Zinnschlag	1b84aeb5b9	fixed a problem with editing records that do not exist in base	2013-05-02 14:30:39 +02:00
kpp	28ef4d97da	Fixes Bug #734 'Book empty line problem' ... Hides buttons 'Next' and 'Prev' at the last and at the first page	2013-05-02 07:35:25 +04:00
Chris Robinson	03a6190c5a	Merge remote-tracking branch 'zini/master' into animations	2013-05-01 10:20:42 -07:00
Chris Robinson	a120653c38	Implement handling weapon states	2013-05-01 10:19:16 -07:00
Marc Zinnschlag	d5741c7141	Merge remote-tracking branch 'scrawl/master'	2013-05-01 16:58:43 +02:00
Marc Zinnschlag	95eeea2a27	Revert "Merge remote-tracking branch 'glorf/acrobatics'" ... This reverts commit 089ef7a2a0, reversing changes made to 67422c397c.	2013-05-01 16:56:16 +02:00
Marc Zinnschlag	f8a331f173	fixed a bad cast	2013-05-01 16:49:34 +02:00
scrawl	1acfd849a2	Fix a case folding bug	2013-05-01 16:38:16 +02:00
Marc Zinnschlag	6f0ccb6e38	Merge remote-tracking branch 'scrawl/insertrecords'	2013-05-01 13:55:26 +02:00
Marc Zinnschlag	089ef7a2a0	Merge remote-tracking branch 'glorf/acrobatics'	2013-05-01 13:44:23 +02:00
scrawl	40a0969055	Insert records that may not exist in vanilla MW	2013-05-01 12:47:50 +02:00
Glorf	b8630239d7	Code cleanup	2013-05-01 12:25:02 +02:00
Glorf	236ec3409f	Finished acrobatics	2013-05-01 12:21:59 +02:00
scrawl	67422c397c	GetWindSpeed	2013-05-01 11:42:24 +02:00
scrawl	5063d90dda	GetStartingAngle was implemented, but not registered	2013-05-01 11:22:46 +02:00
scrawl	627c3fdb6b	Added GetStandingPC, GetStandingActor; Fixed GetStartingPos	2013-05-01 11:15:43 +02:00
scrawl	3c68c87923	Fix some naming guidelines, fix topic index exception, fix exception in keyword search for some journal entries	2013-05-01 10:28:59 +02:00
scrawl	8bc59f8fe6	Merge branch 'master' into journal	2013-05-01 08:27:42 +02:00
Chris Robinson	d01351431c	Merge remote-tracking branch 'zini/master' into animations	2013-04-30 19:27:55 -07:00
Chris Robinson	4b15da076b	Move getStateInfo into the character controller	2013-04-30 19:26:41 -07:00
Glorf	d30e43784a	Fatigue decrease when jumping, live decrease when falling	2013-04-30 23:39:56 +02:00
Glorf	5a8c1661be	Jump acrobatics working, started falling acrobatics implementation	2013-04-30 20:44:17 +02:00
scrawl	1420a2cb33	Tweaked adjustPosition. Now uses a very thin box for tracing the feet only.	2013-04-30 20:43:38 +02:00
scrawl	91c89e5db4	Use sphere cast instead of ray for camera distance adjustment; use the box orientation value in newtrace	2013-04-30 20:26:59 +02:00
Glorf	add3cd6456	Advance acrobatics on jump	2013-04-30 18:22:59 +02:00
scrawl	2a42556aa5	Merge branch 'master' into HEAD	2013-04-30 14:54:10 +02:00
Marc Zinnschlag	61e476118d	Merge remote-tracking branch 'kcat/animations'	2013-04-30 10:25:26 +02:00
Marc Zinnschlag	2cb7e1f3d5	Merge remote-tracking branch 'glorf/bugfix-4'	2013-04-30 10:24:02 +02:00
scrawl	c0dd383cd0	Fix door collision to work with all possible movement directions	2013-04-30 09:43:32 +02:00
Chris Robinson	05060e57ec	Add a weapon state to the character controller	2013-04-29 13:07:49 -07:00
Glorf	d283f8d85f	Bugfix #748	2013-04-29 21:19:13 +02:00
Chris Robinson	020e3e8a8e	Show the equipped weapon in the inventory screen ... And use the proper pose based on what's equipped.	2013-04-29 12:08:43 -07:00
Chris Robinson	854de1c6c1	Make sure the weapon is in the proper group	2013-04-29 11:43:37 -07:00
Chris Robinson	15a2eeebb8	Merge remote-tracking branch 'zini/master' into animations ... Conflicts: apps/openmw/mwworld/worldimp.cpp	2013-04-29 10:16:29 -07:00
Chris Robinson	063322b081	Declare some variables closer to where they're used	2013-04-29 10:12:50 -07:00
Chris Robinson	0cf531ba12	Make sure to update parts when the weapon changes	2013-04-29 09:53:36 -07:00
Marc Zinnschlag	93868c8bca	Merge remote-tracking branch 'scrawl/master'	2013-04-29 18:08:25 +02:00
Marc Zinnschlag	bab899513a	Merge remote-tracking branch 'glorf/bugfix-4'	2013-04-29 18:04:22 +02:00
Glorf	74de8b83b6	Enabled collision when new game	2013-04-29 17:56:16 +02:00
Marc Zinnschlag	236751ec45	some IdCollection and IdTable cleanup	2013-04-29 17:52:01 +02:00
Chris Robinson	a15758ac85	Fix preview and vanity cameras	2013-04-29 08:48:45 -07:00
Glorf	6222b3f52a	Bugfix #744	2013-04-29 17:19:20 +02:00
Chris Robinson	d17e1e83d5	Rename MWRender's Player to Camera	2013-04-29 05:50:40 -07:00
Chris Robinson	dbba126344	Use a method to check if the view should be first person	2013-04-29 04:40:28 -07:00
Chris Robinson	bb8277920b	Manage the player's NpcAnimation object in the RenderingManager ... It may be more appropriate to manage it in MWRender::Actors with the other Animation-based objects, but that will need some (minor) interface changes.	2013-04-29 03:31:46 -07:00
scrawl	6c5ea1ea7a	Fix incorrect weapon health meter for fully repaired weapons, fix exception when equipping lockpicks or probes	2013-04-29 12:05:10 +02:00
scrawl	5ff098b8fb	Fix quick keys being triggered when in UI mode	2013-04-29 11:55:30 +02:00
scrawl	867c7db014	Fix wrong door sounds	2013-04-29 11:00:15 +02:00
scrawl	9648804af5	Fix terrain material leak, this should in theory allow the terrain to free its temporary resources	2013-04-29 10:20:38 +02:00
scrawl	78596cad83	Fix enchantment points value	2013-04-29 10:19:09 +02:00
Chris Robinson	ba3a67f84b	Don't store the player base node in MWRender::Player	2013-04-28 23:44:44 -07:00
Chris Robinson	24e503330b	Merge remote-tracking branch 'zini/master' into animations	2013-04-28 09:41:31 -07:00
Marc Zinnschlag	11a45b3034	Merge remote-tracking branch 'scrawl/doors'	2013-04-28 18:22:09 +02:00
scrawl	67e5e939a1	Fix some doors	2013-04-28 17:57:36 +02:00
Marc Zinnschlag	f2a5377b2b	Merge remote-tracking branch 'glorf/bugfix-4'	2013-04-28 16:52:48 +02:00
Marc Zinnschlag	116ac05677	Merge remote-tracking branch 'scrawl/doors'	2013-04-28 16:44:11 +02:00
Glorf	98baf9fac1	Bugfix #718	2013-04-28 16:36:12 +02:00
scrawl	6ecd88af14	More fixes	2013-04-28 15:59:59 +02:00
scrawl	4ee1a6ee02	Put door physics in a separate method, some fixes	2013-04-28 15:36:37 +02:00
Marc Zinnschlag	cd61177eed	Merge remote-tracking branch 'gus/renderWeaponShield'	2013-04-28 15:00:47 +02:00
scrawl	9343b4459e	Opening doors	2013-04-28 14:59:15 +02:00
Marc Zinnschlag	a6b7f8e904	Merge remote-tracking branch 'scrawl/fall'	2013-04-28 14:14:10 +02:00
Marc Zinnschlag	93c98e1df4	Merge remote-tracking branch 'scrawl/athletics'	2013-04-28 14:11:12 +02:00
Marc Zinnschlag	738a54337d	removed redundant case smashing	2013-04-28 14:07:53 +02:00
gus	3d9ceede77	little fix (weapons disapeared when tab was pressed)	2013-04-28 12:33:41 +01:00
gus	5388c25e64	Fix or lockpicks.	2013-04-28 11:55:50 +01:00
gus	766d1efa84	Render weapon and shield. Only shield can be seen right now as weapons need to be drawed out.	2013-04-28 11:41:01 +01:00
scrawl	7d61459ccd	Added stub implementation for 'Fall'. There is no use for this function because our physics controller applies gravity constantly anyway.	2013-04-28 11:13:21 +02:00
scrawl	fdf80c1c4f	Fix unused variable	2013-04-28 11:05:01 +02:00
scrawl	db78d15fc4	Fix changeWeather	2013-04-28 11:02:30 +02:00
Chris Robinson	ce7bc20fa1	Avoid special-casing player rotation	2013-04-28 01:14:58 -07:00
scrawl	07891fa213	Athletics skill increase	2013-04-28 07:53:04 +02:00
Glorf	3669d0a998	Bugfix #742	2013-04-27 20:57:44 +02:00
Marc Zinnschlag	e7bf1d230c	fixed an indexing problem in IdCollection	2013-04-27 16:22:04 +02:00
Chris Robinson	ab52e68c05	Merge remote-tracking branch 'zini/master' into animations	2013-04-27 05:16:15 -07:00
Chris Robinson	137017b325	Don't allow forcing vanity mode	2013-04-27 01:24:36 -07:00
Glorf	ade871ce12	Corrected unused opcodes	2013-04-26 17:31:58 +02:00
Glorf	89f7ef2472	Move, moveworld script instructions	2013-04-26 17:28:19 +02:00
Marc Zinnschlag	32138dbb0f	silenced a warning	2013-04-26 13:33:47 +02:00
Chris Robinson	2822f431c4	Merge remote-tracking branch 'zini/master' into animations	2013-04-26 01:38:51 -07:00
Chris Robinson	b666f1d551	Work around a problem with MWRender::Player::renderPlayer ... NpcAnimation::setViewMode makes a call to the character controller, in the mechanics manager, to forcefully update the character's state. This in turn makes a call to the player's old NpcAniamtion object that was just deleted. The mechanics manager will eventually remove and reinsert the player, so the old character controller will be removed and a new one will get the right Animation object again, but not in time for the setViewMode call. There's many factors that all contribute to this run-around, which needs discussion on how to best fix.	2013-04-26 01:30:36 -07:00
Chris Robinson	55ee4e65a9	Clean up the slotlist struct	2013-04-25 23:42:20 -07:00
scrawl	7821610ec6	Make OnDeath work with explicit reference	2013-04-26 02:08:53 +02:00
scrawl	a373f53988	Added SetAtStart	2013-04-26 02:02:51 +02:00
Marc Zinnschlag	4e45222a63	Merge remote-tracking branch 'glorf/rotate-update1'	2013-04-25 20:57:24 +02:00
Glorf	240217ae42	Fixed rotations more than 360 degrees	2013-04-25 20:52:38 +02:00
Marc Zinnschlag	1e9656ee9c	Merge remote-tracking branch 'glorf/rotate-update1'	2013-04-25 20:22:40 +02:00
Marc Zinnschlag	2c1796cc74	Merge remote-tracking branch 'kcat/animations' into ref	2013-04-25 20:12:14 +02:00
Glorf	7cd4dd0c91	Improved local rotations	2013-04-25 19:14:10 +02:00
Chris Robinson	274f3c7b77	Force character state to update after switching view modes	2013-04-25 07:08:11 -07:00
Chris Robinson	e4eb4b7e30	Keep track of the character looping state	2013-04-25 06:29:17 -07:00
Chris Robinson	9da2c9153e	Don't store the animation group string in the character controller	2013-04-25 06:12:37 -07:00
Chris Robinson	849335d8cc	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-25 05:35:33 -07:00
Chris Robinson	2769adcee0	Implement switching to and from first-person animations ... Note that the current animation gets interrupted, so switching to first person may break movement until you stop and try to move again. This can be fixed by alerting the character controller in the mechanics manager to force a state update when switching POV.	2013-04-25 05:23:05 -07:00
Chris Robinson	9a2a32f2a5	Add a method to clear all Animation sources except the first ... The first needs to remain, since that's where any mSkelBase entity comes from, and where any retrieved nodes are from.	2013-04-25 05:02:11 -07:00
Chris Robinson	9be20b90f1	Fix potential infinite loop when layer 0 is empty	2013-04-25 03:35:40 -07:00
Marc Zinnschlag	08e2254628	Merge remote-tracking branch 'pvdk/spacefix'	2013-04-25 12:15:35 +02:00
pvdk	d5d14c5147	Fixes issue with multiple spaces in plugin filename not being read correctly	2013-04-25 11:04:12 +02:00
Chris Robinson	76c8e81908	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-25 01:35:21 -07:00
Marc Zinnschlag	247a76766d	fixed a typo in a doxygen comment	2013-04-25 10:27:43 +02:00
Marc Zinnschlag	71fc8f5830	Merge remote-tracking branch 'scrawl/item' into next	2013-04-25 10:21:14 +02:00
Chris Robinson	86fda1bff6	Only set mSkelBase from the first objectlist	2013-04-25 00:52:26 -07:00
Chris Robinson	7eac37be23	Make sure the old layer is cleared before starting the next	2013-04-25 00:18:02 -07:00
Chris Robinson	09fc50948b	Add methods to disable and get info for a layer	2013-04-25 00:08:16 -07:00
Chris Robinson	24f1eba902	Keep track of whether an animation supplies movement ... Also handle it when it doesn't.	2013-04-24 22:45:43 -07:00
Nathan Jeffords	7db6447a00	dropped the I infront of the journal view model interfaces	2013-04-24 21:53:25 -07:00
Nathan Jeffords	36a6806faf	drop the leading 'I' from the book page control interfaces	2013-04-24 21:44:29 -07:00
Nathan Jeffords	4c22afc29b	made a pass at conforming to established naming convention	2013-04-24 20:22:57 -07:00
Nathan Jeffords	c7ede9b523	port code to C++03	2013-04-24 20:22:57 -07:00
Nathan Jeffords	718af692c9	reworked journal to match bethesda's implemenation	2013-04-24 20:20:01 -07:00
Nathan Jeffords	f02a53b121	Created a helper class to format books for display from the journal ... view-model data.	2013-04-24 20:20:01 -07:00
Nathan Jeffords	50d688c2fc	Created a view-model to present journal data to the UI in the form it ... intends to display it.	2013-04-24 20:20:00 -07:00
Nathan Jeffords	55ca037411	Created a MyGUI widget to present a page of formatted text.	2013-04-24 20:20:00 -07:00
Nathan Jeffords	8dad04eef1	hid JournalWindow behind IJournalWindow interface, and put its entire ... implementation, class definition and all, into journalwindow.cpp	2013-04-24 20:20:00 -07:00
scrawl	9e3917881d	Don't fail on nonexistent items in a levelled list	2013-04-25 04:44:30 +02:00
Chris Robinson	0817d59f23	Allow specifying where to start in an animation	2013-04-24 19:09:36 -07:00
scrawl	933f894148	Added Blind and Night Eye effects	2013-04-25 02:31:51 +02:00
scrawl	baa7a9160c	Rank condition should always fail if NPC is not in a faction	2013-04-25 02:31:39 +02:00
scrawl	a7092ef2d7	Fix activation not working sometimes ... The current player cell was only being updated when the reference was not empty, causing it to incorrectly detect a cell change the first time something was activated in a newly visited cell, immediately closing the opened dialogue again.	2013-04-25 02:31:39 +02:00
Nathan Jeffords	2dc01fe56b	fixed the type of iterator uses in MWWorld::Store ... The containers type used to declare some iterators was not an exact match for the type of the container the iterator was being initialized from. This was causing build failure on windows.	2013-04-25 02:31:39 +02:00
scrawl	51580ead4f	Fix consecutive dialogue choices	2013-04-25 02:31:39 +02:00
Marc Zinnschlag	87ce2110dc	hotfix for CharacterPreview destructor	2013-04-25 02:31:38 +02:00
scrawl	cd57e3f896	Auto calculate attributes if there are not specified in the NPC record	2013-04-25 02:31:38 +02:00
Glorf	53fb17da10	Rotation system fixes	2013-04-24 21:42:04 +02:00
Chris Robinson	333354fe62	Remove the character controller from the Animation class	2013-04-24 07:10:41 -07:00
Chris Robinson	b80891099e	Don't use the character controller to handle text keys ... The Animation class has the Ptr and can call to whatever subsystem is needed.	2013-04-24 06:48:34 -07:00
Chris Robinson	e8cabc9434	Pass the loop count from loopgroup to the play method ... Instead of queueing each iteration separately.	2013-04-24 06:32:11 -07:00
Chris Robinson	b482d5be09	Add a method to check if a given layer is playing	2013-04-24 05:23:45 -07:00
Chris Robinson	c58dfbe921	Specify the loop count to Animation::play	2013-04-24 04:56:39 -07:00
Chris Robinson	7241267d5c	Make an AnimationValue for each animation layer	2013-04-24 04:41:52 -07:00
Chris Robinson	102b3bdef9	Update position by reference	2013-04-24 01:57:51 -07:00
Chris Robinson	9e05ee53da	Avoid looking for the controller if there is no NonAccum node ... Also, make sure there is a controller before updating the position.	2013-04-24 01:18:08 -07:00
Chris Robinson	544011e096	Fix 'start' text key fallback lookup	2013-04-24 00:40:58 -07:00
Chris Robinson	7e2995bc2f	Fix setting up active controllers	2013-04-23 19:43:26 -07:00
Chris Robinson	6a67a5e650	Merge remote-tracking branch 'zini/next' into nifogre	2013-04-23 16:57:48 -07:00
Chris Robinson	8c9e2e0ee9	Improve handling of reaching the stop animation text key	2013-04-23 05:34:08 -07:00
Chris Robinson	c4806f01f8	Use a separate list of controllers to update ... This should make it easier to figure out what controllers need to be updated for various animation sources and layers.	2013-04-23 04:08:09 -07:00
greye	cfccf0981d	update IndexedStore::setUp() for multiple datafile support	2013-04-23 14:36:38 +04:00
Chris Robinson	e4c5aac966	Keep track of the animation layers a given object list is animating on ... This only tracks layers they explicitly animate on. They may animate on other layers as well, if nothing else is animating on them.	2013-04-23 02:48:11 -07:00
Marc Zinnschlag	a17d17c191	added additional type argument to IdCollection::load	2013-04-23 11:22:07 +02:00
Marc Zinnschlag	808718d967	added referenceable record types to UniversalId	2013-04-23 11:21:21 +02:00
Marc Zinnschlag	afe7b3c64c	added additional type argument to IdCollection::appendBlankRecord	2013-04-23 10:56:55 +02:00
Chris Robinson	e378176937	Don't update controllers that have already been updated	2013-04-23 00:15:31 -07:00
Chris Robinson	8782ae6976	Separate some Animation fields into a separate AnimLayer class	2013-04-22 23:52:28 -07:00
Chris Robinson	c3ce49798a	Fix animation velocity calculation	2013-04-22 21:34:39 -07:00
Chris Robinson	7279e015e9	Search the textkeys to check if an animation group exists	2013-04-22 20:59:55 -07:00
Chris Robinson	a2fc43c7df	Use reset to check that the animation exists and has the right markers	2013-04-22 20:41:54 -07:00
Chris Robinson	507d72ede5	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-22 18:44:28 -07:00
Chris Robinson	bb64efc18e	Improve looping behavior	2013-04-22 05:08:52 -07:00
Chris Robinson	cc70c6263b	Use the NodeTargetValue for the NonAccum root	2013-04-22 04:10:46 -07:00
Chris Robinson	9485a4aa6d	Look through the whole animation stack to find the "velocity"	2013-04-22 01:40:41 -07:00
Marc Zinnschlag	29cb076113	Merge remote-tracking branch 'scrawl/rank'	2013-04-22 09:52:28 +02:00
Marc Zinnschlag	3fa35af796	Merge remote-tracking branch 'scrawl/master'	2013-04-22 09:52:24 +02:00
Chris Robinson	a7776e124c	Only set mNonAccumRoot from mSkelBase	2013-04-22 00:22:31 -07:00
Chris Robinson	a3511c62cf	Don't store textkeys in user object bindings ... It's a bit unwieldy to have them stored in the 'skeleton master' instead of the skeleton instance. And although the text keys are extracted for each created instance now, this shouldn't be much worse than the multimap copying going on before. Plus, proper serialization can help for future optimizations.	2013-04-22 00:01:30 -07:00
scrawl	56b871e362	Rank condition should always fail if NPC is not in a faction	2013-04-22 07:57:53 +02:00
Chris Robinson	2345b5e8b3	Avoid storing text keys for each animation	2013-04-21 22:56:40 -07:00
Chris Robinson	7d59340ed6	Don't clip out the group name from the textkeys	2013-04-21 22:13:49 -07:00
Chris Robinson	6c85d6763a	Pass "loop stop" to the character controller	2013-04-21 18:38:25 -07:00
Chris Robinson	d7c9df16f8	Store the current animation group	2013-04-21 18:32:34 -07:00
scrawl	8bf1149cec	Fix activation not working sometimes ... The current player cell was only being updated when the reference was not empty, causing it to incorrectly detect a cell change the first time something was activated in a newly visited cell, immediately closing the opened dialogue again.	2013-04-21 21:24:48 +02:00
Nathan Jeffords	19325f9d40	fixed the type of iterator uses in MWWorld::Store ... The containers type used to declare some iterators was not an exact match for the type of the container the iterator was being initialized from. This was causing build failure on windows.	2013-04-21 11:41:09 -07:00
Chris Robinson	835ff8eb1e	Avoid creating an AnimationValue per ObjectList	2013-04-20 17:13:27 -07:00
Chris Robinson	4122b0b55f	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-20 00:25:00 -07:00
scrawl	a8e3acd6c4	Fix consecutive dialogue choices	2013-04-19 17:57:22 +02:00
Marc Zinnschlag	f13b0c884f	hotfix for CharacterPreview destructor	2013-04-19 14:41:26 +02:00
Chris Robinson	50bb92beb3	Use a method to set the visibility flags and render queue.	2013-04-19 02:01:50 -07:00
Marc Zinnschlag	9c1e280614	Merge remote-tracking branch 'scrawl/master'	2013-04-19 00:23:24 +02:00
Chris Robinson	434f3ac8c8	Merge remote-tracking branch 'zini/next' into nifogre	2013-04-18 15:14:28 -07:00
scrawl	ef9afeb53e	Auto calculate attributes if there are not specified in the NPC record	2013-04-18 23:51:43 +02:00
Marc Zinnschlag	1b764e5d3c	Merge remote-tracking branch 'gus/AI'	2013-04-18 22:17:49 +02:00
Glorf	f9deb593d1	Bugfix #578	2013-04-18 21:37:58 +02:00
gus	c753eb4c28	another way to do pathfinding. Slightly less powerfull algorithme in theory, but morrowind pathgrids are so simple it shouldn't be a problem. Hope it solves the bug for KittyCat	2013-04-18 18:35:01 +01:00
scrawl	3c5e4ceefd	Workaround for ambiguous "Chargen_plank" ID in chargen script (one at -22,16 and one at -2,-9)	2013-04-18 16:46:32 +02:00
Chris Robinson	6d59325bff	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-17 23:21:17 -07:00
Britt Mathis	1dff1fabdb	Fixed race.cpp	2013-04-17 19:38:13 -04:00
Britt Mathis	7eee86ab66	No more using namespace	2013-04-17 18:56:48 -04:00
scrawl	c519fc360d	Move away from fixed record names for body parts	2013-04-18 00:19:34 +02:00
scrawl	0341a9e778	Fix a gcc 4.8 warning	2013-04-17 20:57:22 +02:00
scrawl	547f77031d	Fix crash when disabling objects in a previously loaded cell, then coming back to that cell and leaving again	2013-04-17 17:06:30 +02:00
Bret Curtis	c1ec16986b	add cmake fix for compiling with binutils >= 2.23 which requires explicit linking for dl<friends> and Xt	2013-04-17 12:04:05 +02:00
Marc Zinnschlag	5bbab1abd9	Merge remote-tracking branch 'galdor557/master'	2013-04-17 09:52:58 +02:00
Britt Mathis	60fadaeaf0	Cleaned up includes in implementation files	2013-04-16 20:16:22 -04:00
Glorf	e3a9f73eb6	Improved getangle script behaviour	2013-04-16 21:40:34 +02:00
Glorf	1fd59d0ce0	Removed useless include	2013-04-16 21:21:54 +02:00
Glorf	1e92ffc314	Added rotation layer	2013-04-16 21:17:19 +02:00
Chris Robinson	cac793758b	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-16 11:52:19 -07:00
Marc Zinnschlag	518cb0e3b7	added another abstraction layer to ID access in IdCollection	2013-04-16 12:12:04 +02:00
Chris Robinson	4ce98e9bd6	Store iterators for start and stop keys	2013-04-15 20:37:10 -07:00
Chris Robinson	1b1f9f7921	Allow multiple ObjectLists to be created for Animations. ... addObjectList may not currently be called outside of the related constructor.	2013-04-15 18:55:28 -07:00
Glorf	e0357c7b7c	Merge rotate	2013-04-15 20:29:38 +02:00
Glorf	763308868d	Fixed rotation speed	2013-04-15 17:45:18 +02:00
Glorf	972481f63f	Working rotate, rotateworld	2013-04-15 16:45:53 +02:00
scrawl	7fcaffefb0	Fixed travel window to use the rotation part of ESM::Position	2013-04-15 03:13:25 +02:00
Chris Robinson	69084139aa	Use an array of objectlists, instead of one base objectlist and an array of 'animation sources'	2013-04-14 17:58:21 -07:00
scrawl	2693b78536	Add initial player inventory when new game is started	2013-04-15 02:56:23 +02:00
Chris Robinson	f9dee25fd1	Store the base skeleton entity in MWRender::Animation	2013-04-14 16:56:35 -07:00
Glorf	4e0233cf06	Base local rotations implementation	2013-04-14 21:42:37 +02:00
Marc Zinnschlag	9bc07e6221	Merge remote-tracking branch 'scrawl/diseasefix'	2013-04-14 19:45:55 +02:00
Marc Zinnschlag	615ce0b199	Merge remote-tracking branch 'scrawl/master'	2013-04-14 19:45:33 +02:00
Marc Zinnschlag	b2b953d2a8	added region column to cell table	2013-04-14 19:34:55 +02:00
scrawl	a57fbbb168	Fix wrong detection of diseases	2013-04-14 17:51:17 +02:00
scrawl	48f46e505c	Look in exterior cells first (chargen_crate_01_empty is in the prison ship but also outside of it, the one outside needs to be disabled)	2013-04-14 17:37:39 +02:00
Marc Zinnschlag	71148121a2	added flag columns to cell table	2013-04-14 17:10:37 +02:00
Marc Zinnschlag	0c33dd86d5	added basic cell table	2013-04-14 17:04:55 +02:00
Marc Zinnschlag	62aa563466	Merge remote-tracking branch 'scrawl/scale'	2013-04-13 10:32:09 +02:00
Marc Zinnschlag	41744818bb	Merge remote-tracking branch 'scrawl/master'	2013-04-13 10:23:35 +02:00
scrawl	d50150ad71	Scale adjustment factor should not be written back to cellref scale	2013-04-13 00:13:56 +02:00
scrawl	2eb9395661	Do some padding with zeros on the resource group name to avoid priority problems with more than 10 resource groups.	2013-04-13 00:05:31 +02:00
scrawl	86bac7aa92	Fix wrong BSA group name typo	2013-04-12 23:40:30 +02:00
gus	905cff2a94	anonymous namespace	2013-04-11 18:02:12 +01:00
gus	0a187e56aa	bugfix	2013-04-11 17:58:11 +01:00
gus	6934b20abd	actors are now updates every frame. This should not be the case, but this is a quickfix for AI.	2013-04-11 17:57:58 +01:00
gus	b5b0e7a656	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AI	2013-04-11 16:15:32 +01:00
Marc Zinnschlag	5bfa691f14	Merge branch 'script'	2013-04-11 10:50:46 +02:00
Marc Zinnschlag	f17cebde0a	syntax colouring for comments	2013-04-11 10:50:35 +02:00
Marc Zinnschlag	31289237ce	Merge remote-tracking branch 'kcat/nifogre'	2013-04-11 10:16:48 +02:00
Marc Zinnschlag	3f846a50d9	Merge remote-tracking branch 'galdor557/master' ... Conflicts: apps/openmw/mwgui/travelwindow.cpp	2013-04-11 10:15:42 +02:00
Chris Robinson	82091e3d07	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-10 23:20:28 -07:00
Britt Mathis	6128b9276f	Removed non-essential includes from all MWGui header files.	2013-04-11 00:21:56 -04:00
Chris Robinson	caff28e20a	Move NIFSkeletonLoader to a separate file	2013-04-10 19:58:17 -07:00
Glorf	106ef4c936	Rotate script	2013-04-10 22:53:03 +02:00
Marc Zinnschlag	74145410f2	basic syntax highlighting in script subview	2013-04-10 22:49:22 +02:00
Marc Zinnschlag	3a87b12baf	delete script subview on script deletion	2013-04-10 21:31:14 +02:00
Britt Mathis	f7383905b7	Finally eliminated calls to MWBase::WindowManager in constructors	2013-04-10 14:46:21 -04:00
Marc Zinnschlag	d61ec1063e	added script editor	2013-04-10 20:14:10 +02:00
Britt Mathis	d768f6b57e	Deleted *_* files in MwGui, builds.	2013-04-10 13:05:15 -04:00
Marc Zinnschlag	beb1858a57	Merge remote-tracking branch 'glorf/bugfix'	2013-04-10 17:39:19 +02:00
Glorf	ad49d1ecab	Sixth minor fix	2013-04-10 15:24:20 +02:00
Britt Mathis	ce9bc6d9ba	MwGui windowManager calls fixed to use MWBase::Environment::get().getWindowManager, filenames in MwGui now comply with naming conventions	2013-04-10 00:32:05 -04:00
Chris Robinson	50d8353a8d	Fix a hack so arms dont show in first-person	2013-04-09 16:51:04 -07:00
Chris Robinson	9d29921913	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-09 15:12:19 -07:00
Chris Robinson	a700c50e84	Add a first-person view mode to NpcAnimation ... And use it instead of showing/hiding the player.	2013-04-09 15:10:14 -07:00
Marc Zinnschlag	a2ab43be7e	Merge remote-tracking branch 'scrawl/master'	2013-04-09 21:22:38 +02:00
scrawl	0e7d555cdf	Terrain material now uses multiple passes if required, which means it can support an arbitrary number of layers. Also re-enables PSSM.	2013-04-09 20:31:00 +02:00
Tom Mason	6ca2b1af74	fix for turning animations playing when in vanity mode	2013-04-09 19:24:41 +01:00
Glorf	bd93e63150	Fifth minor fix	2013-04-09 19:46:27 +02:00
Glorf	248fff6eb7	Fourth minor fix	2013-04-09 19:41:03 +02:00
Glorf	44ef02eb99	Third minor fix	2013-04-09 19:04:59 +02:00
Chris Robinson	029d565727	Avoid calling setVisible for character previews	2013-04-09 09:23:07 -07:00
Chris Robinson	9f9d978b0f	Use an enum to specify the NPC's view mode (normal, head only)	2013-04-09 09:07:05 -07:00
Glorf	46925e93a6	Second minor fix	2013-04-09 16:14:08 +02:00
Marc Zinnschlag	cd33f40c8f	re-enabled opening of record subviews via double click in table	2013-04-09 14:28:31 +02:00
Marc Zinnschlag	be4a01bdb4	added missing recrod type columns	2013-04-09 14:27:32 +02:00
Marc Zinnschlag	40bb772e34	added verifier for spell record	2013-04-09 12:44:49 +02:00
Marc Zinnschlag	ae0a7d5bcd	added cost and type columns to spell table	2013-04-09 11:53:47 +02:00
Marc Zinnschlag	ec6dff38b1	added basic spell table	2013-04-09 11:40:36 +02:00
Glorf	623c2c8201	Minor fix	2013-04-09 07:45:07 +02:00
scrawl	01ae91f640	Fix several NPCs spawning in the ground	2013-04-09 01:24:17 +02:00
Glorf	7c22e123f4	Bugfix #691 changes	2013-04-08 22:10:55 +02:00
Chris Robinson	01a1a0b846	Merge remote-tracking branch 'zini/master' into nifogre ... Conflicts: components/nifogre/ogrenifloader.cpp	2013-04-08 11:46:57 -07:00
Marc Zinnschlag	ef09b1cac8	Merge remote-tracking branch 'glorf/bugfix-1'	2013-04-08 20:23:18 +02:00
Marc Zinnschlag	85e5bd212b	Merge remote-tracking branch 'scrawl/master'	2013-04-08 20:05:52 +02:00
Glorf	2f52df22ce	Bugfix #553	2013-04-08 19:00:38 +02:00
Glorf	194ca2584d	Small azura's star fix	2013-04-08 17:53:41 +02:00
Glorf	50932a7a6b	Finished bugfix #691	2013-04-08 17:50:03 +02:00
scrawl	d0bcf83091	Adjust player position to ground after using travel services	2013-04-08 16:30:18 +02:00
scrawl	a7de870a44	Fix mercenary not updating its profit when item was dragged onto the player avatar	2013-04-08 16:21:18 +02:00
Chris Robinson	08d43fe217	Make the getHeadNode method more general	2013-04-08 05:48:52 -07:00
Chris Robinson	3768e04a0c	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-07 17:24:47 -07:00
Chris Robinson	7baca30a1d	Only get the non-accum root's keyframe when updating positions ... The actual animation pose is now handled by the controllers, based on the current animation time.	2013-04-07 16:21:45 -07:00
Chris Robinson	261ea1fe5e	Implement a KeyframeController	2013-04-07 14:56:23 -07:00
Marc Zinnschlag	43a5013690	added verifier for birthsign record	2013-04-07 23:25:35 +02:00
Chris Robinson	f69a8259e1	Update animation source controller targets	2013-04-07 13:51:04 -07:00
scrawl	9e08497f02	Initial container content should inherit the owner of its container	2013-04-07 22:07:04 +02:00
Chris Robinson	7494f90301	Remove an unneeded function	2013-04-07 13:02:46 -07:00
scrawl	480467b6eb	Reset the 'owner' field for items that were legitimately bought from an NPC.	2013-04-07 21:53:11 +02:00
Chris Robinson	2362e920f3	Use an unconnected object list for animation sources ... We'll want the controllers, as the plan is to use their keyframe controllers to animate the actual skeleton used for the meshes.	2013-04-07 12:41:27 -07:00
scrawl	f3c8cd2065	Don't buy/sell keys which are set to open a lock	2013-04-07 21:38:53 +02:00
scrawl	2d2196b0d6	Implemented levelled items	2013-04-07 21:01:02 +02:00
Marc Zinnschlag	baf8eaecb8	added texture column to birthsign table	2013-04-07 20:46:04 +02:00
Marc Zinnschlag	60cc95305d	added basic birthsign table	2013-04-07 20:26:39 +02:00
Chris Robinson	80a1abd48a	Clear the old text keys when setting new animation sources	2013-04-07 11:09:55 -07:00
Marc Zinnschlag	a0d34c5e8d	Merge remote-tracking branch 'wheybags/autorun2'	2013-04-07 19:51:02 +02:00
Marc Zinnschlag	a91e3c0b01	Merge remote-tracking branch 'scrawl/fatigue_bug'	2013-04-07 19:50:16 +02:00
Marc Zinnschlag	5dc1a00544	Merge remote-tracking branch 'scrawl/master'	2013-04-07 19:43:39 +02:00
Marc Zinnschlag	593646436e	added verifier for region record	2013-04-07 19:39:13 +02:00
Marc Zinnschlag	c9424f577f	added sleeplist column to region table	2013-04-07 19:29:15 +02:00
Tom Mason	822866b5ae	fixed autorun	2013-04-07 18:04:30 +01:00
Marc Zinnschlag	f49a2a97c5	added map colour column to region table	2013-04-07 16:56:21 +02:00
Marc Zinnschlag	e25f5c6dfe	added basic region table	2013-04-07 16:32:06 +02:00
scrawl	8bbfba3f43	Fix fatigue not being set to its maximum value when player is rebuilt	2013-04-07 16:18:40 +02:00
scrawl	755a80a522	Fix camera shaking when near the pitch limit.	2013-04-07 15:52:43 +02:00
Marc Zinnschlag	ff1d908af4	added script table	2013-04-07 15:17:35 +02:00
Chris Robinson	be419bc891	Handle NiCamera nodes	2013-04-07 02:28:15 -07:00
Chris Robinson	878b4c15c5	Set visibility flags and the render queue group for particles	2013-04-07 02:08:33 -07:00
Chris Robinson	2db72ae607	Rename EntityList to ObjectList	2013-04-07 01:52:35 -07:00
Marc Zinnschlag	e2c6458adb	added verifier for sound records	2013-04-06 21:48:52 +02:00
Marc Zinnschlag	50b58b2ead	added sound file column to sound table	2013-04-06 21:43:05 +02:00
Marc Zinnschlag	dd5940b395	added sound parameter columns to sonud table	2013-04-06 21:40:03 +02:00
Marc Zinnschlag	8bf569d58a	added basic sound table	2013-04-06 21:21:10 +02:00
Chris Robinson	41e410347e	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-06 10:35:01 -07:00
Marc Zinnschlag	053f744566	Merge remote-tracking branch 'scrawl/master'	2013-04-06 19:31:46 +02:00
scrawl	1f3df4df0f	Perform a sanity check on count arguments	2013-04-06 19:25:29 +02:00
Marc Zinnschlag	0f34c79d0a	Merge branch 'race'	2013-04-06 19:21:38 +02:00
Marc Zinnschlag	98e7b3fd93	check for at least one playable race	2013-04-06 19:20:59 +02:00
Marc Zinnschlag	9bc3945f40	multiple fixes to UniversalId constructor	2013-04-06 19:20:46 +02:00
Chris Robinson	59f1d4b047	Add support for NiUVController on meshes	2013-04-06 09:44:10 -07:00
Marc Zinnschlag	0fb583e065	added verifier for race record	2013-04-06 17:35:36 +02:00
Chris Robinson	1d934e3112	Reduce some stdout spam	2013-04-06 04:46:28 -07:00
Chris Robinson	0631b28646	Prepare for supporting controller objects	2013-04-05 10:13:54 -07:00
Chris Robinson	af2a38db38	Fix looping anims that dont have "loop start"	2013-04-05 08:27:26 -07:00
Glorf	48d9885554	Started bugfix #691	2013-04-05 15:42:05 +02:00
Marc Zinnschlag	35fe828108	added race table weight/height columns	2013-04-05 13:46:48 +02:00
Marc Zinnschlag	076831c9cc	added flag columns to race table	2013-04-05 12:48:05 +02:00
Chris Robinson	4d14fe0d95	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-04 22:06:27 -07:00
Marc Zinnschlag	034ebf8ffd	Merge remote-tracking branch 'scrawl/master'	2013-04-04 19:57:55 +02:00
scrawl	2e7d5377f4	Fix crash when moving npcs to an inactive cell	2013-04-04 16:51:22 +02:00
scrawl	48a88f1917	Fix startRandomTitle	2013-04-04 15:10:27 +02:00
Marc Zinnschlag	73da794d77	added basic race table	2013-04-04 14:34:39 +02:00
Chris Robinson	77ba0fbe73	Prepare for creating particles ... This adds a vector of ParticleSystems to the EntityList, and modifies corresponding code to handle it. It also loads the ParticleFX plugin so particles can be created (although they aren't yet).	2013-04-04 05:10:52 -07:00
Marc Zinnschlag	18e046e628	cleaned up race record struct	2013-04-04 13:50:36 +02:00
Marc Zinnschlag	62d70f17c8	removed another redundant include	2013-04-04 12:42:38 +02:00
Marc Zinnschlag	111ebf84bb	replaced an include with a forward declaration	2013-04-04 12:27:57 +02:00
Marc Zinnschlag	5244362fba	some cleanup	2013-04-04 12:23:06 +02:00
Marc Zinnschlag	8c7d578ddc	moved the CellRef struct to its own header	2013-04-04 12:13:15 +02:00
Marc Zinnschlag	e8c32d0c3d	MWWorld::Player cleanup	2013-04-04 12:05:03 +02:00
Marc Zinnschlag	7136ac0079	added missing attribute columns to faction table	2013-04-04 10:58:53 +02:00
Marc Zinnschlag	b5eaa464ad	added faction record verifier	2013-04-04 10:39:43 +02:00
Marc Zinnschlag	06533b8d71	additional check for using the same attribute twice in a class	2013-04-04 10:31:10 +02:00
Marc Zinnschlag	fea44c05d4	added class record verifier	2013-04-04 10:10:58 +02:00
scrawl	ebaf80d539	Trace actors onto the ground after load, when moved to a different cell by the console or on player cell change.	2013-04-03 23:55:57 +02:00
scrawl	43cdbd033d	Display remaining item health / enchantment charge in HUD icons, display remaining enchanment charge in tooltips	2013-04-03 21:17:31 +02:00
scrawl	8ca88d1a70	Fix merchant repair menu allowing repair of repair items	2013-04-03 21:17:31 +02:00
Marc Zinnschlag	32d3fe0e35	Merge remote-tracking branch 'glorf/enchanting'	2013-04-03 19:39:18 +02:00
Glorf	08e9bb0236	Another small enchanting fix	2013-04-03 18:25:40 +02:00
Glorf	2179619721	Small enchanting fix	2013-04-03 18:06:11 +02:00
Glorf	ae3e4ecf8b	Finished enchanting	2013-04-03 18:02:30 +02:00
scrawl	f0d49fdbd0	Create separate groups for each data dir / BSA file.	2013-04-03 12:28:57 +02:00
scrawl	aac2ba1d5f	Fix loading screen looking for wallpapers in a fixed group.	2013-04-03 12:24:13 +02:00
scrawl	05a5cb3ae4	Improved responsiveness of the inventory window when resizing.	2013-04-03 00:27:29 +02:00
scrawl	df0ee82a3c	Loose files should have priority over BSA resources. This makes texture replacers work.	2013-04-02 23:45:32 +02:00
Glorf	7b7d3353a6	Exception for enchanting with Azura Star	2013-04-02 22:23:38 +02:00
Marc Zinnschlag	ffb133c862	Merge remote-tracking branch 'lgro/qt_and_boost_join_workaround'	2013-04-02 22:18:32 +02:00
Lukasz Gromanowski	98727d2fb6	Workaround for launcher compilation problems due to bug in Qt MOC compiler. ... For details please see: https://forum.openmw.org/viewtopic.php?f=7&t=1451 https://bugreports.qt-project.org/browse/QTBUG-22829 Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-04-02 21:32:23 +02:00
Glorf	369cf0b4ca	Enchanting price mechanics	2013-04-02 20:46:48 +02:00
Marc Zinnschlag	676a92e2e0	moved Verify function from World menu to File menu	2013-04-02 15:47:25 +02:00
Marc Zinnschlag	9d009af2a1	simplified code for sub view factory creation	2013-04-02 15:33:28 +02:00
Marc Zinnschlag	0856e3ebc2	Merge remote-tracking branch 'glorf/bugfix'	2013-04-02 14:35:14 +02:00
Marc Zinnschlag	df658d29f0	Merge branch 'faction'	2013-04-02 14:21:51 +02:00
Marc Zinnschlag	82498f6cff	added hidden flag column to faction table	2013-04-02 14:20:51 +02:00
Marc Zinnschlag	384c88182d	dealing with unset attribute fields	2013-04-02 14:15:22 +02:00
Glorf	900c2cfa81	Minor bugfix #646 change	2013-04-02 14:08:59 +02:00
Marc Zinnschlag	ec6bdbeb40	added skill columns to faction table	2013-04-02 14:04:13 +02:00
Marc Zinnschlag	f9f520df34	adjusted faction record to increase consistency with other records	2013-04-02 13:59:45 +02:00
Marc Zinnschlag	c71edb613d	added faction table	2013-04-02 12:00:45 +02:00
Glorf	d25c838e1d	Bugfix #646	2013-04-02 11:42:29 +02:00
gus	6a33170ca2	More bugfix, but I don't like this one.	2013-04-01 17:44:06 +00:00
gus	20af7d89a2	post master-merge fixes. Looks a little odd.	2013-04-01 17:30:40 +00:00
gus	2be9405c96	the sgn function is no longer in the global namespace	2013-04-01 15:44:08 +00:00
Marc Zinnschlag	751c679255	Merge remote-tracking branch 'glorf/enchanting'	2013-04-01 17:35:04 +02:00
Marc Zinnschlag	9dbd024076	another minor fix	2013-04-01 17:30:54 +02:00
Glorf	1bff6ed872	Enchaning values import, fixed constness	2013-04-01 17:12:47 +02:00
gus	1eb3d3e10e	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AI ... Conflicts: apps/openmw/CMakeLists.txt	2013-04-01 14:10:19 +00:00
gus	47cc945ef4	more refactoring	2013-04-01 12:38:13 +00:00
Marc Zinnschlag	26db983599	minor fix	2013-04-01 10:46:08 +02:00
Chris Robinson	f976eb5bd8	Improve mouselook scaling	2013-03-31 17:32:39 -07:00
Chris Robinson	d0703efd69	Another place to check the class' isActor method	2013-03-31 17:32:39 -07:00
Chris Robinson	04aeb3dd07	Rename Mechanics' Activators to Objects	2013-03-31 17:32:38 -07:00
Chris Robinson	10d04c928c	Use the object's class to check if it's an actor	2013-03-31 17:32:38 -07:00
Glorf	d29a42dcbe	Fixed enchanting mechanics	2013-03-31 23:18:23 +02:00
gus	63424ade56	refactoring	2013-03-31 17:30:03 +00:00
Lukasz Gromanowski	acae815cd2	Added workaround for OpenCS compilation problems due to bug in Qt MOC compiler. ... For details please see: https://forum.openmw.org/viewtopic.php?f=7&t=1451 https://bugreports.qt-project.org/browse/QTBUG-22829 Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-03-31 18:00:46 +02:00
scrawl	8fd961bbac	Fix ReferenceInterface not resetting the Ptr after it was deleted, causing onReferenceUnavailable to be called every frame. Fix inputmanager hiding the cursor when it shouldn't.	2013-03-31 15:50:48 +02:00
scrawl	1a2daa3bc1	Merge branch 'master' of git://github.com/zinnschlag/openmw into companion	2013-03-31 14:50:03 +02:00
scrawl	bc6e1fd981	Add missing files	2013-03-31 14:36:03 +02:00
scrawl	b0199c703c	Companion UI	2013-03-31 13:13:46 +02:00
Chris Robinson	4836ba16f7	Implement turning states	2013-03-31 03:50:20 -07:00
Chris Robinson	7611caa6eb	Merge remote-tracking branch 'zini/master' into rotation	2013-03-31 03:00:11 -07:00
Chris Robinson	13c098266c	Pass player rotation through the movement settings	2013-03-31 02:57:22 -07:00
scrawl	69099c11a2	Merge branch 'enchanting' into companion	2013-03-31 11:52:55 +02:00
Chris Robinson	18e8ff7198	Actually rotate the object when updating physics	2013-03-31 02:24:44 -07:00
Chris Robinson	b6f2b39a2f	Clear the movement and rotation vector when getting them	2013-03-31 01:56:38 -07:00
Marc Zinnschlag	607435aaf2	Merge branch 'class'	2013-03-31 10:49:56 +02:00
lazydev	38d19d33d8	fix for #634	2013-03-31 10:45:42 +02:00
Chris Robinson	7b02ec411b	Apply the rotation when updating the character controller	2013-03-31 01:29:24 -07:00
Marc Zinnschlag	e71181810f	Merge remote-tracking branch 'scrawl/master'	2013-03-31 10:18:13 +02:00
scrawl	13be61812a	Made the "Unknown class key" exception slightly more helpful	2013-03-31 10:16:02 +02:00
Marc Zinnschlag	48d6fe8014	Merge remote-tracking branch 'kcat/rotation'	2013-03-31 10:14:57 +02:00
Chris Robinson	466c0086b8	Use a full Movement to hand off to the world physics update	2013-03-31 00:13:56 -07:00
Chris Robinson	0ce188b7cc	Store the position and rotation in MWMechanics::Movement	2013-03-30 19:00:46 -07:00
Chris Robinson	af65ecd841	Pass the movement vector in as a parameter to CharacterController::update	2013-03-30 18:37:40 -07:00
Chris Robinson	63af72c315	Avoid converting to and from quaternions	2013-03-30 17:31:16 -07:00
Chris Robinson	c8606d2f63	Implement IsWerewolf script function	2013-03-30 13:22:33 -07:00
scrawl	e27e53f607	Fix not playable body parts appearing in the race selection menu.	2013-03-30 20:04:05 +01:00
lazydev	ee5d0277e8	fix for #634	2013-03-30 22:18:34 +04:00
Glorf	7dbc779c3a	Self-enchanting mechanics	2013-03-30 19:08:42 +01:00
scrawl	0f0cc0e3e3	Fix a few gold conditions that I missed, trade window was affected	2013-03-30 18:29:21 +01:00
scrawl	a723ad8f29	Don't allow toggling inventory or journal when a modal window is opened	2013-03-30 16:32:24 +01:00
scrawl	0079f62180	Gold condition now always checks RefID instead of the name. This is necessary because in the french MW version, the sGold GMST is different from the name of the gold references.	2013-03-30 16:27:06 +01:00
scrawl	51204f098e	Added soulgem dialog; made interactive message boxes not close the previous UI	2013-03-30 15:51:07 +01:00
scrawl	e7af718b55	Remove unnecessary WindowManager::messageBox arguments	2013-03-30 12:56:37 +01:00
scrawl	04673b2f14	Don't enchant if the enchantment value is too high for the item	2013-03-30 12:54:20 +01:00
scrawl	5e7e9fd26a	Properly calculate light activation range	2013-03-29 20:21:37 +01:00
Marc Zinnschlag	573368849b	Merge remote-tracking branch 'glorf/enchanting' ... Conflicts: apps/openmw/CMakeLists.txt	2013-03-29 16:48:21 +01:00
Glorf	86275e5bd4	Some enchanting fixes	2013-03-29 12:00:09 +01:00
Marc Zinnschlag	e7684c4677	some random cleanup	2013-03-29 09:04:02 +01:00
Chris Robinson	c5f0556451	Handle light linear/quadratic settings	2013-03-28 20:57:33 -07:00
Glorf	cc8f7f238e	Enchanted item base ptr fix	2013-03-29 00:55:29 +01:00
Glorf	eb88463b94	Some enchanting fixes	2013-03-28 23:39:20 +01:00
Glorf	6643fe789c	Enchanting system	2013-03-28 17:41:00 +01:00
scrawl	564256c4e1	Fix the spell icon panel being visible when it shouldn't.	2013-03-27 18:04:15 +01:00
scrawl	406488d086	Soulgem value should be multiplied by the trapped soul	2013-03-27 17:39:49 +01:00
scrawl	6f1575d42a	CELL record corrections	2013-03-27 17:27:43 +01:00
scrawl	efe6a3ebee	Fix compile error & warnings	2013-03-26 18:01:01 +01:00
scrawl	2ecd2f4ecd	Merge branch 'next' into HEAD	2013-03-26 17:44:53 +01:00
Marc Zinnschlag	82f1cee116	added is-playable column to class	2013-03-26 09:51:39 +01:00
Marc Zinnschlag	ea3b14f2d2	added skill columns to class	2013-03-26 09:43:13 +01:00
scrawl	6a2b87e14a	Fix dialogue response coloring for creatures	2013-03-25 17:37:59 +01:00
scrawl	4be0c6b708	Fix topics not being selectable for creatures	2013-03-25 17:32:01 +01:00
Marc Zinnschlag	65cda580db	added attributes to class table	2013-03-25 14:31:46 +01:00
Marc Zinnschlag	c7275965b8	added basic class record table	2013-03-25 13:22:06 +01:00
Marc Zinnschlag	f2969e7143	fixed access to records flagged as deleted	2013-03-25 12:56:52 +01:00
Marc Zinnschlag	f39f694638	various global variable fixes in editor	2013-03-25 11:59:25 +01:00
Marc Zinnschlag	6c76e97bbc	fixed day count in rest dialogue	2013-03-25 11:53:02 +01:00
Marc Zinnschlag	1078386fd7	Merge branch 'skills' into next	2013-03-25 11:07:14 +01:00
Marc Zinnschlag	dc67ddf39b	added verifier stage for skill records	2013-03-25 11:07:04 +01:00
Marc Zinnschlag	739e7e7298	improved record access from ID collection	2013-03-25 11:06:40 +01:00
Marc Zinnschlag	7450554ef1	fixed a broken UniversalId constructor	2013-03-25 11:04:41 +01:00
Marc Zinnschlag	10c5f29075	added attribute column to skills	2013-03-24 15:50:29 +01:00
Marc Zinnschlag	114f99ddbf	add skill records when creating a new base file	2013-03-24 15:10:03 +01:00
Marc Zinnschlag	4208d52b1a	added use value columns to skills	2013-03-24 14:51:48 +01:00
Marc Zinnschlag	7cae61a202	Merge remote-tracking branch 'psi29a/master' into next	2013-03-23 18:51:05 +01:00
Bret Curtis	962b504129	add dpkg information for mwiniimporter, this blocked debian/ubuntu buildd from building	2013-03-23 16:20:10 +01:00
Marc Zinnschlag	0ce962e815	added specialisation column to skill table	2013-03-23 13:13:53 +01:00
Marc Zinnschlag	92f0098911	added new constructors for EnumDelegateFactory	2013-03-23 13:13:34 +01:00
scrawl	a2ca679beb	Added PC repair feature	2013-03-23 08:16:46 +01:00
scrawl	78f3f19f62	Thrown weapons, arrows and bolts shouldn't have item health	2013-03-22 14:28:50 +01:00
scrawl	20774f8f81	Added merchant repair feature	2013-03-22 14:13:10 +01:00
scrawl	8e2f9f5186	Fix CellRef to load current weapon/armor health correctly, also show it in the tooltips	2013-03-22 12:24:09 +01:00
Marc Zinnschlag	feaf2b43fb	disabled and deleted objects where not correctly ignored during adding objects to a cell when it became active	2013-03-22 09:44:59 +01:00
scrawl	918cdcffc2	Split up components/esm/loadlocks	2013-03-22 05:50:54 +01:00
Marc Zinnschlag	8e472cc624	added description column to skill table	2013-03-21 14:38:06 +01:00
Marc Zinnschlag	fefe061294	added basic support for skills to editor	2013-03-21 14:31:32 +01:00
Marc Zinnschlag	947ab6635b	removed automatic detection of setting modified to the same value of base with subsequent setting modifiction state to base only (can cause problems with implicitly added records)	2013-03-21 14:29:31 +01:00
Marc Zinnschlag	a955068853	added universal IDs for skills	2013-03-21 13:40:55 +01:00
Marc Zinnschlag	9464f45d57	fixed an encoding problem. I hate you QString. I hate you so much	2013-03-21 12:47:22 +01:00
Marc Zinnschlag	cafbabde45	fixed broken loading of single files into the editor	2013-03-21 12:13:32 +01:00
Marc Zinnschlag	ebb1dab8e1	removed debugging leftovers	2013-03-21 10:19:07 +01:00
Marc Zinnschlag	d05508db52	switching editor id tables from QAbstractTableModel to QAbstractItemModel (in preparation for record types like containers)	2013-03-21 10:07:25 +01:00
Marc Zinnschlag	cd84b68e4b	silencing some warnings	2013-03-20 20:55:48 +01:00
Marc Zinnschlag	775f9e8402	Merge remote-tracking branch 'potatoesmaster/dialogue' into next	2013-03-20 20:53:14 +01:00
Emanuel Guevel	6783ff6748	Workaround to have dialogues until actor detection is implemented for NPCs	2013-03-20 20:10:55 +01:00
Emanuel Guevel	8de93db488	Coding style consistence	2013-03-20 20:10:55 +01:00
Emanuel Guevel	f25b56ac88	Add dialogue function: NotLocal	2013-03-20 20:10:54 +01:00
Emanuel Guevel	ad3478c8f2	Fix inverted dialogue functions (NotClass etc.) ... The comparison present is useless for these functions.	2013-03-20 20:10:54 +01:00
scrawl	4cbb202306	Several tooltip fixes	2013-03-20 03:31:01 +01:00
scrawl	b9c3a4816d	Fix dialogue topics still being accessible in the history pane when they shouldn't be	2013-03-20 03:30:15 +01:00
scrawl	2509b34ace	Enabled bloodmoon weather	2013-03-20 02:48:10 +01:00
scrawl	6c1ff8caca	Merge branch 'master' into next ... Conflicts: apps/openmw/mwworld/weather.cpp components/fileorderlist/model/datafilesmodel.cpp	2013-03-20 02:29:03 +01:00
scrawl	21cc7483e4	Fix broken weather transitions	2013-03-20 01:20:56 +01:00
Glorf	3bd545ed8e	In-console nonexistent class fix	2013-03-19 21:55:37 +01:00
Glorf	dd11ae04ee	Console code cleaned	2013-03-19 17:25:41 +01:00
pvdk	e76d03dcc4	Added a warning message to the importer dialog	2013-03-19 12:01:54 +01:00
Glorf	f5bf7254a8	Minor console selection improvements	2013-03-18 23:46:17 +01:00
Glorf	a07c910d0b	Feature #535: Console object selection improvements	2013-03-18 21:33:12 +01:00
Marc Zinnschlag	0092a2f437	Merge remote-tracking branch 'pvdk/firstrunfix'	2013-03-18 20:09:10 +01:00
Marc Zinnschlag	c53d7ba6d6	Merge remote-tracking branch 'pvdk/resolutionfix'	2013-03-18 19:59:20 +01:00
Marc Zinnschlag	e4ed5b836e	added ondeath script function	2013-03-18 11:04:47 +01:00
Marc Zinnschlag	fd2c07a6f4	delete death events on adding an actor to the scene	2013-03-18 10:54:47 +01:00
Marc Zinnschlag	61cb0f98a6	keep track of death events	2013-03-18 10:47:09 +01:00
Marc Zinnschlag	08f6d04960	constness fixes	2013-03-18 08:29:40 +01:00
Marc Zinnschlag	19c3b5516d	Merge remote-tracking branch 'glorf/fallbacks-next' into next	2013-03-18 08:14:25 +01:00
scrawl	95e1cdc07d	Move getArmorRating to MWWorld::Class.	2013-03-17 22:29:12 +01:00
scrawl	c66675b599	Fix the 'Take all' button taking equipped items when stealing	2013-03-17 22:28:28 +01:00
Glorf	5922637c58	Unblocked Solstheim weather that should work now.	2013-03-17 20:12:26 +01:00
Glorf	f3fd3a7691	Much more moons fallbacks	2013-03-17 19:36:14 +01:00
Glorf	1369090a80	More moons fallbacks, minor weather fixes	2013-03-17 14:50:02 +01:00
Glorf	6165cd2c6b	Moons fallbacks partially implemented	2013-03-17 14:22:30 +01:00
Glorf	ea7f386e7d	Access to Fallback via getFallback	2013-03-17 13:50:15 +01:00
greye	52ed451ae7	fix eraseStatic() assumptions	2013-03-17 08:36:15 +04:00
scrawl	c07b3ea61d	Text defines for npc race, class, and faction should use the translated name	2013-03-17 04:20:30 +01:00
scrawl	dd57eabc3e	Better use an enum for magic effect IDs	2013-03-16 23:28:26 +01:00
scrawl	1666bc7740	Armor rating	2013-03-16 22:53:33 +01:00
scrawl	e8b08326dc	Corrected Id, Race, Class, Faction and Cell select functions to do the exact opposite as before. That is how they are displayed in the CS, anyway.	2013-03-16 20:52:05 +01:00
scrawl	cebcbe11f8	Implemented service refusal	2013-03-16 20:32:21 +01:00
scrawl	c0b0227e8a	enchanting	2013-03-16 19:00:14 +01:00
pvdk	75be474005	Use the resolution QRegExp cap() instead of converting ints back and forth	2013-03-16 13:45:23 +01:00
pvdk	d1860f2d6c	Removed color information from Direct3D resolutions	2013-03-16 13:40:29 +01:00
pvdk	c15d920133	Fixed the first run dialog, makes sure Morrowind.ini is found	2013-03-16 01:46:28 +01:00
scrawl	485b6c855a	Fix NPC race height not being applied	2013-03-15 16:44:35 +01:00
Marc Zinnschlag	66a2df68db	some cleanup	2013-03-15 10:26:04 +01:00
Glorf	727a598cbe	Last tabulator died	2013-03-15 10:32:03 +01:00
Glorf	542c1bcc53	Some other tabulators deleted	2013-03-15 10:28:39 +01:00
Glorf	e1c6c3fe02	Tabulators deleted	2013-03-15 10:22:02 +01:00
Glorf	521bebd2f4	Fallback system rewritten, added light fallbacks	2013-03-15 10:17:30 +01:00
Marc Zinnschlag	4de2a741ed	Merge remote-tracking branch 'scrawl/master'	2013-03-15 09:58:24 +01:00
pvdk	110dd5d0ee	Possible fix for the resolutions not appearing with Direct3D Renderer	2013-03-15 01:56:39 +01:00
scrawl	3e9cd0e2e3	Fix the back button on generate class result dialog advancing creation stage	2013-03-14 22:33:51 +01:00
Marc Zinnschlag	ef72894b81	Merge remote-tracking branch 'scrawl/alwaysrun' into next	2013-03-14 22:11:12 +01:00
scrawl	7ab236337b	Dialogue responses should be random only for persuasion results	2013-03-14 21:33:00 +01:00
scrawl	b36295cbb3	Removed a leftover	2013-03-14 21:10:22 +01:00
scrawl	5b943a965f	Handle always run in the inputmanager, instead of using forced stance.	2013-03-14 21:08:19 +01:00
scrawl	2d8f0949a4	Always run key (Y)	2013-03-14 20:27:16 +01:00
scrawl	beab20cb42	Fix message boxes not opening if they opened as a result of object activation	2013-03-14 19:53:57 +01:00
gus	9efb073617	clean up + correct a bug	2013-03-14 18:05:00 +00:00
gus	80804fac35	check if the NPC is close from a non loaded cell. If yes, AITravel is simply ended.	2013-03-14 17:16:37 +00:00
greye	d30b38f336	fix Store<T>::eraseStatic()	2013-03-14 19:28:17 +04:00
Marc Zinnschlag	73278edf7e	Merge remote-tracking branch 'scrawl/collision' into next	2013-03-14 13:29:31 +01:00
scrawl	84afd87321	Placeable objects should not collide unless they have a NiRootCollisionNode	2013-03-14 03:04:02 +01:00
scrawl	c4a42f2e1f	Fix infinite recursion on shutdown caused by incorrect onWidgetDestroy listener	2013-03-13 23:17:25 +01:00
scrawl	e4717d7c92	Merge branch 'next' of git://github.com/zinnschlag/openmw into next	2013-03-13 19:46:05 +01:00
scrawl	17fb0f5a69	Merge branch 'master' of git://github.com/zinnschlag/openmw	2013-03-13 19:45:47 +01:00
scrawl	0223df4dfc	Fix invalid cast exception in the spell creation dialog	2013-03-13 19:45:22 +01:00
scrawl	fdcbdbf35d	Rewrote layout tooltips to use the new box layout system, fixes word wrapping delay	2013-03-13 19:44:34 +01:00
gus	f943580138	Somehow manages to get from one cell to another, but this looks wrong... And I don't know how morrowind do it, because aitravel is completly buggy	2013-03-12 17:44:22 +00:00
Marc Zinnschlag	25fd7a41eb	Merge remote-tracking branch 'scrawl/next' into next	2013-03-12 18:13:57 +01:00
scrawl	4c588cbab6	Levelup dialog is now dynamic; added level descriptions	2013-03-12 17:18:47 +01:00
Marc Zinnschlag	10fad47a81	some cleanup	2013-03-12 14:51:16 +01:00
Marc Zinnschlag	170451cb79	Merge remote-tracking branch 'graffy76/saveOnClose' into next	2013-03-12 14:47:42 +01:00
Marc Zinnschlag	75bd30844d	added optional format sub-record to tes3 record	2013-03-12 14:33:35 +01:00
graffy76	50abb22162	Fix to allow application closing from multiple views and a single view.	2013-03-12 06:28:13 -05:00
Marc Zinnschlag	9e68a420ae	restructuring tes3 record structs	2013-03-12 08:15:20 +01:00
Marc Zinnschlag	ce67fbdfca	Merge remote-tracking branch 'pvdk/encoding'	2013-03-12 07:02:44 +01:00
Marc Zinnschlag	0b51e89b78	Merge remote-tracking branch 'pvdk/uifix2'	2013-03-12 07:01:41 +01:00
pvdk	31ba332647	Moved Windows icon to files/launcher	2013-03-12 04:05:14 +01:00
pvdk	f574c37e93	Added encoding flag to ini importer arguments	2013-03-12 04:00:43 +01:00
scrawl	41a958cd4e	Fix hardcoded beast races in MWClass::Npc::getModel	2013-03-12 02:50:23 +01:00
scrawl	46d8f3ce5a	Fix hardcoded race IDs	2013-03-12 02:44:03 +01:00
scrawl	eeb60edb65	Properly check for the Beast flag instead of hardcoding beast races	2013-03-12 02:09:54 +01:00
scrawl	543f573739	Fix the firstguard armor mod	2013-03-12 02:02:59 +01:00
pvdk	81604613b5	Narrowed down includes to improve compile time	2013-03-12 01:29:13 +01:00
scrawl	bcdab2aeab	Fix wrong padding breaking local map for cells where the bounds center is far from the origin	2013-03-11 19:32:39 +01:00
Marc Zinnschlag	2e1a1fd11a	removing some remains of the removed GMST fixing feature	2013-03-11 16:30:47 +01:00
Marc Zinnschlag	64d517dd79	removed unused file type information from esm component	2013-03-11 14:42:49 +01:00
graffy76	96b62940b3	Fixes docked subviews becoming tabbed and application closure when ... closing one of several views.	2013-03-11 06:38:27 -05:00
Marc Zinnschlag	a0df25c631	Merge remote-tracking branch 'pvdk/uifix'	2013-03-11 10:10:48 +01:00
Pieter van der Kloet	b4d408af5d	Added actions to datafiles.ui and implemented them in the launcher	2013-03-11 01:48:01 +01:00
Pieter van der Kloet	fc1940257a	Fixed issue with new profile dialog being too small	2013-03-11 01:23:24 +01:00
Pieter van der Kloet	091c569fbe	Fixed issue with the combobox dropdown looking weird	2013-03-11 01:20:30 +01:00
pvdk	52e5dcc7f0	Some fixes to the way data paths are saved and settings are handled	2013-03-10 21:12:26 +01:00
Marc Zinnschlag	f6d2dec973	Merge remote-tracking branch 'glorf/master'	2013-03-10 17:28:57 +01:00
gus	bbc4c23f7e	AITravel now works correctly on exterior cells. As long as NPC don't try to leave cell, it's ok.	2013-03-10 15:07:22 +00:00
Glorf	93de570f9a	Moved specializations out of step	2013-03-10 15:58:29 +01:00
Glorf	04e99ee9d6	Character creation struct consts	2013-03-10 15:15:33 +01:00
Glorf	1ef682896a	Character creation questions import	2013-03-10 15:03:48 +01:00
graffy76	ce91ef36ea	Fix for warnings on close, leaves all views open until a decision is ... made	2013-03-10 07:49:43 -05:00
Glorf	d5ca00c927	Another fix	2013-03-10 12:11:38 +01:00
Marc Zinnschlag	bdec87e51b	some cleanup	2013-03-10 11:30:50 +01:00
Glorf	81338d3b23	Weather code fixes	2013-03-10 11:30:24 +01:00
Marc Zinnschlag	65c382116f	Merge remote-tracking branch 'glorf/master'	2013-03-10 11:24:23 +01:00
Marc Zinnschlag	6cef7fb610	rescale all objects to the range of [0.5, 2] when a cell becomes active	2013-03-10 10:00:20 +01:00
Glorf	a68c55fea5	Merge branch 'master' of git://github.com/zinnschlag/openmw	2013-03-10 00:29:42 +01:00
Glorf	aebd9a3700	Weather to pull	2013-03-10 00:24:14 +01:00
Marc Zinnschlag	549678394c	Merge remote-tracking branch 'potatoesmaster/fallback-archives'	2013-03-09 23:01:42 +01:00
scrawl	a51b73b609	Fix topics that have the same name as a service opening that service when clicked	2013-03-09 21:50:01 +01:00
Marc Zinnschlag	fbaad8e105	Merge remote-tracking branch 'potatoesmaster/strfix'	2013-03-09 21:33:32 +01:00
Emanuel Guevel	289bbc64f7	Load fallback archives listed in openmw.cfg at startup	2013-03-09 21:14:11 +01:00
Sebastian Wick	0ae48c1f83	fix for Bug #509	2013-03-09 20:40:59 +01:00
scrawl	b19571df89	If character creation dialogs are enabled in the wrong order, force creation stage to advance	2013-03-09 14:59:50 +01:00
Marc Zinnschlag	2cc20c67cb	Merge remote-tracking branch 'scrawl/raycasting'	2013-03-09 14:34:29 +01:00
scrawl	5c94c654d4	Fix wrong rotation of objects dropped on the ground	2013-03-09 13:27:24 +01:00
scrawl	c8b31b4745	Remove an outdated message	2013-03-09 13:26:00 +01:00
graffy76	c17821e6c8	Merge branch 'master' of https://github.com/zinnschlag/openmw into saveOnClose	2013-03-08 20:08:56 -06:00
Emanuel Guevel	c020665cf2	Fix appending int to string in an exception message	2013-03-09 01:00:03 +01:00
scrawl	d7c4a622cf	Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack	2013-03-08 23:46:25 +01:00
Marc Zinnschlag	d396785008	Merge remote-tracking branch 'scrawl/master'	2013-03-08 11:00:20 +01:00
graffy76	03c7f18112	Fixes for save-on-close message boxes	2013-03-07 17:48:05 -06:00
scrawl	285b4bf726	Allow zooming camera in vanity or preview mode with the mousewheel	2013-03-08 00:12:56 +01:00
Emanuel Guevel	1223a2e105	Bsatool: extract and extractall modes	2013-03-07 21:21:00 +01:00
Emanuel Guevel	3adf3f5121	Revive bsatool	2013-03-07 21:13:10 +01:00
Marc Zinnschlag	17e406e58c	Merge remote-tracking branch 'mikesc/bug586'	2013-03-07 20:48:58 +01:00
Michal Sciubidlo	f2f4b6e2d5	Make MWWorld::getInterior case insensitive. ... Interior cells names can use different mix of uppercase/lowercase in different places. getInterior() should return same cell in all cases. Fixes bug #586.	2013-03-07 20:15:01 +01:00
Marc Zinnschlag	2a9d15cd9f	Merge remote-tracking branch 'scrawl/master'	2013-03-07 16:42:07 +01:00
scrawl	66a754e9aa	Fix tooltip position when hovering the crosshair over NPCs	2013-03-07 15:25:22 +01:00
scrawl	0ee0dbdb97	Added "dispose corpse" button, added stealing (all items visible and no penalty yet)	2013-03-07 14:00:13 +01:00
scrawl	e34685b8a3	Fix manually changed mouse cursor	2013-03-07 12:46:26 +01:00
Marc Zinnschlag	a994a23f4e	file loading fixes	2013-03-07 07:56:29 +01:00
Pieter van der Kloet	9145fb210b	Merge remote-tracking branch 'upstream/master' into opencsui	2013-03-07 03:02:03 +01:00
Pieter van der Kloet	7504ae675b	Implemented a file dialog for the editor using launcher .ui	2013-03-07 03:00:59 +01:00
gus	01908dbcc2	little improvement	2013-03-06 21:17:33 +00:00
gus	5fc7103425	First attempt at pathfinding using boost::graph	2013-03-06 20:31:47 +00:00
scrawl	8be9627c8d	Fix method signatures	2013-03-06 21:26:41 +01:00
scrawl	f7d8f6456f	Stats should never go below 0	2013-03-06 20:45:11 +01:00
Marc Zinnschlag	642653d10e	World constructor fixes	2013-03-06 19:57:00 +01:00
Marc Zinnschlag	7e100c36b5	Merge remote-tracking branch 'gus/AI'	2013-03-06 19:05:55 +01:00
Marc Zinnschlag	ef86a693c3	Merge remote-tracking branch 'scrawl/sneak'	2013-03-06 18:59:37 +01:00
Marc Zinnschlag	69eb5aa99a	Merge remote-tracking branch 'scrawl/master'	2013-03-06 18:59:02 +01:00
gus	5938e19362	Clean up	2013-03-06 17:31:57 +00:00
scrawl	66d2d3522f	Race selection preview: render only the head, and focus the camera on its node	2013-03-06 18:03:47 +01:00
scrawl	268bb23590	Implemented sneaking animation	2013-03-06 16:58:56 +01:00
scrawl	39411eda7b	Fix the spell buying window listing already owned spells	2013-03-06 15:11:40 +01:00
Pieter van der Kloet	c9859382bf	Made the launcher write the custom resolution to file, cleaned resolution parsing	2013-03-06 01:35:32 +01:00
gus	d3bf3812a4	changing rotation order (fix some misoriented objects)	2013-03-05 20:16:57 +00:00
gus	8b6f0e0770	Correct orientation sign	2013-03-05 18:28:57 +00:00
Marc Zinnschlag	d839a4c6c2	Merge remote-tracking branch 'scrawl/graphics'	2013-03-05 16:31:22 +01:00
scrawl	fe7b2732d8	Avoid manually updating render targets from within frameRenderingQueued	2013-03-05 14:24:29 +01:00
scrawl	2486ec6cb9	Material fixes (vertex colors, alpha)	2013-03-05 13:51:48 +01:00
Marc Zinnschlag	46de45b9a2	added var type column to globals	2013-03-05 11:37:13 +01:00
Marc Zinnschlag	dc3edc6024	Merge branch 'vartype'	2013-03-05 10:59:08 +01:00
Marc Zinnschlag	1489570b09	change variant in info record to new type	2013-03-05 10:34:03 +01:00
Marc Zinnschlag	ba4907fbaf	use new Variant type for GMSTs	2013-03-05 08:02:27 +01:00
Pieter van der Kloet	770d8af931	Forgot to add the DataFilesPage .ui	2013-03-05 03:57:27 +01:00
Pieter van der Kloet	75cf009101	Finished implementing the .ui file for the DataFilesPage	2013-03-05 03:47:57 +01:00
Pieter van der Kloet	4c9d0563fe	WIP: Implementing the .ui for the DataFilesPage	2013-03-05 03:13:39 +01:00
Pieter van der Kloet	fb5213a754	Made the GraphicsPage use a .ui file and added support for custom res	2013-03-05 02:17:28 +01:00
Marc Zinnschlag	8a887a0aef	Merge remote-tracking branch 'potatoesmaster/tradewindow'	2013-03-04 19:42:51 +01:00
Marc Zinnschlag	ac810faa7e	Merge remote-tracking branch 'scrawl/master'	2013-03-04 19:36:58 +01:00
Marc Zinnschlag	a93034b0a9	Merge remote-tracking branch 'k1ll/store_segfault_fix'	2013-03-04 19:27:14 +01:00
scrawl	d5c6c221c1	Books/scrolls: Fix the take button incorrectly showing	2013-03-04 17:28:01 +01:00
scrawl	ca707aa65f	Transparency should be evaluated per subentity, not per NIF	2013-03-04 16:57:00 +01:00
scrawl	cab5315a8e	Disable mipmaps generation	2013-03-04 16:28:20 +01:00
Marc Zinnschlag	a1ac20c6f3	changed global variable records to new variant type	2013-03-04 14:32:59 +01:00
Marc Zinnschlag	65081f5520	added variant class	2013-03-04 14:32:23 +01:00
gus	3384d92761	oups introduced a bug..	2013-03-04 12:28:43 +00:00
gus	48b3f1e0cf	Clean up. But still a little hacky	2013-03-04 12:08:35 +00:00
Emanuel Guevel	8e07638699	Update the trading offer on "max sale" button click	2013-03-04 12:24:41 +01:00
graffy76	6911868f2a	File->close and File->exit menu items added. Exit uses ... closeAllWindows() to ensure ViewManager::closeRequest is called on the last open window. Exit will close all open windows but the last one in cases of active save operation or modified file.	2013-03-03 15:58:26 -06:00
scrawl	f1d35b73b8	Cleanup	2013-03-03 19:52:20 +01:00
scrawl	359ae06fcf	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-03-03 19:35:26 +01:00
scrawl	c9fefc7f5d	Simpler, more lightweight underwater effect, changed colors to match vanilla better	2013-03-03 19:28:11 +01:00
Marc Zinnschlag	123a111580	Merge remote-tracking branch 'scrawl/master'	2013-03-03 17:13:05 +01:00
scrawl	f0e3463e9b	Disable assertion for comparing iterators from different containers (Bug #605)	2013-03-03 16:50:10 +01:00
scrawl	5341bf9504	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-03-03 15:51:58 +01:00
Marc Zinnschlag	3e97943e06	Merge remote-tracking branch 'scrawl/includes'	2013-03-03 15:37:13 +01:00
Marc Zinnschlag	5595675664	Merge remote-tracking branch 'scrawl/effects'	2013-03-03 15:33:23 +01:00
scrawl	05bd94effb	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-03-03 15:14:20 +01:00
scrawl	002830e13b	Make sure render textures are inactive when in a cell without water	2013-03-03 15:11:45 +01:00
scrawl	867b22ce19	Fix a terrain glitch	2013-03-03 15:11:19 +01:00
scrawl	11f21a1988	Weather update should be before renderer update	2013-03-03 15:10:40 +01:00
gus	5951abfae2	fix some script instructions	2013-03-03 13:59:38 +00:00
gus	7fb2ff18a3	Fix bug induced by previous commit (player orientation wasn't stored correctly), and fix NPC not beeing able to move with certain angles (like angle Z 70) because the trace function was hitting NPC own hitboxes. The solution prposed here is a little hacky, but i works. Need a little clean up(mBody shouldn't be public)	2013-03-03 13:06:45 +00:00
gus	e1882dce32	correcting a bug: player orientation wasn't stored correctly, and objects orientation wasn't properly retrived.	2013-03-03 13:02:41 +00:00
scrawl	9a84f6744f	Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr)	2013-03-03 13:11:02 +01:00
scrawl	6037c44ea6	Fix ingredient effect display	2013-03-03 12:41:57 +01:00
scrawl	6f05c4229f	Implemented potion & ingredient effect stacking	2013-03-03 12:41:37 +01:00
scrawl	8e05c4159d	Magic effect icons for permanent enchantments	2013-03-03 12:17:37 +01:00
scrawl	cf87708c1f	Magic effect icons for spells	2013-03-03 12:01:19 +01:00
scrawl	0f6fd80294	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics ... Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp apps/openmw/mwrender/npcanimation.cpp files/mygui/openmw_settings_window.layout	2013-03-03 11:02:38 +01:00
graffy76	eb90bd71ba	Fixed triggering confirmation messages boxes when more than one view is ... open.	2013-03-02 21:34:55 -06:00
Pieter van der Kloet	0a6e3701ab	Made the Play page use a .ui file too	2013-03-03 01:49:41 +01:00
Pieter van der Kloet	f2193bb1ba	Made the mainwindow use a .ui file and removed the stylesheet	2013-03-03 00:48:09 +01:00
Pieter van der Kloet	2b6bb9657b	Added Qt Designer .ui files	2013-03-02 23:49:31 +01:00
Pieter van der Kloet	a3c5c868ec	Merge remote-tracking branch 'upstream/master' into launcherui	2013-03-02 23:01:53 +01:00
Nathan Jeffords	109dff2d29	renamed high level NIF files...	2013-03-02 13:23:09 -08:00
k1ll	dde43e8c87	Some cleanup	2013-03-02 21:46:31 +01:00
graffy76	bf6c855e6d	Final changes to implement save-on-close features	2013-03-02 12:49:26 -06:00
Nathan Jeffords	d3c1f5e7b2	renamed low-level NIF related files and include guards to conform to naming convention	2013-03-02 10:46:12 -08:00
k1ll	9acd4061cc	Fix dangling static references in mShared	2013-03-02 17:04:17 +01:00
graffy76	9193ddc9d3	Merge branch 'master' into saveOnClose	2013-03-02 09:24:42 -06:00
graffy76	a2e36594c9	Completed "abort save on close" feature	2013-03-02 09:22:44 -06:00
graffy76	f85be6a744	80% complete save-on-close feature	2013-03-02 07:57:41 -06:00
scrawl	e1957e4ee9	Potion effects should be hidden until discovered	2013-03-02 13:34:26 +01:00
Marc Zinnschlag	0f4f91605a	some cleanup	2013-03-02 11:19:48 +01:00
Marc Zinnschlag	401903c9ce	Merge remote-tracking branch 'lazydev/master'	2013-03-02 11:11:41 +01:00
lazydev	ccb7ed93b3	fix for https://bugs.openmw.org/issues/593	2013-03-02 03:54:25 +04:00
Marc Zinnschlag	3961fb36d4	Merge remote-tracking branch 'chris/transparency-fixes'	2013-03-01 23:18:35 +01:00
Chris Robinson	e6b547b9ba	Merge remote-tracking branch 'zini/master' into transparency-fixes	2013-03-01 13:32:30 -08:00
scrawl	ef1678e47e	Oops, rotation center should be dynamic	2013-03-01 22:32:02 +01:00
Chris Robinson	238a8feb18	Fix transparency checks	2013-03-01 13:27:25 -08:00
scrawl	d8f2d0195a	Got rid of the texture rotation hack by rendering the cursor manually.	2013-03-01 18:45:52 +01:00
scrawl	1d988676fe	Local map: the obtained bounding box wasn't exactly accurate, getWorldBoundingBox seems to solve this.	2013-02-28 22:56:29 +01:00
Chris Robinson	1168f15361	Don't disable depth writes when blending is enabled	2013-02-28 12:17:58 -08:00
scrawl	b7ab12e7cf	Workaround to prevent the map drawing on top of the world button	2013-02-28 21:12:13 +01:00
scrawl	3efbb5e728	Don't try to render a map in empty cells	2013-02-28 20:27:35 +01:00
Marc Zinnschlag	038c5c3e82	Merge remote-tracking branch 'mikesc/bug574'	2013-02-28 20:21:38 +01:00
Michal Sciubidlo	3df34fb5cc	fix bug 574	2013-02-28 19:52:32 +01:00
vorenon	c9a701cfa1	Removed the 3 dots after the load text.	2013-02-28 19:25:18 +01:00
vorenon	f66f67eaa1	Loading text uses now the corresponding GMSTs	2013-02-28 17:54:42 +01:00
vorenon	a6fb58bc59	Using "Loading Exterior" and "Loading Interior" instead of "Loading Cell" ... This commit replaces the default "Loading Cell" text with "Loading Interior" and "Loading Exterior"	2013-02-28 16:31:24 +01:00
vorenon	d4aa33b9a7	Removing the unloading cells part instead of just commenting them.	2013-02-28 15:58:03 +01:00
vorenon	ffd96c7715	Removed "Unloading Cell..." text from loading screen ... OpenMW unloads the cell so fast, it's hardly noticable. This commit gets rid of the "flicker" every time a cell loads.	2013-02-28 13:19:05 +01:00
Chris Robinson	bfe80bb8dc	Avoid duplicating skeletons due to casing issues ... Manually created resource names are apparently always case sensitive, causing some skeletons to get loaded multiple times.	2013-02-27 12:33:36 -08:00
Marc Zinnschlag	ce1310614c	Merge remote-tracking branch 'potatoesmaster/pinned'	2013-02-27 17:37:04 +01:00
Marc Zinnschlag	14459460c1	Merge remote-tracking branch 'potatoesmaster/gender'	2013-02-27 17:36:57 +01:00
Marc Zinnschlag	7cae69ee4e	Merge remote-tracking branch 'vorenon/master'	2013-02-27 17:36:03 +01:00
Emanuel Guevel	be9d49c510	Do not hide pinned windows during loadings	2013-02-27 16:17:41 +01:00
Emanuel Guevel	0bc4c3556a	Fix dialogue gender filter	2013-02-27 15:58:01 +01:00
scrawl	369f881170	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-27 09:25:44 +01:00
scrawl	9b0ac4e299	NPCs / creatures can now emit ripples	2013-02-27 09:20:42 +01:00
vorenon	89cba3cf45	Replaced ifs/elseifs with switch	2013-02-26 19:52:51 +01:00
vorenon	13c33c1613	added missing click sound to main menu	2013-02-26 19:37:47 +01:00
Chris Robinson	35e2b6942a	Merge remote-tracking branch 'zini/master' into misc-cleanup	2013-02-26 10:21:28 -08:00
Chris Robinson	ceafcc2ebb	Support float samples with ffmpeg ... Requires the AL_EXT_FLOAT32 extension in OpenAL	2013-02-26 10:19:33 -08:00
Nathan Jeffords	21f502e3dd	properly handle potentially non 16 bit planar audio formats	2013-02-26 09:37:18 -08:00
vorenon	b1ca719d61	Added click sound to OK button for message boxes	2013-02-26 16:37:59 +01:00
vorenon	1a43d86d9e	Close messages boxes with the activation key (Bug #589)	2013-02-26 15:58:32 +01:00
scrawl	d4264353a3	Merge branch 'z-up' into graphics ... Conflicts: apps/openmw/mwrender/localmap.cpp apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/water.cpp files/materials/water.shader	2013-02-26 14:54:53 +01:00
Marc Zinnschlag	dc445844d2	Merge remote-tracking branch 'scrawl/z-up'	2013-02-26 14:37:50 +01:00
Marc Zinnschlag	a7102c143f	ESX variable type cleanup	2013-02-26 14:37:11 +01:00
scrawl	b9912a19e0	Z-up conversion: fix player arrow direction on global map	2013-02-26 14:31:30 +01:00
scrawl	cd68012498	Z-up conversion: raycasts	2013-02-26 14:28:35 +01:00
scrawl	cc9b72b9b1	Removing some leftovers of mwRoot node	2013-02-26 14:01:10 +01:00
scrawl	341f9b96e2	Local map: restore zHigh	2013-02-26 13:53:23 +01:00
scrawl	284ba58e1e	Z-up conversion: global map, shader fix	2013-02-26 13:52:01 +01:00
scrawl	2e7bc1a368	Z-up conversion: local map, fix tcg	2013-02-26 13:39:10 +01:00
scrawl	5c0c5854e8	Unrelated change: we always want the XAutoRepeat workaround, regardless of using exclusive input or not	2013-02-26 12:01:10 +01:00
scrawl	3ef952172d	Z-up conversion: water, sky	2013-02-26 10:38:48 +01:00
scrawl	3cb3ec91c0	Z-up conversion: camera	2013-02-26 09:12:35 +01:00
scrawl	a5451eb9d9	Z-up conversion: terrain, objects	2013-02-26 08:30:06 +01:00
Chris Robinson	955e2713a9	Fix encumbrance term calculation	2013-02-25 17:29:32 -08:00
Chris Robinson	a576e9e430	Set the race selection character preview in a valid (idle) pose.	2013-02-25 16:40:08 -08:00
Chris Robinson	9679daa6a4	Merge remote-tracking branch 'zini/master' into misc-cleanup	2013-02-25 13:10:21 -08:00
Chris Robinson	da575b181e	Use the correct GMST for the race menu	2013-02-25 13:04:17 -08:00
Pieter van der Kloet	b209b6a0e6	Added missing includes	2013-02-25 22:00:51 +01:00
Pieter van der Kloet	469d608f51	Merge remote-tracking branch 'upstream/master' into launchernext	2013-02-25 21:26:54 +01:00
Pieter van der Kloet	9cd8dd39de	Make the launcher code conform to the coding standards and cleanup	2013-02-25 21:22:07 +01:00
Marc Zinnschlag	bd9884b244	Merge remote-tracking branch 'chris/misc-cleanup'	2013-02-25 19:45:09 +01:00
Chris Robinson	000128d084	Merge remote-tracking branch 'zini/master' into misc-cleanup	2013-02-25 10:38:08 -08:00
Marc Zinnschlag	08f13ef5ab	Merge remote-tracking branch 'greye/master'	2013-02-25 19:34:03 +01:00
Marc Zinnschlag	fa45def475	Merge remote-tracking branch 'scrawl/master'	2013-02-25 19:30:30 +01:00
greye	661fd73c6e	fix rotation for objects in inactive cells and forced vanity mode	2013-02-25 22:00:50 +04:00
Chris Robinson	48271e49ec	Properly update the Ptr object in the mechanics manager when moving across cells	2013-02-25 09:57:34 -08:00
scrawl	8aff033a0c	Atmosphere no longer does "real" alpha blending to blend with the horizon, this is in preparation for proper underwater viewport BG / fog	2013-02-25 18:29:11 +01:00
scrawl	b1fc68d44d	Merge branch 'master' into graphics	2013-02-25 17:36:33 +01:00
scrawl	355390429e	Fix World::isUnderwater to use dynamic waterlevel	2013-02-25 17:27:50 +01:00
Marc Zinnschlag	88e8659a49	minor cleanup	2013-02-25 16:52:31 +01:00
Chris Robinson	5d5d28c06c	Increase the ID cache to 40 ... Helps improve performance with Tribunal and Bloodmoon's scripts	2013-02-25 07:43:56 -08:00
scrawl	73d48a95f6	Add message box when the player tries to move when being overencumbered.	2013-02-25 16:31:48 +01:00
scrawl	cacdb33b42	Merge branch 'master' into graphics ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/sky.cpp	2013-02-25 15:12:03 +01:00
Marc Zinnschlag	cd40d167ce	Merge remote-tracking branch 'chris/animation2'	2013-02-25 14:56:03 +01:00
scrawl	dfe29db9cb	Fix bug #591: Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation)	2013-02-25 06:57:32 +01:00
Pieter van der Kloet	c4ebdc230c	Cleaned up strings and indentation	2013-02-25 01:28:13 +01:00
Pieter van der Kloet	a0007325ad	Added a warning when stylesheet cannot be read and check if data paths contain masters/plugins	2013-02-25 01:22:14 +01:00
Pieter van der Kloet	6eaaf20c94	Merge remote-tracking branch 'upstream/master' into launchernext	2013-02-25 00:56:23 +01:00
Pieter van der Kloet	17a0a201df	Various fixes and changes to the settings handling	2013-02-25 00:56:04 +01:00
Chris Robinson	000236ba80	Merge remote-tracking branch 'zini/master' into animation2	2013-02-24 15:30:46 -08:00
Chris Robinson	74b8095fc7	Use default parameters where appropriate	2013-02-24 14:43:20 -08:00
Chris Robinson	5267d17408	Revert "forgot to destroy child scene nodes" ... This reverts commit f1a3309392. Unneeded. The caller already calls this which destroys the children recursively	2013-02-24 14:14:08 -08:00
ChrisKCat	9e7b559b09	Merge pull request #6 from scrawl/lights ... For light objects without an AttachLight bone, attach the light to the c...	2013-02-24 14:12:53 -08:00
scrawl	f1a3309392	forgot to destroy child scene nodes	2013-02-24 19:03:25 +01:00
scrawl	1ae2d3c6ab	For light objects without an AttachLight bone, attach the light to the center of the object instead of the origin.	2013-02-24 19:00:06 +01:00
Nathan Jeffords	7ea1f6a02a	fixes for using FFMPEG on windows	2013-02-24 09:42:08 -08:00
scrawl	a3afb91485	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-24 18:04:51 +01:00
Chris Robinson	94be45e07e	Merge remote-tracking branch 'zini/master' into animation2	2013-02-24 06:20:10 -08:00
ChrisKCat	aab7cf137b	Merge pull request #5 from greye/cross-cell ... fix and unify object cell change update in mwrender	2013-02-24 05:32:52 -08:00
Marc Zinnschlag	fa880e3274	Merge remote-tracking branch 'lazydev/master'	2013-02-24 14:07:52 +01:00
Chris Robinson	db9a3aeddf	Merge remote-tracking branch 'zini/master' into animation2	2013-02-24 03:32:35 -08:00
Chris Robinson	89d4c245e9	Better calculate jump velocity ... The fatigue term isn't currently used correctly	2013-02-24 03:30:33 -08:00
greye	6a8c532244	fix and unify object cell change update in mwrender	2013-02-24 15:04:56 +04:00
scrawl	0d6a3367d3	Water shader no longer depends on object shaders being enabled	2013-02-24 10:28:50 +01:00
scrawl	3135482cee	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-24 10:06:04 +01:00
Pieter van der Kloet	919d1ee572	Some fixes to the settings handlers	2013-02-24 04:14:18 +01:00
Pieter van der Kloet	4737b20e4c	Fixed a bug in the combobox popup font size, items overlapping	2013-02-24 04:00:22 +01:00
Pieter van der Kloet	be43fa334f	Added support for non-latin characters, fixes Bug #515	2013-02-24 03:14:19 +01:00
Pieter van der Kloet	9198afeefb	Improved context menu, added context menu for masters and added multi-selection support	2013-02-24 03:10:27 +01:00
Chris Robinson	90cb9ee0ac	Don't set a vertical velocity when on the ground	2013-02-23 16:30:11 -08:00
lazydev	a5ff8181b7	fix for https://bugs.openmw.org/issues/569	2013-02-24 03:35:43 +04:00
Chris Robinson	8e59ea4941	Use a separate method to handle animation events	2013-02-23 14:39:01 -08:00
Pieter van der Kloet	150d4a7a72	Added support for multiple ini files	2013-02-23 23:18:42 +01:00
Chris Robinson	d77d035d3a	Handle the "sound" events in runAnimation	2013-02-23 14:15:11 -08:00
Chris Robinson	df8889dcc4	Limit maximum frame time to 200ms ... This effectively slows game time when it drops below 5 fps. Something like this is desirable when dealing with time-based animations, which can jump forward after a lengthy cell transition.	2013-02-23 13:15:37 -08:00
Marc Zinnschlag	9a03b17b2d	Merge branch 'localworkaround'	2013-02-23 20:50:22 +01:00
Marc Zinnschlag	a95431c387	fix	2013-02-23 20:20:40 +01:00
Marc Zinnschlag	9e8d0128e0	Merge remote-tracking branch 'blunted2night/size_t-warnings_v2'	2013-02-23 20:06:27 +01:00
Nathan Jeffords	44b1c66c4b	fixed various warnings about converting size_t to int	2013-02-23 10:23:38 -08:00
Chris Robinson	d208422ca7	Add a method to update an Animation's Ptr object	2013-02-23 10:12:36 -08:00
Marc Zinnschlag	d98ec67671	Merge remote-tracking branch 'graffy76/recentfiles'	2013-02-23 18:53:33 +01:00
Chris Robinson	a2eaec7878	Avoiding holding the InventoryStore in the NpcAnimation class	2013-02-23 08:03:52 -08:00
Chris Robinson	0d0e75fe0b	Don't set animation sources for models that don't have a skeleton	2013-02-23 07:36:11 -08:00
graffy76	89dace3cc3	Fix for operations widget - hides when no operations are running.	2013-02-23 09:07:13 -06:00
Chris Robinson	0148db8ccf	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/npcanimation.hpp	2013-02-23 05:59:35 -08:00
Marc Zinnschlag	3472a6f180	workaround for infinite recursion during local variable access	2013-02-23 14:40:56 +01:00
scrawl	4b51184ec4	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-23 14:37:28 +01:00
Chris Robinson	e6da9dfae5	Specify the animation key to stop playing at	2013-02-23 05:15:10 -08:00
Marc Zinnschlag	59748a7647	Merge remote-tracking branch 'greye/cross-cell'	2013-02-23 13:55:31 +01:00
Sergey Shambir	a3adcf752d	TradeWindow: fixed coding style ... Mentioned here: https://github.com/zinnschlag/openmw/pull/554	2013-02-23 13:51:21 +01:00
greye	ac7095537f	remove insertMesh() call on object cell change	2013-02-23 16:50:37 +04:00
greye	d983ed5c78	fix invalid SceneNode pointer on cell change	2013-02-23 16:45:55 +04:00
greye	9659b4a95e	update NpcAnimation inventory reference on cell change	2013-02-23 16:45:55 +04:00
Marc Zinnschlag	868916a9a2	added add-on global variables in the same way add-on GMSTs were added	2013-02-23 12:51:45 +01:00
Marc Zinnschlag	6f5a772d02	fixed another case handling problem	2013-02-23 12:35:05 +01:00
Chris Robinson	b8f5813609	Set all animation sources at once	2013-02-23 03:34:03 -08:00
Marc Zinnschlag	c9ca565462	removed a redundant function call	2013-02-23 12:05:09 +01:00
Chris Robinson	f841576bba	Don't override animations played with playgroup	2013-02-23 01:54:46 -08:00
scrawl	7e816c826b	Fix lights without a mesh	2013-02-23 09:17:12 +01:00
scrawl	01102f9c73	Don't emit if there wasn't enough movement	2013-02-23 05:53:20 +01:00
graffy76	6f89d453a5	Operations widget height fix and abort button feature. Successfully ... tested resizing of Operations QDockWidget for multiple concurrent operations.	2013-02-22 21:53:32 -06:00
scrawl	5b099393fa	Fix time factor	2013-02-23 04:43:51 +01:00
scrawl	db9e49968e	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-23 04:13:51 +01:00
scrawl	f17ea109ca	Fix light positions	2013-02-23 04:06:05 +01:00
Chris Robinson	b12c6a4c16	Fix character preview	2013-02-22 11:16:00 -08:00
Chris Robinson	ecbf1568a1	Fix NPC part attachment	2013-02-22 10:15:29 -08:00
Chris Robinson	9dee2a72cd	Use a separate method to calculate animation velocity	2013-02-22 09:22:06 -08:00
Chris Robinson	3c0b29de45	Merge remote-tracking branch 'zini/master' into animation2	2013-02-22 01:34:22 -08:00
Chris Robinson	84227caa0c	Cleanup Npc::getSpeed a little	2013-02-22 01:30:06 -08:00
Chris Robinson	7ec73c29f2	Do not return the player's Animation object for non-players	2013-02-22 01:27:26 -08:00
Chris Robinson	9c3af5f344	Do not interpret noclip mode as flying	2013-02-22 01:26:30 -08:00
lazydev	71e5369f04	Loading translation data for all the plugin files, not only for the first one	2013-02-22 02:18:54 +04:00
Chris Robinson	7fcca180b6	Implement rudimentary jumping	2013-02-20 20:08:04 -08:00
Pieter van der Kloet	63a13cf9ca	Whoops, removed an include	2013-02-20 19:29:12 +01:00
Pieter van der Kloet	18d01cd65a	Implemented a first-run dialog to import Morrowind.ini settings	2013-02-20 19:27:04 +01:00
Chris Robinson	bbde0146a7	Merge remote-tracking branch 'zini/master' into animation2	2013-02-20 08:27:40 -08:00
Chris Robinson	4eb8ea0c95	Fix stepping and vertical force accumulation	2013-02-20 07:51:36 -08:00
Chris Robinson	b14def7c09	Set the character as being on the ground when colliding with a shallow enough slope	2013-02-20 05:24:38 -08:00
Chris Robinson	fe6fa9ebe7	Simplify newtrace a bit	2013-02-20 04:14:52 -08:00
Chris Robinson	617158afcd	Ensure updated skeleton bone placement matches in world space ... Objects attached to actors (shirts, robes, etc) do not require the same node hierarchy as the character root. So to ensure proper placement, we need to set the bone target's derived transformation using the source bone's derived transformation (which in turn means we need to work up from the root, to ensure the bone's parents are properly placed).	2013-02-20 02:41:46 -08:00
Chris Robinson	cfdc820a1f	Make an actor fly when it has a levitate effect	2013-02-20 01:55:12 -08:00
Emanuel Guevel	3dc28baa28	Remove "PinToggle" event from layout file	2013-02-20 01:31:10 +01:00
Emanuel Guevel	3ba3c71556	Make the "lock window" button to change state visually	2013-02-20 01:30:39 +01:00
Emanuel Guevel	43d6392921	Change the way pinnable window are made visible ... This ensure pinned window are not displayed in main menu, dialogue and container mode.	2013-02-20 01:00:13 +01:00
Pieter van der Kloet	2172fb4229	Added checkable message box class	2013-02-19 16:41:33 +01:00
Pieter van der Kloet	35b68a3c40	Fixed accidental profile deletion and added sorting by date	2013-02-19 15:58:01 +01:00
Chris Robinson	8196694c08	Avoid applying the animation when resetting it	2013-02-19 06:04:25 -08:00
Chris Robinson	f8349a04bf	Use the looping portion of the animation to calculate the velocity	2013-02-19 05:26:58 -08:00
Chris Robinson	5d55b41714	Remove a now-unneeded(?) hack	2013-02-19 04:59:38 -08:00
Chris Robinson	89fabdb3a9	Update the PhysicActor's RigidBody when moving ... This works, but is less than ideal. As it is now, the rigid body gets updated twice as the position and rotation are set separately. They should instead be updated together.	2013-02-19 04:18:15 -08:00
Chris Robinson	1399a06c76	Update animation looping when setting the same state	2013-02-19 04:01:33 -08:00
Chris Robinson	a510adc572	Allow stepping when not being affected by gravity	2013-02-19 02:25:57 -08:00
Chris Robinson	8255a64bfe	Handle levitate and swift swim effects	2013-02-19 02:10:36 -08:00
Chris Robinson	c694161272	Don't try to step if not on the ground	2013-02-19 01:28:02 -08:00
Chris Robinson	5a1a0b7338	Add and use an MWWorld::isFlying method	2013-02-18 22:39:43 -08:00
Chris Robinson	17200cb226	Don't try to move when there's no speed	2013-02-18 20:43:55 -08:00
scrawl	5d403ebdd3	Fix collision debug drawer (tcg)	2013-02-19 04:03:24 +01:00
scrawl	427152c518	Disabled ripples until we can properly trigger them from the new character controller.	2013-02-19 03:15:31 +01:00
scrawl	6cceb04adf	When a custom near clip plane is used, we need to fix up a second viewproj matrix manually to get proper depth values in the vertex shader. This fixes fog on reflections.	2013-02-19 03:08:00 +01:00
Pieter van der Kloet	37fe31e858	Merge remote-tracking branch 'upstream/next' into settings_selwidget	2013-02-19 01:12:47 +01:00
scrawl	32b837ebd4	Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics	2013-02-19 00:15:54 +01:00
Pieter van der Kloet	bcf4f96209	Added writing masters/plugins to openmw.cfg	2013-02-18 23:10:50 +01:00
Pieter van der Kloet	178cf2154e	Made checking/unchecking work with the new datafiles model	2013-02-18 17:59:08 +01:00
Chris Robinson	627b866744	Don't try to set a new state when dead	2013-02-18 06:29:16 -08:00
Chris Robinson	f2948ced23	Allow diagonal movement	2013-02-18 03:07:31 -08:00
Marc Zinnschlag	0713afb97d	Merge branch 'gmstfixing' into next	2013-02-18 09:24:22 +01:00
Marc Zinnschlag	a50ff34774	better default value for string GMSTs	2013-02-18 09:23:14 +01:00
scrawl	42883ec64b	cleanup	2013-02-18 02:33:53 +01:00
Chris Robinson	bea460955d	Merge remote-tracking branch 'zini/next' into animation2	2013-02-17 16:03:39 -08:00
Marc Zinnschlag	1343c2c22b	Merge remote-tracking branch 'scrawl/next' into next	2013-02-17 20:29:45 +01:00
scrawl	b52df83d84	Pressing Enter should skip _one_ message box, not skip all message boxes until the key is released again	2013-02-17 20:23:22 +01:00
Marc Zinnschlag	e5149e57ac	Merge remote-tracking branch 'scrawl/next' into next	2013-02-17 20:04:18 +01:00
Marc Zinnschlag	475f4f9311	implicitly add Tribunal/Bloodmoon GMSTs to base, if present neither in base nor in modified	2013-02-17 20:03:39 +01:00
scrawl	52d0f0b750	Fixed OpAddItem, OpRemoveItem	2013-02-17 19:44:00 +01:00
Marc Zinnschlag	abd307d70e	Issue #567: workaround for crash with non-English ESX files	2013-02-17 19:26:01 +01:00
scrawl	e1ca0a15ae	Add message box when item is added to player's inventory	2013-02-17 18:58:54 +01:00
scrawl	170a9762ac	Fix travel services not actually costing gold.	2013-02-17 18:30:21 +01:00
scrawl	791d16bbdb	Use infinite AAB for sky meshes to fix them from disappearing from underwater refraction, while still taking advantage of CPU culling for other meshes	2013-02-17 18:12:38 +01:00
Marc Zinnschlag	31bfe62bbc	Merge remote-tracking branch 'scrawl/bug_562' into next	2013-02-17 17:41:19 +01:00
Marc Zinnschlag	9221c861c5	Merge remote-tracking branch 'graffy76/next' into next ... Conflicts: apps/opencs/CMakeLists.txt	2013-02-17 17:38:33 +01:00
Marc Zinnschlag	bb990b96bf	Merge branch 'globaltype' into next	2013-02-17 17:27:41 +01:00
Marc Zinnschlag	50d61a5b6e	proper implementation of gmst type column	2013-02-17 17:27:25 +01:00
scrawl	7ffcfa3622	Water and clouds no longer depend on timescale.	2013-02-17 16:23:55 +01:00
scrawl	5a11ddc485	Pressing F1 again hides the quick keys menu.	2013-02-17 16:01:36 +01:00
scrawl	d899f33444	Race/Class/Birth dialogs: immediately enable OK buttons since they have a preselected entry now.	2013-02-17 16:00:31 +01:00
scrawl	00db13be32	Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.	2013-02-17 15:56:22 +01:00
graffy76	ceefae81e8	fix for the opencs icon	2013-02-17 07:46:50 -06:00
Chris Robinson	e2d7cc49e3	Merge remote-tracking branch 'zini/next' into animation2	2013-02-17 03:42:37 -08:00
Marc Zinnschlag	44d66cbf5a	Merge remote-tracking branch 'scrawl/bug_562' into next	2013-02-17 09:09:31 +01:00
Marc Zinnschlag	448293f270	Merge remote-tracking branch 'scrawl/bug_559' into next	2013-02-17 09:09:06 +01:00
Marc Zinnschlag	b8c0c94d5f	Merge remote-tracking branch 'wareya/master' into next	2013-02-17 08:58:41 +01:00
scrawl	c4f17f5596	playercontrols switch now disables activation in general (Chris' suggestion)	2013-02-17 03:03:41 +01:00
scrawl	373de19aee	Removed dialogue fix again, now on separate branch	2013-02-17 03:02:47 +01:00
scrawl	df8e502f8c	Ouch, I used && instead of &, this broke actions without a sound	2013-02-17 02:52:49 +01:00
Wareya	c98a815581	Remove debug printing from previous commit	2013-02-16 13:37:25 -05:00
Wareya	f0220fb06b	Implement "Rest Until Healed" ... Fixes: https://bugs.openmw.org/issues/563	2013-02-16 13:35:03 -05:00
scrawl	a5c8d5748f	fix FailedAction.	2013-02-16 18:05:25 +01:00
scrawl	0bc34c1c0d	Action::executeImp returns a bool value to indicate if the sound should be played.	2013-02-16 16:40:44 +01:00
scrawl	7d918caa93	Don't allow dialogue if player controls are disabled.	2013-02-16 16:26:40 +01:00
Marc Zinnschlag	910858c300	Merge remote-tracking branch 'sergeyshambir/guiconvience' into next	2013-02-16 14:50:42 +01:00
Douglas Mencken	eb09662f1d	Don't include boost/filesystem/v3/operations.hpp, use boost/filesystem/operations.hpp instead. ... It is boost headers' job to deal with their internals.	2013-02-16 14:49:11 +01:00
Douglas Mencken	a3e421167b	esmtool/labels: bodyPartLabel, meshPartLabel, meshTypeLabel ... Signed chars, unsigned chars... Just use int for index everywhere.	2013-02-16 14:48:44 +01:00
Chris Robinson	158e18b98d	Remove an unused method	2013-02-16 00:30:07 -08:00
Chris Robinson	c965bd8e18	Increase step size to 30	2013-02-15 17:22:55 -08:00
Douglas Mencken	df5919f2c5	Use `signed char' explicitly where needed. It is important because: ... - It is implementation-dependent if plain `char' signed or not. - C standard defines three *distinct* types: char, signed char, and unsigned char. - Assuming that char is always unsigned or signed can lead to compile-time and run-time errors. You can also use int8_t, but then it would be less obvious for developers to never assume that char is always unsigned (or always signed). Conflicts: components/esm/loadcell.hpp	2013-02-15 20:28:14 +01:00
scrawl	4da11a96a5	Fixed gold ref count always becoming 1 when dropped on the ground	2013-02-15 17:34:55 +01:00
Pieter van der Kloet	fd430dc5a9	Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget ... Conflicts: apps/launcher/datafilespage.cpp components/fileorderlist/datafileslist.cpp	2013-02-15 15:38:30 +01:00
Pieter van der Kloet	ee27e3bb58	Merge remote-tracking branch 'upstream/next' into settingsnext ... Conflicts: apps/launcher/CMakeLists.txt apps/launcher/datafilespage.cpp apps/launcher/datafilespage.hpp apps/launcher/graphicspage.cpp components/fileorderlist/utils/filedialog.cpp components/fileorderlist/utils/filedialog.hpp	2013-02-15 15:21:14 +01:00
Pieter van der Kloet	0e143b1926	Merge remote-tracking branch 'upstream/master' into settingsparser	2013-02-15 14:45:19 +01:00
Pieter van der Kloet	43e9ad8733	The text color of the profiles dialog now turns red on invalid names	2013-02-15 14:26:09 +01:00
Pieter van der Kloet	990895fd2b	Mainwindow size and position now gets saved/restored	2013-02-15 14:12:25 +01:00
Chris Robinson	c57001e3bd	Remove an unused field	2013-02-15 05:11:06 -08:00
Chris Robinson	e4341525c8	Add a jump state ... Currently unused	2013-02-15 04:45:28 -08:00
Chris Robinson	ff0099fa6e	Scale the animation speed based on the animation velocity and movement speed ... This may not be totoally correct since it takes the whole animation into account, rather than just the looping portion. But it's good enough for now.	2013-02-15 02:15:39 -08:00
Chris Robinson	e1a1530774	Better implement Npc::getSpeed	2013-02-15 01:27:57 -08:00
Chris Robinson	3348e8a436	Clarify a comment	2013-02-14 22:41:14 -08:00
Chris Robinson	ac717373b1	Add a method to check if an object is on the ground	2013-02-14 22:35:15 -08:00
Chris Robinson	18b606fddf	Use the PhysicActor's set/getOnGround method	2013-02-14 20:10:04 -08:00
Chris Robinson	15dc82f454	Increase step size to 15	2013-02-14 18:59:05 -08:00
Chris Robinson	a729b1b12a	Snap to the ground after moving ... Depends on two factors: * End up close enough above to a walkable plane (it's within sMaxStep units down and is angled sMaxSlope or less) * Started out on the ground without any upward movement This also reduces the distance needed to be to the ground to 4 (from 10), and ensures the actor is 2 units above the ground when on it. Downward force is also removed when starting on the ground.	2013-02-14 18:34:51 -08:00
Pieter van der Kloet	1b9cf8c23f	More work on integrating the settings parser, profiles are handled correctly	2013-02-15 01:20:48 +01:00
scrawl	7604fb51b6	CG no longer listed in the settings if the plugin isn't loaded.	2013-02-14 23:17:21 +01:00
Pieter van der Kloet	5d1bede9e5	Forgot to add two files	2013-02-14 11:20:47 +01:00
scrawl	6a49ea9b4f	Cleaning out some old bits	2013-02-13 18:39:36 +01:00
Chris Robinson	6a9755778e	Merge remote-tracking branch 'zini/next' into animation2	2013-02-12 18:14:46 -08:00
scrawl	de90b911c9	Near clip plane corrections	2013-02-12 20:56:00 +01:00
scrawl	d213ff680f	Disabled terrain LOD	2013-02-12 20:55:45 +01:00
Marc Zinnschlag	5e3529783d	Merge remote-tracking branch 'ace/win-fixes' into next	2013-02-12 15:42:45 +01:00
Alexander "Ace" Olofsson	bbb845824d	Added typedef for ssize_t in windows and fixed a use of __PRETTY_FUNCTION__	2013-02-12 13:59:24 +01:00
Alexander "Ace" Olofsson	0ae01794f1	Fixed build errors in OpenCS	2013-02-12 13:57:16 +01:00
Sergey Shambir	7d7a1119da	Fixed book text misalignment, at least in some cases ... https://bugs.openmw.org/issues/284	2013-02-12 11:49:20 +04:00
Sergey Shambir	03803f19b5	BookTextParser: moved to Ogre::UTFString ... Font height and unicode characters glyph width now accounted correctly.	2013-02-12 11:22:19 +04:00
Sergey Shambir	3b64389668	BookTextParser: fixed infinitive loop	2013-02-12 11:14:30 +04:00
Marc Zinnschlag	1a079ec8d3	Merge branch 'master' into next	2013-02-11 19:53:51 +01:00
Marc Zinnschlag	1fd7d8ed2a	Merge remote-tracking branch 'graffy76/master' into next	2013-02-11 15:35:59 +01:00
Pieter van der Kloet	aa25471517	WIP: working on improving the config file handling	2013-02-11 15:01:00 +01:00
graffy76	55dd17c27c	Added setBarColor() function to CSVDoc::Operation. Created four color ... types for existing operations (save, verify, compile and search), with a default for future / undefined ops.	2013-02-11 04:30:16 -06:00
Michal Sciubidlo	f4d60ae7b2	Files sorting (masters then plugins). ... Remove unneeded includes.	2013-02-10 19:59:25 +01:00
Marc Zinnschlag	64d9d9e2ce	Merge remote-tracking branch 'wheybags/master' into next	2013-02-10 17:29:28 +01:00
Marc Zinnschlag	eb6590f7d8	added delegate factory	2013-02-10 17:21:25 +01:00
Tom Mason	c32c31f6d6	break after activating button	2013-02-10 15:41:02 +00:00
Tom Mason	158c6fc9fa	pressing enter when a messagebox is prompting for "ok", will activate ok button	2013-02-10 14:58:46 +00:00
Sergey Shambir	59808c3e10	GUI: Birth and Class dialogs now both select 1st item in list at first ... time.	2013-02-10 08:59:38 +04:00
Sergey Shambir	725bfe6372	TradeWindow: balance now changes per time if user holds +/- button ... pressed	2013-02-10 08:50:36 +04:00
Sergey Shambir	bba024d6ad	Right mouse button click now stops Container GuiMode.	2013-02-10 08:37:45 +04:00
Chris Robinson	4ee5857bae	Filter accumulation axis for mLastPosition as needed	2013-02-09 19:09:56 -08:00
Chris Robinson	8d6f017f17	Remove an unneeded Animation field	2013-02-09 13:25:39 -08:00
Chris Robinson	34ddf69a31	Merge remote-tracking branch 'zini/next' into animation2	2013-02-09 09:46:57 -08:00
scrawl	d47090b312	Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics	2013-02-09 16:40:10 +01:00
Marc Zinnschlag	f19fbaa293	Merge remote-tracking branch 'mark76/multiple_esm_esp' into next	2013-02-09 15:30:29 +01:00
Marc Zinnschlag	2d937cd9e2	Merge branch 'gmst' into next	2013-02-09 15:26:25 +01:00
Marc Zinnschlag	d40ee06897	fixed base/modified logic	2013-02-09 15:25:50 +01:00
Mark Siewert	55bd9eef66	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-02-09 13:03:35 +01:00
Mark Siewert	eefbdde6de	- For pull request: remove all instances of maps used to track refnumbers. ... - new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.	2013-02-09 13:00:57 +01:00
scrawl	6805c7bab4	Merge branch 'master' into graphics	2013-02-08 18:35:41 +01:00
Marc Zinnschlag	828695f295	added value column to gmst table	2013-02-08 14:48:38 +01:00
Marc Zinnschlag	cce2d63433	added type column to gmst table	2013-02-08 12:20:03 +01:00
Marc Zinnschlag	d5dd0640c7	basic gmst support	2013-02-08 09:58:19 +01:00
Chris Robinson	f5afa43db5	Remove an unneeded parameter	2013-02-07 17:45:41 -08:00
Chris Robinson	d47d2216f2	Use some const references where appropriate	2013-02-07 16:33:44 -08:00
Chris Robinson	cbdd459500	Remove unneeded playerMove from PhysicActor	2013-02-07 15:48:41 -08:00
Chris Robinson	ca6f8b6d88	Reorganize a bit of code in the movement solver	2013-02-07 13:18:16 -08:00
Chris Robinson	fe0e6c452d	Remove the unneeded playerMove object from PhysicsSystem	2013-02-07 12:11:10 -08:00
Nikolay Kasyanov	0d4b0bfd93	Trying to resolve sound issues on OS X with ffmpeg backend	2013-02-07 23:40:20 +04:00
Marc Zinnschlag	dd2b7d5c63	handle deleted records	2013-02-07 13:26:00 +01:00
Marc Zinnschlag	c1cd8305bc	a bit of cleanup for the previous commit	2013-02-07 13:13:06 +01:00
Marc Zinnschlag	21733e8181	hide startup dialogue when opening open dialogue	2013-02-07 13:11:41 +01:00
Marc Zinnschlag	adcaea464b	basic globals record loading	2013-02-07 12:52:01 +01:00
Marc Zinnschlag	7d112e4d5c	rewrote logic of content file loading	2013-02-07 11:33:08 +01:00
Chris Robinson	8de2d24d0e	Restore old ground check	2013-02-06 21:57:59 -08:00
Chris Robinson	923d0d6eb4	Fix up some header includes	2013-02-06 21:47:09 -08:00
Chris Robinson	e577ee2de8	Add a method to set/retrieve being on the ground	2013-02-06 21:44:58 -08:00
Chris Robinson	ebc7bc9427	Rename A_AlwaysRun to A_Run ... Note that there is an "always run" key, but its functionality is handled by A_ToggleWalk.	2013-02-06 18:22:16 -08:00
Chris Robinson	a8f0ce43a5	Add a run key	2013-02-06 17:51:47 -08:00
Chris Robinson	cbaf489eb6	Add running states	2013-02-06 16:53:52 -08:00
Chris Robinson	04524fbf92	Don't scale the movement vector up	2013-02-06 15:23:52 -08:00
Chris Robinson	bdda7278c4	Use 3/4ths of the physic actor's height to test if swimming	2013-02-06 12:56:30 -08:00
Chris Robinson	dfd16c4424	Fix movement rotations	2013-02-06 12:39:26 -08:00
Marc Zinnschlag	43912f927a	Merge remote-tracking branch 'potatoesmaster/importer' into next ... Conflicts: apps/openmw/mwworld/worldimp.cpp	2013-02-06 10:12:40 +01:00
Chris Robinson	9cf30f39bd	Don't apply gravity when swimming	2013-02-05 19:45:51 -08:00
Chris Robinson	fc307e64b0	Add swimming states	2013-02-05 19:05:07 -08:00
Chris Robinson	18b7008409	Better fix some scaling issues	2013-02-05 18:25:09 -08:00
Chris Robinson	535cd8360f	Load extra animations for NPCs	2013-02-05 18:09:43 -08:00
Chris Robinson	8b1e7b95ba	Attempt to load the skeleton source if it doesn't yet exist	2013-02-05 17:55:12 -08:00
Chris Robinson	c839502743	Setup base_anim.nif as an initial skeleton source for biped creatures	2013-02-05 17:16:45 -08:00
Chris Robinson	054ef3113a	Check existing skeleton sources if the current one has no animation root	2013-02-05 17:15:40 -08:00
Chris Robinson	16933e3926	Scale the accumulation root translation	2013-02-05 16:59:20 -08:00
Chris Robinson	600fe06f00	Use a vector of skeletons to handle animation sources	2013-02-05 16:29:51 -08:00
Chris Robinson	e217a3d25c	Silence some console spam	2013-02-05 15:51:26 -08:00
Emanuel Guevel	a4f051e85a	Fix game files import	2013-02-06 00:51:05 +01:00
Emanuel Guevel	6e3c016351	Add archives to settings imported by mwiniimporter ... Add Morrowind.bsa by default.	2013-02-06 00:51:05 +01:00
Chris Robinson	ee3764e9b3	Increase max slope to 60. 45 is too low.	2013-02-05 15:07:48 -08:00
scrawl	86d65519e3	Settings window fix	2013-02-05 23:57:30 +01:00
Chris Robinson	8c0bb1ff4d	Rotate movement in the movement solver	2013-02-05 14:02:14 -08:00
Michal Sciubidlo	347a734364	Move OpenDialog to editor and use it in startup dialogue. ... Remove debug output from DataFilesList.	2013-02-05 22:06:36 +01:00
Chris Robinson	f7f1adfb9d	Don't accumulate animations with activators	2013-02-05 12:55:06 -08:00
Chris Robinson	2c39760bd5	Move the movement solver code to mwworld's physics system	2013-02-05 12:45:10 -08:00
Michal Sciubidlo	f7e5ea24f4	Merge branch 'startup' into cs_load. ... Fix include in textinputdialog.cpp.	2013-02-05 21:23:49 +01:00
scrawl	608c112f34	Supply the new render window to mygui	2013-02-05 20:48:25 +01:00
scrawl	31f760ccce	Fixing issues from last commit: restored input and occlusion queries	2013-02-05 20:26:13 +01:00
Chris Robinson	0a4568bd11	Move the PtrMovementList typedef to MWWorld ... Use it for the doPhysics parameter, too	2013-02-05 11:03:39 -08:00
Chris Robinson	2cdda96798	Clear out some unneeded doPhysics stuff	2013-02-05 10:23:26 -08:00
scrawl	c4d518132f	With the 1x1 background window trick, we can apply VSync without restart. Some issues left though.	2013-02-05 19:22:08 +01:00
Chris Robinson	3251796ba0	Fix left/right movement	2013-02-05 09:57:08 -08:00
Chris Robinson	d50832081c	Remove the unneeded PhysicActor field from MovementSolver	2013-02-05 09:37:02 -08:00
Chris Robinson	a782a9109b	Store the vertical velocity in the physic actor	2013-02-05 09:24:22 -08:00
Chris Robinson	82e4da4e64	Get the half-extents from the physicactor	2013-02-05 07:41:57 -08:00
scrawl	499f3ac0d1	Slightly better ripple normal blending. Not physically accurate at all, but looks good.	2013-02-05 16:40:41 +01:00
Chris Robinson	1c604445ba	Store movement vectors as they get returned	2013-02-05 06:59:01 -08:00
scrawl	3772cd9257	Refraction can be disabled separately now	2013-02-05 14:29:46 +01:00
Chris Robinson	4bd1e63ac1	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: apps/openmw/mwworld/worldimp.cpp	2013-02-05 03:26:46 -08:00
Marc Zinnschlag	c409f1184e	cleaned up object movement and fixed a bug regarding local scripts	2013-02-05 12:19:06 +01:00
Chris Robinson	786cb6e928	Merge remote-tracking branch 'zini/master' into animation2	2013-02-05 02:57:02 -08:00
Marc Zinnschlag	86fb3574a0	Merge remote-tracking branch 'wheybags/master' into next	2013-02-05 11:55:47 +01:00
Chris Robinson	bd4fdf47a3	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: apps/openmw/mwrender/sky.cpp	2013-02-05 02:27:57 -08:00
scrawl	a29919d02d	restored global map	2013-02-05 00:39:56 +01:00
scrawl	35b5fdab5d	Merge branch 'terrainfix' into graphics	2013-02-05 00:28:59 +01:00
scrawl	09180666b2	Merge branch 'master' of git://github.com/zinnschlag/openmw into terrainfix	2013-02-05 00:21:42 +01:00
scrawl	58cf182db2	better place for syncing	2013-02-05 00:21:29 +01:00
scrawl	bb1f23875d	Merge branch 'terrainfix' into graphics	2013-02-04 23:16:11 +01:00
scrawl	596628d339	Fix terrain derived data update (bug 534, bug 544)	2013-02-04 23:13:01 +01:00
Chris Robinson	5ee298cdc1	Make sure the player updates last	2013-02-04 14:08:38 -08:00
Michal Sciubidlo	66ec4ca7d9	Split launcher specific code from DataFilesList back to DataFilesPage.	2013-02-04 22:14:14 +01:00
Chris Robinson	2f8affc955	Make sure the player's controller is properly updated when they change	2013-02-04 12:58:06 -08:00
scrawl	0f37c24d5f	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-02-04 21:55:41 +01:00
Chris Robinson	ee9b19d2ed	Make sure to remove a Ptr from the activators when requested	2013-02-04 12:04:06 -08:00
Chris Robinson	39cf7b0b42	Pass the Ptr of the object being moved to the move method ... This prevents having to store another copy of it, which risks getting out of sync.	2013-02-04 11:17:48 -08:00
Chris Robinson	1a5cb8760d	Rotate movement vector to world space before passing to the movement solver	2013-02-04 11:04:20 -08:00
Chris Robinson	6b32fa7999	Use the correct position for the actor	2013-02-04 09:48:21 -08:00
scrawl	bf037b7d29	Removed problematic ModVertexAlpha method, now done in shader	2013-02-04 18:03:03 +01:00
Chris Robinson	1747c1e01a	Integrate a new movement solver to handle object movement and collisions ... Temporary, and pretty breoken. Needs some serious integration fixes.	2013-02-04 07:10:14 -08:00
Marc Zinnschlag	ba0d13fc12	moved code for creating new base content records into the Document class	2013-02-04 13:50:38 +01:00
Marc Zinnschlag	4c973a0f67	constructing documents from a file list instead of a single name	2013-02-04 13:46:54 +01:00
Marc Zinnschlag	3f0a49a2f6	Merge branch 'master' into startup ... Conflicts: apps/opencs/CMakeLists.txt	2013-02-04 10:22:37 +01:00
Chris Robinson	91513206a0	Don't use per-animation accumulation values ... This breaks walking diagonally and "jumping" (which technically wasn't jumping anyway).	2013-02-03 12:02:51 -08:00
scrawl	fa07288b15	tweaked map light color	2013-02-03 20:29:50 +01:00
scrawl	5cc8af0f14	fix map positions	2013-02-03 20:06:03 +01:00
scrawl	a44dfcd2ac	Now that refraction is separated out, we don't have to worry about rendering order. Should fix transparency blending issues around water (eg waterfalls) for good.	2013-02-03 19:28:31 +01:00
scrawl	109d0a942f	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-02-03 19:02:57 +01:00
scrawl	979a874220	Fixed the custom near clip planes	2013-02-03 19:01:59 +01:00
scrawl	5334934612	Listen to render window updates and properly activate/deactivate occlusion queries pre/post update.	2013-02-03 18:03:09 +01:00
Chris Robinson	51d5efeeb2	Work out the state in the character controller update method	2013-02-03 07:15:34 -08:00
Mark Siewert	3e43db5f76	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-02-03 16:14:41 +01:00
scrawl	15e51b76de	Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth	2013-02-03 15:46:23 +01:00
Tom Mason	ac112ef972	refactored special variable code	2013-02-03 13:27:27 +00:00
Marc Zinnschlag	c97553703a	fixes for static build without cg	2013-02-03 13:47:55 +01:00
Marc Zinnschlag	a4872e3217	rewrote the opencs cmake scripts (more compact and no more annoying warnings)	2013-02-03 13:30:40 +01:00
Chris Robinson	23acf4b130	Don't break right away when the animation time remaining is 0	2013-02-03 01:38:42 -08:00
Chris Robinson	60a75cb5ee	Make sure to keep the character preview animation updated	2013-02-03 00:54:50 -08:00
Chris Robinson	7fe877d8ea	Add a couple more character states	2013-02-03 00:19:22 -08:00
Chris Robinson	007a5963de	Handle most state changes in the character controller when setting the movement vector	2013-02-02 23:39:43 -08:00
Tom Mason	f785659297	Implemented OnPCAdd special variable ... Had to edit OpAddItem in miscextensions.cpp, as local variables were not being initialised for items added through it. Does not get reset on drop, as per original morrowind.	2013-02-02 17:36:12 +00:00
Michal Sciubidlo	155cca0c9a	Upload missing files. ... Fix folder name. Keep Qt optional. Move open dialogue from doc to tools. Rename 'load' to 'open'. Deleted wrong comment.	2013-02-02 18:36:01 +01:00
Marc Zinnschlag	67a1ec5166	added provisional startup dialogue	2013-02-02 16:14:58 +01:00
Chris Robinson	c23a96d606	Run an aniamtion update after "playing" the inventory idle ... This is so all the NPC parts get updated correctly.	2013-02-02 06:08:03 -08:00
Chris Robinson	fc7590694d	Revert "Revert "Use a child scene node for the accumulation root"" ... This reverts commit 376dfed15b. I was wrong. It's needed at least for NPCs since they're attaching multiple animated skeletons to an object, and they all need to be offset correctly. Would be nice to use a Node, Bone, or TagPoint instead of a hefty SceneNode, though.	2013-02-02 05:43:37 -08:00
Marc Zinnschlag	85697e4628	reverted to C++03	2013-02-02 13:24:28 +01:00
Chris Robinson	7f87c1873b	Use an array to store the entity parts	2013-02-02 02:53:22 -08:00
scrawl	a461b282c1	water ripples (experimental)	2013-02-01 23:43:23 +01:00
Chris Robinson	376dfed15b	Revert "Use a child scene node for the accumulation root" ... This reverts commit d6f923f274. We don't need it for any of the NIFs we're currently handling. As long as there's no NIF files that would break it, we should require a stationary root if an animation wants to accumulate. If we must, a better idea may be to inject an extra bone into the skeleton instance and make that the accumulation root.	2013-02-01 08:50:32 -08:00
scrawl	3ec703e6af	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-02-01 16:25:54 +01:00
Michal Sciubidlo	492482de7f	Add "open" option in opencs.	2013-02-01 00:42:03 +01:00
Tom Mason	0f58e03343	Unequipping items will reset OnPCEquip variable	2013-01-31 19:04:39 +00:00
Tom Mason	9ad08520fd	Implemented OnPCDrop special variable ... Scripts are responsible for resetting to 0, as investigation showed that is how vanilla handled it.	2013-01-31 18:45:32 +00:00
Tom Mason	0fc5ee5149	allow OnPCEquip special variable to be of any type	2013-01-31 17:46:16 +00:00
Chris Robinson	d6f923f274	Use a child scene node for the accumulation root	2013-01-30 22:28:18 -08:00
Tom Mason	09f9557ecb	Implemented OnPCEquip special variable	2013-01-31 00:34:16 +00:00
Tom Mason	dc91211b12	Fixed Small bug where scripts were being removed when they shouldn't be. ... Scripts should only be removed when the item is being moved to another cell, otherwise they should remain active.	2013-01-31 00:21:04 +00:00
Michal Sciubidlo	ac62dd050d	Rename datafilespage to datafileslist	2013-01-30 21:08:27 +01:00
Michal Sciubidlo	f029a9011a	Move datafilespage to shared space.	2013-01-30 20:21:03 +01:00
Chris Robinson	b6354c6282	Don't share skeleton instances between bounded parts on an NPC ... However, a skeleton instance will still be shared between entities in an entity list.	2013-01-30 09:29:16 -08:00
Chris Robinson	5c3a7f7d52	Avoid handling animation states ... We don't need them anymore	2013-01-30 07:34:07 -08:00
Chris Robinson	360f7bfac8	Apply animations to bones manually ... Couple reasons for this: * This paves the way for allowing animations specified in other skeletons to be applied to the character (NPCs and certain creatures can have multiple animation sources, but Ogre is incredibly strict when it comes to sharing animations between skeletons). * It will allow for entities to be animated based on the character's skeleton, without having to duplicate the mesh for each skeleton it can be used on. This doesn't impact Ogre's ability to efficiently deform skinned meshes, nor does it get in the way of hardware skinning.	2013-01-30 07:04:18 -08:00
Chris Robinson	600d3bf9eb	Make sure the player node's visibility cascades	2013-01-30 02:38:50 -08:00
Chris Robinson	04d4c125ba	Print when an animation event is unhandled	2013-01-29 02:00:42 -08:00
Chris Robinson	d4ddaa3d95	Only register activators that have a MWRender::Animation object	2013-01-29 01:08:52 -08:00
Chris Robinson	99efe4e494	Remove an unnecessary class member	2013-01-29 01:02:55 -08:00
Chris Robinson	879359f39d	Set the animation state loop flag as appropriate	2013-01-29 00:50:52 -08:00
Chris Robinson	92d0c55f32	Add a flag to specify if an animation should be playing	2013-01-29 00:43:42 -08:00
Chris Robinson	fdabef65a1	Use a method to update an object's cell in the mechanics manager ... This prevents destroying and recreating the object's character controller (and messing up the current animation) when moving between cells.	2013-01-29 00:19:24 -08:00
Chris Robinson	8d98f3649c	Use a separate class to handle activator mechanics	2013-01-28 23:39:11 -08:00
Chris Robinson	7df4d0d19f	Remove an unnecessary cast	2013-01-28 21:41:51 -08:00
Pieter van der Kloet	25edba0887	Rewriting the config code of the pages to use the new settings classes	2013-01-27 16:39:51 +01:00
Chris Robinson	7b71b4eb31	Add a missing include	2013-01-27 03:03:48 -08:00
Pieter van der Kloet	5579df30ff	Implemented data/data-local support and added settingshandlers to main.cpp	2013-01-26 18:19:04 +01:00
Chris Robinson	0cd3880b20	Merge remote-tracking branch 'zini/master' into animation2	2013-01-26 04:54:52 -08:00
Chris Robinson	b1ffdf855f	Reset the initial state of animated nodes on the skeleton instances ... This is so the animation specifies node keyframe data based on the node's parent. This will also be necessary for applying animations from different skeleton sources, as they can have different binding positions (even native .skeleton resources will need to specify animation data this way).	2013-01-26 04:48:53 -08:00
Mark Siewert	dca8dc4fdb	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ... Conflicts: apps/openmw/engine.cpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/store.hpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm/esmreader.hpp - Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.	2013-01-25 18:22:01 +01:00
Pieter van der Kloet	6faf6f57e1	Added settings file reader/writers for openmw.cfg and settings.cfg	2013-01-25 05:19:06 +01:00
Emanuel Guevel	19dff822f4	Dialogue: do not filter on disposition for creatures	2013-01-24 19:43:21 +01:00
Emanuel Guevel	ed9a9904b4	Dialogue filter: search script variables case-insensitively	2013-01-24 19:39:31 +01:00
Marc Zinnschlag	90d05858ef	disabling dialogue sub-views for now	2013-01-22 11:50:08 +01:00
Marc Zinnschlag	cd662af634	Merge branch 'globals'	2013-01-22 11:47:24 +01:00
Chris Robinson	05f8b8c283	Specify the text key to reset animations to	2013-01-22 00:31:45 -08:00
Chris Robinson	37fe1bd3f0	Handle looping in the Animation object	2013-01-21 22:51:13 -08:00
Marc Zinnschlag	2756d3ee94	Merge remote-tracking branch 'wheybags/containerscripts'	2013-01-21 23:02:45 +01:00
Tom Mason	f5f3c2e62d	enabling / disabling should not affect scripts	2013-01-21 20:06:08 +00:00
Chris Robinson	e956a1cbc0	Merge SpecialIdle character state into Idle	2013-01-21 03:24:52 -08:00
Chris Robinson	6905bd18ba	Filter out the group name from the text keys ... It's already in the animation name, and the text keys are animation-specific anyway.	2013-01-21 02:59:12 -08:00
Chris Robinson	536f8104e6	Do not create an 'all' animation.	2013-01-20 17:24:43 -08:00
Chris Robinson	e1e76bde76	Combine a loop into another where it's used	2013-01-20 15:39:43 -08:00
Mark Siewert	713d324eeb	- Minor code cleanup	2013-01-20 19:07:33 +01:00
Tom Mason	31c71c029d	objects with scripts attached, that are inside containers will behave correctly when the container is moved	2013-01-20 17:01:30 +00:00
Emanuel Guevel	736e471613	Print a fallback text when no topic response is found	2013-01-20 17:44:09 +01:00
Emanuel Guevel	43e85ea0c6	Disallow redirection to info refusal for greetings	2013-01-20 17:44:09 +01:00
Emanuel Guevel	05796d85a4	NPC: take stats from NPDT12 into account ... Some available stats (level, reputation and disposition) were not used for NPC with auto-calculated stats.	2013-01-20 17:44:08 +01:00
Emanuel Guevel	951eb1b236	Dialogue: return a response from "Info Refusal" when disposition is not satisfied	2013-01-20 17:44:08 +01:00
Tom Mason	23dada0ee4	moved script handling on enable / disable into their own functions	2013-01-20 16:38:56 +00:00
Tom Mason	28c580d280	disabling and enabling containers causes scripts on contents to be disabled and enabled accordingly	2013-01-20 15:43:52 +00:00
Tom Mason	abe25c5f66	removed use of c++11 auto	2013-01-20 14:24:55 +00:00
Tom Mason	665a530e10	renamed realAdd to addImp	2013-01-20 14:14:34 +00:00
Tom Mason	3c6ddd7fa7	fixed isInCell method	2013-01-20 14:10:04 +00:00
Chris Robinson	85ca1e993f	Properly check if an animation exists before playing it	2013-01-19 21:55:04 -08:00
Nathan Jeffords	f55da17933	made some journal accessor methods constant	2013-01-19 16:21:41 -08:00
Nathan Jeffords	4c7ae3d1ff	prevent duplicate journal entries from being recorded	2013-01-19 16:21:15 -08:00
Nathan Jeffords	528c3da6da	record heard topics in journal	2013-01-19 16:20:22 -08:00
Chris Robinson	68779375b2	Implement WalkLeft and WalkRight character states	2013-01-19 16:19:47 -08:00
Nathan Jeffords	d6b956cdcf	fixed swapped day & month fields when created a stamped journal entry	2013-01-19 16:19:03 -08:00
Chris Robinson	a7b07ee5cf	Don't reset the animation when setting the same state ... Unless looping is being toggled on.	2013-01-19 15:46:22 -08:00
Chris Robinson	e0541b52c4	Use a list to store and get state information	2013-01-19 14:56:24 -08:00
Mark Siewert	a8e02779b2	- Add support for multiple plugins trying to modify the same reference ... - Fix a small signed/unsigned warning	2013-01-19 23:33:18 +01:00
Chris Robinson	de2d084e61	Add a looping property to handle if an animation should loop	2013-01-19 14:22:15 -08:00
Marc Zinnschlag	2d96f52864	select correct record when opening a dialogue sub view	2013-01-19 14:29:14 +01:00
Chris Robinson	0b68953f0d	Scale animation speed using the direction length ... The direction length doesn't currently give a good speed, but it's something.	2013-01-18 21:40:47 -08:00
Chris Robinson	aecfc0829a	Implement WalkForward and WalkBack character states	2013-01-18 18:04:00 -08:00
Chris Robinson	e33f59e0fe	Ensure the direction vector is initialized and copied properly	2013-01-18 17:41:36 -08:00
Chris Robinson	1cdd64cd9b	Return the animation movement from the character controller. ... Consequently, dead actors don't move anymore. The doPhysics call apparently isn't moving them.	2013-01-18 17:05:58 -08:00
Chris Robinson	9123f4f2af	Return the movement vector from runAnimation	2013-01-18 16:21:29 -08:00
Chris Robinson	9235fba770	Store the movement vector in the character controller	2013-01-18 16:00:51 -08:00
Chris Robinson	40f8e75763	Use a SpecialIdle state for PlayGroup/LoopGroup invoked animations ... Note that actors will *not* automatically resume a normal idle state afterward. Their AI will need to control what to do when the special idle is finished.	2013-01-18 15:39:28 -08:00
Chris Robinson	a527cb8349	Loop the current animation when not dead ... This should be better, but it's not perfect. It misses the case where start < loop start == loop stop <= stop	2013-01-18 15:22:14 -08:00
Chris Robinson	c7684cb979	Pass the key time to markerEvent	2013-01-18 14:50:55 -08:00
Chris Robinson	3e9b0a333c	Allow specifying the accumulation for animations ... Animations that move a character may do so either visually or physically. An axis' accumuluation value specifies whether the movement is visual (0) or physical (1). Idle animations, for instance, typically don't physically move a character, while death animations may physically move them along the X and Y planes, but not along Z (the vertical movement is purely visual).	2013-01-18 14:25:32 -08:00
Chris Robinson	5cafc24ee2	Rename CharState_Alive back to CharState_Idle	2013-01-18 13:43:45 -08:00
Chris Robinson	613529f1d6	Merge remote-tracking branch 'zini/master' into animation2	2013-01-18 01:02:53 -08:00
Chris Robinson	a94947029e	Check the marker name before deciding what to do with it ... Also, don't force 'idle' after a playgroup	2013-01-18 00:59:48 -08:00
Chris Robinson	9d7ccfda1f	Rename CharState_Idle to CharState_Alive	2013-01-17 21:07:36 -08:00
Chris Robinson	8720433fa9	Do not automatically loop animations ... There are 0 length idle animations that break this	2013-01-17 17:54:09 -08:00
Chris Robinson	8fa1b56efc	Loop the current animation if there's nothing more queued	2013-01-17 16:34:26 -08:00
Chris Robinson	00879ab20e	Fix player rendering	2013-01-17 15:48:09 -08:00
Chris Robinson	fef6284f15	Only reset the animation time if a new state was set	2013-01-17 15:47:25 -08:00
Chris Robinson	fc0f9e2159	The animation state tracks the animation time for us	2013-01-17 14:49:42 -08:00
Chris Robinson	7cce44290e	Handle the animation queue in mwmechanics	2013-01-17 13:18:40 -08:00
Chris Robinson	47c157303a	Filter events that do not belong to the current group	2013-01-17 11:03:58 -08:00
Chris Robinson	da4f17859e	Recognize soundgen animation markers	2013-01-17 10:16:36 -08:00
Marc Zinnschlag	82b790770d	Merge remote-tracking branch 'potatoesmaster/dialogue-creatures'	2013-01-17 10:21:01 +01:00
Chris Robinson	82d549e22f	Don't update the animation if time is the same	2013-01-16 21:39:14 -08:00
Chris Robinson	7ee389f3b2	Handle animation skipping in the character controller	2013-01-16 21:25:50 -08:00
Chris Robinson	852aa214cc	Store the available animation names in the character controller	2013-01-16 21:16:22 -08:00
Chris Robinson	afbc9f3e41	Keep track of the animation group currently playing	2013-01-16 20:44:37 -08:00
Chris Robinson	4dd01b81c6	Update mTime when updating or reseting the animation, and refactor the animation loop	2013-01-16 20:14:49 -08:00
Chris Robinson	685f219560	Return a movement vector from the character controller update	2013-01-16 18:56:13 -08:00
Chris Robinson	daad8d9859	Don't update the character controller while paused	2013-01-16 18:03:39 -08:00
Chris Robinson	d2f5a886c7	Handle playgroup and skipanim through mwmechanics	2013-01-16 17:53:18 -08:00
Emanuel Guevel	4feaa66897	Do not open the dialogue window if no greeting is found	2013-01-17 01:58:44 +01:00
Chris Robinson	46fc61a4c1	Run animations from the character controller	2013-01-16 16:31:09 -08:00
Chris Robinson	46728ab27f	Handle "sound:" animation events	2013-01-16 15:52:03 -08:00
Chris Robinson	3c32385e17	Avoid trying to animate things that don't have animations	2013-01-16 15:00:06 -08:00
Chris Robinson	94b93227d3	Treat activators as actors for rendering and mechanics ... Kinda hacky, but it's the only way to get animated activators (flags, silt striders, etc) to work properly.	2013-01-16 14:37:32 -08:00
Chris Robinson	d2fc3c7b33	Add a method to tell the character controller of new text keys	2013-01-16 13:09:21 -08:00
Marc Zinnschlag	7b568cbb15	Merge remote-tracking branch 'potatoesmaster/dialogue'	2013-01-16 22:03:40 +01:00
Chris Robinson	0a2f92f679	Keep track of the current text key in the animation	2013-01-16 11:57:08 -08:00
Chris Robinson	f46587c383	Store an character controller in the animation	2013-01-16 11:01:08 -08:00
Chris Robinson	3c487e6019	Play an animation when changing states	2013-01-16 10:45:18 -08:00
Chris Robinson	b378bc92a0	Store an animation object in the character controller	2013-01-16 10:16:37 -08:00
Chris Robinson	63e685ea39	Add a method to get the Animation from a Ptr	2013-01-16 09:59:19 -08:00
Chris Robinson	c1b32d6006	Remove outdated comments	2013-01-16 08:24:20 -08:00
Chris Robinson	3c02e1ccc9	Run physics right after updating the actors	2013-01-16 08:22:38 -08:00
Chris Robinson	1ce8eaf52c	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: apps/openmw/mwrender/actors.cpp apps/openmw/mwrender/actors.hpp	2013-01-16 07:36:56 -08:00
Marc Zinnschlag	312f68bf9c	Merge remote-tracking branch 'thoronador/fix-spelling'	2013-01-16 12:28:33 +01:00
scrawl	df602553d1	Reworked MWRender::Water to be more OOP-ish and possibly allow other reflection types.	2013-01-16 09:13:36 +01:00
Thoronador	3220330ce0	fix spelling in comment	2013-01-16 04:19:16 +01:00
Chris Robinson	94e30199d1	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: components/nifogre/ogre_nif_loader.cpp	2013-01-15 14:59:30 -08:00
Emanuel Guevel	9e00c6694f	Allow only ID filtered topics for dialogue with creatures	2013-01-15 21:40:44 +01:00
Chris Robinson	8a073c113e	Use const references where appropriate	2013-01-15 12:07:15 -08:00
Chris Robinson	8361192b64	Use typedefs for some maps and some cleanup	2013-01-15 11:10:41 -08:00
Marc Zinnschlag	3053440462	Issue #539: fixed AiWander	2013-01-15 12:40:44 +01:00
Emanuel Guevel	82287445af	DialogueWindow: do not execute onFrame() when not visible	2013-01-15 00:59:48 +01:00
Emanuel Guevel	f1f9173f24	Prevent closing dialogue window when an answer is expected	2013-01-15 00:53:32 +01:00
Jordan Milne	10a3caa504	more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine	2013-01-13 23:38:46 -04:00
Jordan Milne	9b485a86ef	resize the window in a slightly less bad way, fix my check in setUseHardwareCursors to be the right way round	2013-01-13 22:38:22 -04:00
Jordan Milne	043e29c620	Have SDL manage the window instead of OGRE to work around SDL Windows bugs (grumble)	2013-01-13 21:32:45 -04:00
scrawl	6c6ce4a05c	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-01-14 00:10:57 +01:00
Jordan Milne	d26e33eb26	Merge branch 'master' into sdl_input	2013-01-13 17:06:39 -04:00
Tom Mason	6fc64e8a4e	scripts run for items added to containers, and scripted items in player inv handled correctly	2013-01-13 19:49:56 +00:00
Tom Mason	7c8b3f1239	Merge remote-tracking branch 'real/master'	2013-01-13 17:07:18 +00:00
Tom Mason	c138e00aa2	objects scripts are now stopped when they are removed from a container	2013-01-13 17:05:12 +00:00
Marc Zinnschlag	654cd3ab9b	Issue #479: Use magnitude specified when adding disease	2013-01-13 14:52:55 +01:00
Jordan Milne	b6ec64485c	fix includes for Windows	2013-01-12 17:52:26 -04:00
Tom Mason	d4ca954d47	scripts on items in containers added to script list on cell change	2013-01-12 18:31:57 +00:00
Chris Robinson	94b24f07e1	Keep track of the state in the character controller, and don't remove dead actors from the map	2013-01-12 10:10:27 -08:00
Chris Robinson	4890d901a2	Store an MWWorld::Ptr in the character controller	2013-01-12 08:49:08 -08:00
Jordan Milne	5a6589af01	extract cursor management to a separate class, have windowmanager communicate with it. Initialize SDL during engine start	2013-01-12 11:57:29 -04:00
Chris Robinson	35d17fdaf6	Associate a character controller with each MWWorld::Ptr	2013-01-12 07:12:12 -08:00
Marc Zinnschlag	f4ee8e2642	Issue #479: Added additional magnitude parameter to known spells	2013-01-12 13:10:20 +01:00
scrawl	e4f140841e	Make OpenMW work with Ogre 1.9	2013-01-12 08:23:15 +01:00
scrawl	2c3719a6f5	Disabling PSSM feature to make sure we can fit the max. amount of terrain textures in Morrowind.esm in a single pass.	2013-01-12 07:02:12 +01:00
scrawl	30136eb449	Update settings UI	2013-01-12 06:36:48 +01:00
scrawl	52516ca4b4	Merge branch 'master' into graphics	2013-01-12 01:22:01 +01:00
scrawl	ed3c23ad9a	Fixed crash on changing cell due to Utf8Encoder going out of scope	2013-01-12 01:18:36 +01:00
Jordan Milne	eeacb04fe2	Fully working hardware cursors (if you compile SDL2 with XCursor support)	2013-01-11 09:32:29 -04:00
Jordan Milne	3fb920a66f	Merge branch 'master' into sdl_input	2013-01-11 08:29:01 -04:00
Jordan Milne	f9b064d1bc	add preliminary hardware cursor support into sdl4ogre and windowmanagerimp, handle alt-tabbing away from fullscreen gracefully	2013-01-11 08:27:59 -04:00
Marc Zinnschlag	101810d1e8	Merge remote-tracking branch 'scrawl/ingredients'	2013-01-11 11:12:07 +01:00
Nathan Jeffords	d5ebd6654d	cache loaded NIF files to eliminate reloads ... Created a NIF file caching mechanism to prevent the system from reloading a NIF during a startup and cell changes.	2013-01-10 21:47:02 -08:00
Nathan Jeffords	d469415e59	factored out two function from OMW::Engine::go ... The initialization code inside Engine::go is now in two function it calls prior to running the main loop.	2013-01-10 21:32:24 -08:00
Jordan Milne	a030c03513	support the printscreen button properly	2013-01-10 23:53:19 -04:00
Jordan Milne	403b6756f5	remove dependency on boost::locale, use system mouse position in in-game menus	2013-01-10 23:29:51 -04:00
scrawl	c71656493d	Ingredient effects now correctly hide until the player has discovered them	2013-01-11 01:23:24 +01:00
Jordan Milne	eff26159d9	Merge branch 'master' into sdl_input	2013-01-10 18:03:35 -04:00
Jordan Milne	601d79ef3f	fix the mouse wheel in mygui	2013-01-10 17:59:49 -04:00
Jordan Milne	ed644259ce	Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling	2013-01-10 17:21:47 -04:00
Chris Robinson	97f8c73d91	Remove some useless parameters ... SceneNode::setVisibility merely passes the value to its attached object, of which there are none at the point it would be called. Additionally, the method is always called with enabled=true anyway.	2013-01-10 11:09:33 -08:00
scrawl	6ef85c46fd	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-01-10 19:35:40 +01:00
Chris Robinson	771a5f7316	Add the beginnings of a character controller	2013-01-10 08:35:24 -08:00
Chris Robinson	e8ac3976b5	Fix some subentity assumptions	2013-01-10 06:35:06 -08:00
Chris Robinson	7f2d71554e	Use the correct offset when building static geometry from an entity	2013-01-10 04:16:18 -08:00
Marc Zinnschlag	274ff530dc	Merge remote-tracking branch 'wheybags/master'	2013-01-10 11:53:42 +01:00
Chris Robinson	23ac1c2de5	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: components/nifogre/ogre_nif_loader.cpp	2013-01-09 20:52:12 -08:00
scrawl	55769aaf91	Fix selection buffer (i.e. item selection on the inventory character preview) when object shaders were disabled	2013-01-10 01:46:00 +01:00
Marc Zinnschlag	6e0b86c6f9	Merge remote-tracking branch 'potatoesmaster/getdisposition'	2013-01-10 01:29:02 +01:00
Tom Mason	8486a51535	fixed drop amounts thanks to zinnschlag	2013-01-09 22:55:28 +00:00
Tom Mason	3517635cfd	added Drop and DropSoulGem functions	2013-01-09 21:16:45 +00:00
Marc Zinnschlag	4defb1a476	Merge remote-tracking branch 'trombonecot/lowerstring' ... Conflicts: apps/openmw/mwgui/loadingscreen.cpp	2013-01-09 22:13:59 +01:00
scrawl	d3c0851aa7	Changed light attenuation back to linear in all cases, this seems to be what MW does.	2013-01-09 22:08:42 +01:00
scrawl	b8c6f6640b	Fixing water <-> waterfall blending issues (Sort of... the second part will follow later)	2013-01-09 21:56:26 +01:00
eduard	2dc0064cc2	more string lowercase	2013-01-09 20:51:52 +01:00
Chris Robinson	a14132b5a0	Merge remote-tracking branch 'zini/master' into animation2	2013-01-09 11:12:26 -08:00
scrawl	bc73c5b1ec	enable directional lighting for character previews	2013-01-09 20:08:59 +01:00
Tom Mason	5bfdb2449d	allowed dropObjectOnGround to be used on npcs, not just player	2013-01-09 18:53:14 +00:00
Chris Robinson	c4c8295e0b	Rename NIFLoader to Loader, and update some comments	2013-01-09 09:10:59 -08:00
Nathan Jeffords	6ca87e108f	updated loading screen to use the resource managers pattern matching when finding files	2013-01-09 08:54:03 -08:00
Nathan Jeffords	44031ec3d7	fleshed out BSAArchive and DirArchive. ... Implemented both lists & finds, with pattern matching. Conflicts: components/bsa/bsa_archive.cpp	2013-01-09 08:53:27 -08:00
Chris Robinson	be74859f05	Avoid some unnecessary copying when calling addPartGroup	2013-01-09 08:03:28 -08:00
Marc Zinnschlag	6567bf38f8	Merge remote-tracking branch 'wheybags/master'	2013-01-09 17:01:47 +01:00
Chris Robinson	9fedaf18d6	Make some methods private	2013-01-09 07:55:55 -08:00
Chris Robinson	625a538f03	Combine part selection into a single loop	2013-01-09 07:43:10 -08:00
Jordan Milne	cb01df49c0	begin to support text input	2013-01-09 11:30:33 -04:00
Jordan Milne	5fa77da9d4	Merge branch 'master' into sdl_input	2013-01-09 10:56:15 -04:00
Emanuel Guevel	3e41a1118a	GetDisposition: return calculated disposition instead of base disposition	2013-01-09 15:14:17 +01:00
Tom Mason	375961fe5e	small fix	2013-01-09 13:27:12 +00:00
Tom Mason	b035a5aa4a	beast races cannot equip anything they oughtn't to be able to equip	2013-01-09 13:18:05 +00:00
Jordan Milne	53cff0ba68	use native relative mouse movements where available, have the cursor follow the hardware cursor in the main menu	2013-01-09 09:05:47 -04:00
Chris Robinson	1e38e381a4	Use text keys for each animation	2013-01-09 03:30:55 -08:00
Marc Zinnschlag	649ae645f3	Merge remote-tracking branch 'blunted2night/bug_495_v2'	2013-01-09 12:12:41 +01:00
Jordan Milne	02ccb75894	Wrap the mouse to the window (except in debug mode) ... Grab the mouse when not in the main menu (except in debug mode) Always hide the cursor when it's over the window Allow warping the mouse around Handle ^C properly	2013-01-09 06:10:05 -04:00
Jordan Milne	1bf36c686c	add ability to check if a window is on the stack (to see if we're in the main menu)	2013-01-09 06:09:47 -04:00
Chris Robinson	bb98542c5a	Build separate animations for each group	2013-01-09 01:40:38 -08:00
Chris Robinson	e44729cd43	Make the text keys lower-case when extracting them ... I think it's safe to assume all text keys are treated in a case-insensitive manner. So far the only known NiTextKeyExtraData records are for animation keys, which effectively are.	2013-01-09 00:17:42 -08:00
Jordan Milne	857bb42297	Create a separate scenemanager for each CharacterPreview instance	2013-01-09 01:44:15 -04:00
Jordan Milne	f85679db93	Merge branch 'master' into sdl_input	2013-01-09 00:04:55 -04:00
Nathan Jeffords	719663d86e	added option to override the activation distance ... The command line option '--activate-dist <int>' can be used to override the in game activation distance.	2013-01-08 20:00:06 -08:00
Tom Mason	62a2ba1cc6	beast races cannot equip shoes/boots	2013-01-09 03:03:14 +00:00
Tom Mason	135f0870f7	in actionequip, was ignoring actor param, and always using player	2013-01-09 02:16:17 +00:00
Jordan Milne	6b49b8ab47	MyGUI doesn't care for SDL's mouse button ordering, send it what it expects	2013-01-08 22:14:30 -04:00
Jordan Milne	3b1d285cf3	fix compile errors, work with unmodified SDL	2013-01-08 21:01:58 -04:00
Nathan Jeffords	39d27b87c9	fixed build error with Audiere coded enabled	2013-01-08 09:14:56 -08:00
Marc Zinnschlag	d4a9236ae5	hocking up dialogue sub view to a widget mapper	2013-01-08 14:59:40 +01:00
Marc Zinnschlag	c0fb46384c	Merge branch 'master' into globals	2013-01-08 11:32:53 +01:00
Chris Robinson	9675a6d04a	Merge remote-tracking branch 'zini/master' into animation2	2013-01-08 02:25:37 -08:00
Jordan Milne	6449f68d61	Merge branch 'master' into sdl_input	2013-01-08 06:24:31 -04:00
Jordan Milne	884d3ea4d8	Rip out OIS, fill the holes with SDL goodness. WIP.	2013-01-08 06:19:05 -04:00
Marc Zinnschlag	c6ff58d5b5	Merge remote-tracking branch 'scrawl/videoplayback' ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2013-01-08 11:17:19 +01:00
Nathan Jeffords	b3932e3dea	added a separate activation distance for NPCs	2013-01-07 23:40:17 -08:00
Nathan Jeffords	b9fbd6ae4b	Factored faced object lookups into MWRender::World ... * Renamed MWWorld::World::getFacedHandle to getFacedObject. * Changed it to return an object pointer * Updated clients to use return object directly.	2013-01-07 23:38:08 -08:00
Nathan Jeffords	05dad29005	update MWWord::World to track distances while performing occlusion queries. ... This allows checking the activation distance against what is stored in GameSettings. Experimentation suggests that a second distance is required for NPCs.	2013-01-07 23:11:15 -08:00
Nathan Jeffords	0108be2e4f	updated MWWorld::PhysicsSystem::getFacedXXX functions ... * changed the names and return values to be consistent * made the distance to search a parameter * change the distance returned to world units instead of percentage of query distance	2013-01-07 23:00:00 -08:00
Nathan Jeffords	86f691d3d5	split MWWord::World::update into multiple functions	2013-01-07 22:48:24 -08:00
Chris Robinson	2a9dc5ad94	Ensure mCurGroup always has valid iterators, and only get the animation state when animation keys exist	2013-01-07 21:00:21 -08:00
Tom Mason	9ee823d8f8	fixed typo in vmformat.txt	2013-01-07 21:09:03 +00:00
Tom Mason	4c5ed43cc9	added removesoulgem, and fixed addsoulgem	2013-01-07 21:08:04 +00:00
Tom Mason	c2901fe6cc	added addsoulgem scripting function	2013-01-07 18:16:50 +00:00
Chris Robinson	d8dbd5e206	Store text key iterators for the start and stop times	2013-01-07 05:56:03 -08:00
Chris Robinson	d3e949f5c6	Make the animation text keys lower case to help lookup	2013-01-07 05:23:44 -08:00
Chris Robinson	05dfafa777	Avoid an unnecessary lookup when moving the scene node	2013-01-07 05:09:15 -08:00
Chris Robinson	5f668976a8	Improve resetting the animation position	2013-01-07 04:48:59 -08:00
scrawl	f1b138d0a8	Merge branch 'master' into videoplayback ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2013-01-07 13:25:15 +01:00
scrawl	c2b75e28e9	Merge branch 'videoplayback' of github.com:scrawl/openmw into videoplayback	2013-01-07 13:20:50 +01:00
scrawl	282601d6e9	support the allowSkipping extra parameter for playBink command.	2013-01-07 13:19:52 +01:00
scrawl	35f4d09288	swscale handled better (cmake)	2013-01-07 13:06:16 +01:00
Marc Zinnschlag	2557ef4d7d	post merge fixes and some misc clean up	2013-01-07 12:17:46 +01:00
Marc Zinnschlag	41767f8dfa	Merge remote-tracking branch 'blunted2night/better_flicker'	2013-01-07 12:06:21 +01:00
Chris Robinson	648e3331f5	Don't try to move objects that aren't in a cell	2013-01-06 23:20:20 -08:00
Chris Robinson	921ae76ea9	Merge remote-tracking branch 'zini/master' into animation2	2013-01-06 21:20:49 -08:00
Chris Robinson	5b3a20ef69	Update the object position as the animation moves	2013-01-06 21:18:48 -08:00
Chris Robinson	910619eb21	Store the NonAccum animation root from the skeleton instance ... Currently this is assumed to be the node with the animation text keys.	2013-01-06 17:31:53 -08:00
Chris Robinson	b96a979719	Store an MWWorld::Ptr with the Animation	2013-01-06 17:05:48 -08:00
Nathan Jeffords	0f3712f284	change flickering light's brightness pattern	2013-01-06 14:29:22 -08:00
Chris Robinson	2b1fe7dc44	Add part info for weapons and shields	2013-01-06 05:39:39 -08:00
Marc Zinnschlag	25815ab8f7	Merge remote-tracking branch 'potatoesmaster/to_utf8-rewrite'	2013-01-06 13:31:01 +01:00
Chris Robinson	976b042cca	Use a list to reduce some repeating code	2013-01-06 02:14:19 -08:00
Chris Robinson	99769879e3	Fix some createEntities calls	2013-01-06 00:32:38 -08:00
Chris Robinson	efca5ded47	Clean up some header includes to reduce nesting	2013-01-05 21:12:08 -08:00
Emanuel Guevel	63f09462fd	to_utf8, Utf8Encoder: pass encoding as constructor parameter ... Edit other files accordingly.	2013-01-06 01:37:58 +01:00
Chris Robinson	58d35dbfcf	Have createEntities' caller retrieve the text keys as needed	2013-01-05 04:01:11 -08:00
Chris Robinson	818a24cdd6	Hold on to the AnimationState being used for animating	2013-01-05 00:03:14 -08:00
Chris Robinson	6e84d4bcdd	Add a helper method to load entity objects	2013-01-04 23:19:48 -08:00
Marc Zinnschlag	fbb59302d9	Merge remote-tracking branch 'blunted2night/loading_screen_fix'	2013-01-04 10:50:59 +01:00
Emanuel Guevel	67273fc177	mwiniimporter: use Utf8Encoder	2013-01-04 01:52:02 +01:00
Nathan Jeffords	9afe4467d8	cache results of query for spash screen names ... ResourceGroupManager::listResourceNames returns a list of all resource accessable which is expensive, this change caches the result of the processed query so additional splash screen changes are quicker.	2013-01-03 15:45:09 -08:00
Mark Siewert	d6377fb2e3	- Support deleting references from a plugin ... - Add preliminary support for loading some unique fields appearing only in savegames - Add a few lines required for supporting respawning references. Incomplete.	2013-01-03 18:51:04 +01:00
Marc Zinnschlag	b7b51f24d6	added new Role for table headers (Role_Display)	2013-01-03 11:20:25 +01:00
Marc Zinnschlag	0af7a2888a	Merge remote-tracking branch 'scrawl/ai_script'	2013-01-03 09:56:36 +01:00
Marc Zinnschlag	25d9918765	post merge fix: bringing code more in line with our naming standards and fixing an invalid name (names starting with double underscore are reserved in C++)	2013-01-03 09:55:48 +01:00
Marc Zinnschlag	c0260697c2	Merge remote-tracking branch 'scrawl/master'	2013-01-03 09:52:46 +01:00
Marc Zinnschlag	ce5d27b07b	Merge remote-tracking branch 'scrawl/button_fixes'	2013-01-03 09:50:24 +01:00
scrawl	42e0501c67	fix typo	2013-01-03 02:40:21 +01:00
scrawl	a5ef669eb6	Merge branch 'master' of git://github.com/zinnschlag/openmw into HEAD ... Conflicts: apps/openmw/mwscript/aiextensions.cpp apps/openmw/mwscript/docs/vmformat.txt	2013-01-03 02:34:31 +01:00
scrawl	ba7086cadf	Use race/class names (instead of ID) in replaced escape sequences	2013-01-03 02:05:05 +01:00
scrawl	1718d735b5	Fix menu/journal/book/scroll buttons when using localised MW-installations ... This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.	2013-01-03 01:09:03 +01:00
scrawl	ddbe13e569	Workaround for http://bugs.openmw.org/issues/475	2013-01-03 01:07:17 +01:00
Marc Zinnschlag	ff74f687fb	Merge remote-tracking branch 'lazydev/master'	2013-01-02 16:04:44 +01:00
lazydev	04cca2a1ce	fix for http://bugs.openmw.org/issues/517	2013-01-02 18:58:52 +04:00
Marc Zinnschlag	83fe128e87	Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'	2013-01-02 10:05:27 +01:00
scrawl	86f30992d7	fix message boxes not appearing properly when e.g. trading	2013-01-01 22:00:14 +01:00
Emanuel Guevel	2a7336c310	mwiniimporter: handle ini file encodings ... Use components/to_utf8 to handle encodings. Add an --encoding option for choosing between win1250, win1251 and win1252 encodings for the imported ini file.	2013-01-01 21:59:30 +01:00
Marc Zinnschlag	4a8bf40a83	Merge remote-tracking branch 'lazydev/master'	2013-01-01 20:45:09 +01:00
lazydev	7cd1e87fe8	Merge branch 'master' of git://github.com/zinnschlag/openmw ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.cpp	2013-01-01 22:18:21 +04:00
Emanuel Guevel	e9a464c9f7	mwiniimporter: remove fallback values for Cursors	2012-12-31 16:45:24 +01:00
Emanuel Guevel	e2b348de96	mwiniimporter: fix line ending problem	2012-12-31 16:44:22 +01:00
Marc Zinnschlag	65c7c7f60e	Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'	2012-12-31 14:47:05 +01:00
greye	7e0713f6c4	fix string case update	2012-12-31 11:22:40 +04:00
lazydev	cd5d95ed22	1. Dialogs in Russian version now works. ... 2. Destination names it travel window are now translated	2012-12-31 04:15:47 +04:00
Marc Zinnschlag	8b2785400b	Merge remote-tracking branch 'trombonecot/comparestring'	2012-12-30 20:11:18 +01:00
eduard	69d9d22579	comparestring	2012-12-30 19:56:38 +01:00
Marc Zinnschlag	e577731a06	Merge remote-tracking branch 'scrawl/master'	2012-12-30 18:31:35 +01:00
scrawl	f56182cac2	fix journal window not rendering any text	2012-12-30 17:06:17 +01:00
Emanuel Guevel	cb71efc427	mwiniimporter: clean up	2012-12-30 16:44:52 +01:00
Emanuel Guevel	38e7dbb970	mwininimporter: add more fallback values	2012-12-30 16:43:05 +01:00
Marc Zinnschlag	714b1924a5	partial dialogue subview implementation	2012-12-30 14:01:52 +01:00
eduard	98103e15eb	conflict resolution	2012-12-30 13:46:07 +01:00
eduard	fb25f407fb	dialoguemanager conflict	2012-12-30 13:37:19 +01:00
eduard	c85400b809	Merge https://github.com/zinnschlag/openmw into comparestring ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.cpp apps/openmw/mwworld/worldimp.cpp components/esm_store/reclists.hpp components/misc/stringops.hpp	2012-12-30 13:09:37 +01:00
Emanuel Guevel	9d043d0193	mwiniimporter: fix string cutting	2012-12-29 18:16:03 +01:00
Emanuel Guevel	b2203d22fc	mwiniimporter: added fallback values ... Ugly comments included. I will merge it on another branch to clean this up later.	2012-12-29 18:15:32 +01:00
scrawl	1dcc0f10ee	Merge pull request #6 from ChrisKCat/videoplayback ... Videoplayback	2012-12-28 15:28:58 -08:00
Marc Zinnschlag	8d4afe3bf5	post merge fix	2012-12-28 23:45:13 +01:00
Marc Zinnschlag	e2a8e2107b	Merge branch 'globals'	2012-12-28 23:42:02 +01:00
Marc Zinnschlag	334588bf1c	Merge branch 'editor2'	2012-12-28 23:31:43 +01:00
Tom Mason	bed8fb69e6	added bounty related scripting functions	2012-12-28 22:26:21 +00:00
Chris Robinson	1dd9276ceb	Add missing decoder method declarations	2012-12-28 11:26:41 -08:00
scrawl	ade4ec0453	fix texture edge bleeding due to wrong addressing mode	2012-12-28 19:01:47 +01:00
eduard	c75a5ae212	string compare and tolower	2012-12-28 18:05:52 +01:00
eduard	8545667bbd	string compare and tolower	2012-12-28 17:54:56 +01:00
Tom Mason	ad9b86058b	replaced explicit text with GMST entries, thanks to zinnschlag	2012-12-27 15:28:13 +00:00
Tom Mason	ba2301a156	removed redundant code thanks to scrawl	2012-12-27 00:49:39 +00:00
Tom Mason	299a1f32ed	cleanup	2012-12-26 23:52:16 +00:00
Tom Mason	51fce62b69	Merge branch 'messageboxes'	2012-12-26 23:06:27 +00:00
Tom Mason	716fbbbd74	messageboxes during dialogue show up in dialogue window, and messageboxes are generated when an item is removed from inventory	2012-12-26 22:57:53 +00:00
Tom Mason	a14b7e4a0f	small fixes on text defines	2012-12-26 18:07:56 +00:00
Marc Zinnschlag	afc2e840ae	renamed namespace TranslationData to Translation	2012-12-26 17:06:33 +01:00
Marc Zinnschlag	206c613b52	moved translation storage from GUI manager to engine	2012-12-26 17:03:37 +01:00
Marc Zinnschlag	2d468fec02	made previous commits naming standard compliant	2012-12-26 16:19:59 +01:00
Marc Zinnschlag	4c28f3211b	Merge remote-tracking branch 'lazydev/master'	2012-12-26 15:50:03 +01:00
Mark Siewert	8ccec17481	- Restore ability for plugins deleting records defined in parent files ... - Don't throw a runtime_error when trying to load a reference based on a deleted record (just a warning for now, should be closer to MW)	2012-12-26 10:34:59 +01:00
Mark Siewert	049b0e66e0	- Restore ability to generate references in the same cell from multiple plugins ... - Disable some code related to deleting entries in the store so that it builds again	2012-12-25 20:27:30 +01:00
lazydev	1f71395660	renaming of translation component; removing of C++11 features	2012-12-25 23:20:39 +04:00
lazydev	74ae479780	Cell names localization fix	2012-12-23 23:23:24 +04:00
Tom Mason	8ac8fdff47	implemented all text defines except a few for keybindings that don't exist yet	2012-12-21 18:09:31 +00:00
Tom Mason	f2c6907244	Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work	2012-12-20 23:16:34 +00:00
Chris Robinson	85850c7440	Fix DEFAULT_OUTPUT declaration	2012-12-18 10:43:04 -08:00
scrawl	64210e6efa	Revert "New Game button" ... This reverts commit c5dd0e1968.	2012-12-18 19:09:27 +01:00
scrawl	1c73a3f2fb	Revert "remove commandline switch for new game" ... This reverts commit 86671096ec.	2012-12-18 19:09:08 +01:00
Chris Robinson	7b2c3e6cd3	Pass a proper PlayMode enum to playSound and playSound3D	2012-12-18 06:01:21 -08:00
Chris Robinson	3b7edae7c3	Don't hold a list of all sound sources	2012-12-18 05:19:32 -08:00
Chris Robinson	fe36cc1de7	Don't try to resume sound types that aren't paused	2012-12-18 04:35:24 -08:00
Chris Robinson	2f8daec379	Allow pausing only certain types of sounds	2012-12-18 04:19:35 -08:00
Marc Zinnschlag	1cf019a007	post merge fix	2012-12-18 12:36:26 +01:00
Chris Robinson	b4e36d4f31	Add a method to get the volume from the sound type	2012-12-18 02:01:04 -08:00
Chris Robinson	a5356e194e	Allow specifying a type for the playTrack method	2012-12-18 01:35:20 -08:00
Chris Robinson	72ffceb206	Add type flags to the sound play mode	2012-12-18 00:57:57 -08:00
Chris Robinson	dd3e568a00	Set the sound properties at initialization	2012-12-17 23:35:20 -08:00
Chris Robinson	20321c4552	Keep track of the actual active sounds	2012-12-17 21:50:01 -08:00
Chris Robinson	d348435a1d	Improve audio open error message	2012-12-17 21:09:57 -08:00
Chris Robinson	67485d3454	Store the AVStream in the decoder for easy referencing	2012-12-17 07:15:53 -08:00
Chris Robinson	4373218746	Fix audio stream check	2012-12-17 06:56:30 -08:00
Chris Robinson	58ab3407b7	Constify a couple fields	2012-12-17 04:17:06 -08:00
Chris Robinson	9e842a0bbb	Fix for trying to play videos when not supported	2012-12-17 00:41:04 -08:00
Chris Robinson	26660110e5	Allow building the video player without ffmpeg (playVideo will always throw an exception)	2012-12-17 00:20:56 -08:00
Chris Robinson	06fd66e99d	Move some fields to the class they're used in	2012-12-16 11:49:46 -08:00
scrawl	f0f521a4e0	enableRestMenu -> enableRest	2012-12-16 16:55:59 +01:00
Chris Robinson	9c805483b0	Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback	2012-12-16 07:17:06 -08:00
scrawl	86671096ec	remove commandline switch for new game	2012-12-16 16:14:49 +01:00
scrawl	c5dd0e1968	New Game button	2012-12-16 16:05:31 +01:00
Chris Robinson	c92cde2be9	Properly flush packet queues when at EOF ... Note: the previous flush method was renamed to clear. Flushing a queue allows consumers to retrieve queued packets, but not expect any more to come in.	2012-12-16 05:50:20 -08:00
Chris Robinson	6bc526b74d	Avoid another loop for decoding audio	2012-12-16 05:30:38 -08:00
Marc Zinnschlag	77852439ce	moved ColumnBase and Column struct into a separate translation unit	2012-12-16 12:52:23 +01:00
Chris Robinson	254a623319	Remove a redundant check	2012-12-16 03:09:24 -08:00
Chris Robinson	dd20db5dc2	Remove the stream indices from the VideoState	2012-12-16 03:05:44 -08:00
Chris Robinson	3f6d36c712	Avoid double-setting the material texture	2012-12-16 02:19:19 -08:00
Chris Robinson	e9d833be03	Use the packet pts to calculate the decoder sample offset	2012-12-16 01:56:52 -08:00
Chris Robinson	0edc87825d	Move audio_clock to the decoder where it's used	2012-12-16 01:17:58 -08:00
Chris Robinson	4561c22e2b	More fixes for the audio clock ... The audio_clock for the decoder represents the end of the current packet, so it needs to be adjusted back to match the position that's actually going to be read next.	2012-12-16 00:07:56 -08:00
Chris Robinson	1a771ae671	Merge the stream struct into the parent decoder	2012-12-15 23:46:32 -08:00
Chris Robinson	5fff1c4e47	Update the ffmpeg decoder to use avcodec_decode_audio4	2012-12-15 23:22:37 -08:00
Chris Robinson	5f4c33f896	Only store one packet at a time	2012-12-15 22:54:54 -08:00
Chris Robinson	9d86890d9d	Only use one stream for the ffmpeg decoder	2012-12-15 22:13:19 -08:00
scrawl	a3bd3a40ca	fix 2 unrelated leaks	2012-12-16 00:47:29 +01:00
scrawl	18623a5efe	Merge branch 'videoplayback' of https://github.com/ChrisKCat/openmw into videoplayback	2012-12-16 00:43:34 +01:00
scrawl	edf18a7d6e	change destruction order to fix crash on exit when a video is playing	2012-12-15 22:01:45 +01:00
Chris Robinson	c869444dcf	Don't leak the IO context if avformat_open_input fails	2012-12-15 11:31:50 -08:00
scrawl	63e86555b6	use sample_aspect_ratio if available	2012-12-15 19:40:59 +01:00
scrawl	5ed04ae53e	added black bars	2012-12-15 19:23:03 +01:00
Chris Robinson	e6d27cd6d0	Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback	2012-12-15 09:15:47 -08:00
Chris Robinson	9b3cf5c159	Use a looping thread to trigger refreshes	2012-12-15 09:14:58 -08:00
Chris Robinson	fa1ad381da	Make sure packets are cleaned up properly	2012-12-15 08:42:54 -08:00
scrawl	7477345481	fixed video material	2012-12-15 17:10:21 +01:00
Chris Robinson	db23c8152e	Only duplicate AVPackets as needed ... Packets that don't have a destruct method are using static memory, which will only be valid until the next av_read_frame call. Otherwise, it's already dynamically allocated and will remain valid.	2012-12-15 07:47:03 -08:00
Chris Robinson	6008cf0d15	Remove unneeded video_current_pts field	2012-12-15 05:02:01 -08:00
Chris Robinson	da44141b95	Avoid creating extra texture unit states on the video material	2012-12-15 04:17:28 -08:00
Chris Robinson	d50698d7d1	Clean up the rectangle and scene node used for displaying the video	2012-12-15 04:01:52 -08:00
Chris Robinson	eb0e8d9e37	Simplify PacketQueue::get	2012-12-15 02:50:59 -08:00
Chris Robinson	b41a77648e	Avoid re-reading the source sample to duplicate, to avoid pointer aliasing	2012-12-15 02:33:59 -08:00
Chris Robinson	62a995d492	Calculate audio sync once per read	2012-12-15 00:18:42 -08:00
Chris Robinson	32b0a5d96e	Update the queued sample count immediately	2012-12-14 23:42:49 -08:00
Chris Robinson	cbdf6ad595	Move more stuff to where it should be, and improve cleanup	2012-12-14 09:07:59 -08:00
Chris Robinson	71ff90aaee	Don't use sub-frame timing for the video clock	2012-12-14 08:42:37 -08:00
Chris Robinson	582efcdb9b	Always try to resync if the clock difference is large	2012-12-14 07:40:19 -08:00
Chris Robinson	f97eaec7ab	Consolidate some code	2012-12-14 07:29:58 -08:00
Chris Robinson	d66d8a3118	Don't assume we can write beyond the end of the sample buffer	2012-12-14 06:43:51 -08:00
Chris Robinson	7332ffb0f8	Let the wanted sample size go down to 0	2012-12-14 06:02:34 -08:00
Chris Robinson	05c6483257	Fix external clock	2012-12-14 04:35:57 -08:00
Chris Robinson	2f37d31108	Move some definitions into the source file they're used in	2012-12-14 04:12:34 -08:00
Chris Robinson	a6e627001a	Avoid a for(;;) construct	2012-12-14 03:23:04 -08:00
Chris Robinson	4d6c05f6cc	Tighten audio skew allowance	2012-12-14 03:19:32 -08:00
Chris Robinson	8db5d10f10	Avoid showing a video picture if we're late ... Ideally we should skip decoding, or at least YUV->RGB conversion, too.	2012-12-14 03:11:59 -08:00
Chris Robinson	157cb10f56	Fix a 16-bit audio assumption	2012-12-14 02:39:46 -08:00
Chris Robinson	c2b711d195	Move some more methods to the class they're part of	2012-12-14 02:36:29 -08:00
Chris Robinson	26a09ee7ba	Move some methods into their respective class	2012-12-14 01:38:00 -08:00
Chris Robinson	5221298a7f	Move a couple packet queue methods into the struct	2012-12-14 01:14:14 -08:00
Chris Robinson	90294c589b	Use a volatile bool for the refresh	2012-12-13 18:24:57 -08:00
Chris Robinson	f555dc60eb	Reduce some indentation	2012-12-13 18:12:17 -08:00
Chris Robinson	6cedd64509	Fix audio sync correction sizes	2012-12-13 18:05:27 -08:00
Chris Robinson	e291d0943d	Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback	2012-12-13 17:53:50 -08:00
Chris Robinson	606fb982a8	Update to use avcodec_decode_audio4	2012-12-13 17:53:22 -08:00
scrawl	82564e07c7	fix crash when video file doesn't exist	2012-12-14 01:44:00 +01:00
scrawl	27cd9ff732	Revert "Use the decoded frame pts when available" ... This reverts commit cab68df257.	2012-12-14 01:03:49 +01:00
scrawl	9d6f656822	fixed ogre resource functions	2012-12-14 00:10:54 +01:00
Chris Robinson	43481ad117	Use the external clock by default	2012-12-13 06:11:32 -08:00
Marc Zinnschlag	f95e72166c	hide type column in non-mixed type tables	2012-12-13 15:03:35 +01:00
Marc Zinnschlag	faa5ef0874	rewrote column class	2012-12-13 14:53:16 +01:00
Chris Robinson	0a5ab977b7	Use the decoder's sample offset for calculating the stream offset	2012-12-13 05:04:53 -08:00
Marc Zinnschlag	640c218df3	made record state uneditable again	2012-12-13 13:52:26 +01:00
Marc Zinnschlag	3d4c8c5444	added dialogue sub view (editing of a single record; not functional yet); fixed a bug in Universal to string conversion	2012-12-13 13:35:08 +01:00
Chris Robinson	cab68df257	Use the decoded frame pts when available	2012-12-13 04:25:41 -08:00
Chris Robinson	1ea1407707	Support quad, 5.1, and 7.1 with OpenAL and ffmpeg ... The other decoders don't guarantee any channel ordering, which makes them useless.	2012-12-13 04:10:19 -08:00
Chris Robinson	600494eed8	More cleanup of unused code	2012-12-13 03:37:04 -08:00
Chris Robinson	f7ff8b3374	A bit more cleanup	2012-12-13 03:13:44 -08:00
Chris Robinson	7e8b844b2e	Clean up some unused code	2012-12-13 03:05:37 -08:00
Chris Robinson	d2fbae9760	Init and deinit the VideoState synchronously, and re-enable audio playback	2012-12-13 02:52:37 -08:00
Chris Robinson	f067b22b3f	Use a recursive mutex for the OpenAL stream thread	2012-12-13 02:33:35 -08:00
Chris Robinson	ba9c5f5b4e	Don't initially fill buffers in OpenAL_SoundStream::play	2012-12-13 02:32:21 -08:00
Marc Zinnschlag	02184526e6	moved two helper classes from view/world/table into a separate translation unit	2012-12-13 11:24:39 +01:00
Chris Robinson	1ffaf6625a	Remove SDL for playing movie audio and prepare for using an audio track ... This breaks audio playback on movies	2012-12-13 01:42:20 -08:00
Chris Robinson	779ced0889	Add a method to play an audio track with a custom decoder	2012-12-13 00:05:57 -08:00
Chris Robinson	1571243ef0	Implement getTimeOffset for OpenAL_SoundStream	2012-12-12 23:16:45 -08:00
Chris Robinson	86bf6388c6	Pass a decoder to the playStream sound output method	2012-12-12 22:32:02 -08:00
Chris Robinson	9c831d3039	Add a decoder method to get the "file" name	2012-12-12 22:19:44 -08:00
Chris Robinson	1fb9eef27b	Detach the thread used for frame timing	2012-12-12 22:02:33 -08:00
Chris Robinson	34e36fb852	Add a method to get the time offset from sounds	2012-12-12 16:50:35 -08:00
Marc Zinnschlag	cc18b30e17	open sub view on double click in report view	2012-12-12 22:36:20 +01:00
scrawl	7fd9e1d212	Merge branch 'videoplayback' of https://github.com/ChrisKCat/openmw into videoplayback ... Conflicts: apps/openmw/mwrender/videoplayer.cpp	2012-12-12 22:24:38 +01:00
scrawl	18d8c767bd	fix a bunch of warnings, improved error handling, initialize texture to black	2012-12-12 15:15:55 +01:00
Chris Robinson	2c1eceb9f0	Add methods to pause and stop all playing sounds (and music)	2012-12-12 02:33:12 -08:00
Chris Robinson	973b5faf25	Keep track of all allocated sources	2012-12-12 01:32:16 -08:00
Chris Robinson	e82c4afd50	close SDL when closing the video, not after the video loop is finished	2012-12-12 00:36:52 -08:00
Chris Robinson	a62d5bbfe4	Sleep using the absolute time, so the thread creation doesn't add to the wait	2012-12-11 23:54:41 -08:00
Chris Robinson	c2e1595445	Treat paused sounds as still playing	2012-12-11 21:01:32 -08:00
Chris Robinson	2efdafecd9	Indentation fixes	2012-12-11 20:11:48 -08:00
Chris Robinson	277248cdcb	Fix some "comparison between signed and unsigned" warnings	2012-12-11 19:43:07 -08:00
Chris Robinson	3519934f27	Add a missing return value	2012-12-11 19:36:04 -08:00
Chris Robinson	9e2d4f8b7c	Avoid potential NULL dereference	2012-12-11 19:32:10 -08:00
scrawl	fe384a1600	pause 3d rendering while the video plays	2012-12-12 01:30:34 +01:00
scrawl	faad64b254	Esc cancels the video	2012-12-12 01:13:53 +01:00
scrawl	0ce5ade6d8	DataStreamPtr fix, indentation fixes	2012-12-11 23:06:06 +01:00
scrawl	c49966dd29	started over	2012-12-11 22:49:31 +01:00
scrawl	5f676f9c6b	Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwscript/miscextensions.cpp	2012-12-11 22:28:23 +01:00
Marc Zinnschlag	c75563c184	report model and view	2012-12-11 15:35:47 +01:00
Marc Zinnschlag	2db930a5cf	rewrote subview factory system	2012-12-11 13:22:43 +01:00
Marc Zinnschlag	0ed378dfb2	changed sub view factory method signature	2012-12-11 11:24:30 +01:00
Marc Zinnschlag	de4a03081c	fixed skill level type in skill level up message	2012-12-10 11:04:21 +01:00
scrawl	e3dd3d565c	fix 2 leaks	2012-12-10 00:59:39 +01:00
Marc Zinnschlag	832fc56d34	changed UniversalId to string conversion	2012-12-09 11:10:35 +01:00
Marc Zinnschlag	5f5addf052	fixed an enum	2012-12-09 00:12:24 +01:00
Marc Zinnschlag	9fe7ff9690	added mandatory ID check stage	2012-12-08 23:27:59 +01:00
Marc Zinnschlag	72623652e4	addded messages interface for operations/stages	2012-12-08 18:38:36 +01:00
Marc Zinnschlag	89b4497331	added missing edit locks for create/revert/delete	2012-12-08 18:15:00 +01:00
Marc Zinnschlag	6c18be39f0	added stage class	2012-12-08 17:53:45 +01:00
Marc Zinnschlag	8b7f342641	removed last remains of old verify implementation	2012-12-08 17:00:58 +01:00
Marc Zinnschlag	af9b48f4d3	added operations base class	2012-12-08 15:25:50 +01:00
Marc Zinnschlag	a2b4f43176	moved document state enum to a separate file	2012-12-08 14:44:03 +01:00
Marc Zinnschlag	0e7ba008ad	another skill gain fix	2012-12-08 14:28:56 +01:00
Marc Zinnschlag	caaffd1ec2	handle persuasion records properly	2012-12-08 14:24:15 +01:00
Marc Zinnschlag	a70a5282f4	fixed an overzealous skill gain error check	2012-12-08 13:37:43 +01:00
Marc Zinnschlag	fdc7e93835	preliminary multi-threaded verify implementation (does not actually perfom any document verification yet)	2012-12-08 11:59:13 +01:00
Marc Zinnschlag	386eec51c1	some skill usage fixes	2012-12-07 11:36:38 +01:00
eduard	e50b9aca86	tradding skill use, spechcraft use	2012-12-06 20:58:33 +01:00
eduard	2d62649dc9	tradding skill use, spechcraft use	2012-12-06 18:30:19 +01:00
eduard	b2a0e4b1fd	tradding skill use, spechcraft use	2012-12-06 18:19:35 +01:00
Marc Zinnschlag	1c80390bce	Merge branch 'master' into editor2	2012-12-06 15:26:03 +01:00
Marc Zinnschlag	2b53cf6547	do not list actions in the pop up menu that do not apply to any of the selected records	2012-12-06 15:25:31 +01:00
Marc Zinnschlag	c12ee129f7	added delete command	2012-12-06 15:18:41 +01:00
Marc Zinnschlag	b41cc5e9e9	added revert command	2012-12-06 14:56:04 +01:00
eduard	ea8ee11ff7	tradding skill use	2012-12-06 14:25:53 +01:00
eduard	5332546541	tradding skill use	2012-12-06 13:58:52 +01:00
Marc Zinnschlag	8bcd7d8fb1	fixed a type in a script instruction	2012-12-04 20:56:45 +01:00
Marc Zinnschlag	f07b7d17cd	improved exception handling	2012-12-04 20:43:47 +01:00
Marc Zinnschlag	8e1a2e3a13	Issue #474: adjust global variable pcrace	2012-12-04 10:58:43 +01:00
Marc Zinnschlag	5cd2fe00ab	initialise blank global records	2012-12-03 22:16:02 +01:00
Marc Zinnschlag	8e93bfa607	turned the global class into a general purpose table subview class	2012-12-03 22:03:02 +01:00
Marc Zinnschlag	0a8b7602d3	fixed edit lock	2012-12-03 21:51:42 +01:00
Marc Zinnschlag	49d6239004	added pop-up menu with create record action	2012-12-03 21:44:16 +01:00
scrawl	7cc28c3eb9	Merge branch 'videoplayback' of github.com:scrawl/openmw into videoplayback	2012-12-03 17:43:00 +01:00
scrawl	3106db0379	commented out debug output	2012-12-03 17:41:38 +01:00
scrawl	bc90c75176	more clean up, video played with correct speed, videos without sound working too (mw_credits.bik)	2012-12-03 17:33:02 +01:00
scrawl	a77d910aaf	audio codec is opened, some cleanup	2012-12-03 16:44:41 +01:00
Marc Zinnschlag	db29e411c4	added merge functions; temporarily merge on document creation	2012-12-03 13:56:02 +01:00
scrawl	3db850a7d1	Don't crash if no loading screens are found	2012-12-03 05:45:04 +01:00
scrawl	ea2bbec76e	better fix for bed activation	2012-12-03 05:32:12 +01:00
Tom Mason	a6fd369e4e	Fixed wait window reappearing after sleeping	2012-12-02 22:10:47 +00:00
greye	682fd23aea	fix wrong increment	2012-12-02 21:18:59 +04:00
Marc Zinnschlag	b25f2e88ce	Issue #492: fixed double alchemy ingredients removal	2012-12-02 15:07:22 +01:00
Marc Zinnschlag	556d737f65	Merge remote-tracking branch 'trombonecot/windowformatting'	2012-12-02 14:36:36 +01:00
eduard	30d0e93cf4	Fix window formatting on tool tip with too log titles	2012-12-02 14:12:18 +01:00
eduard	7e7e6e2bcb	Fix window formatting on tool tip with too log titles	2012-12-02 14:08:22 +01:00
scrawl	d432420a32	fix FindFFmpeg.cmake	2012-12-01 20:53:28 +01:00
Marc Zinnschlag	bd5e364ac1	display record state in table	2012-12-01 13:42:12 +01:00
scrawl	c4facc233e	Merge branch 'master' into videoplayback ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-12-01 11:30:51 +01:00
Marc Zinnschlag	ec1f957e54	edit lock for sub views	2012-11-30 13:58:10 +01:00
rpopovici	7079b9062f	add AI script functions	2012-11-30 02:16:16 +02:00
Marc Zinnschlag	8dd76b49af	factored out table widget from globals sub view	2012-11-29 19:09:06 +01:00
Marc Zinnschlag	fd55c0cae2	record IDs are no longer handled as a special case	2012-11-29 18:56:28 +01:00
Marc Zinnschlag	4086b556d2	use commands for modifying globals	2012-11-29 16:05:28 +01:00
Marc Zinnschlag	8a09e03d5c	global variable editing (no undo support yet)	2012-11-29 14:45:34 +01:00
scrawl	398eecc35e	GetWeaponType fix	2012-11-28 02:51:46 +01:00
scrawl	00e46addc2	GetArmorType fix	2012-11-28 02:48:21 +01:00
scrawl	8e857587d7	fix a text coloring bug	2012-11-28 02:36:33 +01:00
scrawl	1def60dbe1	PcExpell, PcExpelled, PcClearExpelled, RaiseRank, LowerRank	2012-11-28 02:15:34 +01:00
scrawl	9f720ccbc9	Merge branch 'master' of https://github.com/zinnschlag/openmw into scripting	2012-11-28 02:14:37 +01:00
scrawl	644dacf603	suggestion by Zini for SetDelete	2012-11-28 01:30:18 +01:00
Marc Zinnschlag	5eb0f489e2	Issue 476: fixed auto-move bypassing disabled player controls	2012-11-27 18:39:12 +01:00
Greendogo	8b18d195bd	Update apps/openmw/main.cpp ... Edited the description for the --script-run switch.	2012-11-27 04:50:49 -06:00
Marc Zinnschlag	92f70635a2	improved selection behaviour	2012-11-27 10:42:46 +01:00
scrawl	d6dd212ce8	GetWerewolfKills, ModScale, SetDelete, GetSquareRoot	2012-11-27 06:54:13 +01:00
Marc Zinnschlag	ef9575498f	basic (non-editable) subview for global variables	2012-11-26 12:29:22 +01:00
Mark Siewert	b103426cf0	- Partially reimplement deleting objects defined in a parent esX file. ... - Try to reimplement multiple esX files dropping references in the same file. NOTE: None of these features works. Maybe the code itself does not build. Anyway, after 12 hours of hacking, I am just tired and want to get a snapshot of the code out.	2012-11-25 19:07:16 +01:00
Mark Siewert	896ab44d1e	- Add some updated files missing from last commit. ... - Move plugin dependency test from esmreader.cpp to esmstpre.cpp; fixes crash in omwlauncher.	2012-11-25 17:19:29 +01:00
Mark Siewert	8ea9f00e6f	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ... Conflicts: apps/openmw/mwrender/terrain.cpp apps/openmw/mwworld/cells.cpp apps/openmw/mwworld/cells.hpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/cellstore.hpp apps/openmw/mwworld/containerstore.cpp apps/openmw/mwworld/localscripts.cpp apps/openmw/mwworld/scene.cpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm_store/reclists.hpp components/esm_store/store.cpp extern/shiny - Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp. - NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.	2012-11-25 14:12:44 +01:00
Marc Zinnschlag	1dd63e9fb6	Merge branch 'master' into editor2	2012-11-25 10:50:34 +01:00
scrawl	1ccad32877	GetWeaponType	2012-11-25 02:06:43 +01:00
scrawl	e68dc19256	GetCurrentTime, HasSoulGem	2012-11-25 01:54:37 +01:00
scrawl	0db48b29c7	GetSpellEffects, GetRace	2012-11-25 01:26:29 +01:00
scrawl	4b830e5c7a	Merge branch 'scripting' of github.com:scrawl/openmw into scripting	2012-11-25 00:44:38 +01:00
Marc Zinnschlag	eece4226c0	basic sub view system (very incomplete)	2012-11-24 13:30:43 +01:00
Marc Zinnschlag	4c0dcd46a1	added UniversalId class	2012-11-24 11:01:53 +01:00
Marc Zinnschlag	019146756f	minor documentation changes regarding future improvements and additions	2012-11-24 10:14:43 +01:00
scrawl	70aa7459f5	GetWeaponDrawn	2012-11-24 03:04:26 +01:00
scrawl	be82d1452f	HasItemEquipped	2012-11-24 02:59:44 +01:00
scrawl	600ed5f38a	GetAttacked	2012-11-24 02:48:53 +01:00
scrawl	50baf6dac7	moved to controlextensions	2012-11-24 02:45:25 +01:00
scrawl	a596d23203	GetArmorType	2012-11-24 02:38:10 +01:00
scrawl	d7811624d5	GetEffect	2012-11-24 02:15:55 +01:00
scrawl	e8ef4dba1e	getPcRunning, getPcSneaking, getForceRun, getForceSneak	2012-11-24 02:02:49 +01:00
scrawl	10329c780d	GetLocked	2012-11-23 21:31:10 +01:00
Marc Zinnschlag	a6c7f16a7b	Merge remote-tracking branch 'scrawl/reputation'	2012-11-23 21:26:44 +01:00
scrawl	d418e21371	<Mod|Get><Flee|Fight|Hello|Alarm>	2012-11-23 21:14:32 +01:00
scrawl	9c170af30c	SameFaction	2012-11-23 20:57:08 +01:00
scrawl	d54ed557bf	Equip	2012-11-23 20:48:59 +01:00
scrawl	064cb80c0a	fix wait dialog fading	2012-11-23 20:48:53 +01:00
scrawl	0af869c816	GetReputation	2012-11-23 20:22:51 +01:00
scrawl	eb29b1593b	ModReputation, SetReputation	2012-11-23 19:56:45 +01:00
scrawl	f218ef2675	fix separator	2012-11-23 19:21:13 +01:00
scrawl	1d7e92b6b3	dialogue fixes	2012-11-23 19:05:40 +01:00
Marc Zinnschlag	303506d24b	added new document function	2012-11-23 14:08:20 +01:00
Marc Zinnschlag	997386d873	implemented world verify function (doesn't do anything yet; mostly meant as a test for multi-operation interface)	2012-11-23 13:15:45 +01:00
Marc Zinnschlag	2fc183d595	added operations progress bar	2012-11-23 12:20:35 +01:00
Marc Zinnschlag	eaa58e0530	preparations for multiple parallel progress-type operations	2012-11-23 10:52:46 +01:00
Marc Zinnschlag	04158d03b0	clean up properly after closing a top level window	2012-11-23 10:30:14 +01:00
Marc Zinnschlag	03aacd3263	added progress tracking	2012-11-23 10:25:34 +01:00
Marc Zinnschlag	931eb08114	implemented edit locking (used during saves)	2012-11-23 00:51:04 +01:00
Marc Zinnschlag	5838929371	implemented a dummy save function (does not actually save anything)	2012-11-23 00:36:01 +01:00
Marc Zinnschlag	d7c63d4c74	track document modification state and display it in the top level window title bar	2012-11-22 23:42:17 +01:00
Marc Zinnschlag	d7af9fbec6	various fixes	2012-11-22 17:24:28 +01:00
Marc Zinnschlag	6643674b13	ESM tool fix	2012-11-22 17:23:25 +01:00
Marc Zinnschlag	8e546ebd30	added test command	2012-11-22 16:00:23 +01:00
Marc Zinnschlag	ed3d8b8ca2	added undo stack and undo/redo actions	2012-11-22 15:54:31 +01:00
Marc Zinnschlag	1ddcea1f07	display view indices in title bar	2012-11-22 15:25:16 +01:00
Marc Zinnschlag	789cecb9df	added main menu and implemented new view function	2012-11-22 14:51:38 +01:00
Marc Zinnschlag	758371d7e4	implemented view/document closing	2012-11-22 14:10:23 +01:00
Marc Zinnschlag	9834bb3ad5	basic document handling	2012-11-22 13:30:02 +01:00
Marc Zinnschlag	9201baebf9	template fix	2012-11-22 10:19:11 +01:00
Marc Zinnschlag	c3cd6e8a8a	new attempt at the editor	2012-11-21 17:31:18 +01:00
scrawl	c8562d8442	toggleCollisionBoxes actually does something useful now	2012-11-20 02:20:54 +01:00
Marc Zinnschlag	5d45bcd03a	Merge remote-tracking branch 'trombonecot/master' ... Conflicts: apps/openmw/mwclass/light.cpp	2012-11-19 21:21:00 +01:00
eduard	4e4d15f8ac	Failed action	2012-11-19 21:04:49 +01:00
scrawl	693eeabeca	shiny: fix GLSL texture units when shaders were disabled	2012-11-19 13:55:26 +01:00
Mark Siewert	31fb715bd7	- Add support for moving existing references by plugin files. No cell changing yet. ... - Change CellRefList::list from list<> to map<int,> so we can identify live references by their Refnumber. - Introduce ContainerRefList, a clone of the original CellRefList. It is now used for containers, which do not track Refnumbers. - Many small tweaks so that the new CellRefList does not conflict with existing code.	2012-11-17 21:50:25 +01:00
eduard	82ea547ce4	Failed action	2012-11-17 18:17:08 +01:00
Mark Siewert	2175f13b67	- Add tracking for dependencies between plugins. ... - Add reference number mangling required for moving references around.	2012-11-17 00:21:51 +01:00
scrawl	8ef3edd416	Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap	2012-11-16 22:28:00 +01:00
scrawl	f5355e3e92	512x512 map, slightly faster	2012-11-16 22:26:00 +01:00
Marc Zinnschlag	a092deaee8	various fixes	2012-11-16 20:28:20 +01:00
Marc Zinnschlag	3dc013ceae	Merge remote-tracking branch 'gohan/Gohan'	2012-11-16 20:15:58 +01:00
scrawl	dc67a547b0	global map explored overlay	2012-11-16 19:34:09 +01:00
marcin	51027c541e	Feature #391 Dummy AI package classes	2012-11-16 18:38:15 +01:00
Marc Zinnschlag	9193f3b0ae	implemented getCommon/BlightDisease script instructions	2012-11-16 13:32:40 +01:00
Marc Zinnschlag	89c7936534	fixed dialogue script error reporting	2012-11-16 12:47:09 +01:00
Marc Zinnschlag	fd5671e6db	fixed argument lists for setpcfacrep and modpcfacrep	2012-11-16 12:45:07 +01:00
marcin	bed0280ba1	Feature #391 Dummy AI package classes	2012-11-15 22:33:50 +01:00
marcin	99ddc63e2c	Feature #391 Dummy AI package classes	2012-11-15 22:32:15 +01:00
marcin	515419ae0b	Feature #391 Dummy AI package classes	2012-11-15 22:22:44 +01:00
marcin	4b939c7521	Feature #391 Dummy AI package classes	2012-11-15 22:15:20 +01:00
Marc Zinnschlag	82d62eb95a	Merge branch 'script'	2012-11-15 20:00:37 +01:00
Marc Zinnschlag	9669eed083	Issue #219: added last missing function filters	2012-11-15 20:00:27 +01:00
scrawl	aefde3f5bc	Merge branch 'master' into globalmap	2012-11-15 13:21:24 +01:00
marcin	e6c8e1f0d7	Feature #391 Dummy AI package classes	2012-11-14 18:42:04 +01:00
marcin	698afbec3e	Feature #391 Dummy AI package classes	2012-11-14 18:40:32 +01:00
scrawl	5f7d349126	several missing includes	2012-11-14 05:32:23 +01:00
Marc Zinnschlag	b046687f46	added PCFacRep script instructions	2012-11-13 16:11:03 +01:00
Marc Zinnschlag	2a1727d4c5	improved error reporting for dialogue scripts (enabled via --script-verbose)	2012-11-13 15:35:46 +01:00
Marc Zinnschlag	c621a9f7e4	added missing disposition script instructions	2012-11-13 14:29:00 +01:00
Marc Zinnschlag	8aa1fd921b	fixed some stats related script instructions	2012-11-13 14:19:43 +01:00
Marc Zinnschlag	cbb0fd5792	Merge branch 'dialogue'	2012-11-13 10:04:08 +01:00
Marc Zinnschlag	409d15576b	Merge remote-tracking branch 'greye/player-model'	2012-11-12 14:18:38 +01:00
Marc Zinnschlag	e2ccec99f0	Issue #219: added another missing PC stats filter	2012-11-12 14:02:49 +01:00
Marc Zinnschlag	586ac3f5c6	Issue #219: added some more stats filters; fixed two filters	2012-11-12 13:56:51 +01:00
Marc Zinnschlag	77ba8c5117	Issue #219: implemented rank requirement filter	2012-11-12 13:23:25 +01:00
scrawl	8e847fdc6e	fix speechcraft skill increasing when persuade didn't succeed	2012-11-11 19:18:41 +01:00
Mark Siewert	42eefaf36f	- Add support for loading references from multiple esm/esp files. Full reference ID mangling coming soon (currently, moved references are simply cloned). ... - Reference loader now (partially) supports MVRF tag.	2012-11-10 21:43:41 +01:00
scrawl	11a8d5d70a	Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap	2012-11-10 21:19:41 +01:00
scrawl	7c22690116	Merge branch 'next' into globalmap	2012-11-10 21:19:10 +01:00
greye	623e00531d	fix reentering race selection	2012-11-10 21:54:43 +04:00
greye	0d33d005a5	head/hair selection	2012-11-10 21:30:16 +04:00
greye	50867e8d87	fix gender selection update, main model visibility and couple of crashes	2012-11-10 19:57:50 +04:00
Marc Zinnschlag	75f64aa38b	Merge branch 'master' into dialogue ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.hpp apps/openmw/mwmechanics/npcstats.cpp apps/openmw/mwmechanics/npcstats.hpp	2012-11-10 15:44:44 +01:00
Marc Zinnschlag	7b1788b03b	minor fix	2012-11-10 15:11:21 +01:00
Marc Zinnschlag	0ab4068fbd	Merge remote-tracking branch 'scrawl/persuasion' into next	2012-11-10 14:59:52 +01:00
Marc Zinnschlag	6dc2214502	Issue #219: more DialogueManager refactoring	2012-11-10 14:52:44 +01:00
Marc Zinnschlag	79706bf60f	Issue #219: dialogue manager cleanup	2012-11-10 14:31:58 +01:00
Marc Zinnschlag	d24e3eec9f	Issue #219: added filters for various player stats	2012-11-10 14:02:52 +01:00
Marc Zinnschlag	f8fcca64b6	Issue #219: Proper implementation of talked to PC filter	2012-11-10 13:31:10 +01:00
Marc Zinnschlag	7e8d4bb3c9	Issue #219: added various creature and NPC stats; implemented respective filters	2012-11-10 13:21:38 +01:00
Marc Zinnschlag	d15eb6cd17	Merge remote-tracking branch 'greye/player-model' into next	2012-11-10 12:36:01 +01:00
Marc Zinnschlag	e97f3003ab	Issue #219: added expelled status tracking; implemented expelled filter	2012-11-10 12:28:40 +01:00
Marc Zinnschlag	bd2c772dae	Issue #219: implemented player skill and attribute filter	2012-11-10 12:08:04 +01:00
Marc Zinnschlag	d6961c0246	Issue #219: made all unimplemented filters return false	2012-11-10 11:42:03 +01:00
Marc Zinnschlag	ceaf1677ce	Issue #219: rewrote AI settings and implemented AI settings filters	2012-11-10 11:38:37 +01:00
Marc Zinnschlag	eb4e72aaa7	Issue #219: implemented disease filters	2012-11-10 11:08:36 +01:00
Marc Zinnschlag	c425b3f4a3	Issue #219: fixed function decoding and moved choice function from DialogueManager to Filter	2012-11-10 09:48:20 +01:00
Marc Zinnschlag	a752536cea	Issue #219: added function decoding and moved same faction function from DialogueManager to Filter	2012-11-10 09:35:50 +01:00
greye	235b565bb7	update main character model	2012-11-10 11:51:48 +04:00
greye	b1ef0026a9	race selection/inventory preview character model update	2012-11-10 11:41:12 +04:00
scrawl	92bba18218	removed useless member	2012-11-10 00:47:24 +01:00
scrawl	553ea08eae	consider temporary disposition change when trading	2012-11-10 00:42:31 +01:00
scrawl	94aeb15220	bartering disposition change	2012-11-10 00:38:45 +01:00
scrawl	33b4b29fbc	persuasion mechanics, added reputation	2012-11-10 00:29:36 +01:00
scrawl	ace9ee9c83	persuasion dialog	2012-11-09 20:18:38 +01:00
scrawl	f6a9029c4b	bounty & disease disposition effect	2012-11-09 18:33:11 +01:00
Marc Zinnschlag	4994a253da	Merge branch 'bountydisease' into dialogue	2012-11-09 18:17:14 +01:00
Marc Zinnschlag	be1334b202	disease tests	2012-11-09 18:16:29 +01:00
Marc Zinnschlag	0727d943b1	Merge branch 'next' into bountydisease ... Conflicts: apps/openmw/mwmechanics/npcstats.cpp	2012-11-09 18:04:44 +01:00
scrawl	d53a7ade1e	method names, disposition uint->int	2012-11-09 14:42:09 +01:00
Marc Zinnschlag	39ff2f06ce	added bounty to NpcStats	2012-11-09 14:31:38 +01:00
scrawl	ae78eaeb28	fixed training, fixed todo comments	2012-11-08 23:21:03 +01:00
scrawl	b2afb1fd5c	Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement ... Conflicts: apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwclass/npc.cpp apps/openmw/mwdialogue/dialoguemanagerimp.cpp apps/openmw/mwgui/spellbuyingwindow.cpp apps/openmw/mwgui/trainingwindow.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp	2012-11-08 23:16:40 +01:00
scrawl	322faf13e4	cleanup	2012-11-08 22:37:59 +01:00
scrawl	bf4e855260	fixed creatures	2012-11-08 22:31:08 +01:00
Marc Zinnschlag	e6021a3fe3	Issue #219: moved checks for local and global variables from DialogueManager to Filter	2012-11-08 22:11:50 +01:00
gugus	4634227f1c	notify the user when the merchant doesn't accept the offer	2012-11-08 21:50:56 +01:00
Marc Zinnschlag	e68bb3481e	Issue #219: moved over the second batch of functions (boolean and one integer I forgot last time)	2012-11-08 21:48:17 +01:00
Marc Zinnschlag	91afef140b	Issue #219: moved first batch of integer type functions from DialogueManager to Filter	2012-11-08 21:16:49 +01:00
greye	c3f0dc0dfb	m prefix for NpcAnimation members	2012-11-08 23:11:43 +04:00
scrawl	3d7146cd50	don't allow opening a window multiple times, primarily the console	2012-11-08 19:34:54 +01:00
Marc Zinnschlag	2be60041f3	Merge remote-tracking branch 'greye/player-dynamics' into next	2012-11-08 18:32:25 +01:00
Marc Zinnschlag	e912b5bed2	Merge remote-tracking branch 'greye/next' into dialogue	2012-11-08 18:19:52 +01:00
greye	af5fb7916f	fix searching in store	2012-11-08 21:07:14 +04:00
Marc Zinnschlag	235397dde8	Issue #219: added missing implemented for isInverted function	2012-11-08 17:29:10 +01:00
Marc Zinnschlag	f5972a3080	Issue #219: Support for boolean select structs	2012-11-08 17:04:44 +01:00
Marc Zinnschlag	b412ebd0af	Issue #219: Supoort for inverted select structs	2012-11-08 17:01:26 +01:00
Marc Zinnschlag	4614d2bc8e	Issue #219: added basic select struct analysis and type checking	2012-11-08 16:49:38 +01:00
greye	b5a59c3a07	minor doxygen comments update	2012-11-08 19:01:42 +04:00
greye	2a86432887	store birthsign in MWWorld::Player	2012-11-08 18:50:23 +04:00
Marc Zinnschlag	662054acf4	Issue #219: moved checks for various dialogue info fields from DialogueManager to Filter	2012-11-08 14:55:31 +01:00
Marc Zinnschlag	1502b3f6f8	Issue #219: Begin of refactoring; added filter class (doesn't do anything yet)	2012-11-08 14:09:40 +01:00
Marc Zinnschlag	6c6c0dd1e3	Merge branch 'next' into dialogue	2012-11-08 13:45:20 +01:00
gugus	0a883f4492	The player can now barter with merchants	2012-11-08 13:38:20 +01:00
greye	83e758ee50	clean up interfaces	2012-11-08 16:37:57 +04:00
greye	2a06d72e32	remove unused custom character classes	2012-11-08 02:27:01 +04:00
greye	9dc9098fa7	update MWBase::World interface since records contains own id	2012-11-08 01:52:34 +04:00
greye	f818fa1ebf	minor update since records contains own id	2012-11-08 01:39:24 +04:00
greye	5b9621bca5	store player record data in ESMStore	2012-11-08 01:36:43 +04:00
greye	9ab2c16055	store created character classes as dynamic records	2012-11-08 01:22:44 +04:00
greye	78740306db	non-const access to Store<T> from ESMStore	2012-11-08 01:21:54 +04:00
Marc Zinnschlag	c5a6171aab	cleanup	2012-11-07 19:43:42 +01:00
Marc Zinnschlag	918316168f	Merge remote-tracking branch 'greye/store' into next ... Conflicts: apps/openmw/mwclass/light.cpp apps/openmw/mwworld/worldimp.cpp	2012-11-07 19:34:28 +01:00
greye	11c0e6382f	make ESMStore setting up itself after loading	2012-11-07 15:41:59 +04:00
greye	bc218759e9	forgotten module	2012-11-07 15:38:25 +04:00
Marc Zinnschlag	0805301922	Merge remote-tracking branch 'bwrsandman/master' into next	2012-11-07 10:40:40 +01:00
Mark Siewert	7f77bf76c7	- Add support for multiple esm contexts in cell store. This will allow to generate references from multiple esX files. Currently, only the first context is used. ... - Add many TODOs to mark points where more work is required to fully implement this feature.	2012-11-06 22:13:19 +01:00
Mark Siewert	64c08eada4	Merge remote-tracking branch 'upstream/next' into multiple_esm_esp	2012-11-06 20:37:29 +01:00
bwrsandman	7911f08c53	Issue #438: set 0 a.m. to be 12 a.m.	2012-11-06 13:19:35 -05:00
Marc Zinnschlag	81a2c629d8	Merge remote-tracking branch 'scrawl/master' into next	2012-11-06 18:21:24 +01:00
scrawl	21e0cde914	changed OIS includes since OIS_INCLUDE_DIR is already an include directory	2012-11-06 15:26:51 +01:00
greye	58b7927a36	move 'player' record to dynamic	2012-11-06 18:17:32 +04:00
greye	83f5b1df81	change to static --> dynamic search order	2012-11-06 17:58:49 +04:00
greye	9f1733a415	move record insertion to ESMStore	2012-11-06 17:51:38 +04:00
gugus	bf98b95955	bugfix	2012-11-06 13:10:54 +01:00
Marc Zinnschlag	6d5333be05	some code cleanup	2012-11-06 13:08:25 +01:00
Marc Zinnschlag	d661d4f6d6	Merge remote-tracking branch 'emoose/bug-368' into next	2012-11-06 13:04:38 +01:00
greye	dccc157f4c	setting up	2012-11-06 15:26:55 +04:00
greye	18bb5960e4	let's rescue linker	2012-11-06 15:10:57 +04:00
greye	620184a009	fix typos	2012-11-06 14:44:56 +04:00
greye	0fd22ce4b0	CellRefList<X>::find(CellRef &, Y &list) -> ::load(CellRef &, ESMStore &)	2012-11-06 14:23:21 +04:00
greye	242a9b5a59	various interface fixes, commented unused code	2012-11-06 14:03:36 +04:00
greye	b3ad872845	new interface in manualref, fix various typos	2012-11-06 13:43:48 +04:00
greye	e74b2c060d	disable createRecord(), Land constness hack, various fixes with Store<T> interface	2012-11-06 13:14:03 +04:00
greye	ff8da265ed	applying new interface vol.9, inconsistent	2012-11-06 12:36:21 +04:00
greye	932a9dc6f9	applying new interface vol.8, inconsistent	2012-11-06 11:53:00 +04:00
greye	a9c1ce412a	applying new interface vol.7, inconsistent	2012-11-06 11:29:18 +04:00
gugus	2841d831a6	Disposition is now updated everyframe	2012-11-05 23:16:37 +01:00
Marc Zinnschlag	a7da929496	Merge remote-tracking branch 'scrawl/master' into next	2012-11-05 22:46:42 +01:00
emoose	3e5b396b56	Changed: world: cleanup	2012-11-05 21:10:04 +00:00
emoose	5c1b3fc043	Fixed: scene: adjust rotation/scale when creating objects	2012-11-05 20:45:04 +00:00
greye	4637503680	applying new interface vol.6, inconsistent	2012-11-06 00:34:11 +04:00
emoose	e8e3c211a4	Changed: MWRender::player: make camera rotation functions public; world: fix/clean scaleObject and rotateObject; rendering: add scaleObject code, fix rotateObject so it stores correct rotation	2012-11-05 19:56:20 +00:00
scrawl	646e689239	clear name edits when opening alchemy / spell creation	2012-11-05 20:47:28 +01:00
greye	42aae566a7	applying new interface vol.5, inconsistent	2012-11-05 23:41:26 +04:00
emoose	7a7825577a	Changed: use MWWorld::Ptr for PhysicsSystem arguments	2012-11-05 19:37:27 +00:00
gugus	9ebe9cb40c	Disposition is now calculated according to the Wiki. But: bouty and deacease are not implemented (for disposition at least), and there is still no temporary/permanent dispositons changes	2012-11-05 19:55:06 +01:00
gugus	aaf1b66c7e	BarterOffer is used in other trading services too	2012-11-05 19:53:55 +01:00
greye	11567663a7	applying new interface vol.4, inconsistent	2012-11-05 22:34:08 +04:00
greye	e628b23da6	applying new interface vol.3, inconsistent	2012-11-05 21:45:35 +04:00
greye	86ad7a96f4	applying new interface vol.2, inconsistent	2012-11-05 21:19:22 +04:00
Marc Zinnschlag	61942c9c4a	Issue #440: Make day numbers start at 1 instead of 0	2012-11-05 18:01:50 +01:00
greye	bd1bb2e55d	applying new interface vol.1, inconsistent	2012-11-05 18:39:42 +04:00
greye	7cf0b8a680	just replace esmstore, inconsistent	2012-11-05 18:09:58 +04:00
greye	d205723a17	resolving m prefix/ESMStore movement	2012-11-05 18:02:47 +04:00
greye	8691eac557	resolve Script::mData.mName -> mId, resolve moving ESMStore	2012-11-05 17:41:36 +04:00
greye	10ae5d3365	dynamic storage for cells	2012-11-05 17:18:02 +04:00
greye	0f524e4a60	dynamic storage for records with string id	2012-11-05 17:18:01 +04:00
greye	9995fd324d	split record comparator from store	2012-11-05 17:18:01 +04:00
greye	558e0557d0	basic static esmstore	2012-11-05 17:18:01 +04:00
greye	dd8f5e1a91	stores for records indexed with int, basic resolving	2012-11-05 17:18:01 +04:00
greye	ce91c5636d	load() method for records with string id	2012-11-05 17:18:01 +04:00
greye	5ac54d1fff	alter ESM::Script for storing id as std::string	2012-11-05 17:18:01 +04:00
greye	f0ecbbb056	basic Pathgrid store	2012-11-05 17:18:01 +04:00
greye	3b86955d37	basic Cell store	2012-11-05 17:18:01 +04:00
greye	e1f2f190d4	base record containers	2012-11-05 17:18:01 +04:00
greye	2057f5619e	move ESMStore to MWWorld	2012-11-05 17:18:01 +04:00
greye	3c2ce25f5f	m prefix for mwworld/cellstore.hpp	2012-11-05 16:07:59 +04:00
gugus	f72f898bd9	implement barterOffer. It's used for travel only. ... I've started to implement disposition, but it's very basic for now.	2012-11-05 11:07:43 +01:00
emoose	accf8b2f71	Updated Bug #430 fix so it only moves the player now	2012-11-04 23:26:26 +00:00
Marc Zinnschlag	6f7a621b6f	disabled enchanting unfinished enchantment GUI for now	2012-11-04 23:15:20 +01:00
Marc Zinnschlag	aabb1b8f3f	Issue #219: implemented death count filter	2012-11-04 13:26:04 +01:00
scrawl	38828acac9	transparent overlay	2012-11-04 12:13:04 +01:00
scrawl	b7aa7e4cef	pause all animations	2012-11-04 11:57:51 +01:00
scrawl	ba2fc2d6f8	better fix for chargen button colors	2012-11-04 11:37:47 +01:00
emoose	cadc753216	Fixed: engine: Bug #437 Stop animations when paused better fix; scene: Bug #430 Teleporting and using loading doors linking within the same cell reloads the cell ... Bug #437 fix only pauses the RenderingManager, and still updates the mOcclusionQuery Bug #430 fix is only tested in interiors (ToddTest)	2012-11-03 19:29:55 +00:00
emoose	c8cc6b6e65	Fixed: engine: Bug #437 Stop animations when paused; tooltips: capitalize first letter (eg paper -> Paper)	2012-11-03 16:39:32 +00:00
emoose	b70b8cc4bc	Fixed: character creation: make OK button grayed out/disabled (loses the hoverover when it's re-enabled though...)	2012-11-03 06:02:33 +00:00
emoose	1c8e941f0d	fix kdevelop indentation again...	2012-11-02 21:21:32 +00:00
emoose	96b56d9803	fixes: containers: key id case comparison	2012-11-02 21:18:37 +00:00
emoose	4a9821dc65	fix kdevelop indentation...	2012-11-02 20:43:07 +00:00
emoose	15f972cc62	fixes: compile: cast error; doors: key id case comparison; character creation: going from CharacterCreation to BirthDialog loses data; character creation: Class/Race/BirthDialog allowing no data; code: clean up a bit ... todo: going from CharacterCreation back to CreateClassDialog loses data	2012-11-02 20:33:08 +00:00
pvdk	8cdd1e5539	Fixed problem with sorting of the masters in the launcher	2012-11-02 15:06:14 +01:00
Marc Zinnschlag	4bc4ca775c	Issue #432: fixed MWWorld::ContainerStore::clear	2012-11-01 15:11:13 +01:00
Marc Zinnschlag	648b53ef93	removed unused launcher.cfg file	2012-10-31 10:09:27 +01:00
pvdk	b0647d6c8a	Fix for Bug #413: resolutions no longer appear multiple times on Windows	2012-10-30 19:05:44 +01:00
pvdk	60aea3653f	Modified sorting, should not crash anymore	2012-10-30 18:58:17 +01:00
Pieter van der Kloet	64c348c39e	Added support for different encodings	2012-10-30 11:26:48 +01:00
Pieter van der Kloet	433773e0ea	Fixed segfault in datafilesmodel because of invalid modelindex row	2012-10-30 11:10:06 +01:00
Pieter van der Kloet	6920958e16	Oops, forgot to add timestamps for master files	2012-10-30 10:08:24 +01:00
Pieter van der Kloet	6e758af05c	Launcher cfg is stored in the user location only, fixes Bug #414	2012-10-30 06:51:22 +01:00
Pieter van der Kloet	1c06a06f91	Files are now sorted by modified timestamp, fixes Bug #415	2012-10-30 06:47:39 +01:00
Pieter van der Kloet	2b25178aef	Merge remote-tracking branch 'upstream/master' into launcher-model	2012-10-30 05:04:31 +01:00
Pieter van der Kloet	ef11a32fee	Fixed a bug where a non-existant openmw.cfg would crash the launcher	2012-10-30 05:03:58 +01:00
Pieter van der Kloet	d065b56948	Fixed default profile adding and made switching profiles more efficient	2012-10-30 04:21:31 +01:00
scrawl	a04df37f83	implemented looting corpses	2012-10-28 16:04:33 +01:00
Marc Zinnschlag	d7add0b9e6	Issue #61: fixed alchemy skill	2012-10-28 14:07:36 +01:00
Marc Zinnschlag	c635447cea	Merge branch 'death'	2012-10-27 13:34:20 +02:00
Marc Zinnschlag	ed3641b214	Issue #68: check for essential actors	2012-10-27 13:33:54 +02:00
Marc Zinnschlag	2e63ca5e0a	Merge branch 'death'	2012-10-27 11:33:26 +02:00
Marc Zinnschlag	453f347ee8	Issue #68: added getdeadcount script function	2012-10-27 11:33:18 +02:00
Marc Zinnschlag	f72c35fc17	Issue #68: tally deaths	2012-10-27 11:15:52 +02:00
Marc Zinnschlag	6b09b3ad61	Issue #68: Play death animations	2012-10-27 10:36:42 +02:00
bwrsandman	5d45d328b8	Fixed uninitialized variable that caused a segfault when going to previous page.	2012-10-26 21:28:22 -04:00
greye	9f923e7963	fix crashing if /home/greye/.cache not exist	2012-10-25 15:14:34 +04:00
Marc Zinnschlag	21c24dedb6	Issue #68: Stop player from dying (temporary workaround)	2012-10-25 12:28:45 +02:00
Marc Zinnschlag	0ab432b074	Issue #68: fixed death detection	2012-10-25 12:22:48 +02:00
Marc Zinnschlag	9172c3ec4d	Issue #68: stop NPCs from instantly dropping dead	2012-10-23 13:54:36 +02:00
scrawl	234716daa6	finished spell creation	2012-10-23 11:42:38 +02:00
scrawl	33361e6539	Merge branch 'master' into spellcreation	2012-10-23 10:38:53 +02:00
Pieter van der Kloet	fe9120bcb3	Added support for the profiles and made creation/editing them more user friendly	2012-10-23 01:47:07 +02:00
Pieter van der Kloet	a4855186c5	Merge remote-tracking branch 'upstream/master' into launcher-model	2012-10-22 15:00:19 +02:00
Pieter van der Kloet	ab8894e07a	Merge remote-tracking branch 'origin/launcher-model' into launcher-model ... Conflicts: apps/launcher/datafilespage.cpp	2012-10-22 14:59:43 +02:00
Pieter van der Kloet	6433b1e022	Some minor fixes	2012-10-22 02:25:10 +02:00
Marc Zinnschlag	0547f11564	Issue #68: Remove dead actors from actor list	2012-10-20 10:54:51 +02:00
Marc Zinnschlag	f2e25b8a47	Issue #68: Keep dead actors out of the actor list for the current scene	2012-10-20 10:49:48 +02:00
scrawl	59560e84eb	small addition	2012-10-19 20:48:15 +02:00
scrawl	b2b9254718	improved the ingredient GUI code (this didnt fix anything, though)	2012-10-19 20:44:53 +02:00
scrawl	475163bd4a	Merge branch 'master' of https://github.com/zinnschlag/openmw	2012-10-19 20:21:34 +02:00
scrawl	fbe3538f32	bug #412: sort birth signs	2012-10-19 20:13:37 +02:00
Marc Zinnschlag	3f6afb13f1	Merge remote-tracking branch 'scrawl/alchemy'	2012-10-19 20:09:45 +02:00
scrawl	8d7514e341	corrected chance	2012-10-19 19:48:54 +02:00
scrawl	d76522e7a4	searchPtrViaHandle	2012-10-19 19:48:02 +02:00
Marc Zinnschlag	7884a927c9	Issue #68: added dead flag to CreatureStats	2012-10-19 18:56:22 +02:00
Marc Zinnschlag	a8f294c9ae	fixed types of dynamic stats script instructions	2012-10-19 18:01:45 +02:00
Marc Zinnschlag	bdca5aff87	Issue #68: simplified the dynamic stats interface	2012-10-19 13:10:06 +02:00
Marc Zinnschlag	3f833af46a	Issue #407: Fortyfy attribute effects were ignored for the last 3 attributes	2012-10-19 10:07:27 +02:00
scrawl	28cc480ce1	fix some alchemy issues and make the gui use the new implementation	2012-10-18 22:21:39 +02:00
Marc Zinnschlag	18686614db	Merge remote-tracking branch 'scrawl/splashscreen_dirlisting' ... Conflicts: apps/openmw/mwgui/loadingscreen.cpp	2012-10-18 15:46:43 +02:00
Marc Zinnschlag	1864dbe031	Issue #61: potion creation	2012-10-18 15:33:27 +02:00
Marc Zinnschlag	f5caf227b2	Issue #61: remove ingredients on potion creation	2012-10-18 14:47:23 +02:00
Marc Zinnschlag	3c71378fad	Issue 61: improved ingredients handling in alchemy and documenation	2012-10-18 14:41:57 +02:00
Marc Zinnschlag	3fe0a73cf2	Issue #61: increase alchemy skill on successful potion creation	2012-10-18 14:38:38 +02:00
Marc Zinnschlag	510674aa5e	Merge branch 'master' into alchemy ... Conflicts: components/esm/loadmgef.hpp	2012-10-18 14:37:05 +02:00
Marc Zinnschlag	5fbca239dd	Issue #61: potion creation (1st part; still missing some implementations)	2012-10-18 14:02:06 +02:00
scrawl	e80394c0b5	fix training limit	2012-10-17 18:48:29 +02:00
scrawl	125315ebe7	remove a cout	2012-10-17 18:21:24 +02:00
scrawl	c64eb96952	Merge branch 'Travel_Dialogue' into training_travel ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwgui/dialogue.cpp apps/openmw/mwrender/globalmap.cpp files/mygui/CMakeLists.txt	2012-10-17 18:17:53 +02:00
scrawl	1a2034b4dd	training window	2012-10-17 18:03:02 +02:00
scrawl	6be092e268	substr check	2012-10-17 12:41:24 +02:00
scrawl	84a4fd56c3	consider all files in Splash directory	2012-10-17 12:39:45 +02:00
scrawl	6acbea822b	splash screen directory listing	2012-10-16 23:59:03 +02:00
scrawl	7d1e659960	fading, greying out destinations you cant afford, warning fix	2012-10-16 20:25:50 +02:00
gugus	9583a1b8e9	FadeOut/In, that's for you scrawl!	2012-10-16 19:59:53 +02:00
gugus	c9afe222be	traveling now takes time	2012-10-16 19:34:29 +02:00
scrawl	c991f68a2d	buying created spell	2012-10-15 21:54:19 +02:00
Marc Zinnschlag	e05e683da3	Merge remote-tracking branch 'scrawl/spellcreation'	2012-10-12 17:19:30 +02:00
pvdk	85aaacb41a	Some cleaning of the launcher source dir	2012-10-12 02:25:14 +02:00
pvdk	bc95336183	Merge remote-tracking branch 'upstream/master' into launcher-model	2012-10-12 00:08:14 +02:00
scrawl	f154031e54	last bits of the gui	2012-10-11 18:26:29 +02:00
Marc Zinnschlag	b2025b9209	Merge branch 'pedantic'	2012-10-11 09:03:14 +02:00
cfcohen	e4a61486c8	Removed minor comments left in by accident.	2012-10-10 22:15:19 -04:00
cfcohen	68a856ff6f	Human readable labels for many records types. Human readable flags ... for many record types. Improved DialInfo rule parsing. Discovered several issues involving the assignment of various flag bits.	2012-10-10 22:00:44 -04:00
Pieter van der Kloet	5773676986	Got the Data Files tab to use the new model	2012-10-10 22:58:04 +02:00
Pieter van der Kloet	4174d3c235	Added new plugin model for the Data Files tab in the launcher	2012-10-10 21:31:40 +02:00
cfcohen	50e259c060	Remove tabs as requested. Sorry about that, thought I already ... had. :-) I updated the help to better document the --type option, although I did not finish reasoning through it's interaction with the new loading framework. I also expanded the print() methods of a few more of the record types to make a more consistent commit.	2012-10-09 19:41:45 -04:00
Marc Zinnschlag	35d099a638	disabling gcc extensions	2012-10-09 17:10:25 +02:00
cfcohen	57f3b50dc8	Add more detail to ESMTool record dumping.	2012-10-09 01:33:47 -04:00
gugus	27a3487d78	right prices	2012-10-08 15:51:36 +02:00
gugus	5a611b66d7	traveling.	2012-10-08 11:14:22 +02:00
Mark Siewert	1f961d575e	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ... Conflicts: apps/openmw/mwrender/terrain.cpp components/esm/loadland.hpp components/esm_store/reclists.hpp	2012-10-07 20:35:54 +02:00
Mark Siewert	28d4d7ea3f	Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging. ... - Remove check for 255 master/plugin files.	2012-10-07 20:00:55 +02:00
gugus	85d9357e3a	Travel GUI	2012-10-06 17:52:46 +02:00
scrawl	025e820703	abstracted code and use it in enchanting window as well	2012-10-03 15:36:10 +02:00
scrawl	1c0dd3ccc5	some editing code	2012-10-03 15:06:54 +02:00
Marc Zinnschlag	332039da10	Issue #61: replaced 4 ingredient member variables with vector in alchemy GUI	2012-10-02 10:29:47 +02:00
Marc Zinnschlag	14833a4c3a	Issue #61: More robust tools handling in alchemy window	2012-10-02 10:20:49 +02:00
Marc Zinnschlag	1cc2c2055f	Issue #61: Implemented basic ingredient handling in Alchemy class	2012-10-02 10:20:26 +02:00
Marc Zinnschlag	6469933ce8	Merge branch 'master' into alchemy ... Conflicts: apps/openmw/mwgui/alchemywindow.cpp	2012-10-02 09:30:49 +02:00
scrawl	21493c2dbd	added magic effect flags from Research wiki page	2012-10-01 23:33:07 +02:00
scrawl	63fd8172d8	Merge branch 'master' of https://github.com/zinnschlag/openmw into spellcreation	2012-10-01 23:09:03 +02:00
scrawl	dc33dee22e	Merge branch 'master' into videoplayback ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwscript/miscextensions.cpp	2012-10-01 20:25:23 +02:00
scrawl	fa358ab196	change the inventory preview to "inventoryhandtohand" animation pose	2012-10-01 18:04:21 +02:00
scrawl	ff2c2d2b96	Merge branch 'master' into spellcreation ... Conflicts: apps/openmw/mwbase/windowmanager.hpp	2012-10-01 17:54:45 +02:00
Marc Zinnschlag	d1c4559abe	fixed GMST string handling in GUI	2012-10-01 10:03:49 +02:00
Marc Zinnschlag	35d7b5e5b0	Merge remote-tracking branch 'greye/record_saving'	2012-10-01 09:50:20 +02:00
Marc Zinnschlag	29633bd02f	Merge remote-tracking branch 'greye/master'	2012-10-01 09:46:20 +02:00
greye	f907a6a86f	updateListener() every frame	2012-10-01 11:24:44 +04:00
Chris Robinson	6c5c9ce46e	Avoid console spam when a sound can't play	2012-09-30 17:38:55 -07:00
Chris Robinson	6942fa97da	Specify a proper up vector for the listener	2012-09-30 17:23:05 -07:00
Chris Robinson	991f942fba	Merge remote-tracking branch 'zini/master' into sound ... Conflicts: apps/openmw/mwsound/soundmanagerimp.cpp apps/openmw/mwsound/soundmanagerimp.hpp	2012-09-30 16:57:54 -07:00
greye	2fa4ac177a	initial resolving	2012-10-01 00:23:49 +04:00
greye	721324c1db	rm record inheritance, rework esmtool accordingly	2012-09-30 23:34:53 +04:00
Marc Zinnschlag	10c8360e07	Issue #61: Replaced apparatus handling in alchemy GUI with new implementation in Alchemy class	2012-09-30 19:05:45 +02:00
Marc Zinnschlag	42f02f3ccd	Issue #61: Re-implemented tool selection in Alchemy class	2012-09-30 18:54:20 +02:00
Marc Zinnschlag	20a263738a	Merge remote-tracking branch 'chris/animation'	2012-09-29 12:39:56 +02:00
Chris Robinson	41f80908d9	Simplify getting the stop time when playing all animation groups	2012-09-29 01:10:49 -07:00
Marc Zinnschlag	2ab96d0108	Merge remote-tracking branch 'scrawl/next'	2012-09-29 10:03:52 +02:00
Marc Zinnschlag	c6fd864a76	Issue #61: Forgot to add some files	2012-09-29 10:02:46 +02:00
scrawl	0c6ad13364	WakeUpPc instruction	2012-09-29 09:41:34 +02:00
Chris Robinson	cd8515396a	Use a multimap to store the text keys	2012-09-28 23:20:15 -07:00
gugus	4f5c4bf89a	Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwdialogue/dialoguemanagerimp.cpp apps/openmw/mwgui/dialogue.cpp apps/openmw/mwgui/dialogue.hpp apps/openmw/mwgui/mode.hpp apps/openmw/mwgui/windowmanagerimp.cpp	2012-09-28 17:09:15 +02:00
gugus	4d496c1188	correction1	2012-09-28 17:02:27 +02:00
scrawl	044ab3d2b6	fix error in framelistener with tcg enabled	2012-09-28 17:02:18 +02:00
gugus	1971ba66f1	destination name is now OK for every trave services	2012-09-27 13:08:38 +02:00
Marc Zinnschlag	cd343c4fbd	Issue #61: Basic alchemy class (doesn't do anything yet)	2012-09-27 11:59:40 +02:00
scrawl	ac0c1ea986	Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation ... Conflicts: apps/openmw/mwgui/dialogue.cpp	2012-09-27 08:47:47 +02:00
scrawl	9b0254a158	small map fix	2012-09-26 23:34:35 +02:00
Marc Zinnschlag	bb6d9a329c	Merge remote-tracking branch 'scrawl/book_skillgain' into next	2012-09-26 20:35:48 +02:00
gugus	3060fbee60	TravelGUI, not completly finished.	2012-09-26 18:30:47 +02:00
scrawl	71d04e16da	fix the global map updating when pinned	2012-09-25 21:57:57 +02:00
scrawl	caef570c8a	fix the weather not changing when sleeping/waiting	2012-09-25 21:49:34 +02:00
scrawl	359824d614	oops	2012-09-25 21:49:34 +02:00
scrawl	4453459378	re-use the texture across preview instances	2012-09-25 21:49:34 +02:00
scrawl	e2b1329620	fix the race selection escape crash	2012-09-25 21:49:34 +02:00
scrawl	d163f8203c	change books to RecListWithIDT	2012-09-25 21:38:34 +02:00
scrawl	853d62adba	book skillgain	2012-09-25 18:59:24 +02:00
Marc Zinnschlag	a34bdb9623	per NPC ID interaction tracking	2012-09-25 10:48:57 +02:00
scrawl	05eb307bfb	added video timing	2012-09-25 02:54:29 +02:00
scrawl	73c69e8eda	video playback	2012-09-25 02:35:50 +02:00
scrawl	b63d205c6e	change the select attribute/skill dialogs to be reusable	2012-09-24 22:09:38 +02:00
Marc Zinnschlag	5bdc7bcacf	Merge branch 'master' into next	2012-09-24 10:14:09 +02:00
scrawl	d393f551ed	edit effect dialog	2012-09-24 08:09:16 +02:00
scrawl	02e7b3df4f	oops	2012-09-24 01:07:33 +02:00
scrawl	f8a18d58a6	re-use the texture across preview instances	2012-09-24 01:06:17 +02:00
scrawl	dd5c083124	fix the race selection escape crash	2012-09-24 00:42:05 +02:00
greye	1339787863	remove underscores from filenames in esm	2012-09-23 23:12:10 +04:00
scrawl	1cb1259e18	fixing some unrelated warnings	2012-09-23 19:36:37 +02:00
greye	807a56c9e4	fix dynamic potion id	2012-09-23 19:29:00 +04:00
scrawl	9d7c35ae48	and go	2012-09-23 00:36:20 +02:00
scrawl	b4db339fd5	everything uses find now	2012-09-22 21:39:05 +02:00
scrawl	9f2668b45b	Task #400 Review GMST access	2012-09-22 21:35:57 +02:00
scrawl	f45a6b71a9	Merge branch 'master' into next	2012-09-22 20:48:55 +02:00
scrawl	b471bef92a	Merge branch 'master' into next	2012-09-22 20:48:22 +02:00
Marc Zinnschlag	39e21a6103	Merge remote-tracking branch 'scrawl/globalmap' into next	2012-09-22 18:27:42 +02:00
scrawl	78b2d51cfc	fix a map crash	2012-09-22 16:52:31 +02:00
Marc Zinnschlag	8da00caaa4	Merge remote-tracking branch 'scrawl/globalmap' into next	2012-09-21 20:39:20 +02:00
scrawl	47d9fae89f	don't use cache	2012-09-21 20:35:50 +02:00
Marc Zinnschlag	3560690660	Merge remote-tracking branch 'scrawl/sleep_wait' into next	2012-09-21 18:27:06 +02:00
scrawl	b91d74d394	fix normalized encumbrance	2012-09-21 17:56:15 +02:00
scrawl	872fcf3e3d	sleeping restoration of health, magicka, and fatigue	2012-09-21 17:53:16 +02:00
Marc Zinnschlag	28e2430f3a	Merge remote-tracking branch 'scrawl/master'	2012-09-21 17:47:27 +02:00
scrawl	f49401bb53	center map on the player, dynamic map size	2012-09-21 16:26:04 +02:00
scrawl	1d012d1680	don't update input during loading. Fixes the OSX crash, and doesn't suffer from the issue anymore that I had while implementing this, so let's accept it as a hotfix for now. Note this means we can't switch the window during loading anymore.	2012-09-21 15:24:26 +02:00
scrawl	9106e5307c	moved global map from RenderingManager to gui and removed world method	2012-09-21 14:11:01 +02:00
greye	18cc435aa1	resolving conflicts	2012-09-21 13:13:11 +04:00
greye	2d5ddd104b	Land::loadData rework	2012-09-21 12:12:16 +04:00
greye	e69880f77e	almost perfect byte copies, has redundant data	2012-09-20 20:33:30 +04:00
scrawl	a161b34c67	remove useless member, fix map rendering crash	2012-09-20 18:23:27 +02:00
scrawl	98c1dc1151	ShowMap & FillMap commands, merged next	2012-09-20 18:02:37 +02:00
scrawl	8214966d44	Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap	2012-09-20 17:41:14 +02:00
scrawl	451a9fd6ac	don't update world arrow position in interior	2012-09-20 17:35:30 +02:00
scrawl	e5e3d829d0	player arrow & markers	2012-09-20 17:30:09 +02:00
scrawl	5f014f7411	oops, left in a testing assertion	2012-09-20 14:04:29 +02:00
scrawl	86cfc91ef3	global map rendering	2012-09-20 13:56:37 +02:00
Marc Zinnschlag	87a9373a56	Merge remote-tracking branch 'scrawl/gamma' into next	2012-09-20 09:01:58 +02:00
scrawl	b9a3f8e8d7	gamma slider	2012-09-19 23:47:42 +02:00
scrawl	d9f6072f02	gamma correct rendering & adjustment setting	2012-09-19 23:25:07 +02:00
Marc Zinnschlag	ede9a2b170	fixed an orientation problem	2012-09-19 19:56:02 +02:00
scrawl	32de090079	Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities	2012-09-19 19:34:02 +02:00
Marc Zinnschlag	a3c680d20a	Merge remote-tracking branch 'scrawl/sleep_wait' into next	2012-09-19 09:41:32 +02:00
scrawl	be44810623	implemented GetPCSleep	2012-09-19 03:11:23 +02:00
scrawl	bf5e30b24f	everything done except health/mana restore	2012-09-19 02:53:06 +02:00
scrawl	ab698bb401	date time label	2012-09-18 20:53:32 +02:00
scrawl	4d4ba6698a	fix character preview destruction; don't allow empty names in name dialog	2012-09-18 19:00:20 +02:00
scrawl	0ba996f290	dialog layout	2012-09-18 18:29:03 +02:00
Marc Zinnschlag	4abb9a00da	Merge remote-tracking branch 'jhooks/physicsaedra3' into next	2012-09-18 11:25:09 +02:00
Marc Zinnschlag	fcda3b6ca8	fixed some script argument types	2012-09-18 11:09:54 +02:00
Marc Zinnschlag	ea8eab4f34	more cleanup	2012-09-18 11:06:19 +02:00
Marc Zinnschlag	408c5b8bd4	some cleanup	2012-09-18 10:49:51 +02:00
Marc Zinnschlag	4469976be9	Merge remote-tracking branch 'gus/object_movement_creation' into object_movement_creation ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-09-18 10:44:25 +02:00
gugus	3c1a9061de	Fixed a bug of Ptr having a wrong orientation. But that's strange, seems CellRef isn't initialized properly	2012-09-17 14:12:27 +02:00
gugus	032ff7c879	Clean-up. There is still a little bug.	2012-09-17 13:36:48 +02:00
greye	7606ebafd6	resolving conflicts, minor update	2012-09-17 11:37:50 +04:00
Jason Hooks	192d634098	Movement keys; View angles	2012-09-16 13:19:38 -04:00
Marc Zinnschlag	2bb400eaa8	Merge remote-tracking branch 'pvdk/datalocalfix'	2012-09-16 10:36:03 +02:00
Marc Zinnschlag	b041a511b6	Merge remote-tracking branch 'mmd/windowswarnings'	2012-09-16 10:33:06 +02:00
Jason Hooks	76f2a82884	More pmove stuff; Turned off broadphase, we could not fall in exteriors	2012-09-15 22:48:24 -04:00
Pieter van der Kloet	4bcc34f4f9	Re-enabled and fixed multiple data directory handling in the launcher	2012-09-16 04:28:51 +02:00
Pieter van der Kloet	97326ffdbf	Fixed data-local directory handling in the launcher	2012-09-16 03:01:48 +02:00
Jason Hooks	f586f53a42	positioning	2012-09-15 16:45:50 -04:00
scrawl	896428c129	enableRestMenu & enableLevelupMenu	2012-09-15 20:18:41 +02:00
scrawl	9cf1cbc89b	remove book skill gain	2012-09-15 20:03:53 +02:00
scrawl	3e5ab069a6	remove the const cast	2012-09-15 19:52:18 +02:00
Jason Hooks	02bca98e9f	Setrotate working	2012-09-15 13:23:49 -04:00
scrawl	cf358fa79d	>= instead of ==	2012-09-15 19:20:13 +02:00
scrawl	0dc242c603	don't increase skill beyond 100	2012-09-15 19:10:48 +02:00
scrawl	f5237ff1a6	skill gain from books	2012-09-15 19:06:56 +02:00
scrawl	234f8fa5d5	added the missing sound & notification for skill increase	2012-09-15 18:35:59 +02:00
scrawl	b34b894d6a	removed some debug stuff	2012-09-15 17:20:47 +02:00
scrawl	76b494100e	finished?	2012-09-15 17:12:42 +02:00
scrawl	95f3a20e2c	Merge branch 'master' into levelup	2012-09-15 14:25:37 +02:00
scrawl	3e794a6087	remove useless member and removed a warning	2012-09-15 01:02:07 +02:00
scrawl	2793096b50	Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwbase/world.hpp apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/renderingmanager.hpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp	2012-09-15 00:57:29 +02:00
Marc Zinnschlag	b7c9285b24	added support for out of world rendering	2012-09-14 21:12:16 +02:00
scrawl	b76a28f69c	beginnings of the gui	2012-09-14 19:44:00 +02:00
scrawl	35f7216f2f	fixed some things	2012-09-14 17:25:32 +02:00
scrawl	7c59b83419	performance optimization	2012-09-14 17:10:10 +02:00
scrawl	a308d2e38a	fixed exception, fixed armor label obscuring the items	2012-09-14 15:33:24 +02:00
scrawl	1f7e044fad	removed some debug stuff	2012-09-14 14:41:19 +02:00
scrawl	6ac2a12296	item selection working on the preview	2012-09-14 14:34:18 +02:00
scrawl	eef750e6b0	race selection preview	2012-09-13 19:03:31 +02:00
scrawl	5155339cb6	character preview working	2012-09-13 14:56:50 +02:00
scrawl	d90af9c524	Merge branch 'master' into characterpreview	2012-09-13 14:22:17 +02:00
Marc Zinnschlag	835c530e06	Merge branch 'ingredients'	2012-09-13 13:31:46 +02:00
Marc Zinnschlag	5706caa141	Issue #356: added ingredient eating sound effect	2012-09-13 13:30:57 +02:00
Marc Zinnschlag	fe68a252d5	Issue #356: Implemented ingredient eating	2012-09-13 13:02:26 +02:00
Marc Zinnschlag	2ccd7a480d	Issue #356: added a missing return	2012-09-13 13:01:59 +02:00
scrawl	7ad80e306b	fixed the disappearing	2012-09-13 12:33:09 +02:00
Marc Zinnschlag	9de7b3bf90	Issue #356: Properly support ingredients effect in ActiveSpells (hopefully)	2012-09-13 11:30:59 +02:00
Marc Zinnschlag	0af0dc0d5d	Issue #356: More CreatureStats cleanup	2012-09-13 11:13:05 +02:00
Marc Zinnschlag	2934987f78	Issue #356: Some CreatureStats cleanup	2012-09-13 10:52:34 +02:00
Marc Zinnschlag	9dcf8939e9	Issue #356: added function for fatigue term calculation	2012-09-13 10:45:32 +02:00
Marc Zinnschlag	fca3b67507	Issue #356: basic support for ingredients in ActiveSpells (still using the wrong formula)	2012-09-13 09:30:47 +02:00
scrawl	4f3eb3c34a	character preview WIP	2012-09-13 00:54:32 +02:00
Jason Hooks	a1a7733730	Set scale implemented	2012-09-12 18:30:32 -04:00
scrawl	2f0b47fc38	test	2012-09-13 00:21:58 +02:00
scrawl	a96ed6ac61	splash screens on startup	2012-09-12 19:15:29 +02:00
scrawl	c3966a7c5a	oops, I used a float texture for water reflection. this change should give a little performance boost.	2012-09-11 22:45:41 +02:00
Marc Zinnschlag	e9e30c0fce	fixed a memory leak	2012-09-11 20:34:54 +02:00
scrawl	a8d9aa98b1	some fixes	2012-09-11 19:18:26 +02:00
scrawl	d5a08e31e7	scene does not disappear anymore during load	2012-09-11 17:36:20 +02:00
scrawl	369db182de	actual progress bar, performance optimization	2012-09-11 16:53:49 +02:00
scrawl	2b339f6c0f	loading screen	2012-09-11 16:37:54 +02:00
Jason Hooks	c5b25ef70b	Very basic actor physics (no set scale/rotate functions)	2012-09-10 20:29:24 -04:00
scrawl	4977c33e4c	fixed a stats window resizing problem that I introduced today	2012-09-10 21:58:19 +02:00
Marc Zinnschlag	6c03d7aec4	documentation fix	2012-09-10 21:12:35 +02:00
scrawl	9448ce5968	implemented "get<Control>Disabled" functions	2012-09-10 18:44:59 +02:00
scrawl	89ad2af1d9	key usage to open doors or containers ... to test: player->additem, "key_arrile", 1 (door in arille's tradehouse) player->additem, "key_alvur", 1 (chest in the back of beshara)	2012-09-10 17:44:59 +02:00
scrawl	fdc2a7433c	remove the wrong container open sound	2012-09-10 15:01:51 +02:00
scrawl	d581ac426e	useless cout message	2012-09-10 14:10:56 +02:00
scrawl	996e6280d8	more spell buying window cleanup	2012-09-10 14:10:01 +02:00
scrawl	ba0acd4056	changed some text colors	2012-09-10 13:52:37 +02:00
scrawl	fde69d0c87	Merge branch 'master' of https://github.com/zinnschlag/openmw into dynamic_sizing	2012-09-10 13:40:34 +02:00
scrawl	bc6a1979b0	replaced everything with the new method	2012-09-10 13:39:22 +02:00
Marc Zinnschlag	61c8a627aa	added a missing include	2012-09-10 13:19:15 +02:00
Marc Zinnschlag	273ac0a97f	Merge branch 'spellbuying'	2012-09-10 13:16:02 +02:00
Marc Zinnschlag	f17756712a	fixed spell list handling	2012-09-10 13:15:55 +02:00
Marc Zinnschlag	6c928e93d3	added missing initialisation of NPC/creature spell lists from ESX records	2012-09-10 13:04:00 +02:00
scrawl	b66c8099eb	new system for dynamic sizing of buttons & text boxes	2012-09-10 11:20:27 +02:00
scrawl	35dd49f948	fixed some "using namespace" in headers	2012-09-10 09:10:50 +02:00
scrawl	56061474c4	another 3 unnecessary lines	2012-09-09 23:53:23 +02:00
scrawl	bb267dddf6	some stats window cleanup	2012-09-09 23:50:57 +02:00
scrawl	432c089434	fix the spell tooltips to show the spell target	2012-09-09 23:06:24 +02:00
Marc Zinnschlag	bcf3a81a6c	and a tiny bit more of cleanup	2012-09-09 21:18:47 +02:00
Marc Zinnschlag	9c49ca1468	a bit more random cleanup	2012-09-09 21:08:57 +02:00
Marc Zinnschlag	06677a0fc8	fixed ID handling and some misc cleanup	2012-09-09 21:03:39 +02:00
Marc Zinnschlag	3fad1c0786	fixed a crash	2012-09-09 20:43:21 +02:00
Adam Hogan	08410b9062	Renamed SpellBuyingWindow, took some suggestions from scrawl	2012-09-09 14:10:07 -04:00
Adam Hogan	562df5388f	Merge branch 'master' of git://github.com/zinnschlag/openmw	2012-09-09 08:38:56 -04:00
Adam Hogan	ebf80943a9	Added spell buying window	2012-09-08 18:17:03 -04:00
Lukasz Gromanowski	99c46093dd	Merge branch 'master' of git://github.com/zinnschlag/openmw into jenkins-code-coverage-and-unittests	2012-09-08 22:18:25 +03:00
Jason Hooks	23777033fd	Starting to implement new PhysicActor	2012-09-05 17:44:11 -04:00
Marc Zinnschlag	0879abb948	Merge branch 'actiontarget'	2012-09-04 20:56:40 +02:00
Marc Zinnschlag	da041f902f	Issue #370: fixed item taking sound	2012-09-04 20:56:28 +02:00
Marc Zinnschlag	482874f99e	Merge remote-tracking branch 'scrawl/cache'	2012-09-04 20:40:18 +02:00
Marc Zinnschlag	6813bafbfc	added missing sound effect for chest opening; minor cleanup	2012-09-04 15:42:41 +02:00
Marc Zinnschlag	fb8aae243d	Issue #370: replaced custom target handling in talk action with base class implementation	2012-09-04 15:38:21 +02:00
Marc Zinnschlag	8ed8dd649a	Issue #370: replaced custom target handling in take action with base class implementation	2012-09-04 15:34:44 +02:00
Marc Zinnschlag	ea1c3fe1e4	Issue #370: replaced custom target handling in open action with base class implementation	2012-09-04 15:29:51 +02:00
Marc Zinnschlag	8c2b4f996c	Issue #370: replaced custom target handling in equip action with base class implementation	2012-09-04 15:27:10 +02:00
Marc Zinnschlag	b51c42146f	Issue #370: replaced custom target handling in read action with base class implementation	2012-09-04 15:24:55 +02:00
Marc Zinnschlag	3f181f9a9d	Issue #370: Support for targets in containers	2012-09-04 15:21:56 +02:00
Marc Zinnschlag	cc55056adf	Issue #370: replaced custom target handling in apply action with base class implementation	2012-09-04 15:18:59 +02:00
Marc Zinnschlag	733654d730	Issue #370: implemented target handling in action base class	2012-09-04 15:14:33 +02:00
Marc Zinnschlag	1cecab6e3d	fixed RefData::getHandle	2012-09-04 15:08:59 +02:00
Marc Zinnschlag	ead04e1cc3	Issue #389: added AI sequence to CreatureStats; execute AI packages during the regular actor update	2012-09-04 13:32:35 +02:00
Marc Zinnschlag	345eec1135	Issue #389: added AI package base class and AI packages management class	2012-09-04 13:25:53 +02:00
Marc Zinnschlag	ef6f033dd1	Merge branch 'multidata'	2012-09-04 11:02:28 +02:00
Marc Zinnschlag	2284d76307	re-enabled local data directory support in launcher	2012-09-04 11:02:18 +02:00
Jason Hooks	2efceba1fc	Tearing apart PhysicActor	2012-09-03 20:32:20 -04:00
gugus	d261263824	oups forgot vmformat	2012-09-02 21:09:07 +02:00
scrawl	c27ff546e4	shader cache	2012-09-02 19:40:26 +02:00
gugus	95c27723f7	fixed a bug (see commit reverted)	2012-09-02 18:12:13 +02:00
gugus	99885e8ca4	Revert "fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p" ... This reverts commit 165065d378.	2012-09-02 18:04:36 +02:00
gugus	fa9f2b268b	PlaceItem,PlaceItemCell,PlaceAtPC,PlaceAtMe	2012-09-02 17:57:03 +02:00
scrawl	950bf66334	throw an exception if default value for a setting is not found	2012-09-02 11:39:54 +02:00
Jason Hooks	0697c7f7f4	Finally merged in master	2012-09-01 17:28:12 -04:00
Marc Zinnschlag	e2bf4694cb	Merge remote-tracking branch 'scrawl/master'	2012-08-31 09:22:32 +02:00
scrawl	760f05c454	the HUD can be toggled with F12 key; useful for screenshots	2012-08-30 20:47:39 +02:00
Marc Zinnschlag	bc34fab17f	Merge remote-tracking branch 'greye/aidata'	2012-08-30 09:55:01 +02:00
Michael Mc Donnell	3c3737ed78	Write error message for exception and fix warning ... Provides details of what went wrong when reading the .esp and also fixes a warning on vs2010.	2012-08-29 19:38:33 -04:00
greye	a90547bbbe	code formatting	2012-08-29 21:35:06 +04:00
Marc Zinnschlag	81463fa23d	Issue #372: fixed positions in SoundManager	2012-08-29 18:48:20 +02:00
scrawl	6ad08dfd33	added settings for crosshair & subtitles	2012-08-29 11:15:17 +02:00
Artem Kotsynyak	e9b2f4ee74	fix equipment visibility update	2012-08-28 22:59:44 +04:00
scrawl	1c5055c8ac	fix a problem where hovering a marker would render it on top of the fog of war instead of below	2012-08-28 18:49:44 +02:00
scrawl	7eaf5e7f0f	changed the markers to look more like morrowind's (hover effect)	2012-08-28 18:40:11 +02:00
scrawl	d9276ca09d	don't make copy of CellRefList in World::getNorthVector	2012-08-28 18:23:59 +02:00
scrawl	3c39c47e2f	don't make copies of CellRefList & LiveCellRef	2012-08-28 18:23:01 +02:00
scrawl	571d5095d4	removed a cout	2012-08-28 17:32:50 +02:00
scrawl	5834b4baa5	door markers on the local map	2012-08-28 17:30:34 +02:00
Marc Zinnschlag	40d4dad15e	Issue #378: Fix (record wasn't build fully)	2012-08-28 09:32:38 +02:00
Marc Zinnschlag	160b52162b	Merge remote-tracking branch 'scrawl/quick_keys' ... Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp	2012-08-28 09:06:40 +02:00
scrawl	321f7c3419	fix an infinite recursion regression on several dialogs.	2012-08-27 21:29:04 +02:00
scrawl	5c28a67203	broke something in the last commit.	2012-08-27 20:55:39 +02:00
scrawl	4f19b7fb9b	fix leaks.	2012-08-27 20:52:32 +02:00
scrawl	bc36b0e2bd	remove the restriction on the last quick key	2012-08-27 20:51:13 +02:00
scrawl	6161f81c24	last bits of the quick key menu.	2012-08-27 20:44:14 +02:00
Marc Zinnschlag	14b4263143	Merge remote-tracking branch 'scrawl/alttab'	2012-08-27 20:32:56 +02:00
scrawl	dc8f9bd923	workaround for alt tab view mode toggle	2012-08-27 19:25:30 +02:00
scrawl	9af0b48ad6	show/hide crosshair correctly	2012-08-27 19:18:55 +02:00
scrawl	a4c1d979d6	Merge branch 'master' into quick_keys	2012-08-27 18:14:41 +02:00
scrawl	c5e55d3cac	fix screenshot function	2012-08-27 15:51:01 +02:00
greye	61923349e5	resolving conflicts	2012-08-27 14:52:54 +04:00
scrawl	5ebcaeb098	Merge branch 'next' into quick_keys	2012-08-27 11:04:23 +02:00
scrawl	b1a394552d	mouse click sounds	2012-08-27 10:01:53 +02:00
Marc Zinnschlag	d0cebea580	some cleanup	2012-08-26 18:50:47 +02:00
Marc Zinnschlag	450656a890	Merge remote-tracking branch 'dgdiniz/MoveSoundtoAction-Task339' into next	2012-08-26 18:39:09 +02:00
Marc Zinnschlag	ef4910293b	Merge remote-tracking branch 'corristo/osx_f_keys_fix' into next	2012-08-26 18:35:26 +02:00
Douglas Diniz	5cbb08fee1	Task 339 - Moving all sounds to actions	2012-08-26 11:47:45 -03:00
scrawl	c0f27bd5ef	magic selection window	2012-08-26 11:37:33 +02:00
scrawl	fab4cfecb1	some unfinished work on quick keys window	2012-08-26 10:52:06 +02:00
Marc Zinnschlag	1fd4d84173	Merge remote-tracking branch 'mmd/windowswarnings' into next	2012-08-24 15:07:19 +02:00
gugus	165065d378	fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p	2012-08-21 19:54:42 +02:00
Nikolay Kasyanov	71a6ce2202	removed cout spam	2012-08-20 21:14:29 +04:00
Nikolay Kasyanov	5395721c26	more appropriate fix for #189	2012-08-20 21:05:02 +04:00
Douglas Diniz	82e7c04c0a	Changing sounds to Action. ... Adding onActor to Action to choose between playSound and playSound3D.	2012-08-19 20:11:50 -03:00
Lukasz Gromanowski	770f747eec	Added fix for not visible pthreads functions for linker with glibc 2.15 ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-08-20 00:18:40 +03:00
scrawl	f7d537cb28	very small correction	2012-08-19 22:15:31 +02:00
scrawl	19ae30ee68	Merge branch 'master' into next ... Conflicts: apps/openmw/mwbase/inputmanager.hpp apps/openmw/mwinput/inputmanagerimp.cpp apps/openmw/mwinput/inputmanagerimp.hpp apps/openmw/mwinput/mouselookevent.cpp	2012-08-19 22:09:22 +02:00
Lukasz Gromanowski	34513cf16b	Added support for code coverage checking and unittests. ... Added support for code coverage checking with gcov and unittests with Google C++ unittest and GMock frameworks. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-08-19 22:23:46 +03:00
greye	e6c3e0744e	tvm update and fix	2012-08-19 10:37:51 +04:00
greye	5b2b378f25	tvm script instruction	2012-08-18 18:05:10 +04:00
Marc Zinnschlag	d1656b2f5d	Merge remote-tracking branch 'greye/player_control' ... Conflicts: apps/openmw/mwrender/player.cpp	2012-08-18 13:38:54 +02:00
gugus	cc01a5ceed	Merge branch 'next' of https://github.com/zinnschlag/openmw.git into object_movement_creation	2012-08-18 10:51:12 +02:00
gugus	f2d080d091	bugfix	2012-08-18 10:50:58 +02:00
greye	b8e56d61d3	update camera code, add idle time	2012-08-18 01:31:57 +04:00
greye	3f3972eb3b	no vanity in gui mode (thanks scrawl)	2012-08-17 23:44:28 +04:00
greye	d2b451eb7d	entering vanity mode	2012-08-17 23:25:29 +04:00
greye	b6954a4e8d	use the same height on non-1st person modes	2012-08-17 22:08:16 +04:00
scrawl	8817a9634c	don't switch to vanity mode as a result of idle time when the gui is opened (e.g. when talking to someone)	2012-08-17 16:55:21 +02:00
Marc Zinnschlag	1da56e2832	removed some unused variables	2012-08-17 15:37:14 +02:00
greye	14f293882c	still resolving	2012-08-17 16:42:42 +04:00
greye	83356d5505	resolving conflicts	2012-08-17 16:25:54 +04:00
greye	7303d595dd	resolving conflicts	2012-08-17 15:36:51 +04:00
greye	4f10138a04	using real player sight angles on ray cast	2012-08-17 15:20:57 +04:00
greye	0e6e141fd4	camera control related script instructions	2012-08-17 15:20:57 +04:00
greye	60fb1e8df6	fix sky in preview mode movement	2012-08-17 15:19:44 +04:00
greye	6961830efb	using real player eye direction when moving	2012-08-17 15:19:44 +04:00
greye	e8fc942bef	reverse Z-axis rotation to make doors happy	2012-08-17 15:19:44 +04:00
greye	a453a7f035	camera adjustment, fix view mode on start	2012-08-17 15:19:44 +04:00
scrawl	34f796c38e	removed the far clip distance hack which is not needed anymore	2012-08-17 15:19:44 +04:00
scrawl	b97b3d7b71	fix sky position when reflection is enabled, fix delay in sky reflection	2012-08-17 15:19:44 +04:00
greye	575244bd35	fix SkaManager issue	2012-08-17 15:19:44 +04:00
greye	783e81afc3	fix 1st/preview/1st change; 1st invisible model	2012-08-17 15:19:43 +04:00
greye	392e6efcb5	initial player rendering	2012-08-17 15:19:43 +04:00
greye	6f87c0c36d	preview mode, advanced vanity support	2012-08-17 15:19:43 +04:00
greye	fe1a9ac3c5	poor camera with some fixes	2012-08-17 15:19:43 +04:00
greye	db94018865	far better camera movement	2012-08-17 15:19:43 +04:00
greye	a7aeda9a3b	initial vanity mode support	2012-08-17 15:19:43 +04:00
greye	c46eeaa100	initial 3d-person camera support	2012-08-17 15:19:43 +04:00
Jason Hooks	63a40e9ba3	npc xy disabled	2012-08-16 15:41:42 -04:00
Marc Zinnschlag	e97d23e626	Issue #361: reset skill level in race selection stage	2012-08-16 15:42:37 +02:00
scrawl	132da92391	Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem	2012-08-16 13:20:53 +02:00
Marc Zinnschlag	b0506e2220	re-enabling support for multiple data directories	2012-08-16 12:59:28 +02:00
Jason Hooks	8762f4a47a	boxrotation nif field; commented functions	2012-08-15 16:47:26 -04:00
Jason Hooks	7b8b4c366d	Set angle now working for npcs and creatures	2012-08-14 20:29:48 -04:00
Jason Hooks	1f5bc229e0	Separate adjustRigidBody function	2012-08-14 18:04:58 -04:00
scrawl	f9efd543e4	use float for the mouse position tracking, should be more accurate for sensitivity multipliers != 1	2012-08-13 21:33:53 +02:00
Michael Mc Donnell	b373d0ec7b	Correct struct to class in forward declarations ... Fixes http://bugs.openmw.org/issues/362	2012-08-13 13:58:35 -04:00
scrawl	67577c6192	UI cursor & camera sensitivity sliders	2012-08-13 18:48:50 +02:00
scrawl	c7b8787c32	"reset to defaults" button, invert y axis button	2012-08-13 02:55:22 +02:00
scrawl	bc6e4feedc	hotkey window first version	2012-08-13 01:26:15 +02:00
scrawl	c4fe2e4e2a	Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem	2012-08-12 23:01:25 +02:00
scrawl	976ad7a301	key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw	2012-08-12 22:59:58 +02:00
scrawl	90f1d9c2f2	OSX suggestion by corristo	2012-08-12 21:25:13 +02:00
scrawl	97c45455fd	fix WindowManager destruction	2012-08-12 21:21:23 +02:00
scrawl	86d6f190bf	Input system rewrite	2012-08-12 20:45:02 +02:00
Marc Zinnschlag	c4bf6214db	Merge remote branch 'scrawl/master'	2012-08-12 18:11:36 +02:00
Marc Zinnschlag	88e70cb5bd	Merge branch 'decouple'	2012-08-12 18:11:17 +02:00
Marc Zinnschlag	6534c2a55a	Issue #107: WindowManager is accessed only through the interface class from now on	2012-08-12 18:11:09 +02:00
scrawl	b6f427bf5e	fix OpenMW not exiting when the window is closed (alt f4 etc)	2012-08-12 17:20:46 +02:00
Marc Zinnschlag	35a64edf2a	Issue #107: removed a template from the window manager	2012-08-12 16:07:04 +02:00
Marc Zinnschlag	484cce12a8	Issue #107: removed redundant getStore function from window manager	2012-08-12 14:36:46 +02:00
Marc Zinnschlag	f37d3cd3c9	Issue #107: added a few todo comments	2012-08-12 14:09:55 +02:00
Marc Zinnschlag	4ca3cb81d4	Issue #107: some include clean up	2012-08-12 14:07:48 +02:00
Marc Zinnschlag	e0ba7cf952	Issue #107: Fixing up the window manager interface	2012-08-12 13:46:14 +02:00
Marc Zinnschlag	020fde70b8	Issue #107: moving function implementations from hpp to cpp file	2012-08-12 11:10:17 +02:00
Marc Zinnschlag	dbac3d2e5f	Issue #107: fixing WindowManager::removeDialog	2012-08-12 10:52:29 +02:00
Marc Zinnschlag	a3b27ae756	Issue #107: Moved ClassPoint from window manager to character creation	2012-08-12 10:50:03 +02:00
Jason Hooks	e7329d5f8b	Creatures now have a properly positioned box shape	2012-08-12 00:36:49 -04:00
gugus	fb91f76a2b	fixed a crash	2012-08-11 22:08:04 +02:00
gugus	0c8045d606	allow exterior cell for positioncell. Crash!	2012-08-11 19:16:00 +02:00
gugus	0bc48cc5ea	little fix (thanks greye!)	2012-08-11 18:07:20 +02:00
gugus	379fbccf8c	Merge branch 'move_rotate_fix' of https://github.com/greye/openmw.git into object_movement_creation	2012-08-11 17:53:40 +02:00
Marc Zinnschlag	0231533d05	Issue #107: InputManager is accessed only through the interface class from now on	2012-08-11 17:53:39 +02:00
Marc Zinnschlag	b68f9d6a28	Issue #107: MechanicsManager is accessed only through the interface class from now on	2012-08-11 17:30:55 +02:00
scrawl	dcf1e66456	fix main menu placement after resolution changes	2012-08-11 17:26:01 +02:00
greye	f7f8ac0a73	fix move/rotateObject code	2012-08-11 18:28:37 +04:00
scrawl	2ebf4721d1	small main menu fix	2012-08-11 15:15:09 +02:00
Marc Zinnschlag	380defa52f	Merge remote branch 'greye/cross_cell-borders'	2012-08-11 15:08:17 +02:00
greye	47f7a5e988	fix double pos/rot adjustment	2012-08-11 17:01:55 +04:00
Marc Zinnschlag	bc16dc81b9	Merge remote branch 'greye/cross_cell-borders'	2012-08-11 14:44:39 +02:00
gugus	eaf6a8df94	some correction	2012-08-11 14:06:58 +02:00
greye	355ca649c2	camera flip control rewritten	2012-08-11 14:54:33 +04:00
gugus	5d1c01a58e	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into object_movement_creation ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-08-11 12:28:03 +02:00
Marc Zinnschlag	766e782aae	Merge remote branch 'greye/cross_cell-borders'	2012-08-11 12:05:10 +02:00
Marc Zinnschlag	f3edea77b2	MSCV compatibility fix	2012-08-11 12:03:22 +02:00
Marc Zinnschlag	b53b27533a	fixes some include guards	2012-08-11 12:02:51 +02:00
Marc Zinnschlag	6eb9f15b6d	fixed time stamp operator	2012-08-11 11:38:26 +02:00
greye	45306e4bc3	fixed rotation adjustment	2012-08-11 13:23:54 +04:00
greye	5018db3332	removed some redundant code, added some comments	2012-08-11 12:13:16 +04:00
gugus	54221aab89	Merge branch 'cross_cell-borders' of https://github.com/greye/openmw.git into object_movement_creation	2012-08-11 09:53:06 +02:00
gugus	7fa1dc93d7	2nd try: position/ PositionCell	2012-08-11 09:52:49 +02:00
greye	0042020385	should fix 'north direction' bug ... not even compiled	2012-08-10 21:24:07 +04:00
greye	bed6545e45	still fix assertion fail	2012-08-10 21:06:09 +04:00
greye	56c9c4dbd9	remove some redundant code	2012-08-10 21:03:46 +04:00
scrawl	11fadf4a07	forgot something	2012-08-10 16:25:27 +02:00
scrawl	44ff31b50a	removed world exit methods	2012-08-10 16:21:53 +02:00
scrawl	f72956b918	- added a simple main menu (with Return, Options and Exit buttons) ... - removed OEngine::ExitListener (what a terrible abuse of framelisteners)	2012-08-10 15:15:48 +02:00
Jason Hooks	38c2c5d480	Creatures now use object physics	2012-08-09 18:09:11 -04:00
gugus	b664b174f0	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into object_movement_creation ... Conflicts: apps/openmw/mwscript/transformationextensions.cpp	2012-08-09 23:50:44 +02:00
gugus	cb5b69104d	PositionCell	2012-08-09 23:45:06 +02:00
Jason Hooks	083e3537b4	post merge	2012-08-09 17:21:59 -04:00
greye	38b06aee6c	resolving conflicts	2012-08-09 21:49:00 +04:00
Marc Zinnschlag	aca08eb4c2	Merge branch 'decouple' into player_control ... Conflicts: apps/openmw/mwsound/soundmanagerimp.hpp	2012-08-09 16:12:10 +02:00
greye	b5bc7bc424	SoundManager dependency on camera pos/dir	2012-08-09 17:01:03 +04:00
Marc Zinnschlag	6bd48d12af	Issue #107: SoundManager is accessed only through the interface class from now on	2012-08-09 14:33:21 +02:00
Marc Zinnschlag	d00d40cc3f	Issue #107: Journal is accessed only through the interface class from now on	2012-08-09 12:56:03 +02:00
Marc Zinnschlag	a84145a087	Issue #107: minor corrections	2012-08-09 12:05:47 +02:00
greye	181d45661f	fix rotation angles	2012-08-09 13:43:52 +04:00
greye	6b996d8c34	fix disabled camera on start	2012-08-09 13:29:13 +04:00
greye	df60f4bf92	stub for soundmanager, adjust rotation mode	2012-08-09 13:27:32 +04:00
Marc Zinnschlag	923109b260	Issue #107: DialogueManager is accessed only through the interface class from now on	2012-08-09 10:35:53 +02:00
Marc Zinnschlag	e6ede480c7	Issue #107: fixed up some interfaces	2012-08-09 09:41:17 +02:00
greye	378fcc2460	fix DisablePlayerControl logic	2012-08-09 11:10:18 +04:00
greye	1511eb3549	implemented enable/disable player looking switch	2012-08-09 10:55:49 +04:00
greye	a2d87d5f5b	added camera flip control, fixed input rotation axis	2012-08-09 10:24:18 +04:00
greye	ec9cf4d3c6	rotateObject() added, input system rewritten	2012-08-09 00:15:52 +04:00
Marc Zinnschlag	28ecfb4290	Issue #107: ScriptManager is accessed only through the interface class from now on	2012-08-08 15:18:55 +02:00
Marc Zinnschlag	9b567e4ba6	Issue #107: Removed a redundant function in world interface; added a comment	2012-08-08 14:54:35 +02:00
greye	b6f7f21bcf	fix player cell assertion fail, moveObject(Ptr&, CellStore&, f, f, f) added	2012-08-08 14:51:33 +04:00
greye	79b7487c87	fix using deleted objects	2012-08-07 22:21:46 +04:00
greye	d32a61b928	fix object moving	2012-08-06 18:20:48 +04:00
greye	ee97a204f2	fix npc animation key update	2012-08-06 15:26:37 +04:00
gugus	8a485e213b	first try of the Position script instruction. Still missing: check if overlapp with an object.	2012-08-05 16:44:56 +02:00
gugus	d850a3ee49	some correction	2012-08-05 16:21:53 +02:00
Marc Zinnschlag	f5ee5a5414	Merge remote branch 'edmondo/master'	2012-08-05 00:03:16 +02:00
Marc Zinnschlag	1db7978361	silenced a warning	2012-08-04 22:03:14 +02:00
Marc Zinnschlag	0c5f886683	Merge remote branch 'greye/player_control'	2012-08-04 21:55:13 +02:00
Jason Hooks	cacf0bd10d	Basic collision with npcs	2012-08-04 15:43:33 -04:00
greye	16ad97610d	add support for some scripting player control switches	2012-08-04 11:54:42 +04:00
Marc Zinnschlag	994e33e3d2	fixed object rotation code	2012-08-04 09:34:49 +02:00
Marc Zinnschlag	e4dc01832b	fixing object rotation script instructions (wrong argument type and missing error handling)	2012-08-04 09:18:20 +02:00
Edmondo Tommasina	11d0761528	terrainmaterial.cpp: fix std::runtime_error compile error	2012-08-03 22:42:28 +02:00
gugus	b2ce1dfd1a	getStartingPos	2012-08-03 18:20:51 +02:00
gugus	7d6ad6ad94	setPos and getPos Script instructions. Cell-crossing is not tested yet.	2012-08-03 18:14:05 +02:00
greye	ff62770657	World::isUnderwater(), World::isSwimming()	2012-08-03 14:42:09 +04:00
Marc Zinnschlag	c251fbdf23	Merge branch 'master' into HEAD ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt libs/openengine/ogre/renderer.cpp	2012-08-02 14:57:35 +02:00
gugus	e9aac4512b	Build fix for Windows ... Fixes a number of places where uint was used and not defined. This commit was originally authored by gus. It rebased by Michael Mc Donnell to take recent commit fixes into account.	2012-08-01 11:47:36 -04:00
gugus	ebd8b064f6	getStartingAngle script instruction	2012-08-01 12:21:42 +02:00
Marc Zinnschlag	f6d657a5f4	Merge branch 'osx_fix'	2012-08-01 09:09:29 +02:00
scrawl	15a16aeba1	Fixed DirectX HLSL shaders and re-enabled them in the gui	2012-08-01 04:11:16 +02:00
greye	f2a2e5f57d	remove MWWorld::Player::setPos()	2012-07-31 19:30:24 +04:00
greye	0e3f70413e	a very little comments	2012-07-31 16:52:21 +04:00
greye	288b63350c	fixed objects update, local script handling	2012-07-31 11:46:57 +04:00
Nikolay Kasyanov	defab0e4b5	Merge remote-tracking branch 'upstream/master' into osx_fix ... Conflicts: CMakeLists.txt	2012-07-31 01:06:18 +04:00
Nikolay Kasyanov	b05dfeae70	bug #348: cleanup ... moved files to appropriate component, moved function to namespace, added docs	2012-07-31 01:01:00 +04:00
greye	37990b5133	fix player update	2012-07-30 23:54:26 +04:00
greye	d6150b7482	high-level implementation, unstable	2012-07-30 23:28:14 +04:00
gugus	d37d0b1947	build fix for windows	2012-07-30 19:45:40 +02:00
Marc Zinnschlag	db10baafe1	Merge branch 'scriptconsole'	2012-07-30 12:43:48 +02:00
Marc Zinnschlag	2ccecd839b	improved the help text for --script-run; updated readme.txt	2012-07-30 12:43:23 +02:00
Marc Zinnschlag	fd6c155118	Issue #352: added --script-run switch	2012-07-30 12:37:46 +02:00
Marc Zinnschlag	23f8595b87	Issue #352: refactored script execution in console	2012-07-30 11:57:19 +02:00
Marc Zinnschlag	90de02b901	Issue #350: console only script instructions	2012-07-30 11:43:28 +02:00
Nikolay Kasyanov	0cdb651c5e	removed excess invocation	2012-07-28 02:05:06 +04:00
Nikolay Kasyanov	fbe9a94568	bug #348: fixed OS X deployment ... just enable CMake option "OPENMW_OSX_DEPLOYMENT" and it will search plugins inside application bundle instead of Ogre prefix	2012-07-28 01:55:37 +04:00
Marc Zinnschlag	0da3f2cb59	Issue #314: Playing drink sound when using a potion	2012-07-27 12:27:22 +02:00
Marc Zinnschlag	8b08928dae	Issue #351: Added sound playing to Action	2012-07-27 12:19:25 +02:00
Marc Zinnschlag	78fe6fdce5	Issue #351: Refactoring Action class	2012-07-27 12:00:10 +02:00
scrawl	7cf2fc4009	Merge branch 'master' into shadersystem	2012-07-26 23:11:16 +02:00
scrawl	6077965d27	fix the directx startup issue on windows	2012-07-26 23:09:46 +02:00
Marc Zinnschlag	7725190f89	removed some redundant code	2012-07-26 19:09:45 +02:00
greye	aa5f63ffcc	disabled items placing handling	2012-07-26 19:06:48 +04:00
greye	26595f22f6	float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()	2012-07-26 16:14:11 +04:00
greye	b734460dc9	Merge branch 'master' of https://github.com/zinnschlag/openmw	2012-07-26 16:02:58 +04:00
scrawl	06bd2cd919	Merge branch 'master' into shadersystem	2012-07-25 23:54:22 +02:00
greye	cd04911f3c	dropping on the ground	2012-07-25 20:31:39 +04:00
greye	49b1d5e127	fix object placing	2012-07-25 20:31:39 +04:00
greye	e7666d3a7f	move responsibility for cell changing from CellStore::insertObject to Class::moveToCell	2012-07-25 20:31:39 +04:00
greye	bcc47cd5fb	local scripts, move placing to World::placeObject(Ptr, CellStore, Position)	2012-07-25 20:31:39 +04:00
greye	d5fe378a66	Revert "local script registration" ... This reverts commit 0686399a306319a4c49e1009d10215a9c0e65ec2.	2012-07-25 20:31:39 +04:00
greye	aff05b9d36	local script registration	2012-07-25 20:31:39 +04:00
greye	e1c7d1f529	fixed item sinking	2012-07-25 20:31:39 +04:00
greye	6a3a728a56	Class::getModel implementation	2012-07-25 20:31:39 +04:00
greye	87050e48c8	physics getObjectHeight(), MWWorld::Class::getModel() definition	2012-07-25 20:31:39 +04:00
greye	71253c64ab	moving part 2, adding position parameter, stable	2012-07-25 20:31:39 +04:00
greye	61cb012ee7	moving Scene::insertObject to CellStore::insertObject, part 1	2012-07-25 20:31:39 +04:00
Chris Robinson	9f0c1eeb7b	Support playgroup mode 0	2012-07-24 14:54:12 -07:00
Chris Robinson	13ab2baef0	Use a struct to hold the current animation times and remaining loop count	2012-07-24 14:42:01 -07:00
Chris Robinson	fd1e3f6ec5	Add support for playgroup mode 2	2012-07-24 14:14:32 -07:00
Chris Robinson	20121f3b0a	Remove some unused stuff	2012-07-24 13:56:28 -07:00
Chris Robinson	9a7a629d0f	Add support for playing animation groups	2012-07-24 13:51:48 -07:00
Nikolay Kasyanov	94ce95c679	bug #348: works again on OS X	2012-07-25 00:13:33 +04:00
Chris Robinson	f953d7f8c0	Store text keys from base NIF animations	2012-07-23 17:27:35 -07:00
Chris Robinson	36be1536d9	Return text keys from NIFs when creating entities	2012-07-23 17:20:47 -07:00
scrawl	8c8228a15c	fix terrain num lights setting	2012-07-24 00:08:53 +02:00
Chris Robinson	44975854e5	Merge remote branch 'zini/master' into nif-cleanup ... Conflicts: apps/openmw/mwrender/sky.cpp	2012-07-23 13:46:05 -07:00
Chris Robinson	f67983bbee	Don't assume one sub-entity for the night sky entities	2012-07-23 13:37:05 -07:00
Marc Zinnschlag	2d080ce4ef	compile fix	2012-07-23 21:47:53 +02:00
Marc Zinnschlag	483a6d8605	Merge remote branch 'scrawl/shadersystem'	2012-07-23 21:46:06 +02:00
scrawl	02a52c0ff1	fixed some more settings bugs	2012-07-23 21:39:22 +02:00
scrawl	3ebc6fd590	fixed a settings window bug	2012-07-23 20:50:56 +02:00
scrawl	a70f93b024	fix "Crash when running openmw with --start="XYZ", remove HLSL for windows	2012-07-23 20:12:42 +02:00
scrawl	ab35bfa32c	fixed a sky issue	2012-07-23 18:19:34 +02:00
scrawl	cfa0519721	Merge branch 'master' into nif-cleanup	2012-07-23 15:37:08 +02:00
scrawl	1fef086088	Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup" ... This reverts commit 546b640022, reversing changes made to fcaa8aae06.	2012-07-23 15:36:12 +02:00
scrawl	f8d6a36196	Merge branch 'master' into nif-cleanup ... Conflicts: apps/openmw/mwrender/sky.cpp apps/openmw/mwrender/sky.hpp components/nifogre/ogre_nif_loader.cpp components/nifogre/ogre_nif_loader.hpp	2012-07-23 15:35:31 +02:00
Marc Zinnschlag	a24e7c9de2	Merge remote branch 'scrawl/shadersystem'	2012-07-23 15:25:11 +02:00
scrawl	2eca27bba9	fix horizon color of the sky reflection	2012-07-23 14:21:40 +02:00
Marc Zinnschlag	2c5d3d8df9	Merge remote branch 'scrawl/shadersystem' into shadersystem ... Attention: We have submodules again. Don't forget to update! Conflicts: components/files/configurationmanager.cpp	2012-07-23 14:12:21 +02:00
scrawl	1dbfd60305	Merge branch 'nif-cleanup' of https://github.com/ChrisKCat/openmw into nif-cleanup	2012-07-23 13:48:12 +02:00
scrawl	afe7c41729	removed some unused code	2012-07-23 13:47:51 +02:00
greye	32b1350b63	CreatureStats class	2012-07-22 18:29:54 +04:00
Chris Robinson	77446a0d58	Fix skipAnim, only skip one animation update	2012-07-21 17:39:57 -07:00
Chris Robinson	e81fc42daa	Remove the beast-race special cases from updateParts ... The special handling should happen at a much lower level, and prevent the objects from being equipped in the first place.	2012-07-21 17:12:41 -07:00
Chris Robinson	c5b9098517	Remove an unused field from EntityList	2012-07-21 17:09:16 -07:00
scrawl	546b640022	Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup	2012-07-21 23:50:56 +02:00
Chris Robinson	81ce8dbe12	Combine animation handling into the base class	2012-07-21 14:41:26 -07:00
Chris Robinson	fcaa8aae06	Don't skip animation state updates for NPCs	2012-07-21 11:26:09 -07:00
scrawl	e7ab3544ac	removed some redundant code	2012-07-21 13:52:12 +02:00
scrawl	acc5c3bbbf	some fixes	2012-07-20 17:08:15 +02:00
scrawl	014396e80c	remove the plugins.cfg files, do not enforce CG plugin	2012-07-20 16:44:03 +02:00
scrawl	21728020f6	fixed the water on local map	2012-07-20 14:45:42 +02:00
Chris Robinson	2db80a1504	Rename a couple methods to match their scripting counterparts	2012-07-20 00:53:12 -07:00
Chris Robinson	66860825cf	Remove some unused and unneeded bits from the Animation class	2012-07-20 00:36:52 -07:00
Chris Robinson	8b5b74f9ee	Add a quick hack to let "playgroup all" work on creatures and NPCs	2012-07-19 22:34:26 -07:00
scrawl	f5ffea4d4b	new button, water timescale	2012-07-19 23:30:41 +02:00
scrawl	e077814a8c	water	2012-07-19 22:23:07 +02:00
Chris Robinson	a86ed46ec4	Use the race ID specified in the ref base's record instead of the race record ... The latter is localized and doesn't match with international versions.	2012-07-19 11:00:26 -07:00
scrawl	739455e6f8	new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc	2012-07-19 16:23:30 +02:00
Chris Robinson	6caa39629d	Reimplement the skirt part	2012-07-18 22:32:26 -07:00
Chris Robinson	b505d4ace0	Fix feet and entity part detachment	2012-07-18 21:39:50 -07:00
Chris Robinson	4af1bce659	Restore and fix some missing parts	2012-07-18 20:14:23 -07:00
Chris Robinson	d9b64b77ec	Attach skinned parts to the scene node instead of the named bone	2012-07-18 18:38:55 -07:00
Chris Robinson	db948969c9	Attach NPC parts to the proper bone	2012-07-18 11:14:13 -07:00
Chris Robinson	04e496a6ca	Store the entity lists for NPC parts	2012-07-18 10:26:25 -07:00
Chris Robinson	6611b0b317	Use an array instead of a bunch of nearly-identical if blocks	2012-07-18 10:09:16 -07:00
Chris Robinson	02d39080c8	Destroy entities when they're done with.	2012-07-18 00:17:39 -07:00
Chris Robinson	4109d0d923	Destroy entities removed from the NPC	2012-07-17 22:47:56 -07:00
Chris Robinson	92546ca18d	Move the last bits of code to createEntities	2012-07-17 20:23:09 -07:00
Chris Robinson	94f3e7a6c0	Store the entity list in the object	2012-07-17 16:00:03 -07:00
Chris Robinson	a590db2cf4	Create entities when loading NIFs for the NPC base	2012-07-17 15:43:40 -07:00
Chris Robinson	3efd2030e2	Create entities when loading NIFs for creatures	2012-07-17 14:11:07 -07:00
Chris Robinson	3dedac5cb1	Create mesh entities for objects when loading the NIF	2012-07-17 13:40:03 -07:00
Chris Robinson	c6cc82a51a	Handle multiple entities per NPC part	2012-07-17 12:20:52 -07:00
Chris Robinson	89cfe778f0	Support multiple entities for the NPC base	2012-07-17 11:38:50 -07:00
Chris Robinson	0a4a141f2e	Support multiple meshes for creatures	2012-07-17 11:23:34 -07:00
Chris Robinson	6047dc6a0c	Merge remote branch 'zini/master' into nif-cleanup ... Conflicts: apps/openmw/mwrender/animation.cpp apps/openmw/mwrender/animation.hpp apps/openmw/mwrender/creatureanimation.cpp apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/npcanimation.hpp components/nifogre/ogre_nif_loader.hpp	2012-07-17 10:57:15 -07:00
scrawl	4434fb640e	Merge branch 'master' into shadersystem	2012-07-17 19:12:02 +02:00
Marc Zinnschlag	483b125aad	avoid locking up in case actor updates repeatedly throw exceptions	2012-07-17 18:37:20 +02:00
Marc Zinnschlag	6744375636	fixed a logic error in the auto equip code	2012-07-17 18:35:01 +02:00
Marc Zinnschlag	beb18282bb	Issue #342: various fixes	2012-07-17 16:44:55 +02:00
Marc Zinnschlag	76de2f7360	Issue #342: handle magic effects 79-82 and 17-20	2012-07-17 15:49:37 +02:00
Marc Zinnschlag	a3652f16ce	Issue #342: factored out dynamic stats calculation into a separate function	2012-07-17 12:18:43 +02:00
Marc Zinnschlag	2c70a93553	Merge branch 'master' into potions ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwclass/npc.hpp	2012-07-17 10:32:18 +02:00
Marc Zinnschlag	0d3a7d482e	Merge remote branch 'modred11/master'	2012-07-17 10:21:46 +02:00
Marc Zinnschlag	4bfed952bc	Merge remote branch 'guidoj/master'	2012-07-17 10:17:06 +02:00
Marc Zinnschlag	e9b95d55cd	Revert "Proper way to find and use libtbb" ... This reverts commit d6bf2b7d29.	2012-07-17 09:49:52 +02:00
guidoj	a021165d9f	Changed standard C lib includes to C++ format	2012-07-17 09:44:24 +02:00
guidoj	0549e949ba	Mostly removal of unnecessary #include's and a little clean up	2012-07-17 09:27:12 +02:00
Dmitry Marakasov	d6bf2b7d29	Proper way to find and use libtbb	2012-07-17 00:11:56 +04:00
Dmitry Marakasov	0e934a52ca	Include soundmanager.hpp for Play_Normal enum	2012-07-16 23:54:24 +04:00
Dmitry Marakasov	1c53add6c4	Include boost/shared_ptr.hpp for boost:shared_ptr	2012-07-16 23:54:21 +04:00
Chris Robinson	a539e98274	Handle all meshes when inserting objects into the scene	2012-07-16 10:48:48 -07:00
scrawl	509e9d7034	Merge branch 'master' into shadersystem	2012-07-15 21:58:45 +02:00
Chris Robinson	b4c8375f3c	Merge remote branch 'zini/master' into nif-cleanup ... Conflicts: components/bsa/bsa_archive.cpp	2012-07-15 12:04:43 -07:00
Marc Zinnschlag	da916cecfb	fixed a bug in a cmake script that resulted in some files being compiled twice	2012-07-15 19:29:09 +02:00
scrawl	778e59ee37	terrain as it was before, with about 4x less code	2012-07-15 08:21:43 +02:00
scrawl	29f91753f7	correction	2012-07-14 18:44:03 +02:00
scrawl	93c641efa7	terrain albedo	2012-07-14 18:25:43 +02:00
scrawl	7d5b94709d	Merge branch 'master' into shadersystem ... Conflicts: components/nifogre/ogre_nif_loader.cpp	2012-07-14 11:16:35 +02:00
scrawl	16c2ea3a75	terrain colourmap	2012-07-14 11:13:38 +02:00
Chris Robinson	939d0d2fc5	Return a list of meshes and the skeleton from NIFLoader::load	2012-07-13 20:01:15 -07:00
Marc Zinnschlag	573d7e7e45	Issue #314: fix to potion use function (was mixing up potion with potion user)	2012-07-13 15:51:57 +02:00
Marc Zinnschlag	782d417d5b	Issue #314: potion usage	2012-07-13 13:09:22 +02:00
Marc Zinnschlag	182017b8e9	Issue #314: Moved ingredients and potions to a different type of record list	2012-07-13 13:08:48 +02:00
Carl Maxwell	e4d046f69c	Prepending m to the name of every member variable. ... I made a bunch of changes in apps/openmw/mwrender/animation.cpp because the scope brackets didn't line up in a bunch of places npcanimations.cpp & creatureanimations.cpp were the same kind of thing	2012-07-13 03:51:58 -07:00
scrawl	d2fbb11475	temp commit	2012-07-13 11:26:36 +02:00
Marc Zinnschlag	29b4a5e5f7	Issue #314: added apply actions	2012-07-13 09:41:38 +02:00
Marc Zinnschlag	84d846cf07	Issue #314: implemented apply and skillUsageSucceeded functions for MWClass::Npc	2012-07-13 09:16:27 +02:00
scrawl	7731e9a6fa	finished cleaning up sky	2012-07-13 09:13:12 +02:00
Marc Zinnschlag	805b81bf6e	Issue #314: added skillUsageSucceeded function to Class	2012-07-13 09:03:17 +02:00
Marc Zinnschlag	7a2d613043	Issue #314: extended Class::apply function to cover the actor	2012-07-13 08:50:46 +02:00
scrawl	b8384162b6	merge	2012-07-13 06:16:55 +02:00
Chris Robinson	ecdd4ee23f	Load NiMorphData and NiKeyframeData using proper key lists	2012-07-12 20:56:47 -07:00
Chris Robinson	386ac56bda	Remove the NIF loader and code to manually transform the vertices ... This currently breaks just about everything. They should come back as it's all reimplemented, though.	2012-07-12 20:12:18 -07:00
scrawl	ad7383be43	sky	2012-07-11 09:08:55 +02:00
scrawl	e0a99f104b	settings tab "shadows"	2012-07-11 04:28:45 +02:00
scrawl	485adc8bdc	shader mode button in settingswindow	2012-07-11 03:19:51 +02:00
scrawl	865bfc6f47	sync mrt_output setting	2012-07-11 02:31:03 +02:00
Marc Zinnschlag	ec9ebe6b58	Merge branch 'skillgain' into potions ... Conflicts: apps/openmw/mwmechanics/activespells.cpp	2012-07-10 14:08:30 +02:00
Marc Zinnschlag	f11bf49a90	cmake fix; silenced some warnings	2012-07-10 13:23:41 +02:00
gugus	164a5c8fe4	rotation now also work with the physic representation	2012-07-10 12:10:50 +02:00
gugus	70c74ede05	changed rotation order	2012-07-10 11:53:12 +02:00
gugus	410b693555	setAngle improvement	2012-07-10 11:15:46 +02:00
scrawl	3537af051d	removed the old shader helper	2012-07-10 00:17:52 +02:00
scrawl	5d1e6b6bf6	remove cg profile check	2012-07-10 00:09:47 +02:00
scrawl	1a9f59d5d4	shadows	2012-07-10 00:07:33 +02:00
Marc Zinnschlag	0d8150f4bd	Issue #324: added useSkill function to NpcStats (adjust skill level according to use)	2012-07-09 21:15:52 +02:00
Marc Zinnschlag	a207c86fd1	Issue #324: added some range checks	2012-07-09 21:14:11 +02:00
Marc Zinnschlag	67c1c5ce18	Issue #324: adjusted setSkill script instructions according to the recent research	2012-07-09 20:42:45 +02:00
Marc Zinnschlag	25a5657d80	Issue #324: Modified the interface for modified stats	2012-07-09 20:34:12 +02:00
scrawl	07fd9986ef	accidently removed the map.	2012-07-09 20:14:07 +02:00
scrawl	b803d0e949	converted shadow caster shader	2012-07-09 19:46:36 +02:00
gugus	557e114992	clean-up + getScale/Angle script instructions	2012-07-09 19:28:44 +02:00
scrawl	81d30ff63a	temp commit	2012-07-09 19:20:41 +02:00
gugus	0a67f60a6e	Clean-up	2012-07-09 18:47:59 +02:00
gugus	e6716c25c3	little correction.	2012-07-09 15:41:19 +02:00
gugus	feec67094f	Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwworld/physicssystem.cpp	2012-07-09 15:23:26 +02:00
gugus	03f7740474	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwworld/worldimp.hpp	2012-07-09 10:39:57 +02:00
Jason Hooks	b5edad790d	merge	2012-07-07 15:27:04 -04:00
Marc Zinnschlag	fe86ce5a2c	DrawState workaround	2012-07-07 20:53:19 +02:00
Marc Zinnschlag	6277e39216	Merge branch 'master' into skillgain	2012-07-07 20:27:56 +02:00
Alexander "Ace" Olofsson	113457d934	Fixed some windows issues and got rid of a few tiny warnings while at it.	2012-07-07 01:14:18 +02:00
Marc Zinnschlag	0f41cc499d	Issue #324: Added skill gain calculation function	2012-07-06 21:07:04 +02:00
Marc Zinnschlag	10723a149b	Issue #324: Change a forward declartion to avoid potential problems with pesky MSVC	2012-07-06 18:25:16 +02:00
Marc Zinnschlag	d30ba14a17	Issue #324: Finished turning NpcStats into a proper class	2012-07-06 18:23:48 +02:00
Marc Zinnschlag	771863e73b	Issue #324: Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue	2012-07-06 15:50:26 +02:00
scrawl	a095572205	fixed some textures, started with sky	2012-07-06 10:31:48 +02:00
scrawl	33c48b9481	update	2012-07-06 04:28:08 +02:00
scrawl	1a5203749f	fix "error in framelistener" when trying to pick up lights that can't be picked up	2012-07-05 17:13:23 +02:00
scrawl	4ea6530772	hello world.	2012-07-04 00:26:57 +02:00
scrawl	a1e48b0feb	builds now	2012-07-03 22:48:16 +02:00
scrawl	78efc31641	different default coordinates for container window to prevent it from going invsible when changing resolution (bug #308), fixed some windows not centering when resolution change	2012-07-03 16:51:29 +02:00
scrawl	085891879c	fixed another resolution change bug introduced recently	2012-07-03 16:44:20 +02:00
Marc Zinnschlag	205ed0ce5b	post merge fix	2012-07-03 15:53:42 +02:00
Marc Zinnschlag	cc7c6aa0ad	Merge branch 'decouple'	2012-07-03 15:47:57 +02:00
Marc Zinnschlag	c85aaafac2	more include cleanup (most removing Ogre.h)	2012-07-03 15:32:38 +02:00
Marc Zinnschlag	87667ab57e	Issue #107: Ptr related include cleanup	2012-07-03 13:55:53 +02:00
Marc Zinnschlag	5a7b95bf7a	Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp	2012-07-03 13:15:20 +02:00
Marc Zinnschlag	4c39fefd1e	Issue #107: World is accessed only through the interface class from now on; some include cleanup	2012-07-03 12:30:50 +02:00
scrawl	d27863bf8e	rename layout files to .layout to get them recognized by layout editor	2012-07-03 11:34:20 +02:00
Marc Zinnschlag	035c1c4b6e	added World interface class; cleanup of World interface	2012-07-03 01:06:38 +02:00
Marc Zinnschlag	efb95e2f83	Issue #317: check if spell actually exist in AddSpell	2012-07-02 14:25:46 +02:00
Pieter van der Kloet	2db6e4f4cf	Second try: added aspect ratios to the resolution combobox	2012-06-29 19:13:12 +02:00
Marc Zinnschlag	7fcd41c69d	Issue #107: Detemplateised CellStore; some include cleanup	2012-06-29 18:54:23 +02:00
Marc Zinnschlag	76174098c7	Issue #107: CellStore moved from ESMS to MWWorld	2012-06-29 16:48:50 +02:00
Marc Zinnschlag	fc063472d0	Revert "Added aspect ratio info to the list of resolutions" ... This reverts commit be5e047106.	2012-06-29 14:41:19 +02:00
Chris Robinson	897622a511	Merge remote branch 'zini/master' into sound	2012-06-28 15:01:41 -07:00
Marc Zinnschlag	e5cdc988a6	Merge remote branch 'pvdk/launcher'	2012-06-28 10:14:03 +02:00
Pieter van der Kloet	dded604eca	Improved launcher images made by serpentine	2012-06-28 05:16:26 +02:00
Pieter van der Kloet	be5e047106	Added aspect ratio info to the list of resolutions	2012-06-28 02:06:42 +02:00
Marc Zinnschlag	70ac1c818d	Merge remote branch 'scrawl/settingswindow'	2012-06-27 09:02:29 +02:00
scrawl	b73b39f3c6	launcher bugfix, settings was not written when "Play" was selected	2012-06-27 00:55:25 +02:00
Chris Robinson	2f8056dfab	Merge remote branch 'zini/master' into sound	2012-06-26 14:59:01 -07:00
scrawl	232fe0be8c	fix for the directx crash	2012-06-26 18:03:52 +02:00
scrawl	c37b14f5f7	Merge pull request #5 from pvdk/master ... Sorting of graphics values	2012-06-26 06:47:39 -07:00
scrawl	30e86e1b9d	settings window resolution sorting, aspect ratio	2012-06-26 15:41:13 +02:00
Pieter van der Kloet	e5159a1950	Modified sorting of the values in the Graphics Page	2012-06-26 15:37:40 +02:00
Pieter van der Kloet	77ac8760d1	Cleaned up the GUI of the Graphics page	2012-06-26 03:07:54 +02:00
Pieter van der Kloet	6fe471c1c6	Resolutions are now sorted descendingly and removed some debug stuff	2012-06-26 02:41:54 +02:00
Marc Zinnschlag	83c3972a89	Issue #314: added return value to addSpell function	2012-06-24 16:23:43 +02:00
Marc Zinnschlag	aa827442e8	Issue #314: Generalised ActiveSpells class so that it can handle lasting effects from potions too	2012-06-24 11:39:21 +02:00
scrawl	797c2c538d	fix some settings bugs	2012-06-23 12:25:28 +02:00
Marc Zinnschlag	2b68e4d489	Merge remote branch 'scrawl/trianglebatchcount'	2012-06-22 14:30:00 +02:00
scrawl	63ce143a04	fix triangle / batch counts with compositors	2012-06-22 12:56:04 +02:00
scrawl	98f13ebcc0	Merge branch 'misc' of github.com:scrawl/openmw into misc	2012-06-21 12:15:43 +02:00
Marc Zinnschlag	ad251065f4	removed more cout spam	2012-06-21 12:00:56 +02:00
Marc Zinnschlag	89ac0fa232	Issue #312: Implemented ID-search caching to speed up some badly written scripts	2012-06-21 11:43:18 +02:00
Pieter van der Kloet	6a2bcddef5	Changed the way the launcher exits and polished the error handling code	2012-06-20 23:25:22 +02:00
Jason Hooks	5c51674070	update	2012-06-20 13:14:27 -04:00
Marc Zinnschlag	1b368506d4	Merge remote branch 'pvdk/filedialog'	2012-06-20 16:05:20 +02:00
Pieter van der Kloet	d162445e68	Got rid of some unwanted warnings and did some cleanup on the launcher	2012-06-20 13:35:05 +02:00
Marc Zinnschlag	95d9c99d0d	Merge remote branch 'pvdk/filedialog'	2012-06-20 09:28:43 +02:00
Pieter van der Kloet	e21442f6cc	Fix for Bug #306: launcher now creates the config dir and returns proper error codes	2012-06-20 02:28:49 +02:00
Jason Hooks	86d8a07fc7	Switching back to old scaling	2012-06-19 13:28:06 -04:00
Marc Zinnschlag	1f0efa9f7d	Merge remote branch 'scrawl/guifixes'	2012-06-19 19:06:18 +02:00
scrawl	15e959868c	make some of the gui mode changes a bit safer	2012-06-19 17:07:00 +02:00
Marc Zinnschlag	590dfe8d63	fixed the container fill problem on cell load	2012-06-19 16:42:10 +02:00
Marc Zinnschlag	511d0c0e1c	Merge remote branch 'scrawl/rendererselection'	2012-06-19 16:04:48 +02:00
scrawl	61ec56debc	don't add duplicate resolutions	2012-06-19 16:02:28 +02:00
scrawl	c9e76d3e90	remove extra tokens at the end of the resolution string, if present	2012-06-19 15:57:58 +02:00
scrawl	ff278ab4ec	chargen generate class: fix result not being shown in review dialog	2012-06-19 15:25:04 +02:00
scrawl	0aa01b93e2	don't put blue color on actions that are in the topic list, but are not topics (e.g. Barter)	2012-06-19 15:24:52 +02:00
Marc Zinnschlag	9a6f012578	Merge branch 'script'	2012-06-19 11:07:47 +02:00
Jason Hooks	4d55ecfdbe	Deleting scaled shapes; scaleObject()	2012-06-18 13:03:00 -04:00
Marc Zinnschlag	09057daac5	Merge remote branch 'scrawl/containerunlocking'	2012-06-18 09:57:22 +02:00
Jason Hooks	33fe80723c	btScaledBvhTriangleMeshShapes	2012-06-17 20:56:10 -04:00
scrawl	de3daf3dc1	allow the 'lock' and 'unlock' script commands to work on containers, like in morrowind	2012-06-18 00:21:55 +02:00
Marc Zinnschlag	4a726f272b	Merge remote branch 'pvdk/filedialog'	2012-06-17 09:58:39 +02:00
Marc Zinnschlag	badb20e5df	Merge remote branch 'scrawl/rendererselection'	2012-06-17 09:54:18 +02:00
Pieter van der Kloet	f81e127701	Created custom directory dialog which only accepts Data Files dirs	2012-06-17 06:48:32 +02:00
scrawl	b831c3313d	render system was not written on launcher exit	2012-06-17 00:47:45 +02:00
Marc Zinnschlag	3c42a71dae	removed some cout spam	2012-06-16 16:42:35 +02:00
Marc Zinnschlag	e2a77037eb	fixed a type in a script instruction	2012-06-16 16:38:54 +02:00
Marc Zinnschlag	8283f5f135	added setHello/Fight/Flee/Alarm instructions	2012-06-16 16:31:32 +02:00
Marc Zinnschlag	ea29b74bb4	added per NPC/creature basic AI-settings (hello, fight, flee, alarm)	2012-06-16 16:17:42 +02:00
Marc Zinnschlag	7454713a9b	addet provisional implementation of AiWander (doesn't do anything yet)	2012-06-16 16:06:15 +02:00
Marc Zinnschlag	b16157a618	documentation fix	2012-06-16 15:49:39 +02:00
Marc Zinnschlag	3167ae9473	added force/clearforce instructions for run and sneak	2012-06-16 15:49:03 +02:00
Marc Zinnschlag	0795730a19	Merge branch 'xdoty' into script	2012-06-16 14:57:13 +02:00
Marc Zinnschlag	10b27e582b	Issue #181: various fixed to member variable access	2012-06-16 13:51:13 +02:00
Marc Zinnschlag	6c5b21fa42	Issue #181: Member variable access in expressions; error reporting fix for the previous commit	2012-06-16 13:06:23 +02:00
Marc Zinnschlag	6a89d76321	Issue #181: Improved script error reporting for local and global scripts	2012-06-16 11:52:35 +02:00
gugus	5397b9dba6	Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling	2012-06-16 11:38:07 +02:00
gugus	974585d357	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling	2012-06-15 14:53:58 +02:00
gugus	01fefca0a3	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-06-15 14:53:19 +02:00
scrawl	584ae30213	don't show diseases and curses in the spell list	2012-06-15 10:09:46 +02:00
Marc Zinnschlag	0f71439991	Merge remote branch 'garvek/master'	2012-06-15 08:22:56 +02:00
Jason Hooks	897a331244	NPC activation	2012-06-13 12:21:51 -04:00
Jason Hooks	20288de685	Post merge	2012-06-11 15:39:57 -04:00
Jason Hooks	b14c132a31	Merging in the latest master	2012-06-11 13:25:06 -04:00
Alexander "Ace" Olofsson	f675d8d039	Merge branch 'master'	2012-06-11 19:09:10 +02:00
Jason Hooks	595b0729da	Few things changed	2012-06-10 21:08:58 -04:00
Pieter van der Kloet	0bcec32c70	Changed launcher logo to the new one done by Necrod	2012-06-11 02:50:29 +02:00
Mark Siewert	bef4bef5d2	- Add support for loading multiple esm/esp files. Selection in omwlauncher is recognized and applied. ... - Quick hack for multiple terrain palettes. Prevents crashes and/or wrong textures in masters/plugins beyond the first. - Support deleting parent entries from the list.	2012-06-10 11:14:46 +02:00
Jason Hooks	fb0a52809d	Changing transformation processing	2012-06-09 15:19:15 -04:00
scrawl	447158e9d6	shutdown crash fix	2012-06-09 19:15:11 +02:00
Sylvain THESNIERES	fc3a3fc173	MSVC build compliance: ... - static const float member is not ISO - callback do not match DLL signature	2012-06-08 19:55:39 +02:00
Marc Zinnschlag	eb0be10e80	Merge branch 'script' into xdoty	2012-06-07 13:00:01 +02:00
Marc Zinnschlag	ff84fbbfa7	Added DontSaveObject script instruction ... We are ignoring it for now and unless users protest we will probably keep it that way.	2012-06-07 12:36:51 +02:00
Marc Zinnschlag	72fca40090	Issue #181: member variable access in interpreter context	2012-06-07 11:59:45 +02:00
scrawl	42e44ac1b5	fixed some leaks	2012-06-06 21:08:20 +02:00
scrawl	c85c794c86	fixed some cppcheck issues	2012-06-06 20:29:30 +02:00
scrawl	dfac5f26c3	fixed some issues: ... - probes were not showing up in inventory category "misc" - lights, probes, lockpicks were not equippable - weapons could not be picked up	2012-06-04 21:48:20 +02:00
scrawl	ea8e3ca1c8	fix item duplication bug when picking up object with the mouse and immediately dropping again	2012-06-04 21:09:51 +02:00
scrawl	1ecc6f97ed	alchemy effect fix	2012-06-04 20:56:13 +02:00
scrawl	d56defd4f4	set input focus to console after selecting objects in console mode	2012-06-03 21:19:48 +02:00
scrawl	8e96871acd	remove something unused	2012-06-03 18:40:10 +02:00
gugus	0012d7eb58	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-06-03 12:53:23 +02:00
scrawl	b8464d4ce5	allow picking up objects from the gameworld with the mouse in inventory mode	2012-06-02 14:19:02 +02:00
scrawl	b886aea298	change console skin to MW_Window and set the selected object refID as window title	2012-06-02 12:31:23 +02:00
scrawl	0ba0b2122e	set the implicit object for script excution by clicking on it	2012-06-02 12:25:24 +02:00
scrawl	36d26e0681	set the camera orientation after using teleport doors	2012-05-30 15:52:39 +02:00
Marc Zinnschlag	2bbbff2b75	Merge remote branch 'scrawl/spellwindow'	2012-05-30 10:22:56 +02:00
scrawl	2c90654401	fix a typo that caused a crash when trying to disable an already disabled object	2012-05-30 09:21:41 +02:00
scrawl	72bb7a2d2c	fix a typo	2012-05-30 08:04:07 +02:00
Jason Hooks	fb4e7f02b9	code correction	2012-05-29 22:03:00 -04:00
scrawl	c5a685d11f	addition to last commit: show the selected weapon/spell names as inventory/spell window caption	2012-05-29 18:59:11 +02:00
scrawl	298ae4f7f8	HUD icons for selected weapon / selected spell / selected enchanted item	2012-05-29 18:33:01 +02:00
gugus	a711a3ebe1	Various fixes	2012-05-29 16:45:43 +02:00
gugus	f83ffecae5	SetAngle and SetScale script instruction	2012-05-29 15:57:13 +02:00
scrawl	8b7baa808e	fixed the hud icon positioning issues	2012-05-29 15:36:48 +02:00
scrawl	48ba293e88	added the success formula, and spell deleting (shift+click)	2012-05-29 15:13:44 +02:00
scrawl	30461438f6	still left: spell success formula	2012-05-29 12:35:03 +02:00
scrawl	5412d6ed9e	fixed a typo that prevented spells from getting added	2012-05-29 10:47:48 +02:00
gugus	d8051095d6	rotation are updated in the physis system	2012-05-29 10:36:12 +02:00
gugus	26d6c9453c	more work on rotation	2012-05-29 10:15:29 +02:00
scrawl	c7268233df	spell window layout & opening/closing/pinning logic	2012-05-29 09:02:22 +02:00
scrawl	1b561ce91f	Merge branch 'master' into next	2012-05-29 06:56:23 +02:00
scrawl	69e6bc6588	add water settings to settings window	2012-05-29 06:45:44 +02:00
scrawl	5d03e86613	added field of view and texture filtering to settings window	2012-05-29 04:54:54 +02:00
scrawl	6945afe95b	alchemy window layout	2012-05-29 02:57:19 +02:00
scrawl	8c7cb6909d	addition to c7010623fb : apparently talking _is_ allowed during the starting sequence, it is only disabled via scripts for certain actors	2012-05-29 01:59:16 +02:00
scrawl	f75266e4ba	fixed race dialog bug	2012-05-29 01:47:49 +02:00
gugus	77084b27c0	some work for rotation/scaling	2012-05-28 16:01:35 +02:00
scrawl	0a17d6d710	more resolution switching fixes	2012-05-28 12:34:29 +02:00
Marc Zinnschlag	76b23ae864	Merge remote branch 'scrawl/buildplayerfix'	2012-05-28 11:44:43 +02:00
scrawl	a54623bcd2	reset attributes when building player	2012-05-28 11:37:56 +02:00
scrawl	e1ee45a6d6	Issue #297: Make the stats review dialog show correct values for attributes/skills/health/magicka/fatigue	2012-05-28 10:50:00 +02:00
scrawl	6014a90002	added tooltip delay option	2012-05-28 09:46:05 +02:00
scrawl	14f4f09f83	proper resolution switching (reposition GUI & adjust mouse clipping region)	2012-05-28 09:19:25 +02:00
scrawl	3daf1ebc3f	small map tweak	2012-05-28 05:03:50 +02:00
scrawl	19c428e86c	delete fix	2012-05-28 02:04:00 +02:00
scrawl	8f667580bb	ogre 1.8 final release compability fixes	2012-05-27 23:12:45 +02:00
scrawl	f6a6684685	when the resolution changes, adjust camera aspect ratio and recreate compositors	2012-05-27 21:39:18 +02:00
scrawl	10cfe0f5bc	Issue #295: Class creation dialogs tooltips; plus tons of other improvements	2012-05-27 06:39:10 +02:00
scrawl	f1d3978897	Issue #290: Auto-Close MW-reference related GUI windows	2012-05-27 01:14:33 +02:00
scrawl	a7e6a142f9	blend fog of war into adjacent cells	2012-05-27 00:39:33 +02:00
scrawl	63213b36bf	Show a label on the HUD with the cell name when it changes (visible for a few seconds) - like Morrowind	2012-05-26 23:06:15 +02:00
scrawl	313a8e55b7	- Issue #296: Clicking on HUD elements shows/hides the respective window ... - Slightly redesigned the map window and minimap, the player arrow now isn't cut off at cell borders anymore	2012-05-26 21:09:21 +02:00
scrawl	3cba884f59	Issue #294: show/hide HUD elements based on allowed windows	2012-05-26 05:46:46 +02:00
scrawl	738e107b52	Merge branch 'master' into next	2012-05-26 05:31:32 +02:00
scrawl	c7010623fb	Issue #294: disallowed inventory prevents Talk, Open and Take actions	2012-05-25 18:45:17 +02:00
gugus	51b6d5cae0	Scale *should* work. (no script instruction yet)	2012-05-25 18:23:06 +02:00
Marc Zinnschlag	173820d29b	Merge branch 'enable'	2012-05-25 18:19:12 +02:00
scrawl	750259973e	potion creating works, most of the values are bogus	2012-05-25 18:00:13 +02:00
Marc Zinnschlag	6fe53aa320	Issue #277: containers in cells were not filled up on cell load when the cell was preloaded before	2012-05-25 17:55:00 +02:00
Marc Zinnschlag	0131c53005	Issue #176: removed enable/disable functions from MWWorld::Class	2012-05-25 17:28:27 +02:00
Marc Zinnschlag	36885b2e40	Issue #176: removed enable/disable functions from Creature, Npc and Light	2012-05-25 17:04:33 +02:00
scrawl	63b3b82657	don't allow more than 4 potion effects	2012-05-25 16:23:49 +02:00
scrawl	1df1b521a4	show the list of potion effects	2012-05-25 16:20:57 +02:00
scrawl	6eb15f7680	auto-select the alchemy tools with highest quality	2012-05-25 15:24:33 +02:00
scrawl	3ba24aee0d	Merge branch 'alchemy' into next	2012-05-25 13:37:40 +02:00
scrawl	9b623a79ff	Merge branch 'master' into alchemy	2012-05-25 13:14:27 +02:00
scrawl	09c870ad68	first alchemy window layout (not pretty)	2012-05-25 12:58:28 +02:00
scrawl	51b8a76a68	merged by branches together, starting with alchemy window ... Merge branch 'guimode_stacking' into next Conflicts: apps/openmw/mwgui/mode.hpp	2012-05-24 15:57:23 +02:00
scrawl	c2b818373e	adjust tooltip skin, now is never transparent	2012-05-24 15:11:45 +02:00
scrawl	a3a22e9096	ingredient tooltip shows possible effects	2012-05-24 14:47:57 +02:00
Chris Robinson	05fd8f0211	Update the actual sounds and music volume when settings change	2012-05-24 05:30:22 -07:00
Marc Zinnschlag	684208dfc9	Issue #176: when deleting objects, don't go through disable to remove actors from the mechanics manager	2012-05-24 13:26:07 +02:00
Marc Zinnschlag	c0ee382c72	Issue #176: made actor deregistration more robust	2012-05-24 13:21:52 +02:00
scrawl	57d834b14b	fixed an issue with interactive messagebox	2012-05-24 12:05:43 +02:00
scrawl	6ea7bdb224	vsync & fps buttons, sound volume apply fix	2012-05-24 11:50:48 +02:00
scrawl	cbe89f7e32	copy&paste mistake	2012-05-24 08:56:45 +02:00
scrawl	189b044392	small correction	2012-05-24 04:37:41 +02:00
scrawl	9b94edd561	audio tab with volume sliders	2012-05-24 04:34:53 +02:00
scrawl	cb35f4d208	some unrelated gui cleanup	2012-05-24 03:50:02 +02:00
scrawl	a1907e7b88	cleaning up mwgui/widgets part 1	2012-05-24 03:48:02 +02:00
scrawl	7ebbc099b3	allow stacking gui modes	2012-05-23 12:23:35 +02:00
scrawl	689cf7ce05	ConfirmationDialog	2012-05-23 05:28:25 +02:00
Jason Hooks	0066ef9b54	Some cleanup	2012-05-22 21:40:24 -04:00
scrawl	656a8f1be9	working menu transparency slider	2012-05-23 01:32:36 +02:00
scrawl	313294c522	settings window (hotkey F2) which does nothing. Yay!	2012-05-22 21:40:42 +02:00
scrawl	b25d62a7e2	rename antialiasing mode "MSAA 0" to "none" to avoid confusion.	2012-05-22 20:52:38 +02:00
scrawl	ad46049ee0	got the launcher working with the new settings system.	2012-05-22 20:37:18 +02:00
scrawl	355268dae1	make the launcher build and run again, but it doesn't change settings	2012-05-22 19:36:50 +02:00
scrawl	343bbaf0fd	integrated video settings in the settings file, the launcher is now useless	2012-05-22 03:36:03 +02:00
Marc Zinnschlag	7938566004	Merge remote branch 'scrawl/graphics' ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-05-21 11:24:36 +02:00
Marc Zinnschlag	76d733d2b3	Merge remote branch 'scrawl/inventoryGUI'	2012-05-21 11:17:11 +02:00
gugus	dac98b2213	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling	2012-05-21 11:02:10 +02:00
scrawl	bda90b77bc	oops, forgot something	2012-05-21 10:59:06 +02:00
gugus	ca9224ed7f	starting scale function	2012-05-21 10:58:04 +02:00
scrawl	157dd81524	removed script instruction, will be in the settings window later	2012-05-21 10:57:49 +02:00
scrawl	5f6e8224f4	skill progress	2012-05-21 10:48:25 +02:00
Marc Zinnschlag	3e85151c9d	Merge remote branch 'scrawl/inventoryGUI' ... Conflicts: apps/openmw/CMakeLists.txt	2012-05-21 10:13:27 +02:00
scrawl	8f2c8bbea4	Merge branch 'master' into graphics	2012-05-21 09:50:46 +02:00
scrawl	789dfe1c88	fix a bug with water reflection plane height	2012-05-21 09:50:02 +02:00
scrawl	40c52c5d09	max faction rank crashfix	2012-05-21 05:19:20 +02:00
scrawl	1079bb2677	finished tooltips for everything in the stats window, some gui refactoring	2012-05-21 05:14:07 +02:00
scrawl	76d71f86bc	fixed a faction case folding issue	2012-05-21 03:10:55 +02:00
scrawl	4a009fc2bb	faction tooltip (doesn't handle player having max. rank)	2012-05-21 02:58:06 +02:00
scrawl	8ce4727424	skill tooltips	2012-05-21 01:58:11 +02:00
scrawl	6518eb7794	some cleanup	2012-05-20 22:55:14 +02:00
scrawl	1c7110fbf5	birthsign tooltip	2012-05-20 22:45:30 +02:00
scrawl	8d52ee27dc	attribute tooltips now use a new system that allows complex tooltips to be defined entirely through layout files	2012-05-20 22:06:54 +02:00
Marc Zinnschlag	420cd53be0	Merge branch 'effects'	2012-05-19 17:41:47 +02:00
Marc Zinnschlag	be46f5a59c	various fixes	2012-05-19 17:39:24 +02:00
scrawl	876b369ca5	minor tooltip fix	2012-05-19 16:28:10 +02:00
scrawl	92d9e070fb	small tweak to getPlayerGold() method	2012-05-19 16:10:13 +02:00
scrawl	2a4c55f1ab	use Class::getInventoryStore instead of casting ContainerStore.	2012-05-19 16:04:34 +02:00
scrawl	4fb30544d4	more gui files cleanup	2012-05-19 16:00:00 +02:00
scrawl	7a4de0ed1d	changed more gui stuff to use the new tag system	2012-05-19 15:32:32 +02:00
Marc Zinnschlag	0dc412d44c	Merge remote branch 'scrawl/refid_case'	2012-05-19 15:07:12 +02:00
Marc Zinnschlag	9f1919a230	Issue #256: added active spell management (completely untested)	2012-05-19 15:01:07 +02:00
scrawl	7ef0ad4e39	show faction & birthsign in the stats window	2012-05-19 14:55:09 +02:00
Marc Zinnschlag	635a89c35c	Issue #256: RNG fix	2012-05-19 14:43:02 +02:00
scrawl	24ce88de2a	working mygui tag replacement system for GMST strings	2012-05-19 14:19:21 +02:00
scrawl	ee884634b9	fixed item refID handling in the dialogue manager and container script extensions.	2012-05-19 13:19:26 +02:00
Marc Zinnschlag	74ae3605e0	Issue #256: added getTimeStamp function to World	2012-05-19 09:31:45 +02:00
scrawl	9ca579ba63	slightly revamped gold stacking, now always uses the gold_001 base object to be script-friendly	2012-05-19 00:36:01 +02:00
scrawl	1006411c02	small fix for mygui log being spammed with errors	2012-05-19 00:06:11 +02:00
scrawl	41466fc5fc	gold label fix, and don't allow selling gold	2012-05-18 23:00:31 +02:00
scrawl	656b08f620	removed the workaround for the ContainerStore bug.	2012-05-18 22:32:06 +02:00
scrawl	8a0c859c16	Merge branch 'iterator' of https://github.com/zinnschlag/openmw into inventoryGUI	2012-05-18 22:27:48 +02:00
scrawl	f28f36f262	added sounds to trade window	2012-05-18 22:27:27 +02:00
Marc Zinnschlag	498530fad7	container iterator fix	2012-05-18 22:24:19 +02:00
scrawl	c30b9e4bb9	add/remove gold from the player at the end of the transaction.	2012-05-18 22:21:44 +02:00
scrawl	c004f5d570	adjust the "total cost"/"total sold" value when trading items, added some checks with respective user notifications	2012-05-18 22:06:25 +02:00
Marc Zinnschlag	a4343bfa18	Issue #256: added TimeStamp class	2012-05-18 22:04:22 +02:00
scrawl	db49e2c046	bought/sold items now use a separate ContainerStore, this fixes a stacking issue among other things	2012-05-18 20:53:24 +02:00
scrawl	fb47681fbd	fix a bug, some cleanup	2012-05-18 17:58:33 +02:00
scrawl	342a244e31	NPC now doesn't buy items of types that he shouldn't accept.	2012-05-18 17:36:20 +02:00
scrawl	50a8eb05d9	transfering items between player and merchant works and shows a red frame for bought/sold items.	2012-05-18 17:27:55 +02:00
scrawl	e2400ca7b2	only show items in the trade window that the NPC actually trades (services enum)	2012-05-18 15:51:33 +02:00
Marc Zinnschlag	124ea77612	Issue #256: consider equipped items when calculating magic effects	2012-05-18 15:48:55 +02:00
Marc Zinnschlag	372efaafd7	Issue #256: changed implementation of MagicEffects::operator+=	2012-05-18 15:27:41 +02:00
Marc Zinnschlag	40c58c1bb7	Issue #256: fixed a capitalisation mistake	2012-05-18 15:26:08 +02:00
Marc Zinnschlag	5236bcb557	Issue #256: added operator+= for MagicEffects	2012-05-18 15:12:11 +02:00
Marc Zinnschlag	79055e281d	Issue #256: Force update after building the player character	2012-05-18 13:54:07 +02:00
Marc Zinnschlag	e1997b7f04	Issue #256: added MagicEffects::add overload for EffectLists	2012-05-18 13:17:35 +02:00
scrawl	adf0550292	fixed a wrong label.	2012-05-18 00:14:31 +02:00
scrawl	52e5e14654	use GMST sDefaultCellname for the map window when cell has no region or name.	2012-05-17 23:42:09 +02:00
scrawl	3cacc8feec	add re-stocking items to containers (though restocking isn't implemented)	2012-05-17 23:22:41 +02:00
scrawl	9a3fd96a0c	display the merchant gold.	2012-05-17 22:24:47 +02:00
scrawl	41efea4c1d	in the trade window, don't show items that the merchant has equipped.	2012-05-17 21:56:16 +02:00
scrawl	6ae642aa06	complete trade window layout	2012-05-17 21:15:48 +02:00
scrawl	c9aa0ca1f4	don't create terrain if there is no land data, also fixes a water disappearing issue and a sound exception if cells with no region	2012-05-17 19:54:09 +02:00
scrawl	4213b4370f	trade window shows up and shows the vendor's inventory items.	2012-05-17 19:53:04 +02:00
scrawl	1f85475536	Merge branch 'master' into inventoryGUI	2012-05-17 19:03:41 +02:00
scrawl	375c198ebd	WeatherManager: fix for cells that have no region.	2012-05-17 18:21:05 +02:00
scrawl	0afda15ce9	fix for cells that have no region.	2012-05-17 18:14:33 +02:00
scrawl	ae77e7b0d8	don't try to retrieve land data from non-predefined cells.	2012-05-17 18:11:34 +02:00
scrawl	5da4da820e	beginnings of trade window layout.	2012-05-17 17:15:44 +02:00
Marc Zinnschlag	6b74fec8ed	don't do a half finished cell change, when trying to switch to an interior cell that does not exist	2012-05-17 17:13:41 +02:00
scrawl	0dc5e5919b	show the Barter entry in the dialogue gui for npcs/creatures that buy/sell stuff. doesn't work for the Creeper for some reason, but Mudcrab Merchant works.	2012-05-17 14:54:03 +02:00
scrawl	66abfd17ab	check the container's "Organic" flag before trying to place items inside.	2012-05-17 14:13:35 +02:00
scrawl	0c1d06d9f7	added some trade window stuff, which does nothing yet.	2012-05-17 13:36:25 +02:00
Marc Zinnschlag	e56ff9283d	Issue #256: moved magic effects update from MechanicsManager to Actors	2012-05-17 13:21:49 +02:00
Marc Zinnschlag	1fddbf9a40	Issue #256: moved dynamic stats update from MechanicsManager to Actors	2012-05-17 13:15:31 +02:00
scrawl	630241c8e2	load the AIDT (AI data) for creatures in the ESM loader, which also contains the Services enum.	2012-05-17 13:12:38 +02:00
scrawl	c5185cf2e4	drop item on avatar from external container bugfix	2012-05-17 12:09:53 +02:00
scrawl	fca9f1fc5f	gold dropping works without crash, but the code needs clean up.	2012-05-16 22:56:54 +02:00
scrawl	178ad876d7	fix for objects other than Miscellaneous.	2012-05-16 22:17:13 +02:00
scrawl	5875ce5128	select the correct gold base object (still crashing)	2012-05-16 22:13:56 +02:00
scrawl	f73d3ad33f	fix to the "drop object on ground" feature. still crashes for gold.	2012-05-16 21:27:02 +02:00
scrawl	6d34e61dbd	don't stack gold if it has a script (not used in MW, but some mods might)	2012-05-16 19:18:50 +02:00
scrawl	4b5d6ce311	allow stacking gold	2012-05-16 17:22:25 +02:00
scrawl	0f1e09d2c1	make Class::use method return an equip action for equippable items, add sound for equipping	2012-05-16 16:08:55 +02:00
scrawl	9c4243782e	sorting items	2012-05-16 15:17:55 +02:00
scrawl	9a01e18b29	fix some MessageBox code that was using deleted pointers sometimes	2012-05-16 15:00:20 +02:00
scrawl	398a7dc65c	crash fix (hopefully)	2012-05-16 14:32:48 +02:00
scrawl	6a0cb32b7e	removed unnecessary code	2012-05-16 14:30:02 +02:00
scrawl	c5d685c780	added an assert	2012-05-16 14:28:57 +02:00
scrawl	f8c20ef77f	don't allow putting items into a container if the weight is exceeded.	2012-05-16 00:20:24 +02:00
scrawl	2fa7ce0c19	equipping works also when the item wasn't in player inventory before.	2012-05-16 00:02:05 +02:00
scrawl	477f1b42ab	fixed another item dropping bug	2012-05-15 23:28:04 +02:00
scrawl	0f811edb47	fixed a bug with dropping items on the ground	2012-05-15 22:54:28 +02:00
scrawl	5a43fe3e5f	remove debug prints	2012-05-15 22:48:14 +02:00
scrawl	3f4ce32727	implemented player encumbrance bar	2012-05-15 22:45:46 +02:00
scrawl	e9ea1fba4e	fixed typo getCapacity method	2012-05-15 22:31:52 +02:00
scrawl	d3a53ae0b8	removed the _freeSlot method which is now unneeded	2012-05-15 22:01:09 +02:00
scrawl	0063387979	Merge branch 'master' into inventoryGUI	2012-05-15 21:48:05 +02:00
scrawl	175623bf22	change the drag&drop to not use a seperate containerstore	2012-05-15 21:44:57 +02:00
Marc Zinnschlag	fdfddc8be7	some todo comment cleanup	2012-05-15 21:34:32 +02:00
Marc Zinnschlag	7e00fea18b	added getEncumbrance function	2012-05-15 21:34:00 +02:00
Marc Zinnschlag	c6493fb133	added getCapacity function	2012-05-15 21:17:00 +02:00
scrawl	ca4fa21d64	removed the attempt to unify activation and use scripts which was incorrect	2012-05-15 20:51:19 +02:00
scrawl	71de10cb7e	equipping items works, but only if you have more than one of the item that you're equipping	2012-05-15 20:33:34 +02:00
scrawl	765881a61d	equipping items in the inventorywindow (there is no visual indication yet)	2012-05-15 18:20:32 +02:00
scrawl	ab6336b745	using items via the inventory is now possible by dragging them on the avatar (only implemented for books right now)	2012-05-15 18:05:53 +02:00
scrawl	b18ee198b4	use a raycast to determine where to place object, if distance is too far ... drop it on the ground	2012-05-15 16:47:23 +02:00
scrawl	7fbee0d488	use MyGUI::InputManager instead of MWInputManager to detect ctrl/shift	2012-05-15 13:00:26 +02:00
scrawl	24a0fecd37	implemented item count selection dialog	2012-05-15 12:51:51 +02:00
scrawl	320cc7d020	implemented ctrl and shift-keys for item drag&drop (take all, take 1)	2012-05-15 11:02:50 +02:00
scrawl	933a40de14	better floating object label positioning.	2012-05-14 21:37:43 +02:00
scrawl	d3e162ec83	dropping items works	2012-05-14 17:41:17 +02:00
scrawl	6c9f75b322	some unfinished work for dropping objects into the gameworld	2012-05-13 18:35:56 +02:00
scrawl	967fb13fca	remove the old inventory code, split HUD, map and mainmenu into seperate implementation files	2012-05-13 18:14:03 +02:00
scrawl	f300a5621c	Merge branch 'master' into inventoryGUI	2012-05-13 17:45:57 +02:00
Marc Zinnschlag	2bf12a4839	Merge remote branch 'scrawl/itemstacking'	2012-05-13 17:22:18 +02:00
scrawl	82b9f835b1	make sure iterator is not end() before trying to get the equipped item	2012-05-13 16:54:18 +02:00
scrawl	a47d29c184	fix the inventory window overlapping with over windows in default layout	2012-05-13 16:41:00 +02:00
scrawl	8c458fc5ce	Merge branch 'master' into gui	2012-05-13 16:20:35 +02:00
scrawl	471f6467ec	Merge branch 'master' into graphics ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-05-13 16:18:22 +02:00
scrawl	e9a1ef4269	Merge branch 'master' into inventoryGUI	2012-05-13 16:16:54 +02:00
Marc Zinnschlag	73d19f9185	Merge remote branch 'scrawl/itemstacking'	2012-05-13 16:06:30 +02:00
scrawl	d341d2113c	fixed some issues	2012-05-13 14:58:38 +02:00
scrawl	ee7e482cba	implemented un-stacking	2012-05-13 11:52:17 +02:00
scrawl	3a93df8db4	dynamic inventory layout like morrowind	2012-05-13 11:25:35 +02:00
scrawl	d266b4fe87	hide the cursor during drag&drop and don't allow hotkeys that change guimode	2012-05-13 10:18:17 +02:00
scrawl	f31853d30b	mouse wheel works when mouse is over an item	2012-05-13 01:27:17 +02:00
scrawl	16522ddc59	InventoryStore re-stacking unequipped items	2012-05-12 23:09:03 +02:00
scrawl	78b06d0ebf	inventory window pinning	2012-05-12 22:44:12 +02:00
scrawl	822e5fbe1e	add indication which filter is selected	2012-05-12 22:00:15 +02:00
scrawl	902309a554	working filters	2012-05-12 21:44:33 +02:00
scrawl	0114bf948c	revised filters	2012-05-12 21:28:04 +02:00
scrawl	8e6c943400	"take all"-button sound (first item)	2012-05-12 20:39:21 +02:00
scrawl	fd18c95c5f	implemented filters (no gui yet)	2012-05-12 20:35:50 +02:00
scrawl	24e54a81bd	don't show icons in the inventory tooltips, exactly like MW does	2012-05-12 20:28:12 +02:00
scrawl	e6e50f4ad4	fix items getting cut off	2012-05-12 20:14:19 +02:00
scrawl	f3c88adc0b	items can now also be dropped on another item (and will be placed in ... container)	2012-05-12 20:06:44 +02:00
scrawl	54c23c7422	show the background texture for enchanted items in inventory/container	2012-05-12 19:48:01 +02:00
scrawl	19e8e84f9a	more cleanup, removed the redundant ItemWidget and use widget userdata	2012-05-12 18:50:19 +02:00
scrawl	6ee4e8fb5a	Merge branch 'itemstacking' into inventoryGUI ... Conflicts: apps/openmw/mwclass/armor.hpp apps/openmw/mwclass/clothing.hpp apps/openmw/mwclass/weapon.hpp apps/openmw/mwworld/class.hpp	2012-05-12 18:32:06 +02:00
scrawl	e714b77df8	small fix	2012-05-12 18:28:14 +02:00
scrawl	1abf70692c	added a scrollbar to the item container, dynamic positioning of items, fixed the item count display bug	2012-05-12 18:24:47 +02:00
scrawl	9f2595183b	type	2012-05-12 16:30:27 +02:00
scrawl	5b0251b09f	item stacking	2012-05-12 16:17:03 +02:00
scrawl	a31a9e51d3	add the sound for item drag&drop	2012-05-12 14:29:49 +02:00
scrawl	722af60337	implemented the "Take all" button	2012-05-12 14:01:59 +02:00
scrawl	296dbce298	Merge branch 'master' into graphics	2012-05-12 13:47:56 +02:00
scrawl	d64fccec6f	display the item count in the tooltip	2012-05-12 13:46:03 +02:00
scrawl	7723044df0	added the item tooltips	2012-05-12 13:30:34 +02:00
scrawl	ed6ff0a94a	cleanup 3	2012-05-12 13:12:37 +02:00
scrawl	3a6fde5039	cleanup 2	2012-05-11 16:58:07 +02:00
scrawl	a1b86acc38	Merge branch 'master' into inventoryGUI ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwgui/window_manager.cpp apps/openmw/mwgui/window_manager.hpp files/mygui/core.xml	2012-05-11 16:41:27 +02:00
scrawl	007a202deb	cleanup 1	2012-05-11 16:34:36 +02:00
scrawl	2d3cc014c9	Merge branch 'inventoryGUI' of https://github.com/gugus/openmw into inventoryGUI ... Conflicts: apps/openmw/mwgui/container.cpp apps/openmw/mwgui/container.hpp	2012-05-11 16:27:24 +02:00
gugus	cfb7aa4343	Drag and drop works. There is a bug with item count when doing d&d. Clean-up time :p	2012-05-11 12:50:30 +02:00
gugus	9dd65dce30	Finished merging.	2012-05-11 11:52:07 +02:00
gugus	8e8f80807e	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwclass/apparatus.cpp apps/openmw/mwclass/armor.cpp apps/openmw/mwclass/book.cpp apps/openmw/mwclass/clothing.cpp apps/openmw/mwclass/container.cpp apps/openmw/mwclass/ingredient.cpp apps/openmw/mwclass/light.cpp apps/openmw/mwclass/lockpick.cpp apps/openmw/mwclass/misc.cpp apps/openmw/mwclass/potion.cpp apps/openmw/mwclass/probe.cpp apps/openmw/mwclass/repair.cpp apps/openmw/mwclass/weapon.cpp apps/openmw/mwgui/window_manager.cpp apps/openmw/mwgui/window_manager.hpp apps/openmw/mwworld/class.cpp	2012-05-11 10:40:40 +02:00
Chris Robinson	bcd371d37b	Merge remote branch 'zini/master' into sound	2012-05-11 01:15:37 -07:00
scrawl	83e434e2e9	small fix	2012-05-11 09:35:18 +02:00
scrawl	1f1edea6af	make it possible to use scroll wheel when mouse is over a skill in the stats window; set the correct track size for the scrollbar	2012-05-11 08:45:03 +02:00
scrawl	65ccfba191	resize both the left and the right pane of the stats window	2012-05-11 08:15:22 +02:00
scrawl	c4aae96d94	implemented "goodbye" script function that force-cancels dialogue	2012-05-11 07:18:41 +02:00
Marc Zinnschlag	37095b62c6	removed another include	2012-05-10 12:51:40 +02:00
Marc Zinnschlag	e906614170	Merge remote branch 'scrawl/gui'	2012-05-10 12:46:11 +02:00
scrawl	3d9e89c837	removed unnecessary include	2012-05-10 12:44:01 +02:00
Marc Zinnschlag	bee03b5180	Merge remote branch 'scrawl/gui'	2012-05-10 12:08:49 +02:00
scrawl	4ce50c503b	a few tweaks	2012-05-10 11:29:28 +02:00
scrawl	de995e3a69	adjust topic list on window resize	2012-05-10 11:19:22 +02:00
scrawl	8a9e05a96b	display text on the book window	2012-05-10 11:03:27 +02:00
scrawl	d69501b061	change daedric font to .zip resource	2012-05-09 02:16:10 +02:00
scrawl	e5e8663bb4	parse <div> <font> and <p>	2012-05-09 02:11:44 +02:00
scrawl	8e7ab09a25	scroll window image tags working	2012-05-09 01:34:32 +02:00
gugus	e9134717d6	the GUI part of drag and drop is working	2012-05-08 12:59:47 +02:00
scrawl	cd351ba3af	simple scroll text parsing (tags are ignored until now)	2012-05-08 00:39:52 +02:00
scrawl	2b584300d6	throw an exception when no default settings file is found, which indicates a packaging error	2012-05-07 23:16:29 +02:00
scrawl	3c69d26571	journal close sound	2012-05-07 19:42:04 +02:00
gugus	60ad6f01d4	another step towards drand and drop.	2012-05-06 11:04:07 +02:00
scrawl	d91129ed49	Merge branch 'master' into gui	2012-05-04 23:54:37 +02:00
scrawl	499dd26398	dialogue window topic list word-wrapping	2012-05-04 23:53:50 +02:00
Marc Zinnschlag	c227e4127c	Merge remote branch 'scrawl/tooltips'	2012-05-04 22:44:07 +02:00
scrawl	12453d4e9d	Merge branch 'master' into gui	2012-05-04 22:20:52 +02:00
scrawl	a4d6d1baff	added a utility for creating texture atlas at runtime	2012-05-04 18:09:45 +02:00
Marc Zinnschlag	e26f39e563	fixed exception handling during subsystem setup	2012-05-04 17:20:57 +02:00
scrawl	4ddd24fdfc	Merge branch 'master' into tooltips	2012-05-04 07:38:27 +02:00
scrawl	ee883446b5	Merge branch 'master' into graphics	2012-05-04 07:38:11 +02:00
scrawl	ad5753ba91	Merge branch 'master' of https://github.com/zinnschlag/openmw into gui	2012-05-04 07:34:38 +02:00
Chris Robinson	3cace264ed	Merge remote branch 'zini/master' into sound	2012-05-03 16:27:00 -07:00
Marc Zinnschlag	1149e282b8	Merge remote branch 'scrawl/physicsaedra2'	2012-05-03 14:59:36 +02:00
Marc Zinnschlag	e9f1c266bf	Merge remote branch 'scrawl/creaturedialogue'	2012-05-03 09:15:56 +02:00
scrawl	b653f047ac	removed a file that wasn't supposed to be there	2012-05-03 09:15:56 +02:00
scrawl	5028a83d11	fix stats window layout resizing	2012-05-03 07:03:04 +02:00
scrawl	dc378fc6cf	allow talking with creatures	2012-05-03 06:07:41 +02:00
scrawl	02dad448fe	make the wireframe mode not affect sky	2012-05-03 05:38:43 +02:00
scrawl	9fc1138a87	opening, closing and taking books/scrolls works	2012-05-03 05:26:05 +02:00
scrawl	0e6b82284f	book & scroll windows	2012-05-03 03:33:33 +02:00
scrawl	c0e12d0e56	class dialog fix	2012-05-03 01:11:49 +02:00
scrawl	387792bb57	Merge branch 'master' of https://github.com/zinnschlag/openmw into physicsaedra2	2012-05-03 00:42:24 +02:00
Chris Robinson	1627206d56	Remove an unused method ... Best not to design something we don't yet know what's needed from it.	2012-05-02 13:59:03 -07:00
Chris Robinson	144d52cf49	Add voices to the chargen class questions	2012-05-01 20:30:31 -07:00
scrawl	dd8c66b479	notification when screenshot was taken	2012-05-01 21:54:30 +02:00
scrawl	e4b057be30	translated journal notification	2012-05-01 21:49:00 +02:00
scrawl	7f15385dc5	unrelated cleanup	2012-05-01 20:58:09 +02:00
scrawl	6acb777c5a	minimum framerate fix	2012-05-01 20:51:32 +02:00
Chris Robinson	b3caf82714	Avoid using vector<>::data(), which requires C++11	2012-05-01 10:12:45 -07:00
scrawl	86b6184f43	pMove in a seperate loop with fixed timestep to prevent frame-dependent movement	2012-04-30 23:55:22 +02:00
scrawl	bd132074af	some formatting tweaks	2012-04-30 22:37:23 +02:00
scrawl	48e3c43823	added the bloodmoon/tribunal spells	2012-04-30 21:36:45 +02:00
scrawl	9e6531a6c6	fix for dark corners bug on some cards	2012-04-30 21:22:26 +02:00
scrawl	6d21fe3115	fixed mygui leaking some stuff resulting in lower fps after looking at tooltips and low-quality text	2012-04-30 21:07:25 +02:00
scrawl	4655ec94f0	Merge branch 'master' into physicsaedra2 & fix warnings ... Conflicts: apps/openmw/mwworld/scene.cpp	2012-04-30 18:46:51 +02:00
scrawl	aaa81397ed	Merge branch 'master' into graphics ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-04-30 18:24:05 +02:00
scrawl	cc365c5bcb	Merge branch 'master' into tooltips	2012-04-30 18:23:27 +02:00
scrawl	fc06dc72c9	small fix	2012-04-30 18:20:44 +02:00
scrawl	ea275a8aa8	extended the list of spells with no magnitude / no duration	2012-04-30 18:11:34 +02:00
gugus	5f8c08b18b	some work for dropping objects.	2012-04-30 13:01:18 +02:00
Marc Zinnschlag	53e77d4196	Merge remote branch 'scrawl/tooltips' into next	2012-04-30 10:21:21 +02:00
scrawl	2f0a69160c	small fix	2012-04-30 02:10:55 +02:00
scrawl	22f524f8d5	potion effects in tooltip	2012-04-30 01:53:22 +02:00
scrawl	b82c39c8be	renamed Widgets::MWEnchantment to Widgets::MWEffectList so it can be ... reused for potion effects	2012-04-30 01:08:10 +02:00
scrawl	f733382f74	tooltip now contains info about item enchantment	2012-04-30 00:57:41 +02:00
scrawl	eca18f3e1d	dialogue topic and choice sorting independent of case	2012-04-29 18:13:03 +02:00
scrawl	50d79a8815	Merge branch 'next' into tooltips	2012-04-29 17:30:34 +02:00
Alexander "Ace" Olofsson	b1af18e98d	Merged next	2012-04-29 09:28:07 +02:00
Alexander "Ace" Olofsson	0c9dfcc017	Some changes	2012-04-29 09:26:03 +02:00
scrawl	9cf6f27f96	small fix	2012-04-29 03:38:00 +02:00
scrawl	11ebae3be2	toggleCompositors command useful for debugging	2012-04-29 03:33:10 +02:00
scrawl	af3ccd85e3	determine shield weight (tested with some light/medium/heavy shields)	2012-04-28 21:23:24 +02:00
Marc Zinnschlag	d1d21c8a0e	compile fix	2012-04-28 21:21:40 +02:00
scrawl	5d4d35a02c	Merge branch 'master' into graphics	2012-04-28 20:43:53 +02:00
scrawl	4ce83badc9	flickering lights	2012-04-28 20:42:53 +02:00
gugus	5603cb312c	Objects can now be selected and follow mouse movements.	2012-04-27 20:54:39 +02:00
gugus	a6419c3596	Clicking on an item is now detected. ... Trying to have items follow the mouse position, but it doesn't work yet.	2012-04-26 19:35:45 +02:00
Marc Zinnschlag	d5e52e46ea	removing even more cout spam (thanks to scrawl for finding this one)	2012-04-24 09:19:41 +02:00
scrawl	1b5bfc52a1	Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips ... Conflicts: apps/openmw/engine.cpp apps/openmw/mwclass/apparatus.cpp apps/openmw/mwclass/book.cpp apps/openmw/mwclass/container.cpp apps/openmw/mwclass/ingredient.cpp apps/openmw/mwclass/misc.cpp apps/openmw/mwclass/npc.cpp apps/openmw/mwclass/potion.cpp apps/openmw/mwclass/repair.cpp apps/openmw/mwgui/window_manager.cpp	2012-04-24 02:02:03 +02:00
scrawl	e443455612	Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics	2012-04-24 00:54:35 +02:00
Marc Zinnschlag	f4428097f9	removing more cout spam	2012-04-23 15:37:38 +02:00
Marc Zinnschlag	7ac9523e0c	Merge branch 'master' into next	2012-04-23 15:32:02 +02:00
Marc Zinnschlag	9f1199ee7e	removing a using directive from a header file	2012-04-23 15:29:15 +02:00
Marc Zinnschlag	35f478071e	Issue #255: deleted the old environment class and using the new one instead	2012-04-23 15:27:03 +02:00
Marc Zinnschlag	7102a825c2	Issue 255: moved global scripts into script manager (simplifying the environment class)	2012-04-23 11:15:47 +02:00
Marc Zinnschlag	2bfd90f3f9	Issue #255: added new environment class (not in use yet)	2012-04-23 10:57:16 +02:00
scrawl	1b02b503a2	gcc compile fix	2012-04-22 21:06:08 +02:00
scrawl	2c89306306	Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2	2012-04-22 00:33:37 +02:00
Jason Hooks	8ebae0b706	Solid trace	2012-04-21 16:57:46 -04:00
Jason Hooks	16855291a7	Implementing snapping	2012-04-21 16:21:30 -04:00
gugus	25432d97d2	trying to get selected item. Doesn't work.	2012-04-21 20:35:45 +02:00
gugus	d4e9b62436	oups forgot to modify CMake	2012-04-21 11:11:40 +02:00
gugus	93ba773d2e	Merge branch 'inventoryGUI' of https://github.com/pchan3/openmw.git into inventoryGUI ... Conflicts: apps/openmw/mwgui/container.cpp	2012-04-21 11:08:10 +02:00
gugus	33654535c1	The inventory window now display the inventory of the player	2012-04-21 11:05:30 +02:00
gugus	1e8d894e1c	Starting inventory window	2012-04-21 10:51:01 +02:00
Marc Zinnschlag	cc86998281	removing some cout spam	2012-04-21 10:12:59 +02:00
scrawl	7400b7f313	fix underwater effect staying active when teleporting from underwater to a cell that doesn't have water	2012-04-19 23:25:58 +02:00
scrawl	c6da3872b4	light improvements	2012-04-19 20:59:57 +02:00
Marc Zinnschlag	5f09f2bfc6	Merge remote branch 'scrawl/topic_case' into next	2012-04-19 10:36:34 +02:00
scrawl	934caf7a2b	removed --report-focus which is now useless	2012-04-19 01:16:41 +02:00
scrawl	fb0e649191	minor fix	2012-04-19 01:10:55 +02:00
scrawl	aa4a1b675f	fixed the sky reflection issue	2012-04-19 01:08:26 +02:00
scrawl	4889902b98	magic effect widget improvements, read name of effect from GMST and don't show duration/target for constant effects	2012-04-18 21:18:53 +02:00
scrawl	4949576984	disable some player controls in gui mode	2012-04-18 19:03:26 +02:00
scrawl	c7381d4491	adding widget MWEnchantment	2012-04-18 18:09:30 +02:00
scrawl	d568b27b92	spell widget i18n improvements (used e.g. in birth menu)	2012-04-18 16:53:56 +02:00
pchan3	215d4e1739	Made adjustments to keep container window within the viewscreen.	2012-04-18 23:09:13 +10:00
pchan3	f902c8fa6f	Fixes on Namespace issue & more.	2012-04-18 22:35:35 +10:00
scrawl	75b336baea	Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2 ... Conflicts: apps/openmw/mwinput/inputmanager.cpp apps/openmw/mwworld/player.cpp libs/openengine/bullet/physic.cpp	2012-04-18 13:43:15 +02:00
Jason Hooks	4d07ae7fe0	Swimming working	2012-04-18 00:13:38 -04:00
Jason Hooks	5f9056c45d	Better no clip	2012-04-17 20:31:36 -04:00
scrawl	046ef39c4a	use camera-relative rendering to prevent precision artifacts when moving far from (0,0,0)	2012-04-18 01:10:00 +02:00
scrawl	51a76eda92	Merge branch 'master' into graphics	2012-04-18 01:09:55 +02:00
Jason Hooks	1ce759af06	Merging in master	2012-04-17 18:12:05 -04:00
scrawl	8231cab599	correct case for dialogue topics	2012-04-17 23:47:50 +02:00
scrawl	2e57cf5730	fixed the tooltip for doors leading to exteriors, fixed map window cell name	2012-04-17 18:47:51 +02:00
scrawl	94993b515c	clean up and tooltip padding	2012-04-17 16:49:28 +02:00
scrawl	8eb0636344	restored gui-mode tooltips	2012-04-17 16:00:13 +02:00
scrawl	1de1b3e40e	Merge branch 'master' into tooltips	2012-04-17 15:57:08 +02:00
scrawl	c2fdacc84f	show the creature name for soul gems (if any)	2012-04-17 15:51:02 +02:00
scrawl	c044fadcc3	show weapon type & damage in the tooltip	2012-04-17 15:31:16 +02:00
scrawl	a11c4da16c	vertex colour tweak	2012-04-17 14:22:03 +02:00
Marc Zinnschlag	14ddcc1204	Merge remote branch 'jhooks/clothingarmor'	2012-04-17 00:26:39 +02:00
Jason Hooks	950378ff65	Khajiit male foot fix	2012-04-16 17:25:55 -04:00
scrawl	cdd4d83d9e	moved the tooltip info to the appropriate MWWorld::Class classes	2012-04-16 22:58:16 +02:00
scrawl	13b67faf2f	adding more safety checks	2012-04-16 20:39:41 +02:00
scrawl	c4825cdb43	fixed gold pickup sound for international MW versions, fix npc tooltip	2012-04-16 20:20:18 +02:00
scrawl	282f37b1b7	fix compilation	2012-04-16 19:34:46 +02:00
scrawl	53b48196f9	add interface for tooltips to MWWorld::Class	2012-04-16 19:30:52 +02:00
scrawl	cfa37b0e77	fix another bunch of gui stuff, some strings were untranslated and buttons were not resized to fit their text	2012-04-16 19:14:05 +02:00
scrawl	424a90aa92	back & ok button caption	2012-04-16 17:46:54 +02:00
scrawl	14377ba789	window caption fix	2012-04-16 17:30:57 +02:00
scrawl	b3dc1931a9	general GUI refactoring, part 1	2012-04-16 15:48:01 +02:00
scrawl	f5ab127a39	toggleFullHelp	2012-04-16 15:00:44 +02:00
Marc Zinnschlag	7483c78b4a	Merge remote branch 'jhooks/clothingarmor' ... Conflicts: apps/openmw/mwrender/npcanimation.cpp	2012-04-16 14:06:27 +02:00
scrawl	d1e298c2e1	Merge branch 'master' into tooltips	2012-04-16 13:15:50 +02:00
Jason Hooks	0c9c253778	Fix for some types of boots	2012-04-15 22:49:17 -04:00
scrawl	194ecf274c	attribute tooltips	2012-04-16 00:16:35 +02:00
scrawl	0a223196e8	Merge branch 'master' into tooltips	2012-04-15 22:23:16 +02:00
scrawl	268b7cd6fc	replaced typename checks	2012-04-15 22:05:33 +02:00
Marc Zinnschlag	afa859a6a6	Merge remote branch 'jhooks/clothingarmor' ... Conflicts: apps/openmw/mwrender/npcanimation.cpp	2012-04-15 22:06:05 +02:00
scrawl	5d9648d645	fix const reference	2012-04-15 22:00:28 +02:00
Jason Hooks	65c9cf565c	Skirt and robe part blanking	2012-04-15 15:16:48 -04:00
scrawl	688e79e6d1	Merge branch 'master' into tooltips	2012-04-15 21:14:39 +02:00
scrawl	705d4c6d54	mostly complete	2012-04-15 21:14:14 +02:00
gugus	489261a6ae	Close button works.	2012-04-15 21:02:54 +02:00
gugus	58d05fa503	more clean-up. Container window shows up! But there is no working close button.	2012-04-15 20:56:45 +02:00
Jason Hooks	bc8bb9c57e	Reserve; skirts	2012-04-15 14:22:55 -04:00
gugus	78c8a22cd1	more clean up. The container GUI shows up now	2012-04-15 19:32:41 +02:00
gugus	a38db39e88	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI ... Conflicts: apps/openmw/CMakeLists.txt	2012-04-15 17:54:13 +02:00
gugus	b309d245c5	cleaning up hircine work	2012-04-15 17:52:39 +02:00
scrawl	ab4e03f05f	Merge branch 'master' into tooltips	2012-04-15 17:11:14 +02:00
scrawl	d37bc9cba8	basic mouse-over info for in-game objects	2012-04-15 17:10:08 +02:00
Marc Zinnschlag	b5d12d0723	fixed ForceGreeting	2012-04-15 17:08:22 +02:00
Marc Zinnschlag	585ba41557	Merge remote branch 'gus/Factions2'	2012-04-15 17:05:38 +02:00
gugus	c24a85848f	forceGreeting script instruction	2012-04-15 15:56:36 +02:00
gugus	f68248e0d0	corrected a bug in getPCRank	2012-04-15 14:20:08 +02:00
gugus	45a5877b23	implement getPCRank. Does not work yet.	2012-04-15 12:05:46 +02:00
Jason Hooks	85ac658cac	Adding tons of skin body parts	2012-04-14 22:52:05 -04:00
Jason Hooks	5e1ac0cca1	Gloves, Gauntlets, Boots, Shoes	2012-04-14 20:32:46 -04:00
Jason Hooks	940a90e3ba	Pauldrons	2012-04-14 19:21:14 -04:00
Jason Hooks	e5becb1f50	Group add function;Greaves	2012-04-14 18:58:52 -04:00
Jason Hooks	5d4ad4cd81	Shirts and Cuirasses	2012-04-14 16:44:46 -04:00
scrawl	cac662ca98	basic tooltips	2012-04-14 17:47:44 +02:00
scrawl	4b0099fb5b	npc visibility flags fix	2012-04-14 16:10:47 +02:00
scrawl	fa5a1432c9	map lighting tweak, default settings tweak	2012-04-14 15:58:58 +02:00
scrawl	e05faa184f	Merge branch 'terrainshader' into graphics	2012-04-14 15:10:35 +02:00
scrawl	e04d127f30	terrain shader fixes	2012-04-14 15:10:26 +02:00
Jason Hooks	7551926afd	Adding helmets	2012-04-13 23:25:15 -04:00
Alexander "Ace" Olofsson	a74aeace73	Can now save strings with proper encoding, byte-perfect clones up until land records	2012-04-14 00:14:04 +02:00
scrawl	d861b8e45e	Merge branch 'master' into graphics	2012-04-13 16:16:09 +02:00
Alexander "Ace" Olofsson	0c6862e3e6	Undefining some windows defines	2012-04-13 15:09:38 +02:00
Marc Zinnschlag	3442ef17a8	fixed ModDisposition	2012-04-13 14:54:13 +02:00
Marc Zinnschlag	73df51695c	Merge remote branch 'gus/Factions2' ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwscript/statsextensions.cpp	2012-04-13 14:49:37 +02:00
scrawl	f2fae770d4	Merge branch 'master' into physicsaedra2 ... Conflicts: apps/openmw/mwworld/player.cpp	2012-04-13 13:55:13 +02:00
scrawl	a33ae35e94	some fixes	2012-04-13 13:28:31 +02:00
Marc Zinnschlag	e16daeed23	added GetSpell script function	2012-04-13 13:17:57 +02:00
scrawl	e3486931ae	F10 hotkey toggle FPS	2012-04-13 13:17:50 +02:00
Marc Zinnschlag	37f478b69a	Merge branch 'spells' ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwmechanics/npcstats.hpp	2012-04-13 11:32:33 +02:00
Marc Zinnschlag	b099e1baf5	added addspell and removespell script instructions	2012-04-13 11:12:53 +02:00
Marc Zinnschlag	52c7ee3b6a	moved selected spell from NpcStats to Spells	2012-04-13 10:49:45 +02:00
Marc Zinnschlag	1e56acc3de	Merge remote branch 'scrawl/graphics'	2012-04-13 10:12:07 +02:00
Jason Hooks	e869433b07	Add or replace individual parts	2012-04-12 22:16:02 -04:00
Jason Hooks	1f566fc93a	Another remove function	2012-04-12 20:59:30 -04:00
Jason Hooks	a885f3e942	Remove part function	2012-04-12 20:40:11 -04:00
scrawl	fb78e853d4	removed 2 unneeded lines	2012-04-12 19:18:38 +02:00
Marc Zinnschlag	a4fb71a0fc	Merge remote branch 'scrawl/graphics'	2012-04-12 18:46:02 +02:00
scrawl	e2ec889d10	fixed a warning "implicit cast to float3"	2012-04-12 17:40:26 +02:00
gugus	7edc5c733c	corrected a bug about rank.	2012-04-12 17:29:05 +02:00
gugus	03d6d1fb82	NPC rank is correctly loaded now. Also corrected a potential bug (i think).	2012-04-12 17:08:57 +02:00
scrawl	a96ad7fb82	restored toggleWater	2012-04-12 16:46:56 +02:00
scrawl	800df7376c	use the cursors from morrowind.bsa and remove mwpointer.png	2012-04-12 14:26:21 +02:00
Alexander "Ace" Olofsson	f16a9ce5ed	Working on making output identical to input.	2012-04-12 14:00:58 +02:00
Jason Hooks	7fce57f335	Getting started with a new branch	2012-04-11 20:16:22 -04:00
scrawl	a727bcd4a4	override nif transparency settings (part 1)	2012-04-11 20:13:15 +02:00
Marc Zinnschlag	26a529111c	removed old known spell list from NpcStats	2012-04-11 19:45:56 +02:00
Marc Zinnschlag	77065390d7	simplifying Spells class	2012-04-11 19:40:42 +02:00
Marc Zinnschlag	e04ccfced0	replaced old abilities container in CreatureStats with a Spells object	2012-04-11 19:03:36 +02:00
Marc Zinnschlag	750d79eaf0	added spell container class	2012-04-11 19:03:06 +02:00
scrawl	2a4fcf42a3	basic shadows	2012-04-11 18:53:13 +02:00
gugus	0553227ee1	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2 ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwworld/player.cpp apps/openmw/mwworld/player.hpp	2012-04-09 14:43:35 +02:00
gugus	dd9a88cee2	clean up	2012-04-09 14:32:07 +02:00
gugus	6ca212b9e9	script instruction: PCJoinFaction	2012-04-09 14:30:42 +02:00
gugus	aa8418634f	add PCLowerRank script instruction	2012-04-09 14:26:53 +02:00
gugus	45d11eaf14	fixed a bug in the dialogue manager.	2012-04-09 14:23:12 +02:00
scrawl	75dd651205	Merge branch 'terraincollision' into physicsterrain ... Conflicts: apps/openmw/mwworld/physicssystem.cpp	2012-04-09 13:56:09 +02:00
gugus	e5b1e27fa6	pcRaiseRank works. Player can now join factions.	2012-04-09 13:24:19 +02:00
Marc Zinnschlag	62908c9ef5	Merge remote branch 'scrawl/settingsfixes'	2012-04-09 10:47:13 +02:00
Jason Hooks	c0f52fef48	one more change	2012-04-09 00:51:10 -04:00
Jason Hooks	80afcb2eac	small change	2012-04-08 20:44:44 -04:00
Jason Hooks	74deb5588d	Post merge	2012-04-08 20:41:49 -04:00
scrawl	1df7be7fee	- fixes to texture filtering setting ... - add a sensible warning to settings-default.cfg, since there have been some confusions with it	2012-04-09 00:10:42 +02:00
Marc Zinnschlag	0aecb0ed5c	cmake fix	2012-04-08 23:44:40 +02:00
Marc Zinnschlag	5e9d209b21	Merge remote branch 'minty3/testbranch'	2012-04-08 23:40:48 +02:00
Jason Hooks	6bdfdf379b	Trying iterators	2012-04-08 17:27:56 -04:00
Marc Zinnschlag	e17a09e710	Merge remote branch 'scrawl/water'	2012-04-08 23:21:46 +02:00
Aleksandar Jovanov	db928dcb2f	put an opening bracket on a new line	2012-04-08 19:44:11 +02:00
Aleksandar Jovanov	9893e4b384	made player respect NpcStats for mDrawState	2012-04-08 19:43:04 +02:00
Marc Zinnschlag	9e3299cae8	Merge remote branch 'scrawl/water'	2012-04-08 18:40:19 +02:00
Alexander "Ace" Olofsson	290d09de64	Switching creature and npc to using the same id storage as the rest of the records	2012-04-08 18:32:40 +02:00
Alexander "Ace" Olofsson	00b8ce6b35	Fix linker error in windows.	2012-04-08 18:22:41 +02:00
Alexander "Ace" Olofsson	1d48781567	Forgot about the cell refs, oops	2012-04-08 17:52:55 +02:00
scrawl	a5c6207fe7	add setting to disable the underwater effect	2012-04-08 17:44:00 +02:00
Alexander "Ace" Olofsson	23f81e63dd	Nicer help text and error for not selecting a valid mode.	2012-04-08 17:14:56 +02:00
scrawl	9e1a9e5758	Merge branch 'master' into physicsaedra2 ... Conflicts: apps/openmw/mwinput/inputmanager.cpp libs/openengine/bullet/physic.cpp	2012-04-08 17:08:36 +02:00
Alexander "Ace" Olofsson	fc8c75ab89	Esmtool can now clone an esm file in such a way that it can read it back again afterwards.	2012-04-08 17:04:52 +02:00
scrawl	b1c84f28a9	Merge branch 'master' into water ... Conflicts: files/settings-default.cfg	2012-04-08 16:11:16 +02:00
scrawl	113bbfa253	removed the now unneccesary SG for transparent objects	2012-04-08 14:37:36 +02:00
Aleksandar Jovanov	23cc1d17ca	missing ; added	2012-04-08 13:28:34 +02:00
Aleksandar Jovanov	c589cbd4ff	enum bug fix	2012-04-08 13:25:28 +02:00
Aleksandar Jovanov	15526d6110	only fists support lacks	2012-04-08 13:17:16 +02:00
Marc Zinnschlag	77604086e2	Merge branch 'autoequip'	2012-04-08 13:01:25 +02:00
Marc Zinnschlag	ab2a1297b0	exclude player from auto equip	2012-04-08 13:01:03 +02:00
Aleksandar Jovanov	c1afd534fc	all stuff added	2012-04-08 12:37:59 +02:00
Aleksandar Jovanov	b4ee01e691	missing file	2012-04-08 12:26:59 +02:00
Marc Zinnschlag	dcab6737e5	consider skills when auto equipping	2012-04-08 12:26:21 +02:00
Aleksandar Jovanov	b1259ca15c	added a 'backend' for NPC/Player draw state	2012-04-08 12:25:33 +02:00
Alexander "Ace" Olofsson	0fd48c4229	Extended the esmtool a bit and prepared all records for saving.	2012-04-08 11:51:52 +02:00
Aleksandar Jovanov	d5b8d4ef49	Revert "test commit" ... This reverts commit 8c607870c0. reverting the test commit in the test branch	2012-04-08 11:30:17 +02:00
Aleksandar Jovanov	8c607870c0	test commit	2012-04-08 11:26:54 +02:00
Marc Zinnschlag	8e6c445111	Merge remote branch 'chris/sound'	2012-04-08 11:13:42 +02:00
Jason Hooks	ebab98a8a0	Restructuring things	2012-04-07 22:02:20 -04:00
Chris Robinson	59ccab0b2c	Add sound volume settings	2012-04-07 16:00:30 -07:00
Chris Robinson	752e89a268	Add a setting to select the sound device name	2012-04-07 15:28:38 -07:00
Chris Robinson	b8be867e6e	Work around a bug in the Windows OpenAL router	2012-04-07 14:58:52 -07:00
scrawl	c748252d33	weather fix again	2012-04-07 22:55:25 +02:00
scrawl	cdea19206c	Revert "more accurate fog, TODO: apply this to the terrain" ... This reverts commit 96c37d3e7c.	2012-04-07 22:47:39 +02:00
scrawl	96911ada95	restored render queue of transparent objects, they are now part of the mrt textures ... this fixes some issues with transparent objects not visible in the refraction	2012-04-07 22:37:15 +02:00
Marc Zinnschlag	34a02fef45	consider item value when auto equipping	2012-04-07 20:09:09 +02:00
Marc Zinnschlag	d5a7d418dd	added getValue function to Class hierarchy	2012-04-07 19:53:49 +02:00
Marc Zinnschlag	f52b9cc162	Merge branch 'autoequip'	2012-04-07 18:48:30 +02:00
Marc Zinnschlag	c94d683014	fill in initial spell list from NPC record	2012-04-07 18:48:02 +02:00
Marc Zinnschlag	12f7bae526	added known spells and selected spell to NpcStats	2012-04-07 18:37:41 +02:00
scrawl	044d649edd	Merge branch 'master' into water	2012-04-07 17:16:35 +02:00
scrawl	96c37d3e7c	more accurate fog, TODO: apply this to the terrain	2012-04-07 16:55:32 +02:00
scrawl	dbf7547003	fixed first weather transition being instant	2012-04-07 16:33:03 +02:00
Roman Melnik	bdbb8a8d84	Merge remote-tracking branch 'upstream/master' into windowsPinning ... Conflicts: apps/openmw/mwgui/window_manager.cpp (keep both changes)	2012-04-07 17:30:20 +03:00
Roman Melnik	72b3f6121d	Windows Pinning: add files to CMakeLists.txt ... Add new files (map_window and window_pinnable_base)	2012-04-07 12:37:15 +03:00
Marc Zinnschlag	b7614dd0ce	Merge remote branch 'chris/sound'	2012-04-06 22:09:34 +02:00
scrawl	dbde8405f7	Merge branch 'master' into water	2012-04-06 21:21:57 +02:00
scrawl	50702c5e84	Merge branch 'master' into water	2012-04-06 20:58:50 +02:00
Chris Robinson	87e8917c4d	Don't try to play sounds when no sound output is initialized	2012-04-06 10:43:14 -07:00
scrawl	c49d5dd40b	another sky tweak	2012-04-06 19:23:19 +02:00
scrawl	f008ca166b	restored moons like they were	2012-04-06 19:21:28 +02:00
scrawl	c0f991ac0a	underwater depth effect	2012-04-06 18:51:30 +02:00
scrawl	456eb95209	reversed sun and moon paths (sunrise at east)	2012-04-06 18:22:37 +02:00
scrawl	8316a4c2ec	add mrt dummy output to sky shaders	2012-04-06 17:21:56 +02:00
scrawl	c169f9e171	underwater tweaks	2012-04-06 16:11:08 +02:00
scrawl	2976625b00	better underwater	2012-04-06 15:51:57 +02:00
scrawl	ec3fe1ef00	no sun glare in the reflection	2012-04-06 15:17:54 +02:00
scrawl	393530e671	more or less fixed the sky for normal viewing angles, still disappears at a certain height though	2012-04-06 15:05:17 +02:00
scrawl	a41eee9a72	specular lighting	2012-04-06 14:07:52 +02:00
Marc Zinnschlag	8bf9b371c7	removed remains of input framelistener	2012-04-06 10:39:55 +02:00
Roman Melnik	ef0a185e11	Pinnable windows: hide hud elements ... Hide elements of the HUD (health/magicka/stamina bars, minimap) when the corresponding windows (stats/map) are pinned. Rearrange the remaining hud elements in such cases (like in the original Morrowind).	2012-04-06 01:17:23 +03:00
scrawl	e718d4b6f0	another sky fix	2012-04-05 22:36:48 +02:00
scrawl	b36c0d95b8	night transition fix	2012-04-05 22:11:04 +02:00
scrawl	e492a69c8f	Merge branch 'inputfix' into water	2012-04-05 21:27:59 +02:00
scrawl	a3151fe525	fixed input handling priority in the main loop	2012-04-05 21:16:51 +02:00
scrawl	8bfc81f398	Merge branch 'master' into water	2012-04-05 20:09:38 +02:00
scrawl	622fb568cf	removed MRT setting and figure it out automatically	2012-04-05 19:27:54 +02:00
scrawl	b8a470efcd	put transparent objects in a seperate render queue, in order to not mess up the mrt textures	2012-04-05 19:07:21 +02:00
Marc Zinnschlag	000cfad82d	Merge remote branch 'scrawl/gamesettings'	2012-04-05 18:07:47 +02:00
scrawl	88c50c5171	Merge branch 'master' into water	2012-04-05 15:38:46 +02:00
scrawl	1b89a9e203	various fixes	2012-04-05 15:30:55 +02:00
Dmitry Marakasov	84b475130a	Add missing include	2012-04-05 15:03:28 +02:00
scrawl	e1bde415f5	typo	2012-04-05 14:22:44 +02:00
scrawl	43fd0352f4	removed unneeded lines	2012-04-05 14:21:57 +02:00
scrawl	f49131e1b8	renamed setting, automatically disable MRT when unsupported	2012-04-05 13:09:59 +02:00
Marc Zinnschlag	1201c271b2	Merge remote branch 'swick/initocfg'	2012-04-05 12:43:00 +02:00
scrawl	f6342cfd60	fixed viewport background color, fixed indentation of some old functions	2012-04-05 11:52:06 +02:00
scrawl	5664d879a5	fixed some sky objects	2012-04-05 11:40:56 +02:00
scrawl	ab8b74dcac	forgot adding a file	2012-04-05 08:58:21 +02:00
Jason Hooks	ca4de0606e	Some planning	2012-04-04 23:23:24 -04:00
scrawl	3f05aba76d	got MRT working, some minor quirks to solve (black viewport background)	2012-04-05 01:21:36 +02:00
Sebastian Wick	f7bfea5861	typo 2 -.-	2012-04-05 00:16:44 +02:00
Sebastian Wick	56c9992b29	typo	2012-04-04 23:52:42 +02:00
Sebastian Wick	8c84f68dab	fix for older boost versions; unsigned warning	2012-04-04 23:51:22 +02:00
Marc Zinnschlag	6fd3d5c776	Merge remote branch 'lgro/master'	2012-04-04 23:19:30 +02:00
gugus	aaa5368fe9	added script instruction pcraiserank. Does not work yet.	2012-04-04 22:14:38 +02:00
gugus	2c7c945208	check playerfaction during dialogue	2012-04-04 22:13:57 +02:00
Lukasz Gromanowski	cd2789b15a	Revert "Issue #225: Correction to commit ae98904." ... This reverts commit 0e5c90d3e7.	2012-04-04 21:05:19 +02:00
Sebastian Wick	5dd65c11ee	forgot to save the file	2012-04-04 21:04:52 +02:00
Sebastian Wick	57ae1bdc43	Merge branch 'master' of https://github.com/zinnschlag/openmw into initocfg ... Conflicts: apps/openmw/main.cpp	2012-04-04 20:58:02 +02:00
scrawl	eb67afe552	added MRT output to terrain material	2012-04-04 20:18:08 +02:00
Sebastian Wick	6ccb32d26c	import nosound option	2012-04-04 20:06:31 +02:00
Sebastian Wick	d3a6484bbc	set the default value for --fallback the right way	2012-04-04 19:59:46 +02:00
Sebastian Wick	a974d88cf1	Revert "set a default value for --fallback" ... This reverts commit 94a220dcdd.	2012-04-04 19:58:04 +02:00
Sebastian Wick	94a220dcdd	set a default value for --fallback	2012-04-04 19:52:07 +02:00
scrawl	6442d49e16	render queue groups, sky fix	2012-04-04 18:53:40 +02:00
Sebastian Wick	48b7b03453	typo; World::getFallback(std::string key, std::string def)	2012-04-04 16:15:15 +02:00
Sebastian Wick	16e7bf353a	remove debug message	2012-04-04 16:08:46 +02:00
Sebastian Wick	de510d445b	throw an error if the --fallback syntax is wrong	2012-04-04 15:23:14 +02:00
Sebastian Wick	329ba24eab	streamlined command line options	2012-04-04 15:11:30 +02:00
scrawl	cc4076d42a	basic noise	2012-04-03 21:16:43 +02:00
scrawl	fe63f2b2aa	first reflection test; removed the refraction render (we'll have it for free using MRT and deferred water rendering)	2012-04-03 19:10:02 +02:00
Marc Zinnschlag	e403c7158a	Merge remote branch 'gus/DialogueSystem'	2012-04-03 18:27:36 +02:00
Marc Zinnschlag	cc9696cc2c	Merge remote branch 'scrawl/minimap'	2012-04-03 18:26:20 +02:00
gugus	a268b89239	changed the way NPC faction is checked. Should be the same way for the player.	2012-04-03 17:31:41 +02:00
gugus	be4af711af	NPC rank was not loaded. Not sure if it's the right way, but it seems to work.	2012-04-03 17:30:19 +02:00
gugus	07ea63c10c	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2 ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-04-03 17:29:00 +02:00
scrawl	6481cf87fc	cleanup resources	2012-04-03 17:07:16 +02:00
scrawl	052cc47ee9	fixed waterAdded	2012-04-03 16:53:33 +02:00
scrawl	b3a186e729	simple water without shaders that uses original MW textures	2012-04-03 16:37:54 +02:00
scrawl	c1693a0c63	Merge branch 'minimap' into water	2012-04-03 15:37:11 +02:00
scrawl	51e33cc090	fixed map of some interiors	2012-04-03 15:34:13 +02:00
scrawl	8aea311797	added visibility flags for everything	2012-04-03 15:13:47 +02:00
scrawl	fd45208196	re-added code for reflection & refraction rendering	2012-04-03 14:23:23 +02:00
scrawl	d393f2dd4b	Merge branch 'master' into water	2012-04-03 14:06:14 +02:00
Jason Hooks	57299571d5	Preparing for clothes/armor	2012-04-02 22:08:46 -04:00
Sebastian Wick	329d59e52b	typo	2012-04-03 02:17:15 +02:00
Sebastian Wick	73705dadf6	parse fallback with boost program option custom validators	2012-04-03 02:14:39 +02:00
Sebastian Wick	d87dffa948	should work... but does not even compile	2012-04-03 01:47:43 +02:00
Sebastian Wick	2d23d79fd5	allways merge fallback; better syntax	2012-04-03 00:44:26 +02:00
Marc Zinnschlag	26371a82a5	Merge remote branch 'scrawl/crashfix'	2012-04-02 23:53:07 +02:00
Lukasz Gromanowski	0e5c90d3e7	Issue #225: Correction to commit ae98904. ... Changed pointer to LandData struct to simple member variable.	2012-04-02 23:50:53 +02:00
Sebastian Wick	ab9c430632	fallback in apps/openmw; fix for apps/mwiniimporter	2012-04-02 20:47:09 +02:00
scrawl	d4a2bdfa3d	fix crash when hardware occlusion queries unsupporetd	2012-04-02 20:46:42 +02:00
scrawl	c0af3c7241	Merge branch 'master' into terraincollision ... Conflicts: apps/openmw/mwworld/scene.cpp	2012-04-02 19:57:58 +02:00
scrawl	bd9e165e3f	Merge branch 'master' into water	2012-04-02 19:44:25 +02:00
scrawl	16481b0594	Merge branch 'master' into minimap	2012-04-02 19:38:36 +02:00
scrawl	342464530d	rotated map working	2012-04-02 19:37:24 +02:00
scrawl	ff15f28787	options for texture filtering and mipmaps	2012-04-02 18:01:49 +02:00
scrawl	39ee9e9ab8	setting for field of view	2012-04-02 17:51:51 +02:00
Sebastian Wick	6e19076dc5	fallback for ini importer	2012-04-02 17:07:18 +02:00
scrawl	5f2a674d93	fixed a typo	2012-04-02 16:14:39 +02:00
scrawl	00cc45c537	FPS is now a setting instead of commandline option	2012-04-02 16:10:54 +02:00
scrawl	fd662f937a	add settings for viewing distance and fog	2012-04-02 15:51:48 +02:00
scrawl	e5cc9adbb0	added settings for rendering distance of small objects	2012-04-02 15:30:29 +02:00
scrawl	2b4b941192	Merge branch 'master' into gamesettings	2012-04-02 15:21:10 +02:00
Sebastian Wick	16674ad141	open file for writing AFTER reading it :)	2012-04-02 14:42:01 +02:00
scrawl	e0631dd9be	Merge branch 'master' into minimap ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-04-02 14:38:02 +02:00
Sebastian Wick	89565bacd1	since the default method is not available in older boost we should check by ourselfs if the options are given and dont use notify	2012-04-02 14:34:21 +02:00
scrawl	b380e71832	fixed underwater wireframe mode	2012-04-02 14:32:21 +02:00
scrawl	1445ae992d	adding a setting to disable static geometry	2012-04-02 14:24:16 +02:00
scrawl	5accca385c	fix crash on exit when no user settings exist	2012-04-02 13:47:25 +02:00
Marc Zinnschlag	6022d3ab13	Merge remote branch 'corristo/pgrd-rendering' ... reduced cout spam. Conflicts: apps/openmw/mwrender/debugging.cpp apps/openmw/mwrender/renderingmanager.cpp components/bsa/bsa_archive.cpp libs/openengine/bullet/physic.hpp	2012-04-02 12:04:47 +02:00
Marc Zinnschlag	fb44a5da10	Merge remote branch 'ace/win-fix'	2012-04-02 11:46:09 +02:00
Marc Zinnschlag	eccb983c44	Merge remote branch 'chris/sound'	2012-04-02 11:34:48 +02:00
Marc Zinnschlag	cdd0182912	Merge remote branch 'scrawl/occlusionquery' ... Reduced cout spam Conflicts: apps/openmw/mwrender/occlusionquery.cpp	2012-04-02 11:33:16 +02:00
Jason Hooks	07d0203a3c	Merge remote-tracking branch 'upstream/master'	2012-04-02 00:08:12 -04:00
Chris Robinson	63e0e82049	Implement an Audiere-based decoder	2012-04-01 15:02:07 -07:00
Roman Melnik	91a377df86	Fix behaviour of the MapWindow ... The map now will track player's position/rotation when pinned, and will not update if position/rotation didn't change since last frame.	2012-04-01 23:51:49 +03:00
Chris Robinson	2147210ad7	Don't set an underwater environment when there's no water	2012-04-01 12:46:49 -07:00
Lukasz Gromanowski	ae989040e5	Issue #225: Fix for memleak when loading terrain.	2012-04-01 21:29:49 +02:00
Alexander "Ace" Olofsson	cec9562282	Fixing an ambigous symbol	2012-04-01 20:29:00 +02:00
scrawl	0a5757791c	Merge branch 'master' into minimap	2012-04-01 20:17:07 +02:00
scrawl	c2a82c3d89	Merge branch 'master' into gamesettings	2012-04-01 20:06:18 +02:00
Roman Melnik	911ca4be89	Move MapWindow to separate files ... Separate MapWindow from bunch of classes in layouts.cpp/hpp Inherit it from WindowPinnableBase. TODO: map arrow (player position) updates orientation only when you open the inventory. When the map window is pinned, the arrow direction is not updated.	2012-04-01 20:39:53 +03:00
Roman Melnik	d09f0610ea	Add basic windows pinning ... Create WindowPinnableBase class for windows which should be allowed to be pinned. Add skin for pinnable windows - currently just a copy of normal window with 1 extra button (hopefully this can be improved later). Handle clicking on PinToggle button (pinning/unpinning a window).	2012-04-01 20:36:57 +03:00
scrawl	7b3adb27a3	backend changes, terrain num lights setting	2012-04-01 18:48:37 +02:00
scrawl	f4bbcb48a6	settings-default.cfg	2012-04-01 17:14:49 +02:00
Marc Zinnschlag	de41e1118a	Merge remote branch 'scrawl/weather'	2012-04-01 17:10:30 +02:00
scrawl	6091a0504d	first settings test (config file has to be created manually)	2012-04-01 16:59:35 +02:00
Nikolay Kasyanov	30d6c880ff	Feature #37 (In Progress) Render Path Grid ... tuned sized a bit	2012-04-01 17:51:37 +04:00
Nikolay Kasyanov	cab412c225	Feature #37 (In Progress) Render Path Grid ... optimisation, now it takes only two batches per cell.	2012-04-01 17:27:18 +04:00
scrawl	9a261a02aa	changed the cloud movement direction like suggested on the forum	2012-04-01 15:14:43 +02:00
scrawl	ee754eda6c	don't create sky until entering an exterior cell	2012-04-01 15:07:41 +02:00
scrawl	df8e0bbff2	player check	2012-04-01 14:53:41 +02:00
scrawl	80456778be	fix for pickup up transparent objects, workaround for doors	2012-04-01 14:22:04 +02:00
scrawl	30407d3a2c	Merge branch 'master' into occlusionquery	2012-04-01 14:16:25 +02:00
scrawl	4e63f89829	silence an error regarding faced handle	2012-04-01 13:09:30 +02:00
Marc Zinnschlag	8aa4001937	compile fix	2012-04-01 10:34:51 +02:00
Marc Zinnschlag	38066d9ecb	Merge remote branch 'swick/initocfg'	2012-04-01 10:26:26 +02:00
Jason Hooks	0021ccf862	Merge remote-tracking branch 'upstream/master'	2012-03-31 20:48:42 -04:00
Chris Robinson	9c06bfc8fc	Merge remote branch 'zini/master' into sound	2012-03-31 14:26:21 -07:00
Sebastian Wick	a2a7539fd5	fix for more than 10 game files; delete both master and plugin settings if called with --game-files	2012-03-31 23:15:33 +02:00
Sebastian Wick	1d596d6c72	use std::map<std::string, std::vector<std::string> > instead of std::map<std::string, std::string>	2012-03-31 22:48:50 +02:00
Marc Zinnschlag	40310f3663	Merge remote branch 'scrawl/occlusionquery'	2012-03-31 22:09:47 +02:00
Marc Zinnschlag	b5b40e2623	Merge remote branch 'lgro/master'	2012-03-31 21:45:15 +02:00
Lukasz Gromanowski	bdc4c79b4e	Fix for segfault when doing 'coc "seyda neen"'. ... This is a fix for segfault: ==8683== Process terminating with default action of signal 11 (SIGSEGV) ==8683== Access not within mapped region at address 0x0 ==8683== at 0x59DFE4: MWRender::Animation::handleShapes(std::vector<Nif::NiTriShapeCopy, std::allocator<Nif::NiTriShapeCopy> >*, Ogre::Entity*, Ogre::SkeletonInstance*) (animation.cpp:503) ==8683== by 0x5A4ECE: MWRender::Actors::update(float) (actors.cpp:134) ==8683== by 0x5937A9: MWRender::RenderingManager::update(float) (renderingmanager.cpp:168) ==8683== by 0x629AD6: MWWorld::World::update(float) (world.cpp:705) ==8683== by 0x68B022: OMW::Engine::frameRenderingQueued(Ogre::FrameEvent const&) (engine.cpp:157) ==8683== by 0x51F9574: Ogre::Root::_fireFrameRenderingQueued(Ogre::FrameEvent&) (in /usr/lib/libOgreMain.so.1.8.0) ==8683== by 0x51F964F: Ogre::Root::_fireFrameRenderingQueued() (in /usr/lib/libOgreMain.so.1.8.0) ==8683== by 0x51F9681: Ogre::Root::_updateAllRenderTargets() (in /usr/lib/libOgreMain.so.1.8.0) ==8683== by 0x51F98CF: Ogre::Root::renderOneFrame() (in /usr/lib/libOgreMain.so.1.8.0) ==8683== by 0x51F990C: Ogre::Root::startRendering() (in /usr/lib/libOgreMain.so.1.8.0) ==8683== by 0x68A669: OMW::Engine::go() (engine.cpp:408) ==8683== by 0x51CECB: main (main.cpp:254) ==8683== If you believe this happened as a result of a stack ==8683== overflow in your program's main thread (unlikely but ==8683== possible), you can try to increase the size of the ==8683== main thread stack using the --main-stacksize= flag. ==8683== The main thread stack size used in this run was 8388608. when doing 'coc "seyda neen"' when animations are enabled (Animation::animate member variable is set to 1).	2012-03-31 21:34:40 +02:00
Marc Zinnschlag	89fb3146ab	Merge remote branch 'ace/win-fix'	2012-03-31 21:31:16 +02:00
Marc Zinnschlag	ca4ad74151	more cleanup	2012-03-31 21:29:46 +02:00
Sebastian Wick	6d875dfd54	handle master/plugin properly	2012-03-31 21:06:48 +02:00
Alexander "Ace" Olofsson	64f792c01d	Fix a value defined at the wrong place	2012-03-31 21:05:33 +02:00
Alexander "Ace" Olofsson	4ef921c43f	Prevent internal classes from being marked dllimport	2012-03-31 20:50:22 +02:00
scrawl	13efe68fc3	disabled some debug output	2012-03-31 20:28:07 +02:00
scrawl	cfb194f1d1	fix 6	2012-03-31 20:18:20 +02:00
scrawl	5f78f6c723	change queue	2012-03-31 20:10:34 +02:00
scrawl	b018d00fd3	fix 5	2012-03-31 20:05:23 +02:00
Chris Robinson	e8e8d3fb1b	Fully reset the music before starting the next track	2012-03-31 10:59:29 -07:00
Eli2	3cc81d74bc	Cleanup, replaced if with switch	2012-03-31 19:50:21 +02:00
Chris Robinson	3a57746ee4	Remove an unneeded volume special-case	2012-03-31 10:43:55 -07:00
Chris Robinson	4944a29b21	Keep track of the sound pitch	2012-03-31 10:41:12 -07:00
scrawl	c9067249dd	fix 4	2012-03-31 19:16:14 +02:00
scrawl	c08a2b2942	fix 3	2012-03-31 19:12:02 +02:00
scrawl	909abb480d	fix 2	2012-03-31 19:09:36 +02:00
scrawl	f8d45eae52	fix #1	2012-03-31 19:08:05 +02:00
Chris Robinson	cbf6c0404a	Implement a basic underwater sound environment	2012-03-31 10:06:12 -07:00
Sebastian Wick	092de45924	std::map to std::multimap	2012-03-31 18:28:48 +02:00
Sebastian Wick	653fbdd10c	master/plugin support; needs multimap instead of map	2012-03-31 18:24:43 +02:00
Marc Zinnschlag	751e7d2199	basic auto-equipping (picks the first matching item	2012-03-31 17:26:15 +02:00
Chris Robinson	575474ff69	Pass the mode flags to the sound output play methods	2012-03-31 08:14:39 -07:00
Sebastian Wick	ceedae4a1a	technical corrections	2012-03-31 16:54:53 +02:00
Chris Robinson	b2d7dca8c3	Merge remote branch 'zini/master' into sound	2012-03-31 07:46:56 -07:00
Chris Robinson	977e7ac9a3	Remove the Play_Single flag. It's not correct.	2012-03-31 07:41:26 -07:00
Chris Robinson	ae308b9b5f	Use a set of flags instead of separate booleans	2012-03-31 07:31:55 -07:00
Chris Robinson	e48d125a84	Only allow one instance of a given tracked soundid ... The untracked flag should probably be broken up and combined with the loop boolean into a set of flags.	2012-03-31 05:57:03 -07:00
Sebastian Wick	b7635b3d4a	pass maps by reference	2012-03-31 14:34:00 +02:00
Sebastian Wick	e35670c6cb	ignore syntax errors and empty lines; fixed merge function	2012-03-31 14:28:19 +02:00
Nikolay Kasyanov	5e829362cb	Feature #37 (In Progress) Render Path Grid ... more similar to vanilla path grid rendering	2012-03-31 16:22:55 +04:00
Nikolay Kasyanov	006e1cde85	some updates after terrain merge	2012-03-31 14:56:54 +04:00
Nikolay Kasyanov	523648dbb1	Merge branch 'master' into pgrd-rendering ... Conflicts: apps/openmw/mwrender/debugging.cpp	2012-03-31 14:56:18 +04:00
Chris Robinson	bfac946878	Finally "fix" --nosound ... Expect degraded performance with it. Looping sounds are constantly checked to see if they're playing, and try to play it again when it's not.	2012-03-31 03:31:41 -07:00
Chris Robinson	7541e08909	Don't reset the sound Output device if init fails	2012-03-31 02:48:14 -07:00
Nikolay Kasyanov	057c2f2e2a	Merge branch 'master' into pgrd-rendering ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-03-31 13:42:13 +04:00
Marc Zinnschlag	509650d5f3	Merge remote branch 'ace/fs-fix'	2012-03-31 11:37:18 +02:00
Marc Zinnschlag	6eb3281c4c	boost fix	2012-03-31 11:36:51 +02:00
Chris Robinson	28378c063b	Minor OpenAL_SoundStream cleanups	2012-03-31 02:22:23 -07:00
Marc Zinnschlag	222f0e20bc	Merge remote branch 'swick/initocfg' into initcfg	2012-03-31 11:20:05 +02:00
Chris Robinson	4e908aa095	Add a method to set the sound's position	2012-03-31 01:34:26 -07:00
Chris Robinson	b01289128b	Split OpenAL_Sound into separate classes for 2D and 3D sounds	2012-03-31 01:15:27 -07:00
Chris Robinson	5adeee20fd	Mute sounds that go outside the max distance	2012-03-31 00:57:29 -07:00
Sebastian Wick	849c3a9bec	add the section to the ini-keys	2012-03-30 23:12:52 +02:00
Sebastian Wick	c160bc7080	works, sort of	2012-03-30 22:58:54 +02:00
Sebastian Wick	fbd626baf6	mwiniimporter	2012-03-30 20:59:44 +02:00
Chris Robinson	fc167dbc83	Pass Ogre Vector3s to playSound3D and updateListener	2012-03-30 11:42:11 -07:00
Chris Robinson	fefc8f86ab	Remove the unused streamSound3D method	2012-03-30 11:11:07 -07:00
Chris Robinson	c33349a774	Merge remote branch 'zini/master' into sound	2012-03-30 08:36:01 -07:00
Marc Zinnschlag	0892df0ad3	framework for gamemechanics-realted actor updated	2012-03-30 17:01:55 +02:00
Marc Zinnschlag	a1d3516e0a	constness fix	2012-03-30 17:01:23 +02:00
scrawl	fc5cd703bb	maps are now rendered with correct rotation, however for interiors the arrow is wrong	2012-03-30 16:34:36 +02:00
Chris Robinson	1ee8b963d0	Store the sound listener position as well	2012-03-30 07:30:17 -07:00
Marc Zinnschlag	d717b7b9dd	factored out actor related game mechanics code into a separate class	2012-03-30 16:18:58 +02:00
Chris Robinson	fad27d99e6	Update the actual sound volume with the position	2012-03-30 07:10:34 -07:00
scrawl	a4576f043d	fixed the physics debug rendering now activates/deactivates properly	2012-03-30 16:02:41 +02:00
Chris Robinson	479df78ea1	Update the actual sound position after the listener	2012-03-30 07:01:37 -07:00
Marc Zinnschlag	8d7bf34348	Merge branch 'terrain'	2012-03-30 15:52:27 +02:00
Marc Zinnschlag	557e97bab4	fixed a terrain-related Redemption crash	2012-03-30 15:52:09 +02:00
Chris Robinson	71d9d7e943	Store the current sound position with the Sound object	2012-03-30 06:41:06 -07:00
Marc Zinnschlag	46279a001b	Merge remote branch 'scrawl/dialogue'	2012-03-30 15:39:56 +02:00
Marc Zinnschlag	2d2af4b28a	Merge remote branch 'scrawl/terrain18' into terrain ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwrender/renderingmanager.hpp components/esm_store/cell_store.hpp	2012-03-30 15:38:14 +02:00
scrawl	521b9eec6c	Merge branch 'master' into minimap ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwworld/world.cpp	2012-03-30 15:31:07 +02:00
Chris Robinson	de102cd274	Simplify broken OpenAL workaround	2012-03-30 06:28:40 -07:00
Chris Robinson	33a63d88a5	Merge remote branch 'zini/master' into sound	2012-03-30 06:22:19 -07:00
scrawl	30d27fa83f	Merge branch 'master' into occlusionquery ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwrender/renderingmanager.hpp	2012-03-30 15:00:04 +02:00
scrawl	26bdbf77f3	Merge branch 'master' into occlusionquery	2012-03-30 14:49:06 +02:00
Alexander "Ace" Olofsson	4a9a416d46	Can find files even if no .bsa file exists now	2012-03-30 14:45:32 +02:00
scrawl	4a6d034591	Merge branch 'master' into occlusionquery ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/renderingmanager.hpp components/esm_store/cell_store.hpp	2012-03-30 14:39:42 +02:00
scrawl	4bbedeb3e7	made all dialogs semi transparent (like in morrowind)	2012-03-30 14:01:43 +02:00
scrawl	d3f31c3498	dialogue window enhancements	2012-03-30 13:53:35 +02:00
Marc Zinnschlag	a90c3b9f23	Merge remote branch 'scrawl/water'	2012-03-30 13:07:47 +02:00
Marc Zinnschlag	cc9a874f2b	Merge remote branch 'corristo/openal'	2012-03-30 10:45:31 +02:00
scrawl	d5c49fa036	getWaterLevel use CellStore ; attempted fix for morrowind without tribunal	2012-03-30 10:12:28 +02:00
Chris Robinson	6a16e33f82	Merge remote branch 'zini/master' into sound	2012-03-29 21:17:59 -07:00
Nikolay Kasyanov	b21a6291f7	Merge branch 'master' into pgrd-rendering ... Conflicts: apps/openmw/mwrender/renderingmanager.hpp apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwscript/miscextensions.cpp apps/openmw/mwworld/world.hpp	2012-03-30 02:50:30 +04:00
Nikolay Kasyanov	aab79599a9	Merge branch 'openal' into pgrd-rendering	2012-03-30 02:43:40 +04:00
Nikolay Kasyanov	b6aa8925f4	(Temporary) workaround for broken OpenAL implementations that doesn't return meaningful max counts of sources	2012-03-30 00:12:38 +04:00
Marc Zinnschlag	647c0e4df3	Merge remote branch 'scrawl/renderingdistance'	2012-03-29 21:27:25 +02:00
Marc Zinnschlag	eec135c040	Merge remote branch 'scrawl/water'	2012-03-29 21:20:16 +02:00
Chris Robinson	3d5384e2bb	Remove some unneeded casts	2012-03-29 11:28:33 -07:00
scrawl	8d224f009f	toggleFogOfWar script command	2012-03-29 19:45:19 +02:00
scrawl	0c2317ce9d	player arrow works again	2012-03-29 19:20:09 +02:00
scrawl	79c2a2e465	implemented toggleWater (twa); formatting again	2012-03-29 18:33:08 +02:00
scrawl	01ecf3e0be	attempt at rotation (BROKEN)	2012-03-29 18:16:11 +02:00
scrawl	35f40b99ad	remove the bounding box hack, not needed because calculation is correct now	2012-03-29 18:10:01 +02:00
scrawl	0332a8df96	Merge branch 'renderingdistance' into minimap	2012-03-29 18:09:24 +02:00
Marc Zinnschlag	10b4c1d904	silenced a warning	2012-03-29 18:04:52 +02:00
Marc Zinnschlag	ea79d9b7c3	Merge remote branch 'scrawl/renderingdistance'	2012-03-29 18:02:30 +02:00
scrawl	e22ae7c840	bounds fix (again)	2012-03-29 17:30:13 +02:00
scrawl	b2bdf0ebf3	Merge branch 'master' into minimap	2012-03-29 17:08:32 +02:00
scrawl	37e6db69d8	fix	2012-03-29 17:07:59 +02:00
scrawl	19c801f538	disabled rendering distance for now	2012-03-29 16:56:30 +02:00
scrawl	f45c650975	bounds fix	2012-03-29 16:47:59 +02:00
scrawl	2f096e131d	throw exception if water level is attempted to be modified in exterior	2012-03-29 16:23:02 +02:00
scrawl	5a19d4ec45	implement water script functions and save water height in CellStore	2012-03-29 15:50:15 +02:00
scrawl	f497813043	formatting, added Water::setHeight	2012-03-29 15:49:24 +02:00
Nikolay Kasyanov	c3357c4396	Merge branch 'master' into pgrd-rendering ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/renderingmanager.hpp apps/openmw/mwscript/docs/vmformat.txt	2012-03-29 13:27:13 +04:00
Nikolay Kasyanov	0897a2a4cb	Merge branch 'master' into openal	2012-03-29 13:09:54 +04:00
scrawl	39b3afb98f	use camera height instead of player height for underwater check	2012-03-29 05:03:34 +02:00
Nikolay Kasyanov	20f976ddc7	probably openal initialization fix	2012-03-29 03:02:26 +04:00
Pieter van der Kloet	4488be33ce	Added missing slash to launcher CMakeLists.txt	2012-03-29 00:12:34 +02:00
scrawl	e5a19209a4	remove the timeout stuff	2012-03-29 00:05:48 +02:00
scrawl	c5f044eb0d	fixed compilation	2012-03-28 22:46:29 +02:00
scrawl	cb72e812f9	Merge branch 'master' into renderingdistance	2012-03-28 21:47:26 +02:00
scrawl	58f7a03626	Merge branch 'terrain18' into terraincollision ... Conflicts: apps/openmw/mwworld/scene.cpp	2012-03-28 21:46:52 +02:00
Marc Zinnschlag	a0c5ccf974	Merge remote branch 'lgro/valgrind'	2012-03-28 21:46:47 +02:00
scrawl	47c3e92db1	removed the unused ray scene query	2012-03-28 21:42:41 +02:00
scrawl	e6303fc3f4	Merge branch 'master' into water ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwrender/renderingmanager.hpp	2012-03-28 21:37:20 +02:00
Lukasz Gromanowski	f86d53636d	Issue #225: Correction to commit fa4c4b8. ... Correction to commit fa4c4b8 - memeber mChanged should be set to true, otherwise the map won't display if the game is started in (0, 0) cell.	2012-03-28 21:36:38 +02:00
scrawl	6bea08157e	Merge branch 'master' into terrain18	2012-03-28 21:30:15 +02:00
scrawl	ecf99f3309	Merge branch 'master' into minimap	2012-03-28 21:29:46 +02:00
scrawl	29acb057b3	Merge branch 'master' into occlusionquery	2012-03-28 21:04:42 +02:00
scrawl	cc7d3af701	Merge branch 'terrain18' into occlusionquery	2012-03-28 21:03:55 +02:00
Marc Zinnschlag	34d9ad0cbd	Merge remote branch 'chris/sound' into next	2012-03-28 18:14:35 +02:00
Marc Zinnschlag	2b2eb34f8f	Merge remote branch 'corristo/master' into next	2012-03-28 18:07:21 +02:00
Chris Robinson	bedf56a237	Merge remote branch 'zini/next' into sound	2012-03-28 06:27:34 -07:00
Chris Robinson	be337ef7cc	Return SoundPtr objects from playSound[3D] ... Note that each Sound object currently contains "precious" resources even after the sound is stopped. The reference should be reliquished as soon as it's no longer needed (the SoundManager will make sure the sound continues to play until it's finished).	2012-03-28 06:08:25 -07:00
Chris Robinson	293f33914e	Use a deque fpr OpenAL's free sources	2012-03-28 05:35:51 -07:00
Chris Robinson	a3291ef360	Add a sound method to update the volume	2012-03-28 05:19:35 -07:00
Chris Robinson	7008bd2fe1	Store some sound properties in the Sound class	2012-03-28 04:58:47 -07:00
Chris Robinson	c072babd17	Better handle bad OpenAL source counts	2012-03-28 04:56:40 -07:00
Chris Robinson	089c340935	Switch the map so the SoundPtr is used as a key	2012-03-28 04:37:00 -07:00
gugus	ddb35b77ff	Merge branch 'next' of https://github.com/zinnschlag/openmw.git into Factions2	2012-03-28 11:46:39 +02:00
gugus	0c61f0d294	test stuff	2012-03-28 11:45:46 +02:00
Nikolay Kasyanov	66b31d3d43	Bug #229 (Fixed): On OS X Launcher cannot launch game if path to binary contains spaces	2012-03-28 12:04:42 +04:00
scrawl	4249d2c536	add getNorthVector method	2012-03-28 03:15:10 +02:00
Jason Hooks	b9fabce9c4	Awesome, working	2012-03-27 20:17:54 -04:00
scrawl	72ff7ec030	Merge branch 'next' into occlusionquery ... Conflicts: apps/openmw/mwrender/sky.cpp	2012-03-27 23:46:48 +02:00
Lukasz Gromanowski	fa4c4b8f21	Issue #225: Initialize members in class constructor.	2012-03-27 23:07:25 +02:00
scrawl	43b1f896f4	fix object pickup when player is very close to object	2012-03-27 22:36:02 +02:00
scrawl	8f6d10f229	fix uninitalised stuff	2012-03-27 20:59:58 +02:00
Marc Zinnschlag	a996cfed71	Merge remote branch 'ace/win-fixes' into next	2012-03-27 20:11:46 +02:00
Chris Robinson	c6c06f1140	Return SoundPtr objects from the playSound and streamSound methods	2012-03-27 05:59:09 -07:00
Jacob Essex	ec21ff21cc	Removed memory leak, allocated more on the stack	2012-03-27 13:58:12 +01:00
scrawl	e398c51f8a	remove unneeded render queue workaround	2012-03-27 13:13:28 +02:00
Chris Robinson	f0db2ab82f	Split stopSound3D into separate functions to deal with stopping all sounds on an object	2012-03-27 03:20:50 -07:00
Chris Robinson	033faba9c4	Make a function parameter const	2012-03-27 03:00:04 -07:00
Chris Robinson	c2611d035c	Use a pair to match the MWWorld::Ptr object and sound ID, instead of nested maps	2012-03-27 02:50:45 -07:00
Marc Zinnschlag	9863195f09	Merge remote branch 'lgro/valgrind' into next	2012-03-27 11:14:09 +02:00
Marc Zinnschlag	e56731d25e	Merge remote branch 'scrawl/deletefix' into next	2012-03-27 11:10:15 +02:00
Jacob Essex	b76b62e5e4	Fixed a crash when there were cells with no data, refactored to remove non mutable data from CellStore	2012-03-27 09:20:22 +01:00
scrawl	bb09c2189a	lower rendering distance for small objects (reduce batch count)	2012-03-27 00:45:25 +02:00
Alexander "Ace" Olofsson	55f1053b4f	Windows fixes for compiling and linking	2012-03-27 00:36:53 +02:00
Lukasz Gromanowski	be94da1527	Issue #225: Initialize class members in constructor.	2012-03-27 00:34:06 +02:00
Lukasz Gromanowski	6d6ed909bf	Issue #225: Deallocate memory used by actors animations.	2012-03-27 00:31:15 +02:00
scrawl	bf421d2873	use vector instead of array	2012-03-27 00:18:09 +02:00
scrawl	18c2b5eb0a	Merge branch 'next' into occlusionquery	2012-03-26 22:09:41 +02:00
scrawl	bb3f3ce1db	bugfix	2012-03-26 21:52:38 +02:00
scrawl	28dfba55e0	delete fix	2012-03-26 20:29:07 +02:00
Lukasz Gromanowski	5185a28b60	Issue #225: Initialize all class members in constructor.	2012-03-26 19:09:55 +02:00
Chris Robinson	0d552c10bc	Use an empty MWWorld::Ptr object for non-3D sounds	2012-03-26 04:10:47 -07:00
Chris Robinson	7b3ecc290e	Fix compilation with older OpenAL headers	2012-03-26 01:12:06 -07:00
Chris Robinson	f8f749dbec	Merge remote branch 'zini/next' into sound-rewrite	2012-03-26 00:02:21 -07:00
scrawl	4ee03cd61f	handle timeout	2012-03-26 00:31:03 +02:00
scrawl	98a33a7fc6	fix	2012-03-25 23:28:51 +02:00
scrawl	382fa6ac68	fixes	2012-03-25 22:53:00 +02:00
Jason Hooks	e4251be529	Down gravity	2012-03-25 15:16:02 -04:00
scrawl	53d4be5cf6	object pickup should work everywhere	2012-03-25 20:52:56 +02:00
Marc Zinnschlag	d993766ee1	Merge remote branch 'pvdk/garamond' into next	2012-03-25 11:05:41 +02:00
Chris Robinson	3e98e28059	Use a better method to get a more even randomization	2012-03-24 21:05:03 -07:00
Jason Hooks	18a139cd66	adding up and down move buttons	2012-03-24 22:03:08 -04:00
Chris Robinson	2bc81a778b	Merge remote branch 'zini/next' into sound-rewrite	2012-03-24 17:27:10 -07:00
scrawl	f959a5cbeb	auto adjust size of map window title bar	2012-03-24 23:24:19 +01:00
Pieter van der Kloet	155cd76f37	Changed Launcher font to EB Garamond and added license info	2012-03-24 20:43:35 +01:00
scrawl	9d30a139cc	added api	2012-03-24 20:41:23 +01:00
scrawl	e212a32350	bugfix	2012-03-24 18:38:58 +01:00
scrawl	743ea0c9be	use hardware occlusion query for sun glare effect	2012-03-24 17:59:26 +01:00
Chris Robinson	71d3f9bd51	Get the object reference's position once when updating its sounds	2012-03-24 08:12:04 -07:00
scrawl	5fba52c238	Merge branch 'terrain18' into occlusionquery ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwrender/renderingmanager.hpp	2012-03-24 15:14:33 +01:00
scrawl	99b2b6b648	ogre 1.8 fixes	2012-03-24 14:46:48 +01:00
scrawl	f2a7acb102	Merge branch 'next' into terrain ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwrender/renderingmanager.cpp	2012-03-24 13:19:17 +01:00
scrawl	f4898539e9	added some code that doesn't do anything yet, waiting for ogre 1.8	2012-03-24 13:06:01 +01:00
Chris Robinson	5cb90ab704	Add some dummy copy constructors and assignment operators to prevent implicit versions from being used	2012-03-24 03:49:03 -07:00
Marc Zinnschlag	9ec1e55aaf	Merge remote branch 'scrawl/minimap' into next	2012-03-24 10:31:42 +01:00
Chris Robinson	fa70a72b75	Remove some unused sound manager fields and constructor parameters	2012-03-24 00:22:54 -07:00
scrawl	a6259a1b0d	bugfixes	2012-03-23 17:37:56 +01:00
scrawl	7a3034701f	functional HUD map	2012-03-23 16:51:56 +01:00
scrawl	a1f80e029e	abstracted some code to be reused for hud	2012-03-23 16:16:31 +01:00
scrawl	789fbb460f	move implementation to .cpp	2012-03-23 15:34:54 +01:00
scrawl	ce63d29d4a	rotate hud player arrow	2012-03-23 15:26:24 +01:00
gugus	319022d962	speed up dialogue start-up.	2012-03-23 15:24:39 +01:00
gugus	f9bb19fcdc	begining factions	2012-03-23 15:18:09 +01:00
scrawl	06fa310e29	player arrow rotated correctly	2012-03-23 15:00:48 +01:00
scrawl	b8f962a68d	Merge branch 'next' into shaders	2012-03-23 10:26:20 +01:00
scrawl	770b0f2106	gui changes	2012-03-23 10:25:55 +01:00
scrawl	9c3e1f48f0	player arrow	2012-03-23 09:00:00 +01:00
Chris Robinson	1ccddefe28	Properly report the default device when opening sound fails	2012-03-23 00:31:01 -07:00
scrawl	8e299bd25b	remove unuseful std::cout	2012-03-23 08:16:32 +01:00
scrawl	2dd329938a	automatically zoom in on the player while moving	2012-03-23 08:16:04 +01:00
Chris Robinson	2f0af42261	Use the ALC_ENUMERATE_ALL_EXT extension with OpenAL when available	2012-03-22 23:51:00 -07:00
Chris Robinson	277597c567	Fix DEFAULT_OUTPUT for OpenAL_Output	2012-03-22 18:44:55 -07:00
Chris Robinson	2e28819243	Avoid trying to play an ambient sound if there's no chance for any to play	2012-03-22 18:39:10 -07:00
scrawl	9076401892	Merge branch 'next' into terrain ... Conflicts: CMakeLists.txt apps/openmw/CMakeLists.txt	2012-03-22 22:31:49 +01:00
scrawl	6067053f08	Merge branch 'next' into water ... Conflicts: CMakeLists.txt	2012-03-22 21:41:32 +01:00
scrawl	cf3515a898	it is now possible to drag the minimap with the mouse	2012-03-22 21:27:21 +01:00
scrawl	cc9f20a04f	MW_MapView skin	2012-03-22 20:25:41 +01:00
scrawl	ab9aa1ba74	Merge branch 'next' into minimap ... Conflicts: files/mygui/openmw_map_window_layout.xml	2012-03-22 19:36:37 +01:00
Marc Zinnschlag	47bcbdef17	Merge remote branch 'scrawl/mygui' into mygui	2012-03-22 18:46:21 +01:00
scrawl	d1508f5a59	List -> ListBox	2012-03-22 15:28:06 +01:00
scrawl	560e702973	fixed scroll bars	2012-03-22 15:23:23 +01:00
scrawl	26aae9d2ce	fix class name typo	2012-03-22 15:10:29 +01:00
scrawl	161d519206	fixed the dialogue history topic selection	2012-03-22 15:01:37 +01:00
Pieter van der Kloet	73a1b256a8	Changed warning dialog text to be less ambiguous	2012-03-22 12:42:08 +01:00
Pieter van der Kloet	fd4826d06f	Fix for Bug #222, config is always written to user location now	2012-03-22 12:34:43 +01:00
Marc Zinnschlag	47828f91f0	Issue #217: added getWeight function to ContainerStore	2012-03-22 09:45:48 +01:00
Chris Robinson	bac6df5563	Avoid leaking an ffmpeg stream	2012-03-21 23:32:24 -07:00
Chris Robinson	15317796bf	Handle the wav -> mp3 extension conversion in the sound output backend	2012-03-21 22:49:40 -07:00
Chris Robinson	f11e3e39a1	Add an enumerate method to the sound output interface	2012-03-21 20:15:01 -07:00
Chris Robinson	366c97c492	Use a separate method to check for finished sounds and update the listener	2012-03-21 19:24:38 -07:00
Chris Robinson	e6fe1c0261	Remove a mostly unneeded wrapper function	2012-03-21 19:08:11 -07:00
Chris Robinson	aecc77a73c	Replace the sound file extension when opening fails ... This should make it more efficient to lookup a sound instead of checking each time it's played. A better method would perhaps be to check if the resource exists when the ESM is loaded and replace it then as needed.	2012-03-21 18:42:48 -07:00
Chris Robinson	8056a7f20b	Throw an exception when looking up a sound instead of returning an empty string	2012-03-21 18:20:32 -07:00
Chris Robinson	9a139f511f	Avoid redefining SOUND_IN	2012-03-21 15:29:05 -07:00
Chris Robinson	56c3b988cc	Avoid copying the region when looking for a sound to play	2012-03-21 15:19:40 -07:00
Chris Robinson	8c5f85ca83	Use a local variable to mark sound streams as finished while processing ... This avoids a race condition where the source can underrun while the final buffers are being queued and the sound can be detected as stopped	2012-03-21 14:49:29 -07:00
Chris Robinson	6a85ef1229	Set Ogre's data stream to NULL when closing the audio file	2012-03-21 14:46:29 -07:00
Chris Robinson	0d973ac8ff	Use the vector's data field instead of the address of the first element ... Same thing really, but less convoluted	2012-03-21 14:38:37 -07:00
Chris Robinson	fd8326e958	Better handle some ffmpeg errors	2012-03-21 12:20:36 -07:00
scrawl	9b31b6272f	fixed the mouse cursors and fixed MWAttribute & MWSkill	2012-03-21 16:07:56 +01:00
scrawl	64212c0ee6	replaced all the StaticImage and StaticText in code	2012-03-21 14:54:02 +01:00
scrawl	b0b41a9199	should now compile warning free	2012-03-21 13:48:57 +01:00
scrawl	97ab48993e	more deprecated fixes	2012-03-21 13:32:32 +01:00
scrawl	deeb21a131	switched to the new multi-delegates system	2012-03-21 13:27:08 +01:00
Marc Zinnschlag	3dcfcf46cb	Issue #217: container change tracking	2012-03-21 12:48:05 +01:00
Marc Zinnschlag	a0ee2954bd	Issue #217: moved some functino implementations from ptr.hpp to ptr.cpp	2012-03-21 12:29:07 +01:00
Marc Zinnschlag	0adbe258fd	Issue #217: made Ptr track container; fixed a cmake script bug	2012-03-21 12:20:19 +01:00
Chris Robinson	7b22ee6fd1	Use for_each to clear the ffmpeg stream packets	2012-03-20 21:46:12 -07:00
Chris Robinson	2989a1e06e	Improve ffmpeg failure messages	2012-03-20 18:57:11 -07:00
Chris Robinson	26a441f29a	Add a readAll method to the sound decoder, for potentially more efficient reading	2012-03-20 17:57:28 -07:00
Chris Robinson	deb473b9ae	Implement the ffmpeg decoder	2012-03-20 17:05:19 -07:00
Chris Robinson	9a48002025	Fix compilation of the FFmpeg decoder	2012-03-20 14:13:58 -07:00
Chris Robinson	e48745b68e	Fix streamMusic's path lookup	2012-03-20 12:39:49 -07:00
scrawl	d451d7bb67	compile fixes for mygui 3.2	2012-03-20 20:24:36 +01:00
scrawl	66baf9ec81	Merge branch 'master' into mygui	2012-03-20 20:02:30 +01:00
Chris Robinson	fc27d5cc19	Restore music playback	2012-03-20 11:31:13 -07:00
Chris Robinson	5ae47f783e	Use the sound manager's update to make sure music is still playing	2012-03-20 10:46:10 -07:00
Chris Robinson	0261aac518	Use Ogre's resource group manager to handle sound files	2012-03-20 10:34:36 -07:00
Chris Robinson	80dbf82a74	Explicitly stop sounds instead of relying on their deletion to do it	2012-03-20 07:22:17 -07:00
Chris Robinson	74e79bb4af	Merge remote branch 'zini/master' into sound-rewrite ... Conflicts: apps/openmw/mwsound/soundmanager.cpp apps/openmw/mwsound/soundmanager.hpp	2012-03-20 06:17:02 -07:00
Marc Zinnschlag	1023ddd587	silenced some warnings	2012-03-20 10:30:21 +01:00
Marc Zinnschlag	4d0d941c2e	Merge remote branch 'kromgart/master'	2012-03-20 10:17:35 +01:00
Marc Zinnschlag	2d135d81e7	Merge remote branch 'lgro/glibc_pthreads_fix'	2012-03-20 10:15:47 +01:00
Marc Zinnschlag	6a0474a977	removed some cout spam	2012-03-20 10:15:22 +01:00
Marc Zinnschlag	aca274cbca	Merge remote branch 'gus/DialogueSystem'	2012-03-20 10:11:40 +01:00
Marc Zinnschlag	ef711ffdc1	Merge remote branch 'scrawl/weather'	2012-03-20 10:08:43 +01:00
Pieter van der Kloet	0b517d15c1	Made missing data files dialog less scary and added exception handling for esmreader	2012-03-20 02:49:59 +01:00
Jason Hooks	2b3e75718c	Updating everything	2012-03-19 20:03:48 -04:00
Jason Hooks	ed7cb1dc67	restarting	2012-03-19 19:38:44 -04:00
scrawl	04c6f23a2b	disabled solstheim weather (we can't travel there anyway) ... also, there was a bug that could cause this weather to show up on morrowind, which is fixed now	2012-03-19 22:54:04 +01:00
gugus	7a1ff61541	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem	2012-03-19 21:31:36 +01:00
Chris Robinson	fd37a4827c	Enforce a 15MB limit on the sound buffer cache	2012-03-19 13:19:22 -07:00
Lukasz Gromanowski	fc95917253	Fix for not visible pthreads function with glibc 2.15 ... Linking error will appear: Linking CXX executable ../../openmw /usr/bin/ld: CMakeFiles/openmw.dir/__/__/components/bsa/bsa_archive.cpp.o: undefined reference to symbol 'pthread_mutexattr_settype@@GLIBC_2.2.5' /usr/bin/ld: note: 'pthread_mutexattr_settype@@GLIBC_2.2.5' is defined in DSO /lib/libpthread.so.0 so try adding it to the linker command line /lib/libpthread.so.0: could not read symbols: Invalid operation collect2: ld returned 1 exit status if we don't add explicitly pthreads library to linker flags after update glibc to version 2.15 on (Arch) Linux. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-03-19 20:54:30 +01:00
Roman Melnik	88979577db	Change 'nullptr' to 'NULL' (after fixing bug#192 in previous commit)	2012-03-19 21:45:53 +02:00
Chris Robinson	04638516b2	Check for stopped active sounds too and remove them	2012-03-19 12:08:40 -07:00
Roman Melnik	a9759c3f33	Fix bug #192: Remove the focus from the console when console is closed ... (set current keyFocusWidget to nullptr)	2012-03-19 21:01:00 +02:00
Marc Zinnschlag	b46a2bfa01	Merge remote branch 'werdanith/journalmessage'	2012-03-19 19:34:28 +01:00
Marc Zinnschlag	f2a47d421b	some cleanup	2012-03-19 19:21:08 +01:00
Michael Papageorgiou	82c4bfbf18	Add a notification when the journal is updated	2012-03-19 20:18:08 +02:00
gugus	d4f3430fc6	fix: topics who should not be displayed are not displayed anymore.	2012-03-19 19:17:20 +01:00
Chris Robinson	6c45d6668b	Cache OpenAL buffers for easy reuse	2012-03-19 10:33:06 -07:00
gugus	2707391535	fix for questions	2012-03-19 18:30:52 +01:00
gugus	11569819db	compilation fix	2012-03-19 18:01:54 +01:00
gugus	ba4d44eb67	fix for questions.	2012-03-19 18:01:41 +01:00
Chris Robinson	91821ccd8c	Add the sound stream to the thread after resetting the mIsFinished flag	2012-03-19 09:08:59 -07:00
Chris Robinson	db46bf39b3	Add a rewind method to the sound decoder	2012-03-19 08:48:25 -07:00
Chris Robinson	afa2cb6de7	Stop trying to read decoded audio once it's finished	2012-03-19 07:51:28 -07:00
Chris Robinson	4f69972a9c	Add a method to stream a sound in 3D	2012-03-19 07:28:03 -07:00
Chris Robinson	ae8218bf03	Allocate OpenAL sources when opening the device ... This allows sources to be more efficiently retrieved and returned	2012-03-19 07:11:01 -07:00
Chris Robinson	8f9d4ff841	Use 6 125ms buffers for OpenAL streams	2012-03-19 05:29:04 -07:00
Chris Robinson	dc6354b2f9	Add functions to get string names for sample types and channel configs	2012-03-19 02:31:40 -07:00
Chris Robinson	4a0b5b7918	Increase the sound stream thread sleep time to 50ms	2012-03-19 02:19:13 -07:00
Chris Robinson	4698e8c0a2	Make the sound stream thread object per-device	2012-03-19 02:15:08 -07:00
Chris Robinson	2c27827e4f	Add some comment markers to the OpenAL sound classes	2012-03-19 01:33:33 -07:00
Chris Robinson	e234b90173	Use a loop to find the OpenAL format from the decoder format	2012-03-19 00:49:52 -07:00
Chris Robinson	6a256d3993	Make sure the OpenAL stream list is clear before shutting down	2012-03-19 00:38:56 -07:00
Jason Hooks	fe9e6a732c	Some cleanup	2012-03-18 22:32:46 -04:00
Jason Hooks	51fb9e67cd	Merge	2012-03-18 21:31:31 -04:00
gugus	7ca0503205	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem	2012-03-19 00:20:43 +01:00
gugus	1a832a65f6	Changed a lot of things. Topics can now change durring dialogue without bug. ... Missing: ability to remove keyword	2012-03-19 00:19:58 +01:00
Chris Robinson	7194114669	Use a background thread to keep OpenAL streams fed ... Maybe this could be moved to the SoundManager instead of in OpenAL, but it's good enough for now.	2012-03-18 14:42:19 -07:00
Michael Papageorgiou	d10b18b0f3	Removed a couple of warnings with nosound	2012-03-18 22:50:52 +02:00
gugus	ff5d4b24fc	journal filter works now	2012-03-18 21:47:43 +01:00
Michael Papageorgiou	f567950e25	Fix for the --nosound crash	2012-03-18 22:38:53 +02:00
Marc Zinnschlag	af39275a63	Merge remote branch 'scrawl/weather'	2012-03-18 21:07:04 +01:00
scrawl	1907e21207	removed preprocessor constants	2012-03-18 20:44:56 +01:00
scrawl	c2329b7027	removed preprocessor constants	2012-03-18 20:32:50 +01:00
Chris Robinson	b938fd7b36	Make the sound output init return void	2012-03-18 12:19:54 -07:00
Chris Robinson	1965b5bc79	Rename some Sound class member functions	2012-03-18 12:03:15 -07:00
Chris Robinson	403e51cef3	Move the sample type and channel config enums to MWSound and give use appropriate names for the values	2012-03-18 11:56:54 -07:00
Chris Robinson	efae7dfe83	Rename some sound decoder class member variables and functions	2012-03-18 11:47:15 -07:00
Chris Robinson	9656456d30	Make sure the sound decoders are closed when they're finished with	2012-03-18 11:34:23 -07:00
Chris Robinson	362e254720	Rename some more sound class member variables and functions	2012-03-18 11:30:53 -07:00
Chris Robinson	162642e672	Prefix some SoundManager class member variables	2012-03-18 11:17:45 -07:00
gugus	9c85a8c1ce	Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem	2012-03-18 19:06:52 +01:00
Marc Zinnschlag	ce2cb709c5	fixed getJournalIndex function	2012-03-18 19:05:35 +01:00
gugus	00d3bc9d23	every filters are check during dialogue now. There is a problem with journal.	2012-03-18 18:58:22 +01:00
gugus	7f2ff6f5f1	removed the TODO	2012-03-18 18:05:28 +01:00
gugus	4afe6dd235	death filter	2012-03-18 18:04:51 +01:00
gugus	48e6a42168	Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem ... Conflicts: apps/openmw/mwdialogue/dialoguemanager.cpp	2012-03-18 17:59:11 +01:00
gugus	34b33b78d2	better filters	2012-03-18 17:58:14 +01:00
Marc Zinnschlag	76b24d9d1a	fixed a compile error	2012-03-18 17:30:05 +01:00
Chris Robinson	2f92559fc7	Use OpenAL's linear attenuation model ... We should use the inverse distance clamped model (the default), but we first need to handle muting sounds that are beyond their max distance. Linear attenuation doesn't give a proper rolloff, but it makes the sounds silent at max distance.	2012-03-18 09:05:38 -07:00
gugus	8740354c80	inventory filter now use player inventory	2012-03-18 17:03:54 +01:00
Chris Robinson	a256b9a7b0	Remove a comment about Audiere	2012-03-18 08:42:55 -07:00
gugus	019a28093b	better filters	2012-03-18 15:26:18 +01:00
scrawl	3a00fbb950	removed mygui from source tree and use system install instead	2012-03-18 15:11:37 +01:00
Marc Zinnschlag	d9677cb33e	fixed problem with parsing optional string arguments	2012-03-18 14:27:49 +01:00
gugus	100c6a42a5	better default values for filters	2012-03-18 11:32:05 +01:00
Marc Zinnschlag	655f9fe920	Merge remote branch 'k1ll/staticogre'	2012-03-18 11:16:34 +01:00
Marc Zinnschlag	af875896ad	fix for issue #179	2012-03-18 11:09:38 +01:00
Chris Robinson	3fea3e7d25	Fix stereo files with libsndfile	2012-03-17 23:47:12 -07:00
Chris Robinson	f7ac94d686	Pass the new position to the sound update method	2012-03-17 23:41:45 -07:00
Chris Robinson	44fc204864	Avoid passing a sound decoder to the play methods	2012-03-17 23:30:43 -07:00
Chris Robinson	ddfa906922	Add a missing include	2012-03-17 22:45:28 -07:00
Chris Robinson	a69ec91242	Remove some unnecessary wrappers and do some small cleanups	2012-03-17 22:13:57 -07:00
Marc Zinnschlag	187b8e58d6	fixed handling of optional instruction/function arguments; removed choice workaround	2012-03-17 19:32:44 +01:00
Chris Robinson	a91085a1b9	Add a couple comments	2012-03-17 10:45:11 -07:00
Chris Robinson	7160d20db3	Be more consistent with the vector orientations given the sound handler	2012-03-17 10:36:34 -07:00
Chris Robinson	cbeff4657f	Pass the loop and untracked flags when playing a 3d sound	2012-03-17 10:16:22 -07:00
Chris Robinson	87adf6002a	Fix a copy-paste typo in the openal output	2012-03-17 09:57:39 -07:00
Chris Robinson	5563f583ff	Add and implement methods to update tracked sounds on an object	2012-03-17 09:51:03 -07:00
Chris Robinson	979ae89aab	Pass volume and pitch parameters to streamed sounds	2012-03-17 09:37:41 -07:00
Chris Robinson	cac07d0fbf	Remove some unnecessary methods	2012-03-17 09:27:31 -07:00
Chris Robinson	e49a090af7	Remove unnecessary hack	2012-03-17 09:16:09 -07:00
Chris Robinson	d57051375d	Implement non-streaming sounds with OpenAL	2012-03-17 09:15:47 -07:00
gugus	f87bd65ae1	Merge branch 'DialogueSystem' of github.com:scrawl/openmw into DialogueSystem	2012-03-17 17:00:28 +01:00
gugus	846196d048	fixed a crash	2012-03-17 16:56:22 +01:00
Chris Robinson	9adf1e8461	Keep a handle on played sounds	2012-03-17 08:02:46 -07:00
scrawl	21143f006b	fix several warnings	2012-03-17 15:47:22 +01:00
scrawl	9d4f79bcfc	GCC compile fix	2012-03-17 15:24:47 +01:00
Michael Papageorgiou	dbbf50a184	Journal sounds, close sound will be added later	2012-03-17 15:52:57 +02:00
Chris Robinson	656863ec6e	Add functions to play sounds	2012-03-17 06:51:44 -07:00
Chris Robinson	a46f8ced05	Keep the sound output's listener updated with the camera position	2012-03-17 06:18:59 -07:00
scrawl	5e939e4818	map window now works for interiors	2012-03-17 13:59:51 +01:00
scrawl	1840401172	weather transitions (e.g. from clear to cloudy) use timescale	2012-03-17 13:14:31 +01:00
scrawl	3ae69f792a	no light-"jumps" during night	2012-03-17 12:57:52 +01:00
Chris Robinson	2dabdcb9e5	Add a function to update the sound listener	2012-03-17 04:22:54 -07:00
Chris Robinson	2429755bf1	Make the sound's Play method return void	2012-03-17 03:20:43 -07:00
Chris Robinson	caf5d71d44	Make the sound decoder's Open method return void ... Errors are thrown, not returned	2012-03-17 03:18:28 -07:00
Chris Robinson	1b41987e18	Move OpenAL_SoundStream function definitions out of the class	2012-03-17 03:15:07 -07:00
Chris Robinson	2f6b73d461	Prevent streamMusic from throwing an exception	2012-03-17 03:06:35 -07:00
Chris Robinson	207d7dd89e	Stop and delete the current music before deleting the sound output	2012-03-17 03:01:51 -07:00
Chris Robinson	1ade01edc8	Add a function to stream sounds	2012-03-17 02:55:08 -07:00
Chris Robinson	9cf42f6d0f	Flesh out the sound decoder a bit more	2012-03-17 02:51:46 -07:00
Chris Robinson	637617056b	Make a skeleton Sound class	2012-03-17 02:45:18 -07:00
Chris Robinson	246b0266fb	Remove references to Audiere. It's not supported for now.	2012-03-17 00:11:59 -07:00
Chris Robinson	46cd84aac5	Add a skeleton ffmpeg decoder	2012-03-16 23:59:21 -07:00
Chris Robinson	1322b1e160	Move Sound_Output's definition to a separate header	2012-03-16 23:40:07 -07:00
Chris Robinson	10037e79e7	Add a skeleton decoder class using mpg123 and libsndfile	2012-03-16 23:18:15 -07:00
Chris Robinson	45b612ab3b	Add a skeleton output classs using OpenAL	2012-03-16 22:12:17 -07:00
Chris Robinson	42b445383f	Remove Mangle- and OpenEngine-related sound code ... Start of the sound code refactoring. Currently there is no sound, but it will be added back.	2012-03-16 17:08:13 -07:00
scrawl	3e4cf64a77	Merge branch 'master' into shaders	2012-03-16 20:46:18 +01:00
scrawl	5ea2122f79	sun gradually disappears	2012-03-16 20:39:58 +01:00
scrawl	d18b3271b1	transition tweak 2	2012-03-16 20:32:41 +01:00
scrawl	460b584934	transition tweaks	2012-03-16 19:49:01 +01:00
scrawl	a67cc8e73b	more fixes	2012-03-16 19:02:33 +01:00
gugus	10321ff51a	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem	2012-03-16 17:58:23 +01:00
gugus	042d87f77f	a lot of clean up	2012-03-16 17:53:34 +01:00
gugus	91801e5cab	stop spamming messages	2012-03-16 17:39:14 +01:00
gugus	56a84b6a1a	choices works. The only thing remaining is the script arguments problems. ... Need a lot of clean up too.	2012-03-16 17:30:59 +01:00
scrawl	c885ec1bd1	Merge branch 'master' into minimap	2012-03-16 17:10:27 +01:00
scrawl	91d2031eb7	first attempt at map window	2012-03-16 17:09:31 +01:00
Michael Papageorgiou	b2c6d52db1	Another file search fix	2012-03-16 09:00:18 +02:00
scrawl	877cb2aca7	much better looking moons	2012-03-15 20:35:23 +01:00
scrawl	e354203c21	stars rotation	2012-03-15 19:49:15 +01:00
Alexander "Ace" Olofsson	e8eea03b4c	Fixed a few more non-virtual destructor warnings	2012-03-15 17:40:42 +01:00
Nikolay Kasyanov	65fc141b62	Merge branch 'master' into pgrd-rendering ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-03-15 20:38:21 +04:00
Marc Zinnschlag	a7211d2a90	Merge remote branch 'werdanith/searchfix'	2012-03-15 16:54:29 +01:00
Michael Papageorgiou	588ac44bc7	Improved matching for the FileListLocator	2012-03-15 17:32:10 +02:00
Marc Zinnschlag	5b378e820d	warning level adjustments and some related fixes	2012-03-15 16:01:41 +01:00
k1ll	b7eb7ff8e3	Added support for linking static Ogre libraries and plugins into the launcher and openmw.	2012-03-15 15:51:39 +01:00
Marc Zinnschlag	6f9d9c0f9e	another armour class detection fix	2012-03-15 15:05:14 +01:00
Marc Zinnschlag	7ab20c3eb1	fixed armour class detection	2012-03-15 14:36:12 +01:00
Marc Zinnschlag	c616d005e8	fixed a spelling mistake	2012-03-15 14:31:16 +01:00
Marc Zinnschlag	3c3fb8d706	Merge remote branch 'werdanith/activationsounds2' into equipment	2012-03-15 14:06:48 +01:00
Michael Papageorgiou	f7c7ed0ac7	Fix regression with locating sound files	2012-03-15 13:56:46 +02:00
scrawl	2edd7e59f4	some fixes and facilities for saving the fog of war to disk	2012-03-14 20:44:06 +01:00
gugus	07d8d654cd	one step toward function filters and end choices.	2012-03-14 18:47:29 +01:00
scrawl	5a46d58da5	fully working fog of war	2012-03-14 17:44:19 +01:00
scrawl	583a25f634	fog of war rendering (incomplete)	2012-03-14 14:51:58 +01:00
Nikolay Kasyanov	a8e25bc32c	Feature #37 (In Progress) Render Path Grid ... improved path grid point mesh (closer to vanilla MW)	2012-03-14 15:03:04 +04:00
Marc Zinnschlag	81abd97753	Merge remote branch 'scrawl/weather'	2012-03-14 09:40:22 +01:00
Marc Zinnschlag	010c8e6041	Merge remote branch 'scrawl/viewingdistance'	2012-03-14 09:35:24 +01:00
Nikolay Kasyanov	3a705baa29	Feature #37 (In Progress) Render Path Grid ... added simple pathgrid edges	2012-03-14 03:06:56 +04:00
Michael Papageorgiou	947288e13a	Merge master and rewrite around the new detection function	2012-03-14 00:38:44 +02:00
scrawl	e8267c7363	adjusted fog distance, prevents objects suddenly popping up on cell load	2012-03-13 22:14:35 +01:00
scrawl	8421fd2670	fixed a visual issue with the stars	2012-03-13 19:57:33 +01:00
Michael Papageorgiou	db9085ae59	Pickup sounds for weapons	2012-03-13 20:40:30 +02:00
Michael Papageorgiou	7c1475b723	Pickup sounds for potions, repair, gold, lights, rings	2012-03-13 20:01:55 +02:00
Michael Papageorgiou	34e18df0fe	Pickup sounds for apparatus, books, clothes, ingredients, lockpicks, misc and probes	2012-03-13 18:50:32 +02:00
scrawl	118250171d	Merge branch 'master' of https://github.com/zinnschlag/openmw into shaders ... Conflicts: apps/openmw/mwrender/objects.cpp	2012-03-13 17:31:10 +01:00
scrawl	f46d9b094b	fix weather sounds sometimes playing in interiors	2012-03-13 17:25:07 +01:00
scrawl	b43281a66b	Merge branch 'terrain_next' into terraincollision ... Conflicts: CMakeLists.txt	2012-03-13 17:14:49 +01:00
scrawl	9612ce595b	Merge branch 'master' of https://github.com/zinnschlag/openmw into terraincollision ... Conflicts: CMakeLists.txt	2012-03-13 17:09:50 +01:00
Michael Papageorgiou	6dddf8a3d5	Pickup sounds for armors	2012-03-13 18:05:38 +02:00
scrawl	4813a1ce9d	Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next ... Conflicts: CMakeLists.txt	2012-03-13 16:00:59 +01:00
scrawl	771f920c2c	Merge branch 'master' of https://github.com/zinnschlag/openmw into minimap	2012-03-13 15:59:09 +01:00
Marc Zinnschlag	cbbc295eb6	implemented new equipment functions in MWClass	2012-03-13 15:35:06 +01:00
Marc Zinnschlag	c314cddb1c	added getEquipmentSkill function to Class hierarchy	2012-03-13 14:27:13 +01:00
Marc Zinnschlag	ea336214de	more inventory sanity checks	2012-03-13 14:04:19 +01:00
Marc Zinnschlag	4b73116b9d	added getEquipmentSlots function to MWWorld::Class hierarchy	2012-03-13 13:50:11 +01:00
Marc Zinnschlag	635b7ec6cb	slot system	2012-03-13 13:31:11 +01:00
Michael Papageorgiou	703e484a92	Doors and Containers sounds, now in 3D	2012-03-13 14:17:49 +02:00
Michael Papageorgiou	836732096e	Fix both relative and 3D sounds	2012-03-13 14:08:32 +02:00
Marc Zinnschlag	222b5b741e	Merge branch 'master' into equipment	2012-03-13 12:14:47 +01:00
Pieter van der Kloet	1ed1c29db9	Fix Boost path problem for Boost versions below 1.43	2012-03-12 14:46:48 +01:00
Pieter van der Kloet	96c0b8760e	Got rid of the console showing up on Windows and removed libpng stuff	2012-03-12 02:37:40 +01:00
Nikolay Kasyanov	f292a5a7ca	Feature #37 (In Progress) Render Path Grid ... now using mwRoot instead of ogre's root, so no more messing with coordinates.	2012-03-12 02:37:07 +04:00
Jason Hooks	6d346933db	gus's changes	2012-03-10 17:45:34 -05:00
Nikolay Kasyanov	4659076129	Feature #37 (In Progress) Render Path Grid ... workaround for strange ESMStore bug	2012-03-10 20:45:55 +04:00
Nikolay Kasyanov	11f957a64d	Feature #37 (In Progress) Render Path Grid ... cubes for path grid points strange crash when trying to get path grids from Debugging	2012-03-10 20:03:00 +04:00
scrawl	fa68be2b19	set map window cell name	2012-03-10 16:05:12 +01:00
scrawl	5b38b17baf	local map rendering (nothing to see yet, as it is not displayed in GUI)	2012-03-10 15:28:18 +01:00
Nikolay Kasyanov	6357adffcf	Fixed typo	2012-03-10 18:13:44 +04:00
Nikolay Kasyanov	5328853445	Feature #37 (In Progress) Render Path Grid ... added "togglepathgrid" script command	2012-03-10 18:13:44 +04:00
Marc Zinnschlag	79158b9325	NPCs are using InventoryStore instead of ContainerStore from now on	2012-03-10 12:49:54 +01:00
Marc Zinnschlag	84c8cd3720	added InventoryStore class (doesn't do anything yet)	2012-03-10 12:49:27 +01:00
Marc Zinnschlag	5562653578	provisionally fill up containers on cell load	2012-03-10 12:36:29 +01:00
Marc Zinnschlag	06e0706b35	added fill and clear functions to container store	2012-03-10 12:11:07 +01:00
scrawl	2196e1321b	added weather sounds	2012-03-09 18:30:03 +01:00
Marc Zinnschlag	c259b25fcf	Merge remote branch 'werdanith/soundmanagerrefactor'	2012-03-09 17:27:11 +01:00
Michael Papageorgiou	6f46f2b7a0	SoundManager: add the ability to play non-3d looping sounds	2012-03-09 18:10:23 +02:00
Michael Papageorgiou	a309ef7b55	Corrected setPlaylist and added stopMusic	2012-03-09 03:56:29 +02:00
Michael Papageorgiou	44620ada86	SoundManager: Finish up with Task #172, plus cleanup	2012-03-09 03:22:16 +02:00
Michael Papageorgiou	ad6175c78a	SoundManager: Set up the priority for file look up right and take care of a corner case	2012-03-08 23:06:52 +02:00
gugus	82c6b0f92a	choice function. Do not work.	2012-03-07 18:52:27 +01:00
gugus	6f7752633a	there was no extension in the compiler context. Corrected. But Choice doesn't work.	2012-03-07 18:44:09 +01:00
gugus	39415f0b4a	fix compilation bug with Visual C++	2012-03-07 17:35:10 +01:00
Michael Papageorgiou	054a176c86	Added new FileLibrary class to handle music, this fixes a number of issues.	2012-03-07 17:46:51 +02:00
scrawl	8be661c802	Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next ... Conflicts: CMakeLists.txt	2012-03-07 13:29:59 +01:00
gugus	4990ba48ed	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem	2012-03-07 09:47:46 +01:00
Marc Zinnschlag	3d1cbcd4e7	Merge remote branch 'jhooks/animperform'	2012-03-07 09:20:29 +01:00
Michael Papageorgiou	54353794e5	SoundManager: Completely rewrote the file management	2012-03-07 02:20:15 +02:00
Jason Hooks	39ff8d6a01	Compile error retry	2012-03-06 18:28:41 -05:00
Michael Papageorgiou	03ea3bb62f	SoundManager: first attempt at refactoring. BROKEN	2012-03-06 01:21:00 +02:00
Jason Hooks	9848b67174	Fixing errors	2012-03-05 17:46:29 -05:00
Pieter van der Kloet	2429f3960f	Merge remote-tracking branch 'upstream/master' into launcher ... Conflicts: apps/launcher/CMakeLists.txt apps/launcher/datafilespage.cpp	2012-03-05 23:43:59 +01:00
Marc Zinnschlag	25f5bdf7aa	Merge remote branch 'scrawl/weather'	2012-03-05 22:45:52 +01:00
scrawl	3ea2a9f05d	changeWeather bugfix	2012-03-05 19:13:11 +01:00
Marc Zinnschlag	69f0ec99f1	implemented dialogue scripts	2012-03-05 16:56:14 +01:00
Michael Papageorgiou	1776ede9e1	Broken sound path fix	2012-03-05 16:06:46 +02:00
Marc Zinnschlag	65756db49e	Merge remote branch 'gus/DialogueSystem' into dialogue	2012-03-05 11:34:16 +01:00
Marc Zinnschlag	4bdfbb6d4f	Merge branch 'master' into dialogue ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-03-05 11:34:06 +01:00
Marc Zinnschlag	896c7d9fa5	Merge remote branch 'scrawl/batching2'	2012-03-05 10:54:55 +01:00
Marc Zinnschlag	e7fa1d94b8	Merge remote branch 'scrawl/shapefix'	2012-03-05 10:51:18 +01:00
scrawl	42a7375a0b	adjusted the batch region size, this was the cause for lights going on/off bug	2012-03-04 23:26:35 +01:00
scrawl	ff8f95fcca	fix batch lighting, removed the "bumping number of lights" hack	2012-03-04 23:18:40 +01:00
scrawl	8910b0d471	use shaders for all NIF materials. this has numerous advantages: ... - vertex colours are now working as they should (and they have a huge impact on the look) - the lighting is per pixel and looks a lot better - by using shaders, we can use more lights at a time (fixed function has max of 8)	2012-03-04 20:59:23 +01:00
Jacob Essex	eca91d17bb	Indentation tweaks and code cleanup	2012-03-04 11:46:33 +00:00
Jacob Essex	941a22034f	Merge branch 'terrain_next' of git://github.com/scrawl/openmw into terrain_next ... Conflicts: apps/openmw/mwrender/terrain.cpp	2012-03-04 11:30:37 +00:00
Jacob Essex	bcd2371baa	Code cleanup: Removed unneeded Ogre namespace	2012-03-04 11:21:47 +00:00
Jason Hooks	a81ecb5f65	Bug 210 fix	2012-03-03 18:26:11 -05:00
scrawl	a8939bc318	disabled the composite map, improves loading time a lot	2012-03-04 00:08:56 +01:00
scrawl	d74b78a302	very minor performance improvement	2012-03-03 12:26:08 +01:00
scrawl	b882c03adc	fixed terrain regions without vertexcolours, tweaked maxPixelError	2012-03-02 23:36:48 +01:00
Jacob Essex	3c934e3e44	Fixed a bug with fog not being applied to initially created terrain when starting in exteriors.	2012-03-02 22:31:17 +00:00
Jacob Essex	07a2e5a5be	Removed dead code, fixed a error, added comments and tweaked some constants (after trying to find their min/max values)	2012-03-02 21:20:12 +00:00
Jacob Essex	0f705eaca5	Removed the option of not splitting terrain as it was slower and adding to code complexity. The only real reason for keeping it, which was that it made debugging some texture issues easier is now gone.	2012-03-02 21:03:53 +00:00
Jacob Essex	3ecc427b96	Implemented slightly better texture splatting	2012-03-02 20:27:20 +00:00
scrawl	461ec9f3d6	fix regarding last commit	2012-03-02 18:50:55 +01:00
scrawl	0d4e3b8e75	remove alpha channel from colour map	2012-03-02 18:33:05 +01:00
scrawl	ba0365a427	collision shape scale fix	2012-03-02 16:47:39 +01:00
scrawl	2bea4c4724	fixed the global colour map, apparently Ogre::Terrain was corrupting it ... somehow, now we are just bypassing Ogre::Terrain for the colour map and passing it directly to the material, which makes more sense performance-wise anyway	2012-03-02 15:29:12 +01:00
Marc Zinnschlag	1e998545c7	fixed log path	2012-03-02 15:15:44 +01:00
scrawl	04c141ddd5	Merge branch 'terrain' of https://github.com/Yacoby/openmw into terrain_next ... Conflicts: apps/openmw/mwrender/terrain.cpp	2012-03-02 13:49:57 +01:00
Jacob Essex	8dd6e75ae1	Vertex colours now uses the Ogre::Terrain colour map	2012-03-02 11:56:51 +00:00
Marc Zinnschlag	be70d197e5	Merge branch 'next' ... Conflicts: .gitignore cmake/FindOGRE.cmake	2012-03-02 12:11:44 +01:00
Michael Papageorgiou	b3159683a4	Replace gengetopt with bullet program options for esmtool's argument handling	2012-03-02 04:41:29 +02:00
scrawl	562cc7aa30	fixed 2 assertions that caused crashes	2012-03-01 15:03:43 +01:00
scrawl	fddf7b4dd0	terrain material now supports point lights	2012-03-01 14:35:39 +01:00
Nikolay Kasyanov	b283ad86fb	revert to old launcher stylesheet location on OS X	2012-03-01 17:16:44 +04:00
Michael Papageorgiou	185cd63462	ESMTool set to use default Latin encoding	2012-03-01 14:19:27 +02:00
Pieter van der Kloet	5ffa3264b2	Appended resources/ to the stylesheet path	2012-03-01 04:38:37 +01:00
Jacob Essex	611f336d07	Now doesn't attempt to use fake vertex colours with cells that don't have vertex colours	2012-02-29 23:38:21 +00:00
Jacob Essex	6924348696	Fixed some texture splatting issues with loading empty terrain cells	2012-02-29 23:33:54 +00:00
Jacob Essex	1d0ae9c8d1	Start of a basic implementation of fake vertex colours	2012-02-29 23:05:22 +00:00
scrawl	bac7f23604	Merge branch 'terrain' of https://github.com/Yacoby/openmw into terrain_next ... Conflicts: apps/openmw/mwrender/terrain.cpp	2012-02-29 19:38:34 +01:00
scrawl	e04ef38a5c	Merge branch 'next' of https://github.com/zinnschlag/openmw into terrain_next	2012-02-29 11:01:03 +01:00
Marc Zinnschlag	3c5f8a4a23	void pointer workaround	2012-02-29 10:13:25 +01:00
Marc Zinnschlag	ed0fa255b0	Merge remote branch 'scrawl/weather' into next	2012-02-28 23:33:22 +01:00
Pieter van der Kloet	11ec5cf2e2	Stylesheet location changed in CMakeLists and some minor fixes to the launcher	2012-02-28 22:45:03 +01:00
scrawl	be5555956c	improved composite map, now adapts to the ambient/diffuse light	2012-02-28 22:04:44 +01:00
scrawl	f2c3616638	Merge branch 'next' into terrain_next ... Conflicts: CMakeLists.txt apps/openmw/CMakeLists.txt apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/renderingmanager.hpp cmake/FindOGRE.cmake	2012-02-28 21:49:45 +01:00
Pieter van der Kloet	b320733e45	Fixed Qt exits, this time for all occurrences	2012-02-28 21:00:02 +01:00
scrawl	c8aab3a562	fix sun angle	2012-02-28 20:28:46 +01:00
Jacob Essex	13e3955916	Merge branch 'terrain' of github.com:Yacoby/openmw into terrain	2012-02-28 16:22:19 +00:00
Pieter van der Kloet	5b54a658d8	Launcher improvements: ask for data dir and write it to cfg if none is found ... and prevent removal of the default profile	2012-02-28 17:19:44 +01:00
scrawl	f55905609f	fixed the terrain normals - they had to be adjusted because we use Morrowind's coordinate system	2012-02-28 17:18:07 +01:00
Pieter van der Kloet	1512481c07	Changed the way whitespace was removed from retrieved Ogre values	2012-02-28 17:18:01 +01:00
scrawl	abcf25ead2	terrain shader performance improvement (tested on opengl only, please test on directx)	2012-02-28 16:41:05 +01:00
scrawl	5b5e8ba4fd	fix a typo that caused SPLIT_TERRAIN=true blendmap to be too detailed (causing insane loading times)	2012-02-28 16:20:57 +01:00
scrawl	b3db4f1c27	slightly improved moon fading	2012-02-28 15:20:46 +01:00
Marc Zinnschlag	7aaa7f185f	same for launcher	2012-02-28 09:46:48 +01:00
Marc Zinnschlag	4c2fffdd61	temporarily disabled multi data path support in OpenMW	2012-02-28 09:27:35 +01:00
scrawl	dbd2d390fd	terrain material fixes: ... - disable normal and parallax mapping - disable specular mapping and specular	2012-02-27 21:12:16 +01:00
scrawl	f34b2c73c5	committing the terrain material generator from ogre 1.7.4, it seems to ... be almost impossible to make a derived class of TerrainMaterialGeneratorA because of the many classes it contains and the inter-relationships between them; just adding the whole source makes it a lot easier to modify if we decide to update this source from OGRE upstream at any point (which seems unlikely), we can take the diff from this commit on to see the changes we did to the material generator	2012-02-27 19:44:52 +01:00
Marc Zinnschlag	2c20aeab90	Merge remote branch 'werdanith/activationsounds' into next	2012-02-27 18:24:33 +01:00
Marc Zinnschlag	2608491906	Merge remote branch 'corristo/master'	2012-02-27 16:05:04 +01:00
Nikolay Kasyanov	d58b408ae1	Deploying Qt image format plugins on OS X considered useless	2012-02-27 19:00:06 +04:00
Michael Papageorgiou	fe977fe313	More container and door trap fixes	2012-02-27 16:59:45 +02:00
Michael Papageorgiou	28fdfb0f99	Added container locked and trapped activation sounds	2012-02-27 16:37:05 +02:00
Marc Zinnschlag	739870489a	Merge remote branch 'scrawl/weather' into weather ... Conflicts: apps/openmw/CMakeLists.txt	2012-02-27 15:02:03 +01:00
scrawl	c9ceb74e5c	transition fix	2012-02-27 12:21:00 +01:00
Michael Papageorgiou	c6861ed2a9	Added door activation sounds	2012-02-27 09:39:35 +02:00
Jason Hooks	36e9322830	a few changes2	2012-02-26 21:43:04 -05:00
Jason Hooks	8d7a5f469b	a few changes	2012-02-26 21:27:54 -05:00
Marc Zinnschlag	053a2996d2	fix for non-standard erase function	2012-02-26 23:31:16 +01:00
Alexander "Ace" Olofsson	be8690e333	Fix for debug crash on windows	2012-02-26 22:45:17 +01:00
scrawl	8b0ef8f98c	improvements to sun glare	2012-02-26 20:46:09 +01:00
scrawl	932983c2fa	fix toggleSky	2012-02-26 18:21:11 +01:00
scrawl	c1d39bb35f	tweaked cloud color	2012-02-26 15:54:52 +01:00
scrawl	f79bf1f300	fog	2012-02-26 13:13:29 +01:00
scrawl	528cff5a59	implemented ChangeWeather script function	2012-02-26 11:51:02 +01:00
scrawl	a05ba97382	choose a random weather depending on region's weather probabilities	2012-02-25 23:41:02 +01:00
scrawl	d77d5080bd	implemented GetCurrentWeather script function	2012-02-25 21:34:38 +01:00
scrawl	8d5783d75d	- set moon phase using (day%32)/4 (not really correct, but good for now) ... - added all weather patterns from morrowind.ini	2012-02-25 21:06:03 +01:00
scrawl	e31ad90802	moon positions and fading	2012-02-25 16:36:45 +01:00
scrawl	4650672bb1	thunderstorm	2012-02-25 13:46:17 +01:00
Lukasz Gromanowski	c9a1789db8	Bug fix for processing data paths in OpenMW Launcher. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-02-25 10:20:42 +01:00
scrawl	0ebdce543a	- added night sky rendering with stars, nebulas, and fading in/out to sunset / sunrise ... - changed WeatherGlobals members to static	2012-02-24 23:26:38 +01:00
Marc Zinnschlag	771d50fe69	removed a redundant assert and a left-over comment	2012-02-24 20:20:32 +01:00
Marc Zinnschlag	68da94c8f0	workaround for older boost versions	2012-02-24 20:19:32 +01:00
scrawl	9560904d8a	visibility fixes	2012-02-24 18:47:09 +01:00
scrawl	67c7b965f0	calculate a sun position depending on time of day	2012-02-24 18:30:16 +01:00
scrawl	811c4a41b7	fade in/out for sunrise and sunset	2012-02-24 17:42:31 +01:00
scrawl	aad8f6605e	send a raycast through the physics engine to check if sun is visible	2012-02-24 16:12:43 +01:00
Jason Hooks	08f3ecf935	Slightly better performance on animation2	2012-02-24 01:30:17 -05:00
Jason Hooks	fb51b281b2	Slightly better performance on animation	2012-02-24 01:16:30 -05:00
scrawl	af83742e6f	- disable the sky renderer completely in interior cells ... - SkyManager update (initial sun glare effect, no raycast)	2012-02-23 21:44:56 +01:00
scrawl	d9c02ca526	- added isCellExterior / isCellQuasiExterior methods to World ... - interior now have the sun disabled properly (and ambient managed by cell, not sky)	2012-02-23 21:12:06 +01:00
scrawl	90af78e3b8	attempt to fix openmw's lighting (restored the sun, set proper ambient value outside) ... - the fix should remain in this branch since the main branch still has the lighting by caelum	2012-02-23 20:33:34 +01:00
scrawl	a5720e9a4f	set sky colors according to time of day	2012-02-23 19:49:56 +01:00
Marc Zinnschlag	26bd2be1e8	Merge branch 'equipment' into next	2012-02-23 13:02:20 +01:00
Marc Zinnschlag	8f60d5b180	made container store data members private	2012-02-23 13:01:53 +01:00
Marc Zinnschlag	af23cc352e	more cleanup	2012-02-23 12:58:12 +01:00
Marc Zinnschlag	699246e54b	removed insertIntoContainer function from MWWorld::Class hierarchy	2012-02-23 12:53:48 +01:00
Marc Zinnschlag	f39aa2a68d	changed take action to use the new container store interface	2012-02-23 12:38:25 +01:00
Marc Zinnschlag	1d551030d1	container related script instruction are using the new container interface now	2012-02-23 12:34:51 +01:00
Marc Zinnschlag	e13e858c7a	fixed container store iterator; new add function	2012-02-23 12:34:25 +01:00
Marc Zinnschlag	b7ea110632	manually created objects were initialised incompletely	2012-02-23 12:33:50 +01:00
Marc Zinnschlag	5f72199419	Merge remote branch 'lgro/config_fixes'	2012-02-23 09:28:11 +01:00
Lukasz Gromanowski	d5f1d7eed7	Fix for processing tokens inside data-local config option. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-02-22 23:56:07 +01:00
scrawl	ce98397565	adding ini values for 'cloudy' and 'clear'	2012-02-22 20:39:14 +01:00
scrawl	1badb5d04f	some restructurings	2012-02-22 20:12:08 +01:00
scrawl	41a8b22ebd	implemented weather transitions (currently only blends the clouds)	2012-02-22 19:17:37 +01:00
Pieter van der Kloet	280babc719	Fixed stylesheet and configuration problems with the launcher and code cleanup	2012-02-22 08:34:47 +01:00
scrawl	4efc5bc1f2	forgot to add file	2012-02-21 22:56:34 +01:00
scrawl	b2de9e8f45	allow setting the clouds opacity	2012-02-21 22:11:41 +01:00
scrawl	c1fb5ce769	added (incomplete) WeatherManager, created by World	2012-02-21 20:22:46 +01:00
scrawl	83753dc384	tweaked the cloud animation speed	2012-02-21 17:42:43 +01:00
scrawl	91ffacbb6d	added moon phases	2012-02-21 17:38:15 +01:00
scrawl	10ca67c0a5	fixed the sky elements positioning delay (nodes are now children of the camera node)	2012-02-21 16:49:28 +01:00
scrawl	2d8b0a4ac0	merged the sky manager implementation with its interface	2012-02-21 16:15:38 +01:00
Marc Zinnschlag	b2b09320fc	Merge branch 'config'	2012-02-21 13:55:58 +01:00
Marc Zinnschlag	547d6a0639	Merge remote branch 'lgro/config' into config	2012-02-21 11:50:23 +01:00
scrawl	694a537b57	- removed caelum sources, resources, build scripts	2012-02-21 00:14:20 +01:00
scrawl	04d7db2860	moved the SkyManager implementation to a new source file (sky_impl.cpp) for convenience	2012-02-20 23:53:17 +01:00
scrawl	6aac3d4b77	- removed caelum (we can get it from the git history, if needed) ... - added code for moon rendering (they are not visible by default)	2012-02-20 23:41:22 +01:00
scrawl	090c0586a0	leak fix	2012-02-20 22:20:34 +01:00
scrawl	6d37f53fa2	- abstracted the sun creation code into a CelestialBody class to be reused for the moons ... - fixed render queue problem	2012-02-20 22:15:13 +01:00
scrawl	ad0f9f4bcf	fixed the sun rendering (rendered without depth check)	2012-02-20 21:32:12 +01:00
scrawl	3b3218d907	fixed 3 gcc warnings in sky.cpp	2012-02-20 18:45:04 +01:00
scrawl	8b5da06fce	Merge branch 'next' into weather ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-02-20 18:33:13 +01:00
Marc Zinnschlag	db205cf8aa	Merge remote branch 'scrawl/next' into test ... Conflicts: libs/openengine	2012-02-20 14:54:08 +01:00
Marc Zinnschlag	e02cba58b1	Merge branch 'master' into next ... Conflicts: apps/openmw/mwclass/light.cpp	2012-02-20 14:34:27 +01:00
Marc Zinnschlag	1beaea0115	forgot to add cone file	2012-02-20 14:14:39 +01:00
Marc Zinnschlag	781b16a00e	removed bCollision variable from World	2012-02-20 14:07:16 +01:00
Marc Zinnschlag	7eae24bb45	some fixes	2012-02-20 14:02:24 +01:00
Marc Zinnschlag	4a16553acc	replaced an include with a forward declaration	2012-02-20 12:44:17 +01:00
Marc Zinnschlag	e3e6b3809f	added container store iterator (a.k.a. the most hilarious iterator I ever had the misfortune to write)	2012-02-20 12:38:34 +01:00
scrawl	c884f70a61	added sun rendering (unfinished)	2012-02-20 00:52:44 +01:00
Lukasz Gromanowski	0c0b594090	Issue #168 - Configuration cleanup ... Removed unnecessary path methods - according to forum disscusion: http://openmw.org/forum/viewtopic.php?f=6&t=448 Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-02-20 00:02:00 +01:00
Jason Hooks	7e1e746201	More changes	2012-02-19 17:59:50 -05:00
scrawl	705d85e7d1	Merge branch 'next' into weather ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-02-19 23:27:26 +01:00
scrawl	60856b46e6	moved the renderer update call from OMW::Engine to RenderingManager	2012-02-19 23:22:29 +01:00
scrawl	1d9f0f4813	added MWSkyManager; already has atmosphere and moving clouds (although their colour is static)	2012-02-19 23:09:14 +01:00
Jason Hooks	38a0d1d1c5	Merging in master	2012-02-19 15:39:12 -05:00
Jason Hooks	e330c22d68	Removing unneeded files	2012-02-19 02:04:47 -05:00
Jason Hooks	e58f2f5363	Eliminating unnecessary data from skeletons and shape saving	2012-02-19 02:01:15 -05:00
scrawl	457d9fd9f8	updated vmformat.txt	2012-02-18 18:30:01 +01:00
scrawl	f81b615976	implemented script functions FadeIn, FadeOut, FadeTo	2012-02-18 18:25:28 +01:00
scrawl	899aa5b870	fix last commit, also reacts to ToggleWireframe and not only twf	2012-02-18 16:36:54 +01:00
scrawl	40e23fe26f	added twf console command	2012-02-18 16:06:03 +01:00
gugus	9716199d18	script "fix". I'm waiting for you Zini^^	2012-02-18 12:19:42 +01:00
gugus	c0bd86ce44	scripts. Not tested	2012-02-17 20:20:23 +01:00
gugus	232e478768	Fix for prefix/suffix stuff	2012-02-15 13:23:59 +01:00
Marc Zinnschlag	d9c1ed3d5e	Merge remote branch 'corristo/osx-packaging' into config	2012-02-15 10:32:16 +01:00
Nikolay Kasyanov	2020d916ec	added missing comment	2012-02-15 11:30:35 +04:00
Nikolay Kasyanov	57a4b19880	Feature #162 - Need to create app bundle using CMake, not by hand. Almost complete	2012-02-15 11:27:51 +04:00
Marc Zinnschlag	9af08ff18d	store screenshots in user directory instead of local directory	2012-02-13 18:34:21 +01:00
Marc Zinnschlag	77201d05bc	post-merge fix	2012-02-13 16:42:01 +01:00
Marc Zinnschlag	27caee664e	Merge remote branch 'lgro/config' into config ... Conflicts: components/files/path.hpp	2012-02-13 16:36:57 +01:00
Marc Zinnschlag	10d4771550	Merge remote branch 'corristo/osx-packaging'	2012-02-13 16:35:13 +01:00
Marc Zinnschlag	1a6a49b9b8	Merge remote branch 'lgro/fix_warnings'	2012-02-13 11:06:41 +01:00
Nikolay Kasyanov	5a42c6c6f5	Feature #162 - Need to create app bundle using CMake, not by hand WIP. Removed libpng dependency from launcher	2012-02-13 10:31:43 +04:00
gugus	bc72b2d535	fixed text color	2012-02-12 22:24:23 +01:00
Lukasz Gromanowski	8829d46bda	Clean up compilation warnings. ... Clan up compilation warnings like "variable ... set but not used" introduced in some older and recent commits. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-02-12 15:45:08 +01:00
Lukasz Gromanowski	bcc4d7a7c9	Issue #133 Handle resources across multiple data directories ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-02-12 14:21:07 +01:00
Marc Zinnschlag	d66b6743f4	minor fix	2012-02-12 13:58:02 +01:00
Marc Zinnschlag	d9945a976d	Merge remote branch 'gus/DialogueSystem' into dialogue	2012-02-12 13:47:04 +01:00
Marc Zinnschlag	facc36fa34	Merge remote branch 'corristo/osx-packaging' into packaging	2012-02-12 13:35:54 +01:00
Marc Zinnschlag	a0ac6e5150	cells were sometimes not fully loaded	2012-02-12 12:35:29 +01:00
Jacob Essex	286701e3a5	Removed the flawed shading, updated textures, removed the need for a unused base texture	2012-02-11 20:54:29 +00:00
gugus	4d4ae41a4a	greetings are working now	2012-02-11 12:19:02 +01:00
gugus	4658ec276f	increased the max size of the text of the dialogue	2012-02-11 12:18:47 +01:00
gugus	eee5d20809	a little fix	2012-02-10 22:54:17 +01:00
gugus	f1dc360720	added the script instruction addTopic	2012-02-10 22:02:24 +01:00
gugus	554bf8e586	Improvement in the dialogue manager	2012-02-10 22:01:31 +01:00
Pieter van der Kloet	eea8773be1	Changed the order of preference for the configuration files	2012-02-10 21:45:46 +01:00
Marc Zinnschlag	bc71fb47e0	minor fix	2012-02-10 21:24:33 +01:00
Pieter van der Kloet	17b1546dc1	Changed the way screenshots are created (Bug #191)	2012-02-10 20:23:59 +01:00
gugus	94ab65f8bb	fixe a compiling error?	2012-02-10 16:21:04 +01:00
gugus	ea8335a393	addTopic function	2012-02-10 16:09:43 +01:00
Marc Zinnschlag	bb7730a708	Merge branch 'lightfix'	2012-02-10 14:55:52 +01:00
gugus	597e670eef	corrected the light problem	2012-02-10 14:51:49 +01:00
Marc Zinnschlag	00ac2deefb	Merge remote branch 'pvdk/cmakeogre' into cmakeogre	2012-02-10 14:36:34 +01:00
Marc Zinnschlag	b878c87ba8	Merge branch 'renderingfix'	2012-02-10 14:33:27 +01:00
gugus	e7ef39cabc	more improvements to dialogue filters. Some of them are still missing.	2012-02-09 19:27:15 +01:00
gugus	f76e0e1941	corrected the light problem	2012-02-08 00:32:22 +01:00
Jacob Essex	9cc3af34e5	Removed composite maps, fixes to texture sizes and unloading	2012-02-07 12:41:08 +00:00
Marc Zinnschlag	c4e028effe	fixing a faulty include	2012-02-06 10:48:58 +01:00
Marc Zinnschlag	0b0254d30e	spelling fix	2012-02-06 10:48:14 +01:00
Marc Zinnschlag	784c6fe0ff	some cleanup	2012-02-06 10:41:13 +01:00
Marc Zinnschlag	e1600d9a2a	fixed movable object cleanup for ordinary objects	2012-02-06 10:29:18 +01:00
Marc Zinnschlag	c471aa950f	re-enabled batching for statics; fixed a misplaced assert	2012-02-06 09:42:24 +01:00
gugus	c65c160e7b	finished connecting the dialogue GUI and the dialogue manager	2012-02-05 12:25:23 +01:00
gugus	abe38e5f87	Started to weire the dialogue manager and the dialogue GUI	2012-02-05 10:54:56 +01:00
Marc Zinnschlag	ee02154805	lights without a mesh were not rendered	2012-02-04 10:48:15 +01:00
Marc Zinnschlag	52a6605f10	Merge remote branch 'mirc/refactor_wm' into refactor_wm ... - changed the way dynamics stats are passed to the character creation object - some more clean up Conflicts: .gitignore apps/openmw/mwgui/window_manager.cpp apps/openmw/mwgui/window_manager.hpp	2012-02-03 11:24:28 +01:00
Cris Mihalache	4bc7051741	Finished refactoring, brought CharacterCreation up to standards	2012-02-02 18:31:28 +02:00
Nikolay Kasyanov	472d88e2c5	Feature #162 - Need to create app bundle using CMake, not by hand WIP	2012-02-01 20:48:13 +04:00
Cris Mihalache	ed5892eb5c	Finished moving the bulk of character creation code	2012-01-30 21:53:17 +02:00
Cris Mihalache	d17ba6ce19	Forgot the CharacterCreation files	2012-01-30 19:27:49 +02:00
Cris Mihalache	4b758376be	Created a class for char gen, and starting moving code to it	2012-01-30 16:38:43 +02:00
Marc Zinnschlag	78b6ceabc7	Merge branch 'refdata' into equipment	2012-01-30 12:38:55 +01:00
Marc Zinnschlag	e19cea3e7b	Merge branch 'refdata' into next	2012-01-30 12:38:35 +01:00
Marc Zinnschlag	a4785ffc4f	minor fix	2012-01-30 12:38:13 +01:00
Jason Hooks	2d0e83a2cf	Reversing changes	2012-01-30 00:06:29 -05:00
Jason Hooks	d2b3c1dbac	Collision may be working correctly	2012-01-29 18:13:43 -05:00
Jason Hooks	9c73fa6b6d	Physics sort of fixed	2012-01-29 17:50:51 -05:00
Nikolay Kasyanov	a301fc355e	Feature #162 - Need to create app bundle using CMake, not by hand In progress. Still need to handle dynamically loaded libs (Ogre & Qt plugins)	2012-01-29 23:41:27 +04:00
Marc Zinnschlag	5a70f28f47	removed a warning	2012-01-29 20:29:02 +01:00
Lukasz Gromanowski	b004e2479c	Issue #133 Handle resources across multiple data directories - WIP ... Work In Progress - added support for multiple paths in SoundManager. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-01-29 20:27:03 +01:00
Marc Zinnschlag	81d0d58346	Merge remote branch 'mirc/master' into openengine	2012-01-29 20:25:11 +01:00
Cris Mihalache	daa8fb15ce	Removed all physics-related code from Engine	2012-01-29 20:51:20 +02:00
Cris Mihalache	6d4fa9274e	Moved OpenEngine systems into their appropriate classes	2012-01-29 17:31:18 +02:00
Jason Hooks	1da519a914	Some cleanup	2012-01-29 00:42:55 -05:00
gugus	5cbd256e1c	"full" question support. Now needs to be linked with the dialogue Manager.	2012-01-28 16:16:49 +01:00
gugus	debec44b51	better colors (not perfect yet), and some basic question support (not finished yet).	2012-01-28 16:08:22 +01:00
Marc Zinnschlag	0d7f39fcb5	Merge branch 'refdata' into next	2012-01-28 11:46:34 +01:00
Marc Zinnschlag	f2972b1ca0	turned ContainerStore from a template into a simple struct	2012-01-28 11:45:55 +01:00
Pieter van der Kloet	ea241d85ef	Fixed some issues with the CMake files	2012-01-28 01:36:17 +01:00
Marc Zinnschlag	8de6761a79	general cleanup	2012-01-27 15:11:02 +01:00
Marc Zinnschlag	c081160591	replaced container store in ref data with new custom data implementation	2012-01-27 14:55:58 +01:00
gugus	f7cf5f9bef	improved the dialogue GUI. Questions are still missing.	2012-01-27 14:50:13 +01:00
Marc Zinnschlag	b0256cea34	replaced movement settings in ref data with new custom data implementation	2012-01-27 13:17:30 +01:00
Marc Zinnschlag	aa87bd4030	replaced creature stats in ref data with new custom data implementation	2012-01-26 11:35:47 +01:00
Lukasz Gromanowski	1d96b99532	Issue #168 - Configuration cleanup ... Added tokens processing, modified getInstallPath for linux so we could use ~/.wine/dosdevices symlinks. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-01-25 23:55:43 +01:00
Marc Zinnschlag	c6761e3470	replaced NPC stats in ref data with new custom data implementation	2012-01-25 16:56:49 +01:00
Jason Hooks	6de0847b86	Slightly better performance on animation	2012-01-25 01:21:30 -05:00
Yacoby	46b8d3a83e	Merge pull request #1 from corristo/terrain	2012-01-24 05:41:24 -08:00
Jacob Essex	5e3e6f9165	Fixed some minor bugs, a cells terrain can now be rendered as 4 Ogre::Terrain objects, possibly giving a speed increase	2012-01-24 13:29:31 +00:00
Marc Zinnschlag	baf9cff21d	added customdata base class (issue #185)	2012-01-24 11:24:05 +01:00
Marc Zinnschlag	4b6cd582a7	removed some redundant (and misplaced) functions	2012-01-24 10:45:40 +01:00
Jacob Essex	cd0df082df	Textures are now blended between cells and the texture blending functions are now more abstract	2012-01-23 17:19:54 +00:00
Marc Zinnschlag	26c328e73f	added some more comments to avoid further confusion	2012-01-23 14:55:00 +01:00
Marc Zinnschlag	16bc374921	animation updates were hooked up to the wrong update function	2012-01-23 14:33:06 +01:00
Jason Hooks	3a1d7b7864	Huge Water	2012-01-22 19:24:35 -05:00
Jason Hooks	e1aba44da6	Switching cells in exterior works	2012-01-22 16:38:10 -05:00
Jason Hooks	ec94ecacaf	Zinis branch merge	2012-01-22 15:02:38 -05:00
Nikolay Kasyanov	1b1ce48502	Now terrain manager donesn't try to load terrain for interiors	2012-01-22 20:20:12 +04:00
Marc Zinnschlag	7439c83623	Added custom copy-constructor, assignment-operator and destructor for RefData ... Prerequisite for the ContainerStore rewrite, which is a prerequisite for issue #117.	2012-01-22 11:22:12 +01:00
Marc Zinnschlag	6a88133178	Split refdata.hpp in a hpp and a cpp file ... Prerequisite for the ContainerStore rewrite, which is a prerequisite for issue #117.	2012-01-22 11:00:40 +01:00
Jason Hooks	a0838369b2	Very basic exterior water	2012-01-21 20:05:08 -05:00
Jacob Essex	637302fc87	Added blended textures to the terrain	2012-01-21 17:59:12 +00:00
Jacob Essex	18108c02a7	Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered	2012-01-21 16:59:08 +00:00
Lukasz Gromanowski	406897aa64	Issue #168 - Configuration cleanup - WIP ... Sources update. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-01-21 17:58:49 +01:00
Lukasz Gromanowski	7c24ae9ac7	Issue #168 - Configuration cleanup - WIP ... This is "work in progress" commit, it shall not be merged alone, without succeeding commits (it's not fully functional). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-01-21 01:31:20 +01:00
Jason Hooks	84f45b1972	underwater view	2012-01-20 17:59:56 -05:00
Jason Hooks	2aad3a0bd8	Correct water levels	2012-01-19 23:29:07 -05:00
Jason Hooks	ff2bbc9fc5	Transparent water	2012-01-18 22:42:07 -05:00
Jason Hooks	bcf3e45ff6	Proper buffer designation	2012-01-18 22:00:03 -05:00
Marc Zinnschlag	0c2de2c00c	Merge branch 'animation2'	2012-01-17 15:37:51 +01:00
Marc Zinnschlag	9b910dda94	clean up	2012-01-17 15:10:53 +01:00
Marc Zinnschlag	e3631003e9	Merge remote branch 'yacoby/detailed_fps'	2012-01-17 14:04:00 +01:00
Marc Zinnschlag	f5a82931b6	some cleanup	2012-01-17 13:53:27 +01:00
Jacob Essex	e73640e720	Improved code, added labels to the counter	2012-01-17 11:58:06 +00:00
gugus	484b8a95f0	removed useless std::cout	2012-01-16 21:58:18 +01:00
Jacob Essex	3b15170d09	Cleaned up and simplified the code relating to the fps display	2012-01-16 18:16:33 +00:00
gugus	eb4dea3d87	Previous/Next button implemented	2012-01-16 17:46:25 +01:00
Jacob Essex	18e4b73a86	Added a more detailed fps counter displaying the triangle and batch count	2012-01-16 15:33:21 +00:00
Jason Hooks	8798f7dd40	Bringing in some of Azathoth's work	2012-01-14 18:34:14 -05:00
Jason Hooks	e35aee0f89	Disjointed free part fix	2012-01-13 02:19:28 -05:00
Jason Hooks	41769f202c	Huge Performance Increase	2012-01-13 00:48:52 -05:00
Jason Hooks	d1793bc4bd	Animation files in the correct directory	2012-01-12 20:09:55 -05:00
Jason Hooks	0712bba49b	Changing a few things around with handleshapes	2012-01-12 16:03:07 -05:00
gugus	9031f62962	The journal is now in the center of the screen.	2012-01-11 12:58:39 +01:00
Jason Hooks	5e1cc07ee8	Fixed ancestor ghost crash	2012-01-10 02:00:04 -05:00
Jason Hooks	eab69f18ac	File output switch	2012-01-10 00:34:29 -05:00
Jason Hooks	7fde576dd9	actor physics again	2012-01-07 23:21:19 -05:00
Jason Hooks	a615369189	Warning and different physics	2012-01-06 22:52:15 -05:00
Jason Hooks	295eb27c2d	Better Text Indices; Better file output	2012-01-06 18:23:41 -05:00
Jason Hooks	859ac1153e	Basic Text Indices Working	2012-01-06 02:27:10 -05:00
Jason Hooks	0715f9b6ab	Preparing to use text indices	2012-01-06 00:55:02 -05:00
Jason Hooks	595d0b1192	Cleanup; warnings	2012-01-05 21:45:17 -05:00
Jason Hooks	c2fa82326d	Animation with physics attempt	2012-01-04 23:48:25 -05:00
Jason Hooks	45c57721ff	Turning off hardware skinning2	2012-01-04 20:30:06 -05:00
Jason Hooks	1d2e77d947	Turning off hardware skinning	2012-01-04 19:47:06 -05:00
Jason Hooks	762727308e	Hardware skinning working (YESgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --all)	2012-01-02 23:06:10 -05:00
Jason Hooks	a4c6d948d4	Disabling normal updates	2012-01-01 20:51:26 -05:00
Jason Hooks	289b8f667e	Various npc heights	2012-01-01 17:28:46 -05:00
Jason Hooks	f7d26b2695	Scaling for wood elves	2012-01-01 00:05:21 -05:00
Jason Hooks	497d994525	female argonian fix	2011-12-31 02:41:26 -05:00
gugus	428d0ce820	journal formating. Problems with french accents.	2011-12-30 11:39:17 +01:00
gugus	5cfac197d4	Merge branch 'journalfix' of https://github.com/zinnschlag/openmw.git into journal	2011-12-29 17:59:21 +01:00
gugus	d59284a096	first attempt to read the journal	2011-12-29 17:58:58 +01:00
Marc Zinnschlag	33f8049a36	accessing topic index didn't work	2011-12-29 17:32:57 +01:00
Jason Hooks	42e7ff9b13	Introducing loops; SkipAnim; Skeleton reset bug fixed	2011-12-28 21:52:05 -05:00
Jason Hooks	c8cca06b40	unlocking change and stop change	2011-12-28 17:34:47 -05:00
Jason Hooks	8c3127367a	Npc Optimization	2011-12-27 22:35:22 -05:00
Jason Hooks	cef2f5e927	Trying to get code to conform with older c++	2011-12-27 19:19:45 -05:00
Jason Hooks	d855bb4fc6	physics reenabled	2011-12-27 17:52:17 -05:00
Jason Hooks	c399f4f210	Fixing a few things	2011-12-27 17:12:47 -05:00
Jason Hooks	1a90f4241b	Npc Animation Working	2011-12-27 00:25:52 -05:00
Jason Hooks	a6b88b48ec	A different way	2011-12-27 00:20:14 -05:00
Jason Hooks	653d999ac4	Animation creatures	2011-12-26 19:23:46 -05:00
Jason Hooks	88c427543b	Deleting animations; Empty Functions/Planning	2011-12-25 22:37:26 -05:00
Jason Hooks	7eee54bcd7	More physics and managing of Animation objects	2011-12-25 01:52:57 -05:00
Jason Hooks	1b835d6702	Cell changing fixes	2011-12-24 21:53:12 -05:00
Jason Hooks	7cf3fc8991	handleAnimationTransforms	2011-12-18 03:18:26 -05:00
Jason Hooks	6d10c76b06	Unique Identifiers for Creatures and NPC Free Parts	2011-12-17 01:29:08 -05:00
Jason Hooks	93a4060346	Switching handleShapes to use sets instead of maps	2011-12-15 00:41:44 -05:00
Jason Hooks	d51dfebde1	NPCs fully rendered	2011-12-15 00:33:10 -05:00
Jason Hooks	47112ad7f9	Changing a lot of things	2011-12-13 23:49:03 -05:00
Jason Hooks	509009e5c1	Putting the actors in a list	2011-12-11 23:42:39 -05:00
Jason Hooks	0902a3db89	Filled out NpcAnimation and CreatureAnimation classes	2011-12-11 22:40:00 -05:00
gugus	dd14368f76	correct CMake	2011-12-11 11:24:25 +01:00
gugus	28bd9ce362	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal	2011-12-11 11:21:57 +01:00
gugus	7a3bc885d0	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal ... Conflicts: apps/openmw/CMakeLists.txt	2011-12-11 11:21:48 +01:00
Jason Hooks	39338f4be1	NPC bounded parts	2011-12-09 15:20:35 -05:00
Jason Hooks	5c48d8fc1e	more stuff	2011-12-09 03:02:09 -05:00
Jason Hooks	ee98a2af1a	Empty npcs	2011-12-09 00:08:30 -05:00
gugus	4087ab3cda	correct CMake and add some text formating attempt.	2011-12-01 13:44:34 +01:00
gugus	62946cc79d	can now clear text.	2011-11-28 17:00:32 +01:00
gugus	bc51ba5a38	Add the journal window (J key). It's still not in the right position.	2011-11-28 16:51:11 +01:00
Jason Hooks	835c3f2603	Working towards npc rendering	2011-11-27 02:27:06 -05:00
Jason Hooks	7bd911b401	Problems with handles	2011-11-24 23:13:34 -05:00
Jason Hooks	16ff2a7a1b	Changing to Actors;NPCAnimation;CreatureAnimation	2011-11-24 01:48:54 -05:00
Jason Hooks	0d3338f867	Some naming changes	2011-11-22 02:39:28 -05:00
Marc Zinnschlag	51d9c2c780	fixed argument type in ai related script instructions	2011-11-21 14:16:20 +01:00
Marc Zinnschlag	0f4adc39b3	added animation-related script instructions	2011-11-21 14:08:44 +01:00
Marc Zinnschlag	51d5c7cd59	Merge remote branch 'jhooks/mwrender' into mwrender ... Conflicts: apps/openmw/engine.cpp - fixed code that did not compile - removed tons of tabs - more clean up	2011-11-21 12:52:28 +01:00
Jason Hooks	7385948056	Yet another crash fix	2011-11-19 20:22:56 -05:00
Jason Hooks	d8367f4968	Activation fix	2011-11-19 17:45:05 -05:00
Jason Hooks	7319f7a8c6	Many bugs fixed related to changing cells	2011-11-19 01:01:19 -05:00
Jason Hooks	15fcdc8b72	Physics working	2011-11-17 19:38:52 -05:00
Jason Hooks	b3e1044699	Exterior cells	2011-11-17 18:08:48 -05:00
Jason Hooks	4dc59dfbdd	Scenenode flip	2011-11-17 17:10:27 -05:00
Jason Hooks	a0947cd432	Player handle changed;Interior removed;Exterior removed;Cellimp removed; Probe fixed	2011-11-16 21:15:49 -05:00
Jason Hooks	9b94074472	addObject	2011-11-16 16:22:13 -05:00
Jason Hooks	58f103a75c	Adding new insertCellRefList;Collection switched to a set	2011-11-15 23:31:18 -05:00
Jason Hooks	bc06d13d30	Removing backups	2011-11-13 23:17:56 -05:00
Jason Hooks	dd46694059	Changing a lot of things in scene and world	2011-11-13 23:14:18 -05:00
Jason Hooks	db57f0a1a5	more corrections	2011-11-13 18:19:29 -05:00
Jason Hooks	bc58ef28cd	Made corrections	2011-11-12 15:58:22 -05:00
Jason Hooks	0b3bb2719f	Fixing some errors	2011-11-12 00:19:22 -05:00
Jason Hooks	c7dadec840	Updating the rest of mwclass	2011-11-11 23:01:12 -05:00
Jason Hooks	62d8d1add2	more recommended changes	2011-11-11 14:37:42 -05:00
Jacob Essex	746c3dc297	Added some minor documentation	2011-11-11 11:25:01 +00:00
Jason Hooks	f4e7bd6dfd	Made some recommended changes	2011-11-11 00:20:53 -05:00
Jacob Essex	3779aaba62	Now no longer need to handle this exception here as it is handled by the dispatcher in the OpenEngine submodule	2011-11-09 23:12:10 +00:00
Jason Hooks	042bceb547	Changes to insertObjectRendering; Proposed insertObject	2011-11-09 18:06:55 -05:00
Jason Hooks	1faa07b279	insertObjectRendering proposed	2011-11-09 15:47:06 -05:00
Jason Hooks	a7652bcb0c	Yacoby's changes on Objects	2011-11-09 13:53:29 -05:00
Jason Hooks	c25b49d2b6	refdata change	2011-11-08 22:59:39 -05:00
Jason Hooks	469086747e	Compile error fix;RenderingInterface separated; buildStaticGeometry argument changed	2011-11-07 23:35:39 -05:00
Jacob Essex	9aac625000	Changes to move the mutable ESM::Position data to RefData	2011-11-08 00:08:00 +00:00
Marc Zinnschlag	9794c4b928	Merge branch 'cmake'	2011-11-06 14:42:18 +01:00
Marc Zinnschlag	cb1373a4c7	rewrote cmake scripts for components	2011-11-06 09:30:15 +01:00
Jason Hooks	c11b3a57c1	Made buildStaticGeometry function	2011-11-05 14:57:33 -04:00
Jason Hooks	8edcd4d15b	removing tabs	2011-11-04 21:57:39 -04:00
Jason Hooks	6c80e75deb	More Objects functionality	2011-11-04 21:48:52 -04:00
Jason Hooks	e041006063	Adding light and fog functions	2011-11-03 23:47:15 -04:00
Jason Hooks	edf85b26f9	Insert Mesh, Insert Light, insertBegin improved	2011-11-03 19:40:37 -04:00
Marc Zinnschlag	4e25200844	fixed usage of Qt exit	2011-11-03 09:08:40 +01:00
Jason Hooks	9ac627c931	Commenting out assert	2011-11-02 22:45:58 -04:00
Jason Hooks	d49a02abe5	new insertBegin()	2011-11-02 22:41:48 -04:00
Jacob Essex	0e3859385d	Now ensures that the directory to the config file exists before Ogre tries to access it	2011-11-02 11:11:27 +00:00
Jason Hooks	c2181d2091	Dealing with scenenodes	2011-11-02 00:13:33 -04:00
Jason Hooks	5822221ae1	Made recommended changes	2011-11-01 13:47:36 -04:00
Jason Hooks	3d43a4cd33	Made recommended changes	2011-11-01 13:46:57 -04:00
Jason Hooks	f1bc5b0ab6	Objects started, RenderingInterface	2011-10-31 23:59:16 -04:00
Jason Hooks	3761271c59	Empty creature, objects, npc	2011-10-31 00:04:06 -04:00
Jason Hooks	86d3cec1aa	Changing refdata3	2011-10-30 22:38:15 -04:00
Jason Hooks	15fae749ae	Changing refdata2	2011-10-30 17:31:49 -04:00
Jason Hooks	e1558e8e14	Changing refdata	2011-10-30 16:59:40 -04:00
Jason Hooks	1083db5582	Hiding debugging	2011-10-30 00:25:29 -04:00
Jason Hooks	db73487623	Physics fix and cmake changes	2011-10-29 18:52:57 -04:00
Jason Hooks	ee923e1abe	Testing	2011-10-29 18:43:16 -04:00
Marc Zinnschlag	2ee6be1a34	finished cmake cleanup for apps/openmw source files	2011-10-29 13:17:04 +02:00
Marc Zinnschlag	583e7221ef	silenced a warning and removed some tabs	2011-10-29 09:55:22 +02:00
Marc Zinnschlag	33ecd8b66c	fixed collision toggling bug	2011-10-29 09:50:11 +02:00
Jason Hooks	c3a492bf74	Debugging file renamed	2011-10-25 14:06:44 -04:00
Jason Hooks	d4f63443e6	Hiding the rendering manager; crash eliminated	2011-10-24 22:11:36 -04:00
Jason Hooks	965ff24597	Removing Object:	2011-10-24 13:57:12 -04:00
Jason Hooks	0c8aa7fae3	Removing Object:	2011-10-24 13:55:10 -04:00
Jason Hooks	6efc61b9df	Removal of MWScene; Object listing fixed	2011-10-24 13:42:36 -04:00
Marc Zinnschlag	ad086312b8	testing: cmake script simplification	2011-10-22 13:55:06 +02:00
Jason Hooks	30ba9b74da	Simple Debugging class	2011-10-22 00:15:15 -04:00
Jason Hooks	47593f3641	Removing old files	2011-10-20 19:35:49 -04:00
Jason Hooks	fcf404d27b	GetFacedHandle in Physics. RenderingManager constructor code added	2011-10-20 18:15:30 -04:00
Jason Hooks	3315de8b4a	Naming convention change	2011-10-20 15:02:19 -04:00
Jason Hooks	d0f922ec5d	Moved SkyManager creation	2011-10-20 13:55:56 -04:00
Jason Hooks	0992f1e903	Applying Gus's Windows fix	2011-10-18 21:02:42 -04:00
Jason Hooks	9126bb27b6	empty functions	2011-10-18 19:50:19 -04:00
Pieter van der Kloet	5dbbc5bb7b	Changed error handling for Ogre config and made the launcher exit cleanly	2011-10-12 23:02:27 +02:00
Pieter van der Kloet	283a9183d0	Merge remote-tracking branch 'upstream/master'	2011-10-12 22:45:49 +02:00
Marc Zinnschlag	abeb3a22d4	Issue #19: Cleaned up Engine includes	2011-10-09 13:12:44 +02:00
Marc Zinnschlag	bc8db3612a	Issue #19: Create OGRE renderer in go function instead of Engine's constructor ... This avoids setting up a renderer each time openmw is called with the --help switch.	2011-10-09 13:05:38 +02:00
Marc Zinnschlag	39af941d6f	Issue #19: Moved code from Engine to WindowManager and ScriptManager	2011-10-09 12:05:13 +02:00
Marc Zinnschlag	38c0f36d44	Issue #19: Finished cleaning out the Engine framelistener	2011-10-09 09:28:36 +02:00
Marc Zinnschlag	8bf4abf53b	Issue #19: Focus Reporting Improvements ... - moved focus reporting code out of the framelistener - made focus reporting optional (new --report-focus switch) - report based on tiem passed instead of number of frames passed - only report if focus has changed	2011-10-08 10:31:23 +02:00
Marc Zinnschlag	fbcb5fe681	Issue #19: Some more framelistener cleanup	2011-10-08 10:15:03 +02:00
Marc Zinnschlag	8bebae17aa	Issue #19: More local script related cleanup	2011-10-07 09:52:42 +02:00
Marc Zinnschlag	896b7da23d	Issue #19: fixed RNG in engine's frame listener	2011-10-06 12:36:16 +02:00
Marc Zinnschlag	3bef04cb1d	Issue #19: fixed exception handling in engine's frame listener	2011-10-06 12:34:13 +02:00
Marc Zinnschlag	10778d8c3e	Issue #19: factored out local script handling into a separate class ... This also fixes a bug related to self-destructing references (introduced during the cell handling improvements)	2011-10-06 12:30:30 +02:00
Pieter van der Kloet	9e34f30500	Merge remote-tracking branch 'upstream/master'	2011-10-04 00:40:41 +02:00
Marc Zinnschlag	22514cbd4c	Merge branch 'debfix'	2011-09-30 09:36:21 +02:00
Marc Zinnschlag	9872c89539	packaging fixes for .deb packages	2011-09-30 09:36:06 +02:00
Marc Zinnschlag	695452e1a3	Issue #169: Don't continue to run local scripts after the reference the script is attached to has been deleted	2011-09-29 09:02:06 +02:00
Marc Zinnschlag	f6249c39d5	Merge branch 'farcells'	2011-09-29 08:42:38 +02:00
Pieter van der Kloet	6bfaf221e8	Created working icon for Windows and removed QMake file (not parsed by CMake)	2011-09-28 02:57:57 +02:00
Marc Zinnschlag	b866323cf3	Issue #31: create new exterior cells on the fly	2011-09-27 10:08:07 +02:00
Marc Zinnschlag	7c8853f6fe	post-merge fixes	2011-09-27 09:45:28 +02:00
Marc Zinnschlag	8da15440e0	Issue #31: added function for creating cell records	2011-09-26 11:11:30 +02:00
Marc Zinnschlag	cd7aaab48e	Merge branch 'cells' into next ... Conflicts: apps/openmw/engine.cpp	2011-09-24 12:10:53 +02:00
Marc Zinnschlag	02ce672fdc	preload cell's reference list when accessing a reference outside of the actice cells (memory usage and speed optimisation)	2011-09-24 11:45:59 +02:00
Marc Zinnschlag	af4f48fd3f	Issue #28: implemented access to references outside of the active cells	2011-09-22 12:44:17 +02:00
Marc Zinnschlag	aa87370d8f	Issue #28: moved cell-specific getPtr function from World to Cells	2011-09-22 11:59:39 +02:00
Marc Zinnschlag	ce7202a147	Issue #28: shifting around functionality among CellStore, Cells and CellList	2011-09-10 11:23:30 +02:00
Marc Zinnschlag	e8632a799d	Feature #28: refactored out cell management into a separate class	2011-09-08 11:02:55 +02:00
Alexander "Ace" Olofsson	0defc590bc	Quick fix for always using OpenGL rendering, no matter the selected rendersystem	2011-09-07 10:17:46 +02:00
Pieter van der Kloet	ada552ed1f	Added tooltip with plugin info and visual indication of missing masters	2011-09-06 21:37:08 +02:00
Pieter van der Kloet	b7ae31d5fe	Fixed a context menu bug which caused an assert on empty view	2011-09-06 20:45:45 +02:00
Pieter van der Kloet	c9be134226	Fixed config file writing when file does not exist	2011-09-06 15:57:40 +02:00
Pieter van der Kloet	3e6658428b	Removed commented line	2011-09-06 03:54:37 +02:00
Pieter van der Kloet	889e7d6c2e	Config file handling changes to use the right priority and behave like openmw	2011-09-06 03:50:40 +02:00
Pieter van der Kloet	b60bb408fd	Added some useful error messages when things go wrong with Ogre	2011-09-06 02:02:34 +02:00
Pieter van der Kloet	ccfd011df6	Modified write function to always use user location for openmw.cfg	2011-09-06 02:00:18 +02:00
Marc Zinnschlag	40853e292f	various bits of clean up	2011-09-04 09:48:50 +02:00
Marc Zinnschlag	afa84b72e0	fixed exterior bug	2011-09-03 10:26:31 +02:00
Lukasz Gromanowski	d43455fd57	Issue #168: Configuration cleanup, part 2 ... Corrected --data and --data-local parameters handling. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2011-09-02 22:45:21 +02:00
Lukasz Gromanowski	54cb6deab9	Issue #168: Configuration cleanup, part 2	2011-09-02 20:01:24 +02:00
Pieter van der Kloet	ceb8190121	Modified config saving to use Ogre's own methods instead of custom stuff	2011-09-01 05:53:08 +02:00
Marc Zinnschlag	0a2979caf2	more cleanup	2011-08-27 10:45:09 +02:00
Marc Zinnschlag	f8029aaa9e	more cleanup; fixes for player handling during physics (unrelated to the actual refactoring bugs); fixed minor bug in character initialisation	2011-08-27 10:30:38 +02:00
Marc Zinnschlag	4191bb32d1	fixed an unitialised variable	2011-08-22 21:34:51 +02:00
Marc Zinnschlag	705e11becb	Merge remote branch 'swick/mwrender' into mwrender ... Conflicts: apps/openmw/mwworld/world.cpp	2011-08-22 21:27:53 +02:00
Lukasz Gromanowski	ea7eb7a62d	fixes #128 Configuration cleanup. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2011-08-19 21:06:09 +02:00
Sebastian Wick	29b8a5374b	get rid of the warnings	2011-08-19 17:03:47 +02:00
Pieter van der Kloet	50773448d9	Small change in the way config files are found, now includes global config and error handling	2011-08-13 22:35:06 +02:00
Marc Zinnschlag	6d8cfa7dfa	fixed crash bug	2011-08-09 09:56:09 +02:00
Sebastian Wick	a13b958600	MWWorld::Scene::insertCell	2011-08-09 00:05:16 +02:00
Sebastian Wick	b7dbfb849a	moved skyManager into RenderingManager	2011-08-08 21:11:30 +02:00
Marc Zinnschlag	012a41427c	Merge remote branch 'swick/mwrender' into mwrender	2011-08-08 10:30:06 +02:00
Sebastian Wick	54724d7e7f	start RenderingManager	2011-08-07 16:40:01 +02:00
Alexander "Ace" Olofsson	a931124a2f	Changed the confg writer, it now creates configs identical to those created by Ogre itself. This seems to have solved a small issue with Ogre always using OpenGL rendering even when Direct3D was selected in Windows.	2011-08-02 19:54:19 +02:00
Sebastian Wick	74b4a0cbe5	World::moveObjectImp private	2011-08-02 19:46:21 +02:00
Alexander "Ace" Olofsson	141e779e81	Some small launcher fixes	2011-08-02 19:21:27 +02:00
Sebastian Wick	41d4ad93f8	World::moveObjectImp	2011-08-02 18:50:31 +02:00
Sebastian Wick	7cf66443df	const std::string* to std::string	2011-08-02 18:44:10 +02:00
Sebastian Wick	52bf3af565	make World::PhysicsSystem not depending on World::World	2011-08-02 18:16:39 +02:00
Sebastian Wick	4b846a54f1	PhysicsSystem	2011-08-01 15:55:36 +02:00
Sebastian Wick	8d4dc096a4	move getExterior back	2011-08-01 14:41:15 +02:00
Sebastian Wick	3f007d29cc	move mInteriors and mExterior back to World::World	2011-08-01 14:34:50 +02:00
Sebastian Wick	6baf904f0f	mStore fixed; glibc detected in shutdown process	2011-08-01 04:53:06 +02:00
Sebastian Wick	b131f022ba	constructor & destructor	2011-08-01 04:36:23 +02:00
Sebastian Wick	380cd5ca35	World::Scene improvements	2011-08-01 04:30:21 +02:00
Sebastian Wick	af59f3c475	cut down World::Scene	2011-08-01 04:17:50 +02:00
Sebastian Wick	97e4f698a7	World::World looks good for now, cutting down World::Scene; still the to_utf8 error	2011-08-01 04:11:50 +02:00
Sebastian Wick	64633ddcdb	wired string to_utf8 error (maybe it returnes an empty string)	2011-08-01 04:06:38 +02:00
Sebastian Wick	ff68ca7e52	next try :/	2011-08-01 03:33:02 +02:00
Marc Zinnschlag	b157273cd9	Merge branch 'next' ... Conflicts: apps/openmw/main.cpp	2011-07-31 19:28:12 +02:00
Marc Zinnschlag	b3ad3d0778	Merge remote branch 'pvdk/newlauncher' into newlauncher	2011-07-31 19:22:44 +02:00
Pieter van der Kloet	88edbad717	Changed plugins.cfg lookup code to include the global directory	2011-07-31 19:17:52 +02:00
Pieter van der Kloet	8c4a246abd	Disabled Ogre debug output to stdout/stderr	2011-07-31 18:13:24 +02:00
Sebastian Wick	008a3768e2	use MWWorld::Scene	2011-07-31 17:59:08 +02:00
Pieter van der Kloet	3fb99fa4b5	Modified Ogre exception handling to get rid of a compiler warning	2011-07-31 17:43:16 +02:00
Sebastian Wick	e7057bed29	moving stuff from MWWorld::World to MWWorld::Scene but receiving segfault signals	2011-07-31 17:07:11 +02:00
Marc Zinnschlag	14704e65a1	minor fix	2011-07-31 10:42:42 +02:00
Pieter van der Kloet	1b536d69f3	Added and removed some debugging information	2011-07-30 19:19:24 +02:00
Pieter van der Kloet	18d8d89bdb	Removed all debug messages	2011-07-30 03:09:29 +02:00
Pieter van der Kloet	c9c54fed8f	Modified Boost fix to work with Boost ≥ 1.46	2011-07-29 21:39:20 +02:00
Marc Zinnschlag	0acf34a0de	boost compatibility fix	2011-07-28 10:03:44 +02:00
Pieter van der Kloet	24a07eef05	Merge remote-tracking branch 'upstream/master' into newlauncher	2011-07-23 23:25:05 +02:00
Marc Zinnschlag	4367b93e64	typo	2011-07-23 11:56:01 +02:00