cc9cii 312b7cd571 Merge branch 'master' into QtOGre ...

Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/pagedworldspacewidget.hpp
	components/nif/niffile.hpp
	libs/openengine/bullet/physic.hpp

2014-09-30 10:52:04 +10:00

..

action.cpp

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

action.hpp

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

actionalchemy.cpp

Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat.

2014-04-24 22:47:45 -04:00

actionalchemy.hpp

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

actionapply.cpp

Fix Potion use action removing the potion even when the action is not executed (Fixes #1521)

2014-06-17 04:05:20 +02:00

actionapply.hpp

Fix Potion use action removing the potion even when the action is not executed (Fixes #1521)

2014-06-17 04:05:20 +02:00

actiondoor.cpp

Opening doors

2013-04-28 14:59:15 +02:00

actiondoor.hpp

Opening doors

2013-04-28 14:59:15 +02:00

actioneat.cpp

Remove static method MWWorld::Class::get(&Ptr)

2014-05-22 20:50:00 +02:00

actioneat.hpp

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

actionequip.cpp

Cycle with equipped items if all slots are occupied (Fixes #1395)

2014-06-05 14:54:07 +02:00

actionequip.hpp

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

actionopen.cpp

Closes #1081: Implement disease contraction

2014-01-03 23:33:14 +01:00

actionopen.hpp

Added "dispose corpse" button, added stealing (all items visible and no penalty yet)

2013-03-07 14:00:13 +01:00

actionread.cpp

Remove static method MWWorld::Class::get(&Ptr)

2014-05-22 20:50:00 +02:00

actionread.hpp

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

actionrepair.cpp

Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat.

2014-04-24 22:47:45 -04:00

actionrepair.hpp

Added PC repair feature

2013-03-23 08:16:46 +01:00

actionsoulgem.cpp

Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat.

2014-04-24 22:47:45 -04:00

actionsoulgem.hpp

Added soulgem dialog; made interactive message boxes not close the previous UI

2013-03-30 15:51:07 +01:00

actiontake.cpp

Implement theft detection

2014-01-07 19:58:17 +01:00

actiontake.hpp

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

actiontalk.cpp

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

actiontalk.hpp

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

actionteleport.cpp

Fix potential infinite recursion in ActionTeleport (Fixes #1840)

2014-08-26 02:09:23 +02:00

actionteleport.hpp

Fix potential infinite recursion in ActionTeleport (Fixes #1840)

2014-08-26 02:09:23 +02:00

actiontrap.cpp

Basic RefData and CellRef change tracking

2014-05-25 14:30:07 +02:00

actiontrap.hpp

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

cellfunctors.hpp

Show marked position on map. Implement Detect X magic effects.

2014-01-01 22:37:52 +01:00

cellref.cpp

Reset RefNum when copying an object (Fixes #1723)

2014-07-29 15:55:58 +02:00

cellref.hpp

Reset RefNum when copying an object (Fixes #1723)

2014-07-29 15:55:58 +02:00

cellreflist.hpp

Basic RefData and CellRef change tracking

2014-05-25 14:30:07 +02:00

cells.cpp

Search exterior cells in reverse (workaround for duplicate chargen_plank reference in Morrowind.esm and Bloodmoon.esm)

2014-06-28 17:44:52 +02:00

cells.hpp

Fixes #1172: Added basic loading/saving progress bar

2014-04-28 11:29:57 +02:00

cellstore.cpp

Consider moved references in CellStore::listRefs

2014-06-15 14:18:16 +02:00

cellstore.hpp

Feature #32: Implement respawn for containers, creatures and NPCs

2014-05-17 09:09:00 +02:00

class.cpp

Fix cppcheck issues

2014-09-26 17:48:14 +02:00

class.hpp

Fix cppcheck issues

2014-09-26 17:48:14 +02:00

containerstore.cpp

Merge branch 'master' into QtOGre

2014-09-30 10:52:04 +10:00

containerstore.hpp

Attempt to restack item after repair or recharge (Fixes #1656)

2014-07-17 16:16:06 +02:00

contentloader.hpp

Missing iostream include

2013-11-04 10:36:22 +01:00

customdata.hpp

added customdata base class (issue #185)

2012-01-24 11:24:05 +01:00

esmloader.cpp

Issue #913: Merge --master and --plugin switches

2013-09-29 09:11:57 +02:00

esmloader.hpp

Issue #913: Merge --master and --plugin switches

2013-09-29 09:11:57 +02:00

esmstore.cpp

add project file to content file list when running OpenMW from OpenCS

2014-09-13 20:48:24 +02:00

esmstore.hpp

Remove useless throwing of exception

2014-05-22 15:29:36 +02:00

failedaction.cpp

Handle object activation as a werewolf

2013-08-08 22:34:53 -07:00

failedaction.hpp

Handle object activation as a werewolf

2013-08-08 22:34:53 -07:00

fallback.cpp

Fix exception when there are spaces in INI-imported color settings

2014-05-28 21:29:09 +02:00

fallback.hpp

some cleanup

2013-03-15 10:26:04 +01:00

globals.cpp

Fix loading a savegame when some of its content files were disabled

2014-06-01 23:11:38 +02:00

globals.hpp

Fixes #1172: Added basic loading/saving progress bar

2014-04-28 11:29:57 +02:00

inventorystore.cpp

Fix cppcheck issues

2014-09-26 17:48:14 +02:00

inventorystore.hpp

Implement basic spellcasting AI (Fixes #961)

2014-08-28 00:55:37 +02:00

livecellref.cpp

fix for potential script problem during saved game loading

2014-09-22 10:12:07 +02:00

livecellref.hpp

Basic RefData and CellRef change tracking

2014-05-25 14:30:07 +02:00

localscripts.cpp

catch exceptions from adding local scripts

2014-09-21 12:43:19 +02:00

localscripts.hpp

objects scripts are now stopped when they are removed from a container

2013-01-13 17:05:12 +00:00

manualref.hpp

Remove unused FLTV and NAM0 from CellRef

2014-07-24 02:20:16 +02:00

nullaction.hpp

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

physicssystem.cpp

Make sure the Jump control is always handled by the PhysicsSystem even if game runs faster than the minimum physics timestep

2014-09-17 07:02:19 +02:00

physicssystem.hpp

Clear movement queue when changing to a new cell (Fixes #1802)

2014-08-13 16:25:27 +02:00

player.cpp

Make sure player doesn't get any AI packages (Bug #1749)

2014-08-06 20:13:57 +02:00

player.hpp

Fix some spelling mistakes.

2014-05-03 12:23:22 +02:00

projectilemanager.cpp

Set render queue group for projectiles (Fixes #1829)

2014-08-18 15:32:52 +02:00

projectilemanager.hpp

Fix exception when casting Bound Gloves spell

2014-06-19 16:00:27 +02:00

ptr.cpp

Basic RefData and CellRef change tracking

2014-05-25 14:30:07 +02:00

ptr.hpp

Basic RefData and CellRef change tracking

2014-05-25 14:30:07 +02:00

recordcmp.hpp

Cell names localization fix

2012-12-23 23:23:24 +04:00

refdata.cpp

Don't trigger changed flag if a script with no locals is configured

2014-06-26 01:21:15 +02:00

refdata.hpp

Implement idlestorm animation (Feature #41)

2014-06-24 18:37:38 +02:00

scene.cpp

Fix cppcheck issues

2014-09-26 17:48:14 +02:00

scene.hpp

Fix triggering changed flag for all references when cell is visited

2014-06-15 14:18:16 +02:00

store.cpp

Merge cell names when merging cells (Fixes #1929)

2014-09-19 05:02:54 +02:00

store.hpp

Traverse spells in record order from content files. bronrod_the_roarer is perfect now. Other NPCs have some differences.

2014-07-12 18:53:15 +02:00

timestamp.cpp

Savegame: store most of CreatureStats

2014-05-12 21:37:36 +02:00

timestamp.hpp

Savegame: store most of CreatureStats

2014-05-12 21:37:36 +02:00

weather.cpp

Make changeWeather work when the player isn't in a cell yet (workaround for modTESTchargen_v2_5)

2014-09-14 08:38:54 +02:00

weather.hpp

Implement slower movement against storms (Closes #41)

2014-06-27 03:22:00 +02:00

worldimp.cpp

Fix cppcheck issues

2014-09-26 17:48:14 +02:00

worldimp.hpp

Also forgot to remove a now unused variable I introduced

2014-09-11 20:47:14 -04:00