OpenMW

mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-29 00:32:49 +00:00

History

scrawl e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg

Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp

2015-05-04 02:41:50 +02:00

activespells.cpp

Move rng to components

2015-04-22 17:58:55 +02:00

activespells.hpp

fix: multi effect spell with different ranges (Fixes #2285 )

2015-03-01 15:34:18 +13:00

actor.cpp

MechanicsManager, frame update

2015-04-25 15:19:17 +02:00

actor.hpp

Add MWMechanics::Actor class for temporary actor state, move AiState there

2014-12-24 15:45:14 +01:00

actors.cpp

Disable skinning updates for actors beyond the AI processing distance

2015-04-30 00:10:24 +02:00

actors.hpp

Include cleanup

2015-02-05 04:18:42 +01:00

aiactivate.cpp

Draft how to move temporary package state to CharacterController.

2014-10-08 10:58:52 +02:00

aiactivate.hpp

Draft how to move temporary package state to CharacterController.

2014-10-08 10:58:52 +02:00

aiavoiddoor.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 17:42:07 +13:00

aiavoiddoor.hpp

Draft how to move temporary package state to CharacterController.

2014-10-08 10:58:52 +02:00

aicombat.cpp

Move rng to components

2015-04-22 17:58:55 +02:00

aicombat.hpp

Moved all variables in temporary storage for AiCombat and some more for AiWander.

2014-10-10 00:16:17 +02:00

aicombataction.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 17:42:07 +13:00

aicombataction.hpp

Silence -Wreorder warnings.

2015-04-28 18:48:02 -05:00

aiescort.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 17:42:07 +13:00

aiescort.hpp

-improved trigonometric precision

2014-10-10 23:31:01 +02:00

aifollow.cpp

AiFollow: target has to be seen in order to start following (Fixes #1637 )

2014-12-09 22:25:28 +01:00

aifollow.hpp

AiFollow: target has to be seen in order to start following (Fixes #1637 )

2014-12-09 22:25:28 +01:00

aipackage.cpp

Waypoint check only considers X & Y distance (Fixes #2423 )

2015-03-23 20:09:46 +13:00

aipackage.hpp

fixed warning C4099:

2015-03-06 21:36:42 +13:00

aipursue.cpp

Stop AiPursue when target has invisibility or chameleon>=75

2014-12-24 15:45:14 +01:00

aipursue.hpp

Draft how to move temporary package state to CharacterController.

2014-10-08 10:58:52 +02:00

aisequence.cpp

reverted mShouldRepeat back to unsigned char.

2015-03-07 11:04:54 +13:00

aisequence.hpp

fixed warning C4099:

2015-03-06 21:36:42 +13:00

aistate.hpp

Implement AiWander fast-forward (Feature #1125 )

2014-12-31 18:41:57 +01:00

aitravel.cpp

Waypoint check only considers X & Y distance (Fixes #2423 )

2015-03-23 20:09:46 +13:00

aitravel.hpp

Implement AiWander fast-forward (Feature #1125 )

2014-12-31 18:41:57 +01:00

aiwander.cpp

Move rng to components

2015-04-22 17:58:55 +02:00

aiwander.hpp

AiWander, use closest two points if distance is too small (Fixes #1317 )

2015-03-28 20:05:54 +13:00

alchemy.cpp

Move rng to components

2015-04-22 17:58:55 +02:00

alchemy.hpp

Add automatic potion naming

2014-10-20 17:45:11 +02:00

autocalcspell.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 17:42:07 +13:00

autocalcspell.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

character.cpp

Disable skinning updates for actors beyond the AI processing distance

2015-04-30 00:10:24 +02:00

character.hpp

Disable skinning updates for actors beyond the AI processing distance

2015-04-30 00:10:24 +02:00

combat.cpp

Move rng to components

2015-04-22 17:58:55 +02:00

combat.hpp

Combat mechanic fixes

2015-03-12 03:08:58 +01:00

creaturestats.cpp

Update hit chance according to wiki and implement fCombatInvisoMult

2015-03-12 02:47:16 +01:00

creaturestats.hpp

Allow separate summoned creature instances for each spell ID (Fixes #2194 )

2015-01-06 16:11:05 +01:00

difficultyscaling.cpp

Implement difficulty scaling (Fixes #1505 )

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

difficultyscaling.hpp

Implement difficulty scaling (Fixes #1505 )

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

disease.hpp

Move rng to components

2015-04-22 17:58:55 +02:00

drawstate.hpp

Savegame: store most of CreatureStats

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

enchanting.cpp

Move rng to components

2015-04-22 17:58:55 +02:00

enchanting.hpp

Enchanting: fix skill-based cast cost bonus being applied twice

2015-01-07 04:41:12 +01:00

levelledlist.hpp

Move rng to components

2015-04-22 17:58:55 +02:00

magiceffects.cpp

Store magic effect Base values in savegame (Fixes #1489 )

2014-08-17 05:38:48 +02:00

magiceffects.hpp

Fix various MSVC warnings

2015-02-15 20:10:21 -06:00

mechanicsmanagerimp.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-05-04 02:41:50 +02:00

mechanicsmanagerimp.hpp

MechanicsManager, frame update

2015-04-25 15:19:17 +02:00

movement.hpp

Store the position and rotation in MWMechanics::Movement

2013-03-30 19:00:46 -07:00

npcstats.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 17:42:07 +13:00

npcstats.hpp

Remove a large include form mwbase/windowmanager.hpp

2015-02-09 16:23:41 +01:00

objects.cpp

Merge branch 'savedgame'

2014-02-01 18:16:32 +01:00

objects.hpp

Feature #957 : Implement area magic

2014-01-20 13:11:29 +01:00

obstacle.cpp

Clang warning fixes (thanks hemite)

2015-01-27 23:12:20 +01:00

obstacle.hpp

Remove unneeded include in obstacle.hpp

2015-02-09 15:12:10 +01:00

pathfinding.cpp

Waypoint check only considers X & Y distance (Fixes #2423 )

2015-03-23 20:09:46 +13:00

pathfinding.hpp

Pathgrid rendering

2015-05-02 22:45:39 +02:00

pathgrid.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 17:42:07 +13:00

pathgrid.hpp

fixed warning C4099:

2015-03-06 21:36:42 +13:00

pickpocket.cpp

Move rng to components

2015-04-22 17:58:55 +02:00

pickpocket.hpp

Implement pickpocket detection. Play a voiced dialogue entry when detected.

2014-01-07 03:01:33 +01:00

repair.cpp

Move rng to components

2015-04-22 17:58:55 +02:00

repair.hpp

Added PC repair feature

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

security.cpp

Move rng to components

2015-04-22 17:58:55 +02:00

security.hpp

Cleanup Security class

2013-05-19 23:19:48 +02:00

spellcasting.cpp

Move rng to components

2015-04-22 17:58:55 +02:00

spellcasting.hpp

fixed warning C4099:

2015-03-06 21:36:42 +13:00

spells.cpp

Move rng to components

2015-04-22 17:58:55 +02:00

spells.hpp

Graceful error handling for missing spells/factions (Fixes #1825 , Bug #2176 , Bug #2203 )

2014-12-14 02:38:27 +01:00

stat.cpp

Adjust fix for maximum attribute damage limit

2015-03-09 03:15:11 +01:00

stat.hpp

Support fatigue below zero for the Drain effect (Fixes #2430 )

2015-03-09 03:15:11 +01:00

steering.cpp

merge master

2014-04-27 13:49:31 +04:00

steering.hpp

merge master

2014-04-27 13:49:31 +04:00

summoning.cpp

Port EffectManager

2015-04-19 17:55:56 +02:00

summoning.hpp

Suppress warning about the lack of virtual destructor.

2015-02-16 16:41:53 +11:00