417 commits

Author	SHA1	Message	Date
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	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
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
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	6d27ebabb6	Integrate AddGlow with material controllers	2013-12-26 20:53:45 +01:00
Marc Zinnschlag	18e7e83585	Merge remote-tracking branch 'mrcheko/savedgame' into savedgame	2013-12-20 13:13:06 +01:00
mrcheko	3816a09c6f	bug 428 ask to load recent saved game	2013-12-19 22:08:34 +02:00
Marc Zinnschlag	09fadd446b	Merge remote-tracking branch 'mrcheko/savedgame' into savedgame	2013-12-17 19:33:32 +01: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
mrcheko	fd9f8c34f6	bug fix http://bugs.openmw.org/issues/428	2013-12-15 18:50:25 +02:00
Marc Zinnschlag	74793c1c2f	globals script cleanup; fixed potential case folding bug	2013-12-12 13:15:38 +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
scrawl	0bc3a13c0f	Break invisibility on Use or Activate	2013-12-08 23:36:37 +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
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
Marc Zinnschlag	2293b92efe	storing and loading the journal	2013-12-03 14:28:46 +01:00
scrawl	076cc9230b	First try at handling target magic	2013-11-28 17:31:17 +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	71436b1160	changed interface for global variable access	2013-11-28 09:10:38 +01:00
Marc Zinnschlag	99ea63dc4a	factored out code for generating month names	2013-11-26 12:47:30 +01:00
Marc Zinnschlag	bc6fe682c9	replaced getCurrentCellName function with a more general getCellName function	2013-11-26 11:39:58 +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	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
scrawl	2e87cbc231	Add basic functionality to SaveGameDialog	2013-11-21 20:34:34 +01:00
scrawl	800a2845b0	Add Bound & Summon effects (will need some adjustments later)	2013-11-21 17:14:23 +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	cbbdf390ad	added function for inspection of saved characters and character slots	2013-11-21 11:10:18 +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	7f735c2c4c	Release and show the cursor when focus lost	2013-11-20 16:07:14 +01:00
Marc Zinnschlag	8190fdb16c	Merge remote-tracking branch 'scrawl/master'	2013-11-19 16:56:18 +01:00
scrawl	e8dcd74741	Recharge enchanted items in player's inventory over time	2013-11-19 16:42:24 +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	cab535dd69	Implement magic item recharging via soulgem use	2013-11-19 06:48:47 +01:00
gus	dff3cf162d	ToggleAI script instruction	2013-11-18 23:03:44 +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
scrawl	0dc2e829dd	Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX.	2013-11-17 23:31:08 +01:00
Marc Zinnschlag	ec5b2e9a7e	added running flag; moved new game code to MWState	2013-11-16 12:22:28 +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	f7befa3e54	Remove a no longer required method	2013-11-15 02:20: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
Emanuel Guevel	467bd91651	Update actor model on inventory change	2013-11-10 02:45:17 +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
scrawl	cbe96a2170	Refactor ActiveSpells to track range type. Added basic self range magic.	2013-11-09 07:51:46 +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
scrawl	4f35fd8184	Removed a workaround from Renderer, some cleanup	2013-10-30 13:05:28 +01:00
Marc Zinnschlag	87cd5d4267	Merge remote-tracking branch 'potatoesmaster/DisableLevitation'	2013-10-12 13:31:06 +02:00
Emanuel Guevel	4265dddc40	Add MWWorld::isSlowFalling(Ptr)	2013-10-02 23:34:25 +02: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
mckibbenta	89b7d6121d	Initial toggleGodMod/tgm instruction. Currently only affects player health.	2013-09-12 08:30:00 -04: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
mckibbenta	f65172bdca	Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm	2013-08-29 20:26:36 -04:00
Chris Robinson	16331bf1ed	Avoid a hack to play the underwater sound properly	2013-08-27 13:26:57 -07: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
mckibbenta	60fa69139e	minor changes	2013-08-25 19:20:14 -04: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
Chris Robinson	f5d03a16c1	Rename getFacedObject and getFacedHandle for melee hits	2013-08-23 12:27:39 -07:00
Chris Robinson	a993af53e7	Merge remote-tracking branch 'zini/master' into physics	2013-08-20 02:21:44 -07:00
scrawl	ebf9debb80	Enabled terrain self shadows, implemented getHeightAt, some optimizations	2013-08-19 20:39:37 +02:00
Chris Robinson	9d56e2d86d	Apply movement by queueing it to do later	2013-08-17 22:34:38 -07:00
Chris Robinson	2353ac1739	Properly implement SetWerewolfAcrobatics	2013-08-13 04:54:41 -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
PLkolek	86020ad94d	Added underwater and drowning sounds.	2013-08-08 20:57:15 +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
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	20d40c4368	Implement MWWorld::World::setWerewolf()	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
Emanuel Guevel	8f8362d2c4	Expose sneak indicator widget through WindowManager	2013-08-03 03:03:29 +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
Marc Zinnschlag	3642562959	Merge remote-tracking branch 'scrawl/master'	2013-07-30 08:11:40 +02:00
scrawl	3961c276b8	Added enemy health meter	2013-07-30 06:00:20 +02:00
Sebastian Wick	7b40e57ba1	Allow the 'Activate' key to close the countdialog window; cleanups	2013-07-29 18:27:00 +02:00
scrawl	6164e5bae6	Restored window resizing	2013-07-29 02:32:08 +02:00
Chris Robinson	c94653dc49	Implement the ModRegion script function	2013-07-27 07:10:18 -07:00
Chris Robinson	1174b85ac8	Implement Disable/EnableTeleporting script functions	2013-07-27 00:14:55 -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	d8ec813939	Say something from the "hit" dialog topic when losing health	2013-07-24 10:02:50 -07:00
Marc Zinnschlag	a8168c58c2	Merge remote-tracking branch 'kolek/thirdpersonzoom'	2013-07-20 18:29:59 +02:00
Kolzi	1b7966ca27	Can zoom in and out in third person view.	2013-07-19 16:12:01 +02:00
Chris Robinson	14e0c182f3	Allow specifying the sound type to playSound and playSound3D	2013-07-18 21:50:11 -07:00
greye	f3d54a7ba4	move finding default cell positions to World	2013-07-07 15:03:06 +04:00
Vincent Heuken	b095c24854	resize actor collision boxes on death	2013-06-27 14:11:20 -07: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
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	fa63ebce78	Merge remote-tracking branch 'scrawl/master'	2013-05-27 10:19:02 +02:00
scrawl	3a6e54c4f5	Sell owned items in the cell	2013-05-27 02:18:36 +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
Glorf	0539ca6a9c	Bugfix #778	2013-05-16 13:35:28 +02:00
scrawl	c41f119ba6	Added new game button	2013-05-15 17:54:18 +02:00
Marc Zinnschlag	e14cb6853f	Merge remote-tracking branch 'scrawl/containerui'	2013-05-11 19:23:02 +02:00
scrawl	0c4a963132	Container UI rewrite	2013-05-11 18:38:27 +02:00
kpp	24d619d6b4	Changes the logic of WindowManager::messageBox() ... Fixes removeItem Fixes addItem	2013-05-10 14:06:25 +04:00
Marc Zinnschlag	c80ffa0a16	Merge remote-tracking branch 'gus/AIFix'	2013-05-08 20:31:57 +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	78e6dab9d2	Dialogue history rewrite WIP	2013-05-04 14:15:47 +02:00
Glorf	57f22c77c0	Bugfix #732 part 1	2013-05-03 12:44:27 +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	089ef7a2a0	Merge remote-tracking branch 'glorf/acrobatics'	2013-05-01 13:44:23 +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	627c3fdb6b	Added GetStandingPC, GetStandingActor; Fixed GetStartingPos	2013-05-01 11:15:43 +02: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
Marc Zinnschlag	93868c8bca	Merge remote-tracking branch 'scrawl/master'	2013-04-29 18:08:25 +02:00
Glorf	74de8b83b6	Enabled collision when new game	2013-04-29 17:56:16 +02:00
scrawl	867c7db014	Fix wrong door sounds	2013-04-29 11:00:15 +02:00
Chris Robinson	24e503330b	Merge remote-tracking branch 'zini/master' into animations	2013-04-28 09:41:31 -07:00
scrawl	9343b4459e	Opening doors	2013-04-28 14:59:15 +02:00
Chris Robinson	137017b325	Don't allow forcing vanity mode	2013-04-27 01:24:36 -07:00
Marc Zinnschlag	1e9656ee9c	Merge remote-tracking branch 'glorf/rotate-update1'	2013-04-25 20:22:40 +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
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	2693b78536	Add initial player inventory when new game is started	2013-04-15 02:56:23 +02:00
Tom Mason	6ca2b1af74	fix for turning animations playing when in vanity mode	2013-04-09 19:24:41 +01: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	05a5cb3ae4	Improved responsiveness of the inventory window when resizing.	2013-04-03 00:27:29 +02:00
scrawl	1a2daa3bc1	Merge branch 'master' of git://github.com/zinnschlag/openmw into companion	2013-03-31 14:50:03 +02:00
scrawl	b0199c703c	Companion UI	2013-03-31 13:13:46 +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
scrawl	51204f098e	Added soulgem dialog; made interactive message boxes not close the previous UI	2013-03-30 15:51:07 +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	6643fe789c	Enchanting system	2013-03-28 17:41:00 +01:00
scrawl	a2ca679beb	Added PC repair feature	2013-03-23 08:16:46 +01:00
scrawl	20774f8f81	Added merchant repair feature	2013-03-22 14:13:10 +01:00
Glorf	a07c910d0b	Feature #535: Console object selection improvements	2013-03-18 21:33:12 +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
Glorf	ea7f386e7d	Access to Fallback via getFallback	2013-03-17 13:50:15 +01:00
scrawl	1666bc7740	Armor rating	2013-03-16 22:53:33 +01:00
scrawl	cebcbe11f8	Implemented service refusal	2013-03-16 20:32:21 +01:00
Glorf	521bebd2f4	Fallback system rewritten, added light fallbacks	2013-03-15 10:17:30 +01:00
scrawl	285b4bf726	Allow zooming camera in vanity or preview mode with the mousewheel	2013-03-08 00:12:56 +01:00
scrawl	e34685b8a3	Fix manually changed mouse cursor	2013-03-07 12:46:26 +01:00