mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-22 20:23:52 +00:00
Code Issues Releases Wiki Activity
15610 commits 38 branches 54 tags 122 MiB
Commit graph

8740 commits

Author SHA1 Message Date
scrawl
017c9f7ac9 Fading for weather particle effects 2015-06-29 20:19:46 +02:00
scrawl
cd2e6d4436 Move the __STDC_CONSTANT_MACROS define to cmakelists 2015-06-28 05:53:03 +02:00
scrawl
1956e2c988 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
 2015-06-28 00:38:39 +02:00
scrawl
59db9664ba Pass the CharacterController to AiPackage::execute 2015-06-26 17:47:04 +02:00
scrawl
a44be148d8 Fix door collisions 2015-06-26 06:40:28 +02:00
scrawl
882e359008 Move attackStrength to the CharacterController, where it should have been to begin with 
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
 2015-06-26 05:15:07 +02:00
scrawl
beb1086260 Fix attackStrength being unset for creatures with no weapons 2015-06-26 04:21:10 +02:00
scrawl
5bc6513e2d Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime 2015-06-26 02:32:41 +02:00
scrawl
4ef6aa6b7f Fix weather particles disappearing 2015-06-26 02:30:39 +02:00
scrawl
ea0339d471 Make the string argument to BetaComment optional 2015-06-25 21:45:59 +02:00
scrawl
8a3889a81e Rain fading 2015-06-25 17:38:12 +02:00
scrawl
3a21f05f6e Rain effect 2015-06-25 17:23:01 +02:00
scrawl
6f34a0501a Attempting to make a potion with no effects removes the ingredients (Fixes #2722) 2015-06-24 05:17:45 +02:00
scrawl
33a3dabc31 An alchemy effect listed more than once in the same ingredient should not automatically create a potion of that effect (Bug #2722) 2015-06-24 05:17:45 +02:00
scrawl
d7695f2560 Remove unused NpcAnimation visibilityFlags 2015-06-22 21:14:44 +02:00
scrawl
d5b73f2a55 Move HeadAnimationTime to the implementation file 2015-06-22 21:12:15 +02:00
scrawl
24bfb44b13 Move head tracking from NpcAnimation to Animation (Bug #2720) 2015-06-22 21:06:27 +02:00
scrawl
a5670b5133 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
	apps/openmw/mwworld/player.hpp
 2015-06-22 20:09:02 +02:00
Marc Zinnschlag
83961e9109 Merge remote-tracking branch 'dteviot/FixRunningInCircles' 2015-06-22 15:20:58 +02:00
scrawl
2ce269c0fc Werewolf stats compatibility with old save files 2015-06-21 18:45:49 +02:00
scrawl
d6a7255391 Loading/saving for player's original skills/attributes (prior to becoming a werewolf) 2015-06-21 17:36:49 +02:00
scrawl
44582fe3b3 Don't use separate werewolf skills/attributes for non-player werewolves 
Still need to deal with save files.
 2015-06-21 17:28:18 +02:00
dteviot
c65e7a31e7 Aquatic creatures no longer try to get onto land. 
AiWander for aquatic creatures no longer uses path grid points as they're usually on land.
 2015-06-21 16:23:40 +12:00
scrawl
ad6764fa6a Fix bug #2715 2015-06-20 17:08:46 +02:00
scrawl
efad4efe19 Star fading (Bug #2693) 2015-06-19 20:55:04 +02:00
scrawl
74260a9a44 Tweak moon sizes 2015-06-19 20:30:04 +02:00
scrawl
f5c50aa581 Disable FreezeOnCull for effect particles 2015-06-19 18:38:44 +02:00
scrawl
1ed4e33815 Fading for mooncircle texture 2015-06-19 18:19:52 +02:00
scrawl
38d90f47a6 Moon fading fix (Bug #2713) 2015-06-19 18:15:23 +02:00
scrawl
2b53e5d965 Fix for explosion effects playing when the game is paused 2015-06-19 03:32:48 +02:00
scrawl
e0dfc1425e Correct moon blending 2015-06-19 02:51:01 +02:00
scrawl
0c4ebee6b3 Cloud opacity & cross-fading 2015-06-19 01:03:12 +02:00
scrawl
fb94395628 Fix atmosphere lighting 2015-06-18 23:15:13 +02:00
scrawl
c719b7038e Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-06-18 15:00:21 +02:00
scrawl
04010b8a1a Set OnPcHitMe even for missed hits 2015-06-18 15:00:04 +02:00
scrawl
fabc5126f3 Include cleanup 2015-06-18 00:30:51 +02:00
scrawl
0ffa1f964b Fix water ripple height 2015-06-17 22:49:20 +02:00
scrawl
6e5f3339ad Make sure to play IdleSwim when the character is swimming (Bug #2696) 2015-06-17 20:49:01 +02:00
scrawl
3ebfb4e0d9 Ignore particle systems in getScreenBounds 2015-06-17 18:22:31 +02:00
scrawl
b543308e3e Remove an already resolved todo comment 2015-06-17 18:16:05 +02:00
Marc Zinnschlag
5a5c2bb5bc Merge remote-tracking branch 'dteviot/FixRunningInCircles' 2015-06-17 15:56:01 +02:00
scrawl
b648722d3b Don't use the ParticleSystem for computing placeable bounds (Bug #2700) 2015-06-17 15:13:41 +02:00
scrawl
7b35882814 RemoveParticlesVisitor fix 2015-06-17 15:13:17 +02:00
scrawl
1c151f2f0a Re-enable some outcommented sky code 2015-06-16 20:56:48 +02:00
scrawl
3da8f6e62e Water ripples 2015-06-16 20:36:48 +02:00
scrawl
3663511cdb Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-16 19:53:41 +02:00
scrawl
b73947033d Rotate sky meshes 2015-06-16 16:33:31 +02:00
scrawl
2d072aab2d Broken bone references from .kf files are no longer a fatal error (Bug #2687) 2015-06-15 22:42:14 +02:00
scrawl
5347d407d8 Disallow AiWander fast-forward for water creatures 
Pathgrid nodes are usually above the water level, so appearing at a random node would have the creature break out of the water level it's supposed to be constrained to.
 2015-06-15 20:13:59 +02:00
scrawl
98a77f68a3 Fix AiWander::fastForward using incorrect pathgrid coordinates when actor recently moved to a new cell 2015-06-15 20:04:36 +02:00
scrawl
07937c741a Improve exception handling when starting a new game from the main menu 2015-06-15 16:19:05 +02:00
scrawl
a5b72a358b Prune empty nodes in RemoveDrawableVisitor 
Gets rid of 28 useless transform nodes in base_anim.1st.nif.
 2015-06-14 23:56:35 +02:00
scrawl
f017fd6860 Reduce includes in animation.hpp 2015-06-14 23:13:26 +02:00
scrawl
b90fc8ad92 Fix for various Viewer::frame calls resetting the simulationTime 2015-06-14 18:19:53 +02:00
scrawl
9fc2c2e8ee Don't advertise an alpha channel in GraphicsContext::traits (Bug #2677) 2015-06-14 16:32:34 +02:00
scrawl
cad18969e3 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwmechanics/aitravel.cpp
 2015-06-14 16:32:13 +02:00
scrawl
2476cd4f9a Error message fix 2015-06-14 16:12:18 +02:00
scrawl
195e1a8410 Fix the Viewer's FrameStamp not being set correctly during Engine::frame 2015-06-14 15:28:22 +02:00
Marc Zinnschlag
0994893bc5 Merge remote-tracking branch 'dteviot/FixRunningInCircles' 2015-06-14 12:05:53 +02:00
dteviot
520fbd63c4 simplified pathfinding code. 
remove mIsPathConstructed.  Instead call !mPath.empty().
 2015-06-14 15:14:02 +12:00
scrawl
28caeadef4 Improve error message for not found records 2015-06-14 02:31:00 +02:00
dteviot
bfff84ba8f replaced #include with forward class declaration, as suggested by slaugherfish. 2015-06-14 10:30:55 +12:00
scrawl
f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-13 21:11:24 +02:00
scrawl
d4c45efb2b Remove useless #undef's for windows now that we have NOMINMAX flag 2015-06-12 04:39:44 +02:00
scrawl
cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 2015-06-12 01:45:19 +02:00
scrawl
7407bbdac9 Add a function for SDL error handling 2015-06-12 01:08:58 +02:00
scrawl
800bd511f6 Set a sensible value for SDL_GL_DEPTH_SIZE (Bug #2649) 2015-06-12 00:12:12 +02:00
scrawl
76bdf7a5b7 Add night-eye effect 2015-06-11 23:16:05 +02:00
scrawl
712cef36b0 Minor cleanup 2015-06-11 18:01:00 +02:00
scrawl
f81c3bcd6d Fix for broken InitWorldSpaceParticles on projectile effects 2015-06-11 16:40:26 +02:00
scrawl
c94c87d409 Attach effects to the insert node instead of the object root (Bug #2654) 2015-06-11 16:22:09 +02:00
scrawl
c7493eb45c Fix bug with invisibility effect for meshes w/ vertex colors 2015-06-11 16:14:51 +02:00
dteviot
cb8ca2f03a Moved logic for building a Sync'ed path from AiCombat to PathFinding. 
Is now used by AiFollow, which should fix "running in circles" bug caused when recalc a path and closest way point is the one NPC has just passed.
 2015-06-11 18:31:35 +12:00
dteviot
6d7e6cd30c AiTravel logic merged into AiPackage. 2015-06-11 18:28:31 +12:00
scrawl
15453e3d90 Use MyGUI::UString for unicode conversion 2015-06-10 16:59:35 +02:00
scrawl
f511cb08ff Compatibility with bullet versions < 2.81 2015-06-08 21:03:04 +02:00
scrawl
0330d3d61e Restore the "transparent" loading screen 2015-06-07 21:21:57 +02:00
scrawl
f3cbe7b9da Hide FPS widget since it currently doesn't work, use F3 instead 2015-06-07 19:38:59 +02:00
scrawl
bf02c7f6e4 Sun visibility fix 2015-06-07 19:28:12 +02:00
scrawl
508c57d6e2 addEffect crash fix for objects with no model 2015-06-07 17:09:37 +02:00
scrawl
16e080e252 Fix the physics debug drawer lagging a frame behind 2015-06-07 17:00:00 +02:00
scrawl
b33fe8fb62 Fix the inventory listener bug 2015-06-07 16:50:34 +02:00
scrawl
e66e9916db Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp
 2015-06-07 15:23:54 +02:00
scrawl
0a411cbd7c Enable particle lighting 2015-06-07 04:41:55 +02:00
Stanislav Bas
49512a2b57 Correct the explanation for the Console::acceptCommand() 2015-06-05 22:57:35 +03:00
Stanislav Bas
d2293867ba Add the explanation to Console::acceptCommand() 2015-06-05 22:44:06 +03:00
Stanislav Bas
58e2d3711f Reset Console editbox before command execution 2015-06-05 22:00:02 +03:00
scrawl
4c09ecef72 Normalize fixes 2015-06-05 03:41:10 +02:00
scrawl
1fd48e6f81 Fix not being able to move during ashstorm 2015-06-05 03:36:18 +02:00
scrawl
700000cbca Error handling fix 2015-06-05 02:57:50 +02:00
scrawl
403ce30a35 Graceful handling for failing to create SDL window 2015-06-05 02:53:10 +02:00
scrawl
ddfed35d1c Object placement raycasts should use the rendering meshes 2015-06-05 02:26:16 +02:00
Stanislav Bas
c40987338d Scrollbars don't save their positions between openings 2015-06-04 23:09:40 +03:00
scrawl
a0b0ae9bd1 Remove an unused variable 2015-06-04 21:51:24 +02:00
scrawl
30ab15e605 Fix -Wunused-private-field clang warnings 2015-06-04 20:42:05 +02:00
scrawl
e23775e338 Fix -Woverloaded-virtual clang warnings 2015-06-04 20:31:28 +02:00
scrawl
141e9d36a4 Get rid of unused DialogueManager::mScriptVerbose 2015-06-04 20:12:39 +02:00
scrawl
78ac37b52a Remove BOOST_STATIC_ASSERT to fix clang warnings 2015-06-04 20:11:40 +02:00
scrawl
93656aa6cf Add a header missing from CMakeLists 2015-06-04 20:10:07 +02:00
scrawl
869f8a329a Cloud scrolling fix 2015-06-04 20:08:44 +02:00
scrawl
ce0d93caed Fix for "GlobalMap trying to erase an inactive camera" spam in main menu 2015-06-04 16:32:21 +02:00
scrawl
91eea1258c doc.hpp fix 2015-06-04 01:30:16 +02:00
scrawl
4bb3cbf0fb Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
scrawl
b70383d127 Remove last remains of Ogre math 2015-06-03 21:37:21 +02:00
scrawl
2eec0caca0 Remove dependency on Ogre::StringConverter 2015-06-03 19:59:54 +02:00
scrawl
cc6d5a3ba0 Fix player setup bug 2015-06-03 19:44:21 +02:00
scrawl
7bacb9418d Various math code ported to osg 2015-06-03 19:41:19 +02:00
scrawl
0cc9b1bb40 Remove dependency on OgrePlatform.h 2015-06-03 18:49:52 +02:00
scrawl
e642f20a65 Restore screenshot key functionality 2015-06-03 17:25:18 +02:00
scrawl
2a85a22dba Write savegame screenshot 2015-06-03 16:40:16 +02:00
scrawl
24551c7bab Fix for savegame incompatibility with master branch 2015-06-03 14:56:57 +02:00
scrawl
41cce5240f Delete remaining files that won't be of any use 2015-06-03 03:29:21 +02:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
scrawl
292fa0b5e3 Unify raycasting techniques for "on touch" magic 
We don't want pixel-precise raycasting here. Gets annoying when trying to hit a skeleton.
 2015-06-03 03:16:26 +02:00
scrawl
cee1db532f Improve area orb positioning for "on touch" spells 2015-06-03 03:04:39 +02:00
scrawl
2883ecc19a Fix the hilarious bug of NPCs falling to their deaths in interiors 2015-06-03 02:48:45 +02:00
scrawl
cdd0623009 Terrain rendering 2015-06-03 01:35:41 +02:00
scrawl
58ebf57154 Apply a comment that got lost in the endless depths of my git stash 2015-06-02 17:13:30 +02:00
scrawl
8c50f8ed26 Fix for lights with no mesh 2015-06-02 17:06:55 +02:00
scrawl
5a7f2a4f1f Restore light attenuation settings 2015-06-02 17:02:56 +02:00
scrawl
01944c33f5 Basic water rendering 2015-06-02 16:35:35 +02:00
Stanislav Bas
959fe3eb87 Reset the scrollbar position in the topic list when DialogueWindow is closed 2015-06-01 23:49:40 +03:00
scrawl
de8e5f0db1 Restore projectiles 2015-06-01 21:41:13 +02:00
scrawl
c85764b654 Wireframe mode 2015-06-01 17:02:44 +02:00
scrawl
7f9f9a32d2 InitWorldSpaceParticles fix 2015-06-01 16:29:42 +02:00
scrawl
987918ca15 NpcAnimation::setAlpha 2015-06-01 16:18:57 +02:00
scrawl
bed31996c9 Camera raycast 2015-06-01 15:34:46 +02:00
scrawl
2869424847 Fix first person camera for beast races 2015-06-01 04:41:03 +02:00
scrawl
f88079fddd Restore the isOnGround hack 2015-06-01 02:40:42 +02:00
scrawl
ccd95419e5 Restore various raycasting 2015-06-01 01:57:15 +02:00
scrawl
8e0a988289 Icon fix 2015-06-01 01:32:02 +02:00
scrawl
e306853570 Fix chargen crash 2015-06-01 00:50:55 +02:00
scrawl
84fd682e4e Fix for unnecessary exceptions when opening sounds 
This would throw often during normal play, even though the throws are caught and ignored, can be annoying when the debugger is set to 'catch throw'.
 2015-06-01 00:41:44 +02:00
Stanislav Bas
5dc6cdeb99 Scroll to the top of the topic list when dialog is started 2015-06-01 01:14:11 +03:00
scrawl
5b846ebc71 Camera precision fix 2015-05-31 23:09:37 +02:00
scrawl
ed4863ad7d Restore ranged weapon aiming 2015-05-31 18:53:16 +02:00
scrawl
71bafcb52b Restore head tracking 2015-05-31 18:04:14 +02:00
Marc Zinnschlag
9f0ccdc37a Merge remote-tracking branch 'scrawl/master' 2015-05-31 11:05:43 +02:00
scrawl
60f55997fd Rotate first person meshes, sneak camera offset in first person 2015-05-31 02:26:58 +02:00
scrawl
a066b24303 Restore WeaponAnimation 2015-05-31 01:07:43 +02:00
scrawl
7f2dd21c66 Fix for StartScript regression (Fixes #2590) 2015-05-30 17:20:49 +02:00
Marc Zinnschlag
d7cd4203ad Merge remote-tracking branch 'k1ll/mingw' 2015-05-30 11:39:53 +02:00
scrawl
988a9cad58 getHitContact Head exception fix 2015-05-30 01:41:38 +02:00
scrawl
cc3bfe2bb2 Restore collision tracker 2015-05-30 01:32:00 +02:00
scrawl
b2fe21dd3b Minor cleanup 2015-05-30 01:11:00 +02:00
scrawl
fd50be0fb8 Restore various gameplay 2015-05-30 01:00:24 +02:00
scrawl
5c7ecb9c1d string::compare exception fix 2015-05-29 23:38:31 +02:00
scrawl
af2f26d04d Particle fixes 2015-05-29 20:45:27 +02:00
scrawl
7e715decd3 Color fix 2015-05-29 02:26:58 +02:00
scrawl
6d3528af70 Port global map exploration 2015-05-29 01:49:52 +02:00
scrawl
7a1408cfed Restore display of global map overlay, no exploration yet 2015-05-28 18:49:24 +02:00
scrawl
72d0a69132 Fix global map markers not being cleared on a new game 2015-05-28 18:44:34 +02:00
scrawl
9ee63dc3f4 Change stats viewer key to f3 2015-05-28 16:28:48 +02:00
scrawl
5f7a82e0da Fog of war fix 2015-05-28 16:20:29 +02:00
scrawl
f4ee805e3b Object animation fix 2015-05-28 15:44:58 +02:00
scrawl
c811ac6afe Port fog of war 
Not optimized yet, need to work on fog texture's DataVariance.
 2015-05-28 03:50:49 +02:00
scrawl
5628a2b823 Camera zoom fix 2015-05-28 03:47:53 +02:00
scrawl
8b3054aa8b Fix for player collision cleanup issue 2015-05-28 02:45:38 +02:00
scrawl
6555ee8d80 Minor include cleanup 2015-05-28 02:37:35 +02:00
scrawl
025a1a7866 Restore savegame screenshot display 2015-05-28 02:34:38 +02:00
scrawl
1f00174c02 Use a btCollisionWorld instead of btDiscreteDynamicsWorld 
Slightly improves performance, since we no longer need to stepSimulation(). We don't use any Dynamics (yet).
 2015-05-27 23:09:38 +02:00
scrawl
fe439e53ff Bullet include cleanup 2015-05-27 22:32:11 +02:00
Marc Zinnschlag
b6878c2e0c improved error handling in LocalScripts::add 2015-05-27 19:45:26 +02:00
scrawl
2f97649540 Fix for cleanup issue when exiting after a failed savegame load (Fixes #2580) 2015-05-27 00:30:39 +02:00
scrawl
723beb1cac Move IncrementalCompileOperation to SceneManager 2015-05-26 20:20:18 +02:00
scrawl
099f93f00d Sky fixes 2015-05-26 18:22:21 +02:00
scrawl
c4951d1e73 Map rotation fix 2015-05-26 18:10:31 +02:00
scrawl
3dcb167066 Map rendering 2015-05-26 16:40:44 +02:00
scrawl
76dd3e4034 Fix lip animation regression 2015-05-24 04:40:09 +02:00
scrawl
1fd9fba7a3 Fix debug drawer crash 2015-05-24 04:28:34 +02:00
scrawl
95465a1489 Player raycast fix 2015-05-24 04:01:36 +02:00
scrawl
d84990be85 Restore getCollisions 2015-05-24 03:59:22 +02:00
scrawl
8b322fcd06 Implement getFacedObject using osgUtil::IntersectionVisitor 2015-05-24 03:36:34 +02:00
scrawl
c2131e7c31 Make near clip distance configurable 2015-05-24 02:34:20 +02:00
scrawl
9a0db5d55a Restore cell changes 2015-05-24 01:32:00 +02:00
scrawl
152d690a7a Minor cleanup 2015-05-23 23:10:53 +02:00
scrawl
da24e298ee Fix -Wreorder warnings 2015-05-23 22:44:00 +02:00
scrawl
22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
 2015-05-23 20:33:44 +02:00
scrawl
0de6839890 Minor cleanup 2015-05-23 06:07:11 +02:00
scrawl
0b042b75cc Restore actor visibility mask 2015-05-23 05:42:37 +02:00
scrawl
04e827ecf6 Don't try to play an empty video 2015-05-23 05:42:21 +02:00
scrawl
cd81ec92db Minor cleanup 2015-05-23 05:41:53 +02:00
scrawl
8092f37ce5 New game crash fix 2015-05-23 05:40:24 +02:00
scrawl
d1b6289cad Don't teleport followers when using teleportation spells 2015-05-22 19:57:02 +02:00
Rohit Nirmal
396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
scrawl
85345e663a Restore getHitContact 2015-05-22 04:36:33 +02:00
scrawl
627fee07bc Minor cleanup 2015-05-22 04:36:33 +02:00
scrawl
cac7c1e535 Restore various physics features 2015-05-22 04:36:33 +02:00
scrawl
d6da5c8007 Fix for crosshair not showing 2015-05-22 04:36:33 +02:00
scrawl
5ea61af6ac Fix for applying view distance 2015-05-22 04:36:33 +02:00
scrawl
2235d2978b Restore animation text key handling 2015-05-22 04:36:33 +02:00
scrawl
9b8e2e9db3 Port MWRender::Camera 2015-05-22 00:29:27 +02:00
scrawl
0fb97bd2e7 Readded baseonly parameter to Animation::setObjectRoot 
Fixes the first person view.
 2015-05-21 23:24:22 +02:00
scrawl
6031db7882 Character sliding fix 2015-05-21 21:04:48 +02:00
scrawl
cfe57199d7 Minor cleanup 2015-05-20 04:09:21 +02:00
scrawl
c4452afd89 Inventory item picking 2015-05-20 04:09:21 +02:00
scrawl
72c1f37527 Port CharacterPreview 2015-05-20 02:18:20 +02:00
scrawl
820f4a2688 Fix light direction 2015-05-20 02:07:18 +02:00
Stanislav Bas
163c12d3eb Merge remote-tracking branch 'upstream/master' 2015-05-19 21:39:48 +03:00
Stanislav Bas
196be7283d Reset an activated reference after activation's exectution (Fix #1738) 2015-05-19 21:39:17 +03:00
scrawl
8bcfac1ea3 Fix adjustPosition not always working correctly (Fixes #2563) 
moveObject was returning an incorrect Ptr for cell movements.
 2015-05-17 18:16:42 +02:00
scrawl
75ace9f8b5 Global map base layer 2015-05-16 14:48:20 +02:00
scrawl
1b41f6c4c5 Sleep interruption fix 2015-05-16 12:29:26 +02:00
scrawl
bec9abd319 Remove name extension for internal MyGUI textures 
Since they're no longer loaded from disk, the extension makes no sense.
 2015-05-15 23:21:29 +02:00
scrawl
737c2114dc Change viewer stats keybinding to F9 2015-05-15 19:43:48 +02:00
scrawl
b7fa645530 Don't destroy a NULL window 2015-05-15 19:34:18 +02:00
scrawl
49df07ea7f Implement UI scaling factor 2015-05-15 00:41:21 +02:00
scrawl
842ff4d874 Catch exception for not found videos 2015-05-15 00:23:31 +02:00
scrawl
24bb2e152c Apply texture filter setting changes 2015-05-14 21:42:04 +02:00
scrawl
5442bf23a6 Apply video mode & gamma setting changes 2015-05-14 20:31:16 +02:00
scrawl
3e86dd7df0 Apply runtime changes to field of view & view distance 2015-05-14 18:46:28 +02:00
scrawl
b7258c8d23 Readded Objects::updatePtr 2015-05-14 17:34:55 +02:00
scrawl
bc237ee1fe Actor placement fix 2015-05-14 17:14:49 +02:00
scrawl
4ad0b83aa5 Eliminate string lookups in AnimationTime 2015-05-14 16:33:41 +02:00
scrawl
e3b1707bbd Pause simulationTime when the GUI is up 2015-05-14 02:26:19 +02:00
scrawl
a18663c8b3 Improve MyGUI texture updates 2015-05-14 01:26:10 +02:00
scrawl
9ea416b852 Readded HW cursor manager (no image rotation yet) 2015-05-13 18:56:14 +02:00
scrawl
39fb46601a Readded input & event handling 2015-05-13 16:50:47 +02:00
scrawl
298b3ed2ef Create the GraphicsWindowSDL2 directly 2015-05-13 15:08:47 +02:00
scrawl
0498e6e5f0 Readded window icon 2015-05-13 15:03:21 +02:00
scrawl
36e0cfbc9d Cleanup 2015-05-13 03:36:20 +02:00
scrawl
375b736e74 Use SDL to create the window 
No input nor event loop handling yet, so the window will "stop responding" after a few seconds.

Thanks to KittyCat for the GraphicsWindowSDL2 code.
 2015-05-13 02:53:09 +02:00
scrawl
7a3bc69df7 Readded sound listener 2015-05-12 19:02:56 +02:00
scrawl
ccab8cc9a1 Register Player in the PhysicsSystem 2015-05-12 17:40:42 +02:00
scrawl
56ff280230 Mention the RefId in "error during rendering: " errors 2015-05-12 16:50:43 +02:00
scrawl
4036978718 Empty model exception fix 2015-05-12 16:50:31 +02:00
scrawl
e8ec4387d6 Creature collision fix 2015-05-12 16:50:11 +02:00
scrawl
2bc95df265 Actor collision object placement fix 2015-05-12 16:49:28 +02:00
scrawl
65f0195c71 Readded animated collision shape support 2015-05-12 16:26:11 +02:00
scrawl
19988d5e45 Remove RefData::getHandle 2015-05-12 04:04:54 +02:00
scrawl
47758c11cd Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
scrawl
5abeab21ed Various integer/floating point roll adjustments based on wiki 2015-05-11 16:55:09 +02:00
scrawl
58a2ad663c Fix regression of sleep interruption chance 2015-05-11 16:38:16 +02:00
scrawl
97c35da441 Change exterior water level to z=-1 (Fixes #1405) 2015-05-11 16:38:16 +02:00
scrawl
c819180aa1 Minor cleanup 2015-05-11 16:38:16 +02:00
scrawl
9d86e5b028 GetSpellEffects returns true for active abilities (Fixes #2530) 2015-05-11 16:38:16 +02:00
scrawl
ac88326909 Exit out of choice when no responses are found (Fixes #2525) 2015-05-11 16:38:16 +02:00
scrawl
3b8b217888 Fix no punishment for stealing when taking an item with the inventory opened 2015-05-11 16:38:16 +02:00
scrawl
eef8f71797 Add a comment 2015-05-11 16:38:16 +02:00
scrawl
b312f50b1f Fix regression with detect spells detecting deleted objects (Fixes #2518) 2015-05-11 16:38:15 +02:00
scrawl
033719ccd7 Correct the icon used for custom map markers 2015-05-11 16:38:15 +02:00
scrawl
ca53457a1c Correct the map icons used for detect spells (Fixes #2519) 2015-05-11 16:38:15 +02:00
scrawl
54c1f19c18 Readded height fields 2015-05-10 02:08:25 +02:00
scrawl
c31b416ba1 Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
scrawl
c843cfc8e2 Physics stub in preparation for rewrite 2015-05-10 00:28:51 +02:00
scrawl
48ffeab191 Remove old BulletShapeManager 2015-05-09 01:06:55 +02:00
scrawl
52a4456cf7 LoadingScreen update 2015-05-09 00:02:38 +02:00
scrawl
c8eb77c557 Move StatsHandler construction to allow profiling of loading screen 2015-05-08 16:22:42 +02:00
scrawl
5db0639983 IncrementalCompileOperation tweak 2015-05-08 16:20:40 +02:00
scrawl
cf0fc43004 GUI shutdown fix 2015-05-08 15:10:17 +02:00
scrawl
483dc9de45 Stop viewer threading before changing MyGUI textures 2015-05-07 23:17:47 +02:00
scrawl
00f4f78717 Give a name to video streams for logging purposes 2015-05-07 23:08:52 +02:00
scrawl
77f733362c Add stats graphs for Script, Mechanics and Physics timings 2015-05-07 21:57:02 +02:00
scrawl
100d6e5fff Render MyGUI in background thread, i.e. refactor to get rid of DYNAMIC DataVariance 2015-05-05 02:38:59 +02:00
scrawl
e191f0e044 Rename MWRender::Debugging to MWRender::Pathgrid 2015-05-04 17:41:30 +02:00
scrawl
c1edc30ad7 Dead code removal 2015-05-04 03:29:12 +02:00
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
scrawl
f0789352c6 Silence error message 2015-05-04 00:34:30 +02:00
scrawl
5a759f8b0d GUI cleanup fix 2015-05-03 18:35:29 +02:00
scrawl
9de575ad42 Use IncrementalCompileOperation to incrementally upload OpenGL objects during the loading screen 
For now, not much difference, but should result in a sizable speed up once MyGUI no longer needs the DYNAMIC flag (i.e. the loading screen truly renders in the background).
 2015-05-03 18:16:54 +02:00
scrawl
37e3118d21 FontLoader cleanup fix 2015-05-03 17:52:50 +02:00
scrawl
283b252142 Stub InputManager 2015-05-03 17:24:35 +02:00
scrawl
31ead3a9f4 Increase loading screen FPS 
Now that it's rendered in a background thread, we can have a smooth loading bar at virtually no performance cost.
 2015-05-03 17:04:21 +02:00
scrawl
351fd842fd Port loading screen 2015-05-03 16:58:05 +02:00
Marc Zinnschlag
83a7eea2a9 Merge remote-tracking branch 'scrawl/master' 2015-05-03 09:54:32 +02:00
scrawl
92cbc13964 Remove BtOgre 2015-05-03 00:50:56 +02:00
scrawl
1943110170 Add bullet debug drawer 2015-05-03 00:39:01 +02:00
scrawl
9cf9c2876e Pathgrid rendering 2015-05-02 22:45:39 +02:00
scrawl
1a5407af98 Reduce texture memory usage in OpenMW 2015-05-02 19:36:36 +02:00
scrawl
d772da3720 Main menu background videos 2015-05-02 18:15:00 +02:00
scrawl
dc9b27acfe Create manual GUI textures 2015-05-02 18:06:54 +02:00
scrawl
8817f44d63 Remove advanced FPS counter (obsoleted by the OSG stats viewer) 2015-05-02 17:48:24 +02:00
scrawl
bddd31e385 Dead code removal 2015-05-02 17:11:51 +02:00
scrawl
d9d84bd7b2 Remove bullet raycasting shapes, to be replaced with OSG ray casts 2015-05-01 21:43:21 +02:00
scrawl
82c4d01b37 Add back resource handling workarounds to the gui code 2015-05-01 18:37:24 +02:00
scrawl
bd8f0248f0 Player rendering 2015-05-01 18:21:50 +02:00
scrawl
b0804734e5 Port VideoWidget 2015-05-01 03:03:44 +02:00
scrawl
223e3a53f5 Move OEngine::Gui::Layout to MWGui 2015-05-01 02:22:51 +02:00
scrawl
6afb0e43ef Port FontLoader - requires MyGUI patch from https://github.com/MyGUI/mygui/pull/69 2015-05-01 01:44:21 +02:00
scrawl
a59940a2c7 Move MyGUI platform to components 2015-05-01 01:44:21 +02:00
scrawl
db7fe1952d Move MyGUI texture to a separate file 2015-05-01 01:44:21 +02:00
scrawl
62847f0489 Use node masks to separate Scene and GUI 2015-05-01 01:44:21 +02:00
scrawl
c90125f936 Uninitialized basenode fix 2015-05-01 01:44:21 +02:00
scrawl
83c6ba97c0 Disable skinning updates for actors beyond the AI processing distance 2015-04-30 00:10:24 +02:00
k1ll
96d9afec38 More header case fixes 2015-04-29 18:31:30 +02:00
k1ll
a230050ec8 Boost tr1 unordered map does not work with mingw 2015-04-29 18:31:29 +02:00
Rohit Nirmal
997347b01e Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
scrawl
48a6d7c1a0 Remove mygui platform libraries from cmake 2015-04-28 16:33:30 +02:00
scrawl
a27446c8fb Remove unused headers 2015-04-28 16:02:29 +02:00
scrawl
8971a200f7 Sky fix 2015-04-26 14:34:14 +02:00
scrawl
7809caf9dc Dead code removal 2015-04-25 15:53:11 +02:00
scrawl
0ff7b2ff11 MechanicsManager, frame update 2015-04-25 15:19:17 +02:00
scrawl
2db097f80e Fix nested callbacks bug 2015-04-25 15:10:37 +02:00
scrawl
372a54bbc7 Dead code removal 2015-04-25 01:28:01 +02:00
scrawl
a3417a9c49 CharacterController compiles 2015-04-25 01:20:07 +02:00
scrawl
15164e20f7 Cleanup fix 2015-04-24 23:30:30 +02:00
scrawl
42d6c6140c Add mygui backend by chris 2015-04-24 21:55:30 +02:00
scrawl
9f12e53956 Scale NPCs by their Weight property (Fixes #814) 2015-04-24 14:49:20 +02:00
scrawl
1c0e3a6488 rotateObject, scaleObject 2015-04-23 23:50:46 +02:00
scrawl
6f3e920f85 Animation port complete 2015-04-23 23:30:06 +02:00
scrawl
86b4a610cb Movement accumulation works 2015-04-23 22:46:07 +02:00
scrawl
09742d5b95 Animation playback works, no movement accumulation yet 2015-04-23 20:41:31 +02:00
scrawl
1a19cd3607 Some cleanup 2015-04-22 19:08:56 +02:00
scrawl
8c810e3620 Move rng to components 2015-04-22 17:58:55 +02:00
scrawl
7a46d4f46a Dead code removal 2015-04-22 17:48:06 +02:00
scrawl
04accb7652 Add LightController 2015-04-22 17:37:39 +02:00
scrawl
e49b8fe690 Fix persuasion mechanics using player stats instead of NPC's (Fixes #2475) 2015-04-22 01:17:34 +02:00
scrawl
dfd8e08698 Dead code removal 2015-04-21 23:40:10 +02:00
scrawl
26766b8e0a Dead code removal 2015-04-21 23:36:36 +02:00
scrawl
9e177df61b Add fog, view distance, and far plane culling 2015-04-21 23:36:36 +02:00
scrawl
c53a56ed6e clear stream errors before attempting the read 2015-04-21 16:10:11 +02:00
scrawl
92ef9b1c57 Rename to osg-ffmpeg-videoplayer 2015-04-19 20:14:06 +02:00
scrawl
42f6d9e15b Port video player 2015-04-19 20:07:18 +02:00
scrawl
68f93294da Port EffectManager 2015-04-19 17:55:56 +02:00
scrawl
fcc7aa02ab Port addExtraLight 2015-04-19 15:03:08 +02:00
scrawl
c924e64047 Port HeadAnimationTime 2015-04-19 14:42:47 +02:00
scrawl
f7d2a28930 Port BoneOffset 2015-04-19 14:25:36 +02:00
scrawl
9c4b2ea61a CreatureAnimation compiles 2015-04-19 03:05:47 +02:00
scrawl
27cfe8fb58 Crash fix 2015-04-19 02:39:10 +02:00
scrawl
1699759d12 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/view/render/cell.cpp
 2015-04-19 02:29:16 +02:00
scrawl
edc5cad79e Port Animation::addEffect 2015-04-19 01:57:52 +02:00
scrawl
083c41c950 Environment map for enchanted objects 2015-04-17 01:23:37 +02:00
scrawl
c334a76a6f Fix skinning bug 2015-04-15 22:38:43 +02:00
scrawl
5b8c28f641 NpcAnimation compiles 2015-04-15 22:11:38 +02:00
scrawl
13a1ba0aab Moon rendering 2015-04-15 18:50:50 +02:00
scrawl
c516e897ee Move Controller base classes to SceneUtil, add visitor to assign ControllerSources 2015-04-14 17:51:46 +02:00
scrawl
5dd1ab24fe More efficient StateSetController, beginnings of sky rendering 2015-04-14 15:58:16 +02:00
scrawl
8c7c89a4aa Port SoundManager 2015-04-13 22:48:37 +02:00
scrawl
246b06ca27 Forgot to add 2015-04-13 17:30:32 +02:00
scrawl
61aaf0cf70 Attach light lists to the object base nodes instead of each renderable 
Apparently that is how Ogre worked (on the SceneNode) so let's roll with it for now. Have not tested yet what MW does.
 2015-04-12 18:03:36 +02:00
scrawl
c92592493e OpenMW: create a window and render the starting cell(s) 2015-04-12 15:38:30 +02:00
scrawl
642c1d2d36 Build fix 2015-04-10 15:31:19 +02:00
dteviot
0a5de33a1a fireEquipmentChangedEvent() updates the InventoryWindow. (Fixes #2424) 2015-04-06 15:13:09 +12:00
dteviot
fe69dc2863 Made LineInfo a struct, as requested by Scrawl. 2015-04-05 14:56:29 +12:00
dteviot
52de622e97 provide incremental update of SpellWindow (Fixes #2411) 
When SpellWindow is visible, every 0.5 seconds update the cost/changes for spells/enchanted items shown.
Also, check to see if more substantial update of the window is required.
 2015-04-03 17:59:13 +13:00
dteviot
6b6bed520d removed redundant calls. 2015-04-03 13:45:13 +13:00
scrawl
af67de73a5 Delete shiny 2015-04-01 17:06:31 +02:00
scrawl
4e69e7cc0f OpenMW compiles and runs w/o render window 2015-04-01 17:02:15 +02:00
dteviot
be6ee927b9 AiWander, use closest two points if distance is too small (Fixes #1317) 
In AiWander, if wander distance is set too small to get two points, take the closest two points.
 2015-03-28 20:05:54 +13:00
scrawl
236d628884 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/documentmanager.cpp
	components/CMakeLists.txt
	components/bsa/resources.cpp
	components/nif/data.hpp
	components/nif/node.cpp
	components/nifogre/mesh.hpp
	components/nifogre/ogrenifloader.cpp
	components/nifogre/particles.cpp
 2015-03-27 17:30:48 +01:00
dteviot
63ab856024 Removed duplicated code. 2015-03-23 20:57:36 +13:00
dteviot
eb1090a1b6 Waypoint check only considers X & Y distance (Fixes #2423) 
When pathfinder checks if actor has reached a waypoint, ignore actor's altitude.
 2015-03-23 20:09:46 +13:00
scrawl
5cb61fa01c Don't mark gold as stolen, adjust stolen tooltip (Fixes #2465) 2015-03-22 17:28:27 +01:00
Marc Zinnschlag
47bac13749 Merge remote-tracking branch 'scrawl/master' 2015-03-18 12:07:40 +01:00
Marc Zinnschlag
c032113247 Merge remote-tracking branch 'sandstranger/release-jni-memory' 2015-03-17 11:41:41 +01:00
scrawl
d573458896 Fix case sensitivity bug in default head/hair selection (Fixes #2453) 2015-03-16 17:42:15 +01:00
sylar
db10c87b89 release jni memory 2015-03-16 18:21:38 +04:00
Marc Zinnschlag
545ca9c9b4 Merge remote-tracking branch 'sandstranger/fix-bad-code-in-command-line' 2015-03-16 08:42:22 +01:00
sylar
bd4e832cf3 fix memory leaks in emulating command line 2015-03-16 07:41:51 +04:00
Marc Zinnschlag
e6e02714a0 Merge remote-tracking branch 'sandstranger/command-line-support-for-Android' 2015-03-15 22:52:34 +01:00
Marc Zinnschlag
86d39cede9 Merge remote-tracking branch 'dteviot/Rng' 2015-03-15 22:04:26 +01:00
sylar
a418b70937 command line support for Android 2015-03-15 21:15:58 +04:00
dteviot
3f28634d1f consolidate random number logic 
Note, I suspect Rng::rollClosedProbability() is not needed.  The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
 2015-03-15 14:07:47 +13:00
dteviot
1d7f3474fa Fixed more MSVC 2013 warnings. 2015-03-15 08:49:03 +13:00
Marc Zinnschlag
cf077dcf5d Merge remote-tracking branch 'cc9cii/fix-hide-overload-warn' 2015-03-14 14:25:49 +01:00
Rohit Nirmal
2540a901d5 Remove unused variable. 2015-03-13 20:04:47 -05:00
cc9cii
4d46d7ba72 Fix some compiler warnings. 2015-03-14 06:07:12 +11:00
Marc Zinnschlag
f0a7b202b9 Merge branch 'openmw-35-1' 2015-03-13 17:33:08 +01:00
Marc Zinnschlag
056bc66c6c Merge remote-tracking branch 'scrawl/master' 2015-03-12 10:29:39 +01:00
scrawl
767624f518 Combat mechanic fixes 2015-03-12 03:08:58 +01:00
scrawl
a846bb1aa3 Update hit chance according to wiki and implement fCombatInvisoMult 2015-03-12 02:47:16 +01:00
scrawl
f603a68144 Allow binding Hand To Hand in quick keys menu (Fixes #2024) 2015-03-12 02:23:46 +01:00
scrawl
7fd1c2c2e2 CharacterCreation refactoring 2015-03-12 00:43:28 +01:00
scrawl
d00c75d428 Remove more outdated TODO comments. 2015-03-12 00:37:28 +01:00
scrawl
3879ce6ac1 Get rid of "player" string checks (Fixes #2216) 2015-03-11 23:07:39 +01:00
scrawl
68de876051 Switch to weapon drawstate when creating a bound weapon (Fixes #2387) 2015-03-11 21:12:08 +01:00
scrawl
48ea6286fd Book/scroll window refactoring 2015-03-11 20:33:55 +01:00
scrawl
37a6d7da76 WindowManager refactoring 2015-03-11 20:04:25 +01:00
Scott Howard
e2ef8c4022 fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
scrawl
e30f240ba2 Add travel service support for creatures (Fixes #2432) 2015-03-09 03:15:11 +01:00
scrawl
457c135097 Remove old workaround 2015-03-09 03:15:11 +01:00
scrawl
36e1b6cc48 Support fatigue below zero for the Drain effect (Fixes #2430) 2015-03-09 03:15:11 +01:00
scrawl
3d5c1d1190 Adjust fix for maximum attribute damage limit 2015-03-09 03:15:11 +01:00
Ivy Foster
4f100e6870 Fix rapid toggling when holding sneak button. 2015-03-08 16:08:45 -05:00
Ivy Foster
ba7fc8609c Add toggle sneak option; fix bug #2119 
To enable toggle sneak mode, set "toggle sneak = true" in
the [Input] section of settings.cfg.

Outstanding issues:
    - In toggle sneak mode, holding the Sneak button causes
      rapid, repeated toggling.
    - The button in the settings menu doesn't do anything.
 2015-03-08 15:23:46 -05:00
dteviot
36141b0c53 Merge remote-tracking branch 'OpenMW/master' into FixWarnings 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	extern/sdl4ogre/sdlcursormanager.cpp
 2015-03-08 18:29:12 +13:00
dteviot
f19863b545 fixing MSVC 2013 warning C4244: & C4305 
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
 2015-03-08 18:11:54 +13:00
dteviot
ca8c8c6aa4 fixing MSVC 2013 warning C4244: & C4305 
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
 2015-03-08 17:42:07 +13:00
dteviot
e6cd8484a2 fixing MSVC 2013 warning C4244: & C4305 
fixes for mistakes in last commit.
 2015-03-08 13:22:56 +13:00
dteviot
e197f5318b fixing MSVC 2013 warning C4244: & C4305 
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
 2015-03-08 13:07:29 +13:00
Marc Zinnschlag
ba482fa41f Merge remote-tracking branch 'dteviot/FixWarnings' 2015-03-07 18:34:29 +01:00
scrawl
58807064b4 Revert "Fix reference cell movement leaving behind deleted Ptrs for script access" 
This reverts commit 666248618e.
 2015-03-07 15:31:21 +01:00
dteviot
f2ac939e61 reverted mShouldRepeat back to unsigned char. 
As recommended by Scrawl.
 2015-03-07 11:04:54 +13:00
dteviot
27f91a8326 correction from Scrawl. 
Now correctly handles skills/attributes.
Also, document what ContentSelectorView::ContentSelector::slotAddonTableItemActivated() is doing.
 2015-03-06 19:47:46 +01:00
Marc Zinnschlag
907ac5ef7f Merge remote-tracking branch 'scrawl/master' 2015-03-06 19:24:15 +01:00
dteviot
45b6538820 fixed MSVC 2013 warning C4800 
forcing value to bool 'true' or 'false'
 2015-03-06 23:19:57 +13:00
dteviot
407cd50890 fixed warning C4099: 
type name first seen using 'class' now seen using 'struct'
 2015-03-06 21:36:42 +13:00
scrawl
0fda1cdd53 Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs 2015-03-06 02:36:12 +01:00
dteviot
80fe24207c correction from Scrawl. 
Now correctly handles skills/attributes.
Also, document what ContentSelectorView::ContentSelector::slotAddonTableItemActivated() is doing.
 2015-03-05 20:21:22 +13:00
Marc Zinnschlag
9f155df761 Merge remote-tracking branch 'maqifrnswa/bug2407' into openmw-35-1 2015-03-04 17:09:13 +01:00
Marc Zinnschlag
2e31f01585 Merge remote-tracking branch 'maqifrnswa/bug2407' 2015-03-04 16:55:46 +01:00
scrawl
cced508916 Remove unintended 1.5 factor for damage/restore magic effects 2015-03-04 01:49:00 +01:00
scrawl
8931ddf428 Remove unneeded casts 2015-03-03 23:46:53 +01:00
Scott Howard
d01e8cc97d PositionCell/PlaceItemCell: add console message if cell doesn't exist 2015-03-03 17:36:22 -05:00
Marc Zinnschlag
c66bf41ac2 Merge remote-tracking branch 'scrawl/master' into openmw-35-1 2015-03-03 18:23:38 +01:00
Marc Zinnschlag
bf92d5cde9 removed redundant mScript field in ESM::StartScript 2015-03-03 13:04:57 +01:00
Marc Zinnschlag
3b8d709583 Merge remote-tracking branch 'maqifrnswa/bug2407' 2015-03-03 11:26:25 +01:00
scrawl
a8cb4e807b Warning fix 2015-03-03 11:24:23 +01:00
scrawl
f09cbfb167 Add a comment 2015-03-02 23:29:33 +01:00
scrawl
666248618e Fix reference cell movement leaving behind deleted Ptrs for script access 2015-03-02 23:20:59 +01:00
scrawl
8eb1f4e70e Remove more log spam 2015-03-02 22:13:50 +01:00
scrawl
e3f1cb8305 Remove "loading cell" message 
This spams the log too much, in particular when loading a savegame.
 2015-03-02 21:12:21 +01:00
scrawl
653ddd3f25 Warning fix 2015-03-02 20:16:11 +01:00
Marc Zinnschlag
8b84fa5579 Merge remote-tracking branch 'scrawl/master' 2015-03-02 20:01:31 +01:00
Scott Howard
53213bf236 if cell doesn't exist, PositionCell and PlaceItemCell warn std::err but still execute, bug #2407 2015-03-02 11:53:59 -05:00
scrawl
730138035d Cycle infinite loop fix (Fixes #2421) 2015-03-02 17:25:26 +01:00
scrawl
191c0104f6 Crash fix for creatures with no skeleton base (Fixes #2419) 2015-03-02 15:19:57 +01:00
scrawl
a653716e2c Fix for damage/restore effects using the instant apply path when they have a duration 2015-03-01 22:22:20 +01:00
scrawl
239c0071f5 Armor tooltip should show the effective armor rating 2015-03-01 19:40:38 +01:00
Marc Zinnschlag
185757da43 Merge remote-tracking branch 'dteviot/Bug2367' 2015-03-01 10:24:02 +01:00
dteviot
cdee6f41fc fix: multi effect spell with different ranges (Fixes #2285) 
Applies all effects for a spell with multiple effects, where not all effects have the same range.
 2015-03-01 15:34:18 +13:00
dteviot
41e15e0c2d Limit maximum attribute damage (Fixes #2367) 
Maximum damage that an attribute can have = base + fortify.
 2015-03-01 10:27:51 +13:00
scrawl
2f2a95f735 Fix crash for terrain without data, part 2 2015-02-28 19:33:49 +01:00
scrawl
f82751422d Fix constant effect restore enchantments being applied incorrectly (Fixes #2408) 2015-02-28 16:31:22 +01:00
scrawl
2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick 
Conflicts:
	CMakeLists.txt
 2015-02-27 22:37:22 +01:00
Digmaster
84ff11d0ab check if v2 exists before attemping to copy it 2015-02-27 22:21:33 +01:00
Digmaster
464bbe4d6f if v2 doesn't exist, don't erroneously set keyboardUserExists to true. 2015-02-27 22:21:07 +01:00
Digmaster
5d77ebdc60 If v3 doesn't exist, copy from v2 2015-02-27 22:21:07 +01:00
scrawl
97cc2522c0 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout
 2015-02-27 22:21:02 +01:00
Digmaster
df5513da7c uses v3 input bindings, not v2 2015-02-27 22:19:13 +01:00
Digmaster
a192836582 (hopefully) correct gamecontrollerdb.txt behavior 2015-02-27 22:19:13 +01:00
Digmaster
796b4b01b0 Fix activating every frame when action is bound to a trigger 2015-02-27 22:19:13 +01:00
Digmaster
e3e6190b85 Added multiple joystick support in ICS. Will fix other issues shortly 2015-02-27 22:19:12 +01:00
Digmaster
1e4a845b6f Minor code cleanup 2015-02-27 22:19:08 +01:00
scrawl
2eedb3acec Include fix 2015-02-27 20:22:43 +01:00
sylar
cda3782cf2 fix crash game on Android after start loading 2015-02-26 18:30:38 +04:00
sylar
1bb29f610f enable mipmapping for Android again 2015-02-26 18:29:38 +04:00
Marc Zinnschlag
281e0042ab Merge remote-tracking branch 'scrawl/master' 2015-02-26 13:23:15 +01:00
scrawl
e7989a197d Add defaults for some required globals (Fixes #2397) 2015-02-25 20:35:11 +01:00
Jordan Ayers
659a8ba279 Correction to teleportation changes. 
OMW Bug #2400
Related to OMW Bug #1533

Don't crash on confiscating items if a prison marker cannot be found.
 2015-02-24 21:10:01 -06:00
Jordan Ayers
691ebd2372 Correction to teleportation changes. 
OMW Bug #2400
Related to OMW Bug #1533

Don't crash when finding the closest marker to an exterior position.
 2015-02-24 20:51:57 -06:00
scrawl
24de6ba27e Fix crash for LAND records without data 2015-02-24 21:42:40 +01:00
Marc Zinnschlag
da9bd09a8c Merge remote-tracking branch 'miroslavr/master' 2015-02-23 20:53:44 +01:00
Marc Zinnschlag
9109162030 Merge remote-tracking branch 'scrawl/master' 2015-02-23 20:51:18 +01:00
scrawl
77bb77b367 Fix for instant restore effects (Fixes #2392) 2015-02-23 19:07:12 +01:00
MiroslavR
47c053444f Make the jail progress last one second 2015-02-23 00:23:09 +01:00
Marc Zinnschlag
8e007c91fd Merge remote-tracking branch 'jordan-ayers/bugfix/1533' 2015-02-22 21:58:01 +01:00
Marc Zinnschlag
07c27065d6 Merge remote-tracking branch 'slothlife/msvc-warning-fixes' 2015-02-22 21:34:46 +01:00
Jordan Ayers
5edafc2a4c Cleanup: Add const to read-only CellRefList access. 
OMW Bug #1533
 2015-02-22 12:25:10 -06:00
Jordan Ayers
399259a95c Improve CellStore exception messages. 2015-02-22 12:12:54 -06:00
Jordan Ayers
c21b59ecff Teleportation: Avoid marking searched cells as changed. 
OMW Bug #1533
Only mark cells with the target marker / evidence chest as 'changed'.
 2015-02-21 17:55:05 -06:00
scrawl
a5847afdac Fix ignored clicks on HUD mini-map (Fixes #2388) 2015-02-20 00:00:13 +01:00
scrawl
6d62aa7544 Don't prompt for spell deletion when using cycling keys (Fixes #2382) 2015-02-18 19:06:36 +01:00
Marc Zinnschlag
4c5bba2947 Merge remote-tracking branch 'dteviot/SpellCastingFixes' 2015-02-17 16:44:14 +01:00
Marc Zinnschlag
8686ffcedb Merge remote-tracking branch 'scrawl/master' 2015-02-17 11:55:12 +01:00
dteviot
6e2d6a0282 Minor correction, MWWorld::getMaxActivationDistance() is now public. 2015-02-17 22:51:30 +13:00
dteviot
8d7de7d1ec Telekinesis allows safe opening of traps (Fixes #1916) 
When trap activated at beyond normal activation distance, assume telekinesis used and detonate trap at trapped object's location.
Also some minor code refactoring of spellcasting.
1. Corrected parameter passed to explodeSpell().
2. For loop now correctly does an early exit.
3. Removed duplicated tests.
 2015-02-17 22:14:25 +13:00
cc9cii
efdee19477 Suppress warning about the lack of virtual destructor. 2015-02-16 16:41:53 +11:00
slothlife
a9b74671a6 Fix various MSVC warnings 2015-02-15 20:10:21 -06:00
Jordan Ayers
6d1aec6970 Confiscate stolen goods: Support Mournhold prisons. 
OMW Bug #1533
 2015-02-14 16:09:17 -06:00
Jordan Ayers
5ef78903dc Teleportation: Support markers in Mournhold. 
OMW Bug #1533
Note:  the 'stolen goods' search is not yet correct for Mournhald.
 2015-02-14 15:43:09 -06:00
scrawl
81925645a3 Unreachable enemies combat AI fix (Fixes #2271) 2015-02-14 16:51:54 +01:00
scrawl
37a85e31d6 Ripples fix 2015-02-14 16:51:47 +01:00
scrawl
93ffdb427c Small tweak to ripples 2015-02-14 15:53:01 +01:00
scrawl
a139e4efb0 Grey out completed quests in journal quests list 2015-02-13 16:51:34 +01:00
Jordan Ayers
1d18d3ff4c Add a full search to findInteriorPositionInWorldSpace. 
Part of OMW Bug #1533
Implement a search for one of the 'nearest' exterior cells.  In this
case, 'nearest' means the fewest number of cells away via door markers.
This causes the world map position to update immediately after teleporting,
unless the new cell has no connecting path to an exterior.  Intervention
spells and Jail travel will be much closer to vanialla Morrowind,
except for in Mournhold.
 2015-02-12 22:38:08 -06:00
scrawl
75db4d6473 Merge remote-tracking branch 'upstream/openmw-35' into HEAD 2015-02-11 12:11:59 +01:00
scrawl
dfaab1188f Fix for broken levelled creature spawning (Fixes #2365) 2015-02-11 12:10:46 +01:00
Marc Zinnschlag
2b619296d7 Merge remote-tracking branch 'scrawl/master' 2015-02-11 11:30:44 +01:00
scrawl
bf1839b370 Always print the exception to stderr 2015-02-10 22:01:57 +01:00
scrawl
3ccf4642b4 Implement ToggleScripts 2015-02-10 20:25:57 +01:00
Alexander "Ace" Olofsson
1a19253158 Fix MSVC build due to missing M_PI define 
Apparently the header guard on cmath only adds the defines if _USE_MATH_DEFINES is defined when cmath is included for the first time.

So enabling that define and moving cmath up to be the first include, so that nothing else includes it without the define set.
 2015-02-10 15:32:54 +01:00
scrawl
218f789d88 Fix player DrawState reset when selecting enchanted item (Fixes #2356) 2015-02-09 20:16:29 +01:00
scrawl
801c0eb57c Detect Creature should detect alive creatures only (Fixes #2353) 2015-02-09 20:15:41 +01:00
scrawl
c27c20a859 Merge remote-tracking branch 'upstream/openmw-35' into HEAD 
Conflicts:
	files/materials/water.shader
 2015-02-09 19:40:59 +01:00
scrawl
dbd4abd6fe Fix ripples for D3D - added simpler effect (Fixes #1649) 2015-02-09 19:30:11 +01:00
Marc Zinnschlag
e9d6e4f6df Merge remote-tracking branch 'ace/include-cleanup' 2015-02-09 18:03:28 +01:00
Marc Zinnschlag
985f7cbff9 Merge remote-tracking branch 'miroslavr/master' 2015-02-09 17:58:57 +01:00
Alexander "Ace" Olofsson
fce404acc5 Remove some including of mwbase/world.hpp 
Since ref.hpp is rather well used in OpenMW-CS this should help compile times there
 2015-02-09 17:45:48 +01:00
Alexander "Ace" Olofsson
f2c5060cc0 Fix cstdint issue on travis GCC build 2015-02-09 16:37:20 +01:00
Alexander "Ace" Olofsson
d3128a12b6 Remove a large include form mwbase/windowmanager.hpp 2015-02-09 16:23:41 +01:00
Alexander "Ace" Olofsson
8c49812d56 Remove unneeded include in obstacle.hpp 2015-02-09 15:12:10 +01:00
Alexander "Ace" Olofsson
df5a08b6de Move manualref code out of header 2015-02-09 15:01:49 +01:00
Jordan Ayers
ec3487b669 Sun trajectory: handle mNightStart <= mSunriseTime 
OMW Bug #781
Note:  mNightStart == mSunriseTime is treated as 24-hour night.
 2015-02-08 14:31:45 -06:00
scrawl
e81d2a9dde Merge remote-tracking branch 'upstream/openmw-35' into HEAD 
Conflicts:
	apps/openmw/mwmechanics/npcstats.cpp
 2015-02-08 21:28:29 +01:00
scrawl
9dbd9af31c Adjust fix for Bug #2360 to repair affected savegames 2015-02-08 21:26:58 +01:00
scrawl
b542143e3a Fix faction reputation case sensitivity issue (Fixes #2360) 2015-02-08 21:04:01 +01:00
scrawl
ad8790fba0 Fix setWaterLevel script instruction not affecting physics 2015-02-08 15:50:40 +01:00
scrawl
01e32aef79 Fix exception moving a disabled object between cells 2015-02-08 14:34:31 +01:00
MiroslavR
2223a69ab8 Fix getpcinjail returning 0 when the console is open 2015-02-07 20:13:11 +01:00
Jordan Ayers
23024d2beb Re-work the sun's trajectory. 
OMW Bug #781
Have the sun travel 15 degrees south of vertical.
 2015-02-07 12:36:27 -06:00
MiroslavR
9bbe6f8c5e Remove todo 2015-02-07 18:39:05 +01:00
MiroslavR
1230cf49bf Properly center jail progress widget, fix a bug with it not disappearing if the console is open 2015-02-07 18:38:41 +01:00
Jordan Ayers
2d17eaa5ea Fix argument name for setSunDirection. 2015-02-06 22:26:58 -06:00
MiroslavR
1d9e973573 Add training progress bar, implement jail screen, tweak wait dialog (Fixes #1714) 2015-02-07 04:05:28 +01:00
Marc Zinnschlag
6c4920c58e Merge remote-tracking branch 'scrawl/master' 2015-02-06 09:23:45 +01:00
scrawl
01b4177872 Make sure birthsign spells are added when loading savegame 2015-02-06 01:27:17 +01:00
scrawl
9ce3e4b4e1 UI consistency fix in levelup dialog 2015-02-06 01:27:17 +01:00
scrawl
61ec9196c8 Cap the displayed attribute multiplier in levelup to attribute points left to 100 2015-02-06 01:27:17 +01:00
scrawl
b5e0e45c78 Fix iLevelUpTotal not being used in the levelUp logic 2015-02-06 01:27:17 +01:00
scrawl
55cd9b526c Skill progress bar changed to match MW 2015-02-06 01:27:17 +01:00
scrawl
f0b1d889c0 ESSImport: import player skill progress 2015-02-06 01:27:17 +01:00
scrawl
ae77eacd7e Skill progress refactoring 2015-02-06 01:27:16 +01:00
scrawl
dd8aab2a7f Adjust help for --load-savegame again 2015-02-06 01:27:16 +01:00
scrawl
356d1c7657 ESSImport: convert stolen item tracker 2015-02-06 01:27:16 +01:00
scrawl
bea88c3643 Stolen item tracking overhaul part 2 (Fixes #2338) 2015-02-06 01:27:16 +01:00
scrawl
c1862cbfc2 Clarify documentation for --load-savegame 2015-02-05 04:18:43 +01:00
scrawl
8087a7d920 Add possibility to dress up corpses (Fixes #2221) 2015-02-05 04:18:43 +01:00
scrawl
aa6ebcd75c Change stolen items handling to match MW (Fixes #1443, Fixes #2290) 2015-02-05 04:18:43 +01:00
scrawl
955505c167 Remove unused function 2015-02-05 04:18:43 +01:00
scrawl
27dc49a135 Rewrite game settings manager 
Removes the abhorrent dependency on Ogre for this code and improves the error handling.
 2015-02-05 04:18:42 +01:00
scrawl
6ea59c93ab Ignore the object scale in Move instruction (Fixes #2275) 2015-02-05 04:18:42 +01:00
scrawl
6d097fbfbd Normalise spelling of "levelled" throughout the code 2015-02-05 04:18:42 +01:00
scrawl
0c6e2170db Include cleanup 2015-02-05 04:18:42 +01:00
Jordan Ayers
1f036c0381 Patch for COC Spawn Issue. 
OMW Bug #1079
Fall back to the first static's position, if there are no door markers.
 2015-02-04 12:10:56 -06:00
scrawl
fbb8998184 Account for not yet listed cells in getInteriorPtrs 2015-02-04 16:41:14 +01:00
scrawl
14923f3e8b Fix for broken unsetRefNum 2015-02-03 23:05:06 +01:00
MiroslavR
ee8f88fc42 Reset health modifier when actor dies (Fixes #2330) 2015-02-01 22:04:49 +01:00
Marc Zinnschlag
82ff737c31 Merge remote-tracking branch 'scrawl/master' 2015-02-01 12:10:28 +01:00
scrawl
7e33471edb Fix code duplication 2015-01-31 22:40:43 +01:00
scrawl
c98b7db4c1 Fix swim height, use fSwimHeightScale GMST 2015-01-31 22:40:43 +01:00
scrawl
56799c79f4 Fix attachArrow exception when changing weapon (Fixes #2332) 2015-01-31 22:40:42 +01:00
scrawl
fec8cf91f5 Add exception handling to various uses of DataStream::read 2015-01-31 22:40:42 +01:00
scrawl
86165d38d2 Add exception handling in addObjectToScene 2015-01-31 22:40:42 +01:00
scrawl
73e57f53a8 Always print openmw version in the log 2015-01-31 22:40:42 +01:00
scrawl
cbe135c60f Don't require magicka for casting spells in God Mode (Fixes #2331) 2015-01-31 22:40:42 +01:00
scrawl
7d76f1a113 PlaceAt count argument should spawn independent references (Fixes #2283) 2015-01-31 22:40:41 +01:00
scrawl
7542fb5cd9 Show map notes on door marker leading to the cell with the note (Fixes #2284) 2015-01-31 22:40:41 +01:00
scrawl
54e79c8c98 Use mouse pressed event for pin button instead of mouse click 2015-01-31 22:40:41 +01:00
scrawl
c093e284d9 Delegate cleanup 2015-01-31 22:40:41 +01:00
scrawl
bdcc3a4036 Add missing swish sound for thrown weapons 2015-01-31 22:40:40 +01:00
scrawl
326eaea8a6 Add missing sound for drawing throwing weapons (Fixes #2308) 2015-01-31 22:40:40 +01:00
scrawl
0497a40d09 Fix incorrect sound for thrown weapons 2015-01-31 22:40:40 +01:00
scrawl
2346c3528d Remove NpcStats::mProfit and store it in the script instead 
Also use the Profit label when the "minimumProfit" script variable exists, rather than hardcoding to NPCs.
 2015-01-31 22:40:40 +01:00
scrawl
bd0a0e64a9 Fix overwriting script records not working 2015-01-31 22:40:40 +01:00
scrawl
d1b5956a98 Fix crash on exit 2015-01-31 22:40:40 +01:00
scrawl
b9acf437fd Remove friendly hits from the save file 
The vanilla engine does not store friendly hits in the save file. Since there's no other mechanism that ever resets the friendly hits (at least not to my knowledge) this should be regarded a feature rather than a bug.
 2015-01-31 22:40:39 +01:00
scrawl
5a9b30a8ca Don't show VFX on the map (Fixes #2324) 2015-01-31 22:40:38 +01:00
scrawl
417f60f467 Use the mooncircle textures (Fixes #1624, Fixes #1743) 2015-01-31 22:40:38 +01:00
scrawl
dac1290597 Reduce size of water plane and increase subdivisions (Fixes #969) 2015-01-31 22:40:37 +01:00
Marc Zinnschlag
c02c72e134 Merge remote-tracking branch 'jordan-ayers/topic/dialogue-set' 2015-01-30 18:23:14 +01:00
Jordan Ayers
419046e121 Dialogue: Use std::set for known topics in the manager. 
There were three different data structures being used for topic lists
in this code.  (map< string, true >, list< string >, and vector< string >)
Switch the local topic lists to set< string >.  This supports everything
the list and map were doing, reduces the variety of data structures, and
makes count (a more efficient search) available.

The vector has not changed, since it's tied to the ESM modules, and must
meet other requirements.
 2015-01-29 18:28:13 -06:00
scrawl
e712b0353b Terrain refactoring, reduce game startup time and memory usage 2015-01-29 03:39:01 +01:00
scrawl
62a32220ff Use low-LOD heightmap for world map rendering 
Add vanilla-accurate colour palette (thanks Hrnchamd)
 2015-01-29 03:39:01 +01:00
scrawl
c0a88161b2 Get rid of unneeded setSize/setCoord overrides 2015-01-29 03:38:59 +01:00
scrawl
f4c8064d39 Fix camera not being attached properly when player becomes vampire (Fixes #2319) 2015-01-28 19:14:57 +01:00
scrawl
9bcc84ceec Add option to stretch menu backgrounds/cutscenes to the whole screen 2015-01-28 00:22:56 +01:00
scrawl
431f540791 ESSImport: fix NPC factions 2015-01-27 23:12:21 +01:00
scrawl
6367b4dc0b Improve INFO struct naming 2015-01-27 23:12:21 +01:00
scrawl
4cbb79191f Don't put duplicate lines in the console history 2015-01-27 23:12:20 +01:00
scrawl
6f41e0d12e Reapply quest index when loading quest from savegame (Bug #2260) 2015-01-27 23:12:20 +01:00
scrawl
f35c9b7a69 Clang warning fixes (thanks hemite) 2015-01-27 23:12:20 +01:00
scrawl
d34c8526f6 Enchanted arrows should not be added to victim (Fixes #2306) 2015-01-27 23:12:20 +01:00
scrawl
67491c7164 Fix leveled item argument issue (Fixes #2302) 2015-01-27 23:12:20 +01:00
scrawl
9d3f0b2ed5 Remove some unused code, include cleanup 2015-01-27 23:12:13 +01:00
scrawl
4921c6ef9e Split window caption bars so that the caption can be transparent (Fixes #531) 
Fix transparent window background not applying to the header bar (Fixes #2294)
 2015-01-27 23:05:19 +01:00
scrawl
697ab16ec5 Fix for coverity defects 2015-01-27 19:00:26 +01:00
Jordan Ayers
1410819e20 Dialog fix for line breaks in the middle of words. 
Issue 1049
Adjust the TypesetBookImpl::Typesetter to not assume a word break
at the end of write() calls.
A word break is assumed if any of the other content insertion methods
are used (section break, add/select content, etc).
 2015-01-25 22:36:20 -06:00
scrawl
72f7c2e555 Move weather reset to clear() method 2015-01-24 16:45:36 +01:00
scrawl
b1bd236345 ESSImport: convert script local variables 
Had to add special reading code to openmw, because the variable names are not stored.
 2015-01-24 16:45:36 +01:00
scrawl
b0c2aec374 Add warning for missing body parts 2015-01-23 17:31:26 +01:00
scrawl
79d2eebe54 Store selected enchant item in savegame (Fixes #1702) 2015-01-23 16:45:47 +01:00
scrawl
a619cff615 Implement EnableLevelupMenu to trigger level-up 2015-01-23 15:34:47 +01:00
scrawl
c883a73d30 Several warning fixes 2015-01-23 15:34:47 +01:00
scrawl
8b5effe3e0 Fix wrong magic number for JOUR in openmw savegames 2015-01-23 15:34:47 +01:00
scrawl
378e91545d Fix Tribunal/BM summon effects not working 2015-01-23 15:34:47 +01:00
scrawl
0fd5575efe Improve warning message in ContainerStore::readState 2015-01-23 15:34:47 +01:00
scrawl
cc7be1600d Make missing hair/head in NpcAnimation non-fatal for consistency with addOrReplaceIndividualPart 2015-01-23 15:34:14 +01:00
scrawl
69676906ae Don't clear known spells when reading from the savegame 
This is needed because the .ess format doesn't include the racial spells in the player's spell list.
 2015-01-23 15:34:14 +01:00
scrawl
c7d15e6f74 Revert "Revert "Light charge handling fix"" 
This reverts commit b95748d044.
 2015-01-23 15:33:39 +01:00
scrawl
d13335ba40 Ensure the item can be equipped in the given slot when loading inventory 2015-01-23 15:32:34 +01:00
scrawl
c65f9cb3c0 Revert "Change save format to store relative equipment index" 
This reverts commit 89d9649b50.
 2015-01-23 02:32:43 +01:00
scrawl
b95748d044 Revert "Light charge handling fix" 
This reverts commit 5e0428243b.
 2015-01-23 02:32:38 +01:00
Marc Zinnschlag
cd62dbc5b7 Merge remote-tracking branch 'scrawl/essimporter' 2015-01-21 15:12:04 +01:00
scrawl
5e0428243b Light charge handling fix 2015-01-21 01:59:45 +01:00
scrawl
89d9649b50 Change save format to store relative equipment index 
Store the index for the allowedSlots vector instead of the absolute slot index. This will more gracefully handle edge cases like the available slots for an item having changed when loading the game, or the "allows stacking" property having changed. However the main reason this was done is to ease work on the essimporter.
 2015-01-20 23:55:26 +01:00
scrawl
eede2c8e55 ESSImport: convert breath meter and skill increases 2015-01-20 19:30:39 +01:00
Alexander "Ace" Olofsson
3a88f4ebd5 Fix windows build, MessageBox is a defined symbol 
Windows and its stupid defines...
 2015-01-20 17:07:26 +01:00
scrawl
5104a5a023 Add missing setFactionReaction instruction, use absolute storage instead of difference 
Seems to be closer to how MW is storing it (it has the complete FACT record in the savegame, actually).

This (somewhat) breaks OMW savegame compatibility in that old changes are discarded, but I don't think the faction reactions are quest relevant anywhere.
 2015-01-20 00:53:31 +01:00
scrawl
9014dc48ee Don't require the object type id for reading references from savegames 
This is redundant, since we can look it up from the RefID.
 2015-01-20 00:42:25 +01:00
scrawl
235683e449 Remove LightState from openmw save format to streamline inventory loading 2015-01-19 11:36:00 +01:00
scrawl
f9cf31fcd5 ESSImport: convert custom map markers, not working for interiors yet 2015-01-19 09:29:21 +01:00
scrawl
14aacf9a72 Add comment 2015-01-17 00:10:49 +01:00
scrawl
1869d37cfc Remove unused mLastDrowningHit 2015-01-17 00:10:45 +01:00
scrawl
714b19015c Fix unknown record error message 2015-01-15 20:31:08 +01:00
scrawl
fc6aa256bf Add comment 2015-01-15 16:05:25 +01:00
scrawl
bf915d929a Update idle voices according to research 2015-01-15 03:35:46 +01:00
scrawl
6b2df95167 Fix for some coverity defects 2015-01-15 02:03:27 +01:00
scrawl
edbac30a57 Change another dynamic_cast to static_cast (coverity) 2015-01-15 01:23:58 +01:00
scrawl
cef72385d4 Fix extreme frame drop when running into certain corners (Fixes #2023) 2015-01-15 00:58:12 +01:00
scrawl
52ed3d92a8 Fix btCompoundShape scaling (Fixes #1683) 2015-01-14 17:59:04 +01:00
scrawl
a3c861b7fa Idle voice fix 2015-01-14 00:07:14 +01:00
scrawl
2ac4a74a34 Fix running AI for dead actors 2015-01-13 18:13:02 +01:00
scrawl
883f7ec7ce Move workaround for hiding markers from NIF loader to Scene 2015-01-13 17:19:39 +01:00
scrawl
3ce22d31d8 Fix cursor issue when loading savegame from within mouselook-mode and a warning pops up 2015-01-13 05:37:44 +01:00
scrawl
fafc14d5a0 Add proper air movement mechanics (Fixes #2077) 2015-01-13 05:37:43 +01:00
scrawl
41b3a9dba9 Rewrite animated collision shape support (Fixes #2123) 2015-01-13 05:37:37 +01:00
scrawl
4ed3e7bbb7 Enchanting code cleanup 2015-01-12 23:29:58 +01:00
scrawl
bb718f216d Initialize ENAMstruct in SpellCreationDialog (Coverity) 2015-01-12 23:29:58 +01:00
scrawl
08d8dd287c I think this was committed by accident 2015-01-12 23:29:58 +01:00
scrawl
de23ad5c8d Change dynamic_cast to static_cast to make coverity happy 2015-01-12 23:29:58 +01:00
scrawl
cda2eea906 Enchanting: use fEnchantmentConstantDurationMult and fEffectCostMult 2015-01-12 23:29:58 +01:00
scrawl
871d59de6c Reduce Idle voice chance (Fixes #1964) 2015-01-12 23:29:58 +01:00
scrawl
82eaa9f1bc Fix loading crash (don't apply viewmode before player is set up) (Fixes #2272) 2015-01-12 23:29:39 +01:00
scrawl
c3f3f8b3d0 Use only Cell records for saving progress bar (Fixes #2259) 2015-01-11 18:01:06 +01:00
scrawl
0ec018f7f1 More accurate savegame loading progress bar, uses position in the file (Bug #2259) 2015-01-11 17:54:15 +01:00
scrawl
1780bcc238 Print RefNum in BetaComment 2015-01-11 17:04:58 +01:00
scrawl
4d4f2fc475 Add maximum distance for teleporting followers on using a door 2015-01-11 17:04:58 +01:00
scrawl
b108fbe986 Remove incorrect implementation of fGreetDistanceReset 
This can't be right. A reset distance of 512 is smaller than the maximum greeting distance for certain NPCs, which would then say greetings non-stop.
 2015-01-11 17:04:58 +01:00
scrawl
716e14a37a Print missing savegame dependencies on the console 2015-01-11 17:04:58 +01:00
Marc Zinnschlag
289a912817 Merge remote-tracking branch 'scrawl/master' 2015-01-11 12:24:51 +01:00
dteviot
458b82c308 Centralized "fish can't attack non-swimmer" logic. 2015-01-11 14:25:46 +13:00
dteviot
7aa0f887c0 Minor changes to ESM::RefNum 
1. Changed mIndex to unsigned, to solve potential implementation defined behavior with right shift.
2. Refactoring to minimize use of magic number -1 to indicate "no Content File".
 2015-01-11 12:20:22 +13:00
scrawl
f9227beedd Add warning when loading a savegame that depends on non-existing content files (Fixes #2261) 2015-01-11 00:06:52 +01:00
scrawl
579f5d232f Move interactive messageBox to separate function 2015-01-10 23:23:48 +01:00
scrawl
91571f51be Ogre crash workaround (Fixes #1745) 2015-01-10 22:45:08 +01:00
Marc Zinnschlag
595c08817f Merge remote-tracking branch 'scrawl/master' 2015-01-10 17:02:46 +01:00
scrawl
37bea9d4dc Fix exception for empty dialog topics (Fixes #2267) 2015-01-10 15:06:30 +01:00
Marc Zinnschlag
e439065897 Merge remote-tracking branch 'scrawl/master' 2015-01-10 11:33:04 +01:00
scrawl
5b9d10f851 Reduce includes in MWGui 2015-01-10 03:56:06 +01:00
scrawl
728b842e72 Use MyGUI::utility in favor of boost lexical_cast 2015-01-10 03:01:01 +01:00
scrawl
eecea4131f Reduce MyGUI includes 2015-01-10 02:50:43 +01:00
scrawl
4b704f665f Reduce includes, move DragAndDrop to separate file 2015-01-10 01:21:17 +01:00
scrawl
eb99ed697b Reduce includes 2015-01-10 01:00:52 +01:00
scrawl
2ac23008f5 Remove an old workaround (Fixes #2263) 
The workaround was added when we were still using OIS for input. It doesn't seem to be needed with SDL.
 2015-01-10 00:07:55 +01:00
scrawl
dfdf26e95e Add assertion to Store 2015-01-09 20:58:53 +01:00
scrawl
ce2cbab402 Dialogue: improve conflict resolution for chains of overlapping keywords (unit test for such a case will follow) 2015-01-09 20:08:52 +01:00
Marc Zinnschlag
4e7f7baf8b Merge remote-tracking branch 'dteviot/Bug2076' 2015-01-09 13:57:21 +01:00
dteviot
64cd1396ac Fixed minor issues. 
1. Renamed "hightRatio" to "heightRatio".
2. Replaced magic numbers with named constants.
 2015-01-09 22:17:53 +13:00
dteviot
7fe2f86d06 Slaughter fish attacks when player only knee deep in water (Fixes #2076) 2015-01-09 21:40:53 +13:00
scrawl
65ab31eae6 Remove now redundant Store::setUp implementation 2015-01-09 04:31:02 +01:00
scrawl
ddd6e682bc Dialogue: add conflict resolution for overlapping keywords (Fixes #2245) 2015-01-09 04:19:38 +01:00
scrawl
c77660ba20 Remove some nonsense code 2015-01-09 01:59:38 +01:00
scrawl
2ddbe22da3 Fix for NPC store clearDynamic bug 
It was clearing the whole mShared vector, instead of only the dynamic part. Actually, that whole overload was pointless to begin with. All it does is making sure the Player record isn't cleared, but ESMStore::clearDynamic re-inserts the player record anyway after clearing.
 2015-01-09 01:59:32 +01:00
Marc Zinnschlag
f8a3ec3ee3 Merge remote-tracking branch 'scrawl/cmdline-savegame' 2015-01-08 20:57:49 +01:00
scrawl
d31ae2b345 Fix mIds mapping for dynamic records being lost on save/reload 2015-01-08 16:27:13 +01:00
scrawl
928b9ee41b Fix missing GUI mode update when showing soulgem dialog 2015-01-08 16:27:13 +01:00
scrawl
ef7e0070a6 Don't right-shift signed integers which is implementation-defined 2015-01-08 16:27:13 +01:00
Marc Zinnschlag
38a413a483 Merge remote-tracking branch 'scrawl/master' 2015-01-07 20:22:15 +01:00
scrawl
4684014a83 Use .omwsave extension for save game files 2015-01-07 15:06:39 +01:00
scrawl
13c5bd5cc2 Enchanting: fix skill-based cast cost bonus being applied twice 2015-01-07 04:41:12 +01:00
scrawl
ef1b0a191b Revert "Enchanting: fix inverted self-enchant success chance" 
It wasn't inverted to begin with. The author of this commit is an idiot.
 2015-01-07 03:48:16 +01:00
scrawl
4e92f6ab48 Add commandline option to load a save game on startup 2015-01-07 03:27:24 +01:00
scrawl
157438460b Fix being able to activate objects when paralyzed 2015-01-07 02:34:29 +01:00
scrawl
dc5ed5b861 Remove weather particles underwater (Fixes #2010) 2015-01-07 02:34:29 +01:00
scrawl
d02e075bab Add setting for exterior cell grid size (Fixes #1537) 2015-01-07 02:34:29 +01:00
scrawl
a17252eab3 Remove unused checkWaypoint function 
It was an almost exact copy of the checkPathCompleted function anyway.
 2015-01-07 02:34:28 +01:00
scrawl
4d9100091d Reduce default pathing arrival tolerance to 32 units (Fixes #1605) 2015-01-07 02:34:28 +01:00
scrawl
e19ab77d00 Store camera first person state in savegame (Fixes #2255) 2015-01-07 02:34:24 +01:00
scrawl
992b87ea44 Reset existing summons when the spell is re-casted (Fixes #2135) 2015-01-06 16:11:10 +01:00
scrawl
f267497c03 Allow separate summoned creature instances for each spell ID (Fixes #2194) 2015-01-06 16:11:05 +01:00
Marc Zinnschlag
31f6ccdf4d Merge remote-tracking branch 'internecine/bug2031' 2015-01-06 09:43:59 +01:00
Internecine
e1fdcb608e Fixed incorrect index 2015-01-06 15:00:24 +13:00
scrawl
464f8abb3f List exterior cell names in tab completion (Fixes #2252) 2015-01-06 01:10:09 +01:00
scrawl
708dbc2518 Crime fix 2015-01-05 20:31:50 +01:00
scrawl
c343a5c803 stopCombat fix 2015-01-05 20:31:50 +01:00
scrawl
c1955ef7fa Fix enchanting dialog effect labels showing a duration for constant effects 2015-01-05 18:57:08 +01:00
scrawl
5e7e40aac9 Fix being able to switch weapons while knocked out 2015-01-04 19:54:49 +01:00
scrawl
de12c96a46 Fix crash on exit if the window wasn't created (Fixes #2249) 2015-01-04 19:23:31 +01:00
scrawl
bc686c93b5 Potential fix for thrown weapons being regarded as broken 2015-01-04 19:20:30 +01:00
scrawl
398fe6e780 Thrown weapon fix (Fixes #2248) 2015-01-04 19:20:24 +01:00
scrawl
d56906acf7 Fix the creature position glitch 2015-01-03 19:10:15 +01:00
scrawl
6f747df713 Remove an unused constructor 2015-01-03 19:10:15 +01:00
scrawl
593ca6bd48 Fix for framerate-dependent maximum stepping distance (Bug #1638) 2015-01-03 19:10:15 +01:00
Marc Zinnschlag
9f6a2d00e8 Merge remote-tracking branch 'thoronador/fix-uninitialized-members' 2015-01-02 18:17:25 +01:00
Marc Zinnschlag
ec1df719fe Merge remote-tracking branch 'mrcheko/master' 2015-01-02 18:08:47 +01:00
mrcheko
a8621e6230 defaults are set to 1.0; remove contrast setting 
(can be changed in config though); disable gamma control for not Windows
OSs
 2015-01-02 16:49:22 +03:00
Thoronador
526fb1b37b fix uninitialized value in BillboardObject 2015-01-02 00:45:50 +01:00
scrawl
326d0d3ebf Add default values for fNPCHealthBarTime and fNPCHealthBarFade (Fixes #2243) 
These GMSTs are missing in unpatched versions of the game.
 2015-01-01 22:55:43 +01:00
scrawl
92e4a0669c Fix for AiWander state loading 2015-01-01 18:58:17 +01:00
scrawl
559ddbb480 Quick fix for Ai fast-forward crash in exteriors (Fixes #2241) 2015-01-01 18:18:46 +01:00
Internecine
a7a3ab0c78 Fixed instant negative dynamic stat changes being applied as positive 2015-01-01 21:26:09 +13:00
scrawl
dc1c52bda7 Add some todo comments 2015-01-01 03:38:54 +01:00
scrawl
e0d083f702 Add hand-to-hand combat mechanics for bipedal creatures 
You can now have a fistfight with vivec, if you so desire.
 2015-01-01 03:38:54 +01:00
scrawl
70d3bfc6ed Fix idle animation not restarting immediately for creatures 2015-01-01 03:38:54 +01:00
scrawl
01652bbcc5 Store original actor position in AiWander package (Fixes #2200) 2015-01-01 03:38:49 +01:00
scrawl
5d7eb11596 Fix lights being rendered on the map (broken by d55fe43fc9) 2014-12-31 21:04:13 +01:00
scrawl
99ae0f901b Implement AiTravel fast-forward (Fixes #1125) 2014-12-31 20:42:29 +01:00
scrawl
a8ae0dec52 Implement AiWander fast-forward (Feature #1125) 2014-12-31 18:41:57 +01:00
scrawl
d26d5f6c26 Fix outdated bone locations when camera view is changed while paralyzed 2014-12-31 17:25:06 +01:00
scrawl
d1a29300f0 Handle bipedal creatures not using weapons (Fixes #2238) 2014-12-31 16:59:21 +01:00
mrcheko
60a74d5eb8 increase robustness for gamma to persist in the system; 
use GMST strings for gamma interface
 2014-12-31 18:40:01 +03:00
scrawl
363d1f9207 Merge remote-tracking branch 'upstream/master' 2014-12-30 23:01:45 +01:00
mrcheko
04d95810d1 gamma/contrast system reworked 2014-12-30 18:33:11 +03:00
scrawl
9c693d078b Fix equipment update removing ammunition (Fixes #2144) 2014-12-30 16:22:06 +01:00
scrawl
18fb3f831a Make the maximum horizontal stepping distance independent of movement speed (Fixes #1638) 2014-12-30 15:46:33 +01:00
scrawl
e2346d7c37 Store permanent magic effects in savegame (Fixes #1648) 2014-12-30 01:36:31 +01:00
scrawl
6c9875969a Stop idle animations for non-biped creatures when attacking/moving 
The idle animation wouldn't be visible anyway, since these creatures don't have animation layers. However sounds tagged in the animation would still play.
 2014-12-28 15:34:47 +01:00
scrawl
a58bc9f2f7 Remove sneaking effect on combat AI (Fixes #2237) 2014-12-28 14:45:20 +01:00
scrawl
1bd3ab8a2d Fix torch animation playing when torch is hidden (Fixes #2236) 2014-12-28 14:17:53 +01:00
scrawl
377b79d5ba Use SoundGen fallback for type Land only (Fixes #2228) 2014-12-28 02:39:54 +01:00
scrawl
de9d347018 Fix on touch area effect spells (Fixes #2233) 2014-12-28 01:51:12 +01:00
scrawl
25954a80f5 Fix recharging of items in player inventory 2014-12-28 01:06:49 +01:00
scrawl
0a2dd4c6cb Fix unsafe use of BaseNode in Move script instruction 2014-12-27 17:20:37 +01:00
scrawl
a62fe38a1b Fix unsafe use of BaseNode 2014-12-27 15:02:05 +01:00
scrawl
50e31877ab Fix crash when northmarker has been disabled (Bug #2230) 2014-12-27 14:52:33 +01:00
Internecine
5f9540318a Fixed incorrect indexes 2014-12-27 19:49:14 +13:00
Internecine
a87fe71ddf Added a helper function to handle dynamic stat changes 2014-12-27 19:46:54 +13:00
scrawl
2f0793390f Fix cut off text for some widgets in the stats window 2014-12-27 01:25:26 +01:00
Marc Zinnschlag
2fa0764c89 Merge remote-tracking branch 'swick/master' 2014-12-26 16:08:07 +01:00
Marc Zinnschlag
5f8b8b127c Merge remote-tracking branch 'psi29a/clang_lintian' 2014-12-26 16:07:07 +01:00
Marc Zinnschlag
da722a5cf1 Merge remote-tracking branch 'miroslavr/master' 2014-12-26 16:05:20 +01:00
Sebastian Wick
764cd9ca16 disable "window border" setting in the ingame settings UI if fullscreen is enabled 2014-12-24 16:31:23 +01:00
scrawl
6f72989cb1 SpellModel, SortFilterItemModel: case insensitive sorting 2014-12-24 15:45:15 +01:00
scrawl
2e5e7370ba Adjust default angle, FOV and viewport of character preview (Fixes #2220) 2014-12-24 15:45:15 +01:00
scrawl
9a1bde684f Sort class list in select class dialog 2014-12-24 15:45:14 +01:00
scrawl
768c4a5757 Update crime response to pickpocket attempts (thanks Hrnchamd) 2014-12-24 15:45:14 +01:00
scrawl
b8fa73dfa9 Preserve record ordering in Store 
This fixes the default head/hair used for some races in the chargen UI.
 2014-12-24 15:45:14 +01:00
scrawl
5d7dcafa53 Make local map widget size configurable 2014-12-24 15:45:14 +01:00
scrawl
a47de06492 Make local map resolution configurable and use lower default value 
This seems to be the resolution the original engine is using. The change also significantly reduces cell loading time.
 2014-12-24 15:45:14 +01:00
scrawl
7f0d71f8f4 Swap use of iDispAttackMod/fDispAttacking (thanks Hrnchamd) 2014-12-24 15:45:14 +01:00
scrawl
59f21c6105 Use "hair" as filter for PRT_Hair parts (Fixes #2218) 2014-12-24 15:45:14 +01:00
scrawl
d55fe43fc9 Support animation groups for Light and Door objects (Fixes #2039) 2014-12-24 15:45:14 +01:00
scrawl
019cd96719 Stop AiPursue when target has invisibility or chameleon>=75 2014-12-24 15:45:14 +01:00
scrawl
e5de253169 Use maximum step size of 62 units for stepping down (Fixes #1809) 2014-12-24 15:45:14 +01:00
scrawl
edc128572d Add MWMechanics::Actor class for temporary actor state, move AiState there 2014-12-24 15:45:14 +01:00
scrawl
42d63a4eb2 Fix position flicker after an animation ends 2014-12-24 15:45:14 +01:00
scrawl
8bc7eb5530 PlayGroup: Don't loop animations with no loop keys (Fixes #2223) 2014-12-24 15:45:13 +01:00
scrawl
9e5dfb6e98 Update crime system according to research wiki for more accurate attack responses 2014-12-24 15:45:13 +01:00
scrawl
2410d79410 Fix iFightAttack and iFightAttacking being swapped 
Looks like the research wiki page was incorrect, the higher value (iFightAttack) being for the victim makes more sense, is consistent with iDispAttackMod/fDispAttacking, and seems to be how the original game behaves as well.
 2014-12-24 15:45:13 +01:00
scrawl
e73e975291 Fix player being able to activate objects when knocked out 2014-12-24 15:45:13 +01:00
scrawl
3912ee2b1d Fix faction rank not being set on items in faction-owned containers 2014-12-24 15:45:13 +01:00
scrawl
0081a68376 Use fMagicStartIconBlink for spell effect indicator fading 2014-12-24 15:45:13 +01:00
scrawl
877e07823d Fix incorrect sound for spell creation success 2014-12-24 15:45:13 +01:00
scrawl
fb542a64ec Merchant items should be restocked instantly 2014-12-24 15:45:13 +01:00
scrawl
1bcc4430e0 Fix owner not getting set on restocked items 2014-12-24 15:45:13 +01:00
scrawl
9ed71765a9 Fix deleted containers showing in merchant inventories 2014-12-24 15:45:13 +01:00
scrawl
f3738e9a98 Say an "intruder" voice dialogue for trespassing crimes (Fixes #1082) 
Seems to be broken in the original engine, but according to the TES-CS help this is how the intruder voices should be used. There are legitimate entries for "intruder" in the game's files, so we might as well use them.
 2014-12-24 15:45:13 +01:00
scrawl
37e11b7272 Adjust loading box size for large captions 2014-12-24 15:45:12 +01:00
scrawl
866fdfe8bd Crime system improvements 
- If someone saw the crime, they will notify everyone else in range, even if the Alarm rating of the witness is 0.
- Pickpocket and selling stolen items now works properly, i.e. honors the victim's Alarm rating instead of always being reported.
 2014-12-24 15:45:12 +01:00
scrawl
307b84e9f6 Add enemy health bar fading and use relevant GMSTs 2014-12-24 15:45:12 +01:00
scrawl
1910327469 Implement disposition changes due to crimes 2014-12-24 15:45:12 +01:00
scrawl
cc9af9562b Function_CreatureTargetted should return '2' for werewolfs 
This makes NPCs say the correct attack voice files when fighting a werewolf.
 2014-12-24 15:45:12 +01:00
scrawl
efa9ff3a76 Fix incorrect implementation of iWerewolfBounty 2014-12-24 15:45:12 +01:00
scrawl
35d2bfabca Adjust NPC response to pickpocket attempts (Fixes #2219) 2014-12-24 15:45:12 +01:00
scrawl
4aed5158cc Support region names in cell dialogue filter (Fixes #2113) 2014-12-24 15:45:12 +01:00
scrawl
105f0f8716 Head tracking: don't look at dead actors 2014-12-24 15:45:12 +01:00
scrawl
8a210c49e9 Improve AI prioritising health potions 2014-12-24 15:45:12 +01:00
scrawl
a29abb85f1 Fix ItemView sizing bug 2014-12-24 15:45:12 +01:00
scrawl
f931ba2efc Fix some static analysis issues (coverity) 2014-12-24 15:45:12 +01:00
scrawl
1b9209df4a Allow blocking of hand-to-hand attacks 2014-12-24 15:45:11 +01:00
Sebastian Wick
e85df00158 change setting "borderless" to "window border" 
set window border on setting changes
disable window border checkbox in the launcher if fullscreen is enabled
 2014-12-24 15:09:50 +01:00
Bret Curtis
45299abe99 make it C98 compat 2014-12-23 17:13:11 +01:00
Bret Curtis
dcfadeb51a fix typo and annoying gcc/clang unused return values in crash catcher 2014-12-22 10:45:34 +01:00
Sebastian Wick
639fbfad0b make borderless setting available to the UI 2014-12-22 02:44:20 +01:00
MiroslavR
c796589420 Allow adding multiple Attribute/Skill effects in spell making (Fixes #2224) 2014-12-22 01:54:24 +01:00
Alexander "Ace" Olofsson
462b41a3a8 Missing files, aka; Why you shouldn't stresscommit 2014-12-19 11:26:54 +01:00
Alexander "Ace" Olofsson
0af5c7b379 Starting to clean up some heavy includes 2014-12-19 09:23:16 +01:00
Marc Zinnschlag
057d0913d6 Merge branch 'scriptfixes' 2014-12-18 10:22:07 +01:00
Marc Zinnschlag
a6d30bc2e3 consider --script-warn when running with --script-all-dialogue 2014-12-18 10:20:15 +01:00
Marc Zinnschlag
899ae763e6 fixing a travis build problem 2014-12-17 09:33:40 +01:00
scrawl
c2771bc8ab Head tracking fix 2014-12-17 02:15:40 +01:00
scrawl
31d28e727f Implement leveled list script functions (Fixes #1546) 2014-12-17 01:24:22 +01:00
scrawl
d642512f71 Error message fix 2014-12-17 00:57:04 +01:00
scrawl
88c5e1991c Fix being able to stand on top of actors (Fixes #1192) 2014-12-16 23:18:41 +01:00
scrawl
d962f0918d Implement NPC head tracking (Fixes #1720) 2014-12-16 20:47:45 +01:00
scrawl
b9e5aa9db6 Movement controller: Don't allow stepping up other actors 
This seems to fix issues with NPCs inadvertently being placed on top of a small creature while fighting it.
Note that jumping on top of actors is still possible (Bug #1192)
 2014-12-16 20:44:42 +01:00
scrawl
0dc9401269 Fix GUI crash due to outdated spells list 2014-12-15 20:20:17 +01:00
scrawl
ec00c830e5 Fix missing armor rating label update 2014-12-15 19:19:08 +01:00
scrawl
e4127aa491 Use space in ItemView more efficiently 2014-12-15 19:04:53 +01:00
scrawl
c7e1c0b595 Fix weapon cycle getting stuck for same item IDs 2014-12-15 17:49:08 +01:00
scrawl
935cccf974 Implement weapon/spell cycling hotkeys (Fixes #1024) 2014-12-15 16:23:08 +01:00
scrawl
4d5adfb5dd Fix being able to use enchantments of items that failed to equip (Fixes #2215) 2014-12-15 13:47:34 +01:00
scrawl
4e0d16da8c Take Scale field in creature record into account (Fixes #2214) 2014-12-15 13:34:04 +01:00
scrawl
79237d16a7 Refactor spell window to use model/view and remove duplicated code in QuickKeysMenu 
This should also improve window resizing performance, the widgets are now just resized instead of recreated.
 2014-12-15 13:28:03 +01:00
scrawl
7abbca8be9 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-12-14 20:27:12 +01:00
scrawl
2b78e9795d Implement Calm effect removing combat packages (Fixes #1985) 2014-12-14 19:35:34 +01:00
scrawl
4f3995a4d8 Fix werewolf AI being able to use items 2014-12-14 19:15:43 +01:00
scrawl
4acc25f59c Use SoundGen with no creature field as fallback 
This fixes the adorable "thump" sounds in the Scrib's idle animation not playing.
 2014-12-14 17:52:06 +01:00
scrawl
192626c6f5 SoundGen fix: use Original Creature field only if non-empty 2014-12-14 17:44:03 +01:00
MiroslavR
c5a604453e Fix several book formatting issues (Fixes #2204) 2014-12-14 16:25:27 +01:00
scrawl
88a2e4c043 Graceful error handling for missing spells/factions (Fixes #1825, Bug #2176, Bug #2203) 2014-12-14 02:38:27 +01:00
Nik Dyonin
80c92789c2 Fix issue when killed NPC cannot be looted if it was in combat mode before killing. 2014-12-14 02:58:42 +03:00
Marc Zinnschlag
1f74d8cca5 Merge remote-tracking branch 'scrawl/scripttest' 2014-12-13 12:49:33 +01:00
scrawl
ba65c6cc7f Add --script-all-dialogue switch to compile all dialogue scripts (Fixes #1659) 2014-12-13 02:51:18 +01:00
scrawl
2ebf328dec Always print the failing dialogue script 
These aren't usually very long, so printing them shouldn't spam the console by too much.
 2014-12-13 00:39:24 +01:00
scrawl
ed6face4aa Disable activation scripts for actors in combat 2014-12-12 22:21:57 +01:00
scrawl
60aa209144 Implement drowning when knocked out underwater (Fixes #1228) 2014-12-12 17:42:56 +01:00
scrawl
d034a079e6 Allow equipping twohanded weapon and shield at the same time (Fixes #1785) 
The shield can be equipped, meaning armor rating and item enchantments apply, but can not be blocked with.
 2014-12-12 16:49:22 +01:00
scrawl
bc85bb32c2 Fix vampirism magic effect not applying immediately (Fixes #1984) 2014-12-12 02:39:59 +01:00
scrawl
03da21f088 Remove redundant GUI element showing during loading screens 2014-12-12 02:13:50 +01:00
scrawl
e69cf11029 Hide tooltips during loading screens 2014-12-12 02:09:15 +01:00
scrawl
cf5fc60e86 Make ToggleMenus affect tooltips (Fixes #1989) 2014-12-12 01:42:13 +01:00
scrawl
f42420bc19 Use the Original Creature field for SoundGen lookups 2014-12-12 01:24:35 +01:00
scrawl
2601b26217 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-12-11 22:44:58 +01:00
scrawl
7892ed35f3 PlaceItem, PlaceItemCell: Make sure references are placed above terrain (Bug #2078) 2014-12-11 22:25:53 +01:00
scrawl
886903d70e Implement HitAttemptOnMe function (Bug #2078) 2014-12-11 22:25:41 +01:00
scrawl
5f00a3d5c3 Reset lastHitObject when it is retrieved rather than every frame 
This seems to be how vanilla MW does it.
 2014-12-11 22:00:31 +01:00
scrawl
a355550cab Add support for NPCs with missing head/hair models (Fixes #2078) 2014-12-11 21:43:31 +01:00
scrawl
be16f1d0a5 Implement PcForce1stPerson, PcForce3rdPerson, PcGet3rdPerson (Bug #2078) 2014-12-11 21:00:02 +01:00
scrawl
d955017079 Don't report script operation status via messageBox (Bug #1942) 2014-12-11 20:51:02 +01:00
Marc Zinnschlag
912dcdc418 Merge remote-tracking branch 'scrawl/ptrupdate' 2014-12-11 20:41:53 +01:00
Marc Zinnschlag
19bd07648b Merge remote-tracking branch 'scrawl/pathgrid' 2014-12-11 20:32:32 +01:00
scrawl
ed2aa5a233 Fix crash caused by dangling baseNode pointer 2014-12-11 20:32:05 +01:00
scrawl
7e8ca3fff1 Fix object movement between cells producing a stale Ptr within the script execution (Bug #1942) 2014-12-11 19:29:06 +01:00
scrawl
3270f0e932 Change pathgrid workaround to check for interior cell name 2014-12-11 15:19:48 +01:00
scrawl
623783cd6a Enchanting: fix cast cost for "on use" enchantments being set incorrectly 2014-12-10 18:05:11 +01:00
scrawl
619ea846b4 Enchanting: fixed case where no range types at all are allowed (e.g. a Constant Effect item with an effect that does not allow the Self range-type) 2014-12-10 17:55:48 +01:00
scrawl
74c345f790 Enchanting: fix being able to create On Touch / On Target constant effect enchantments (this combination makes no sense) 2014-12-10 17:40:59 +01:00
scrawl
ead6bf1601 Enchanting: cast the enchant points for the item to int (Fixes #2202) 2014-12-10 17:34:05 +01:00
scrawl
3c747195ae Add fall damage for creatures (Fixes #2201) 2014-12-10 17:21:34 +01:00
scrawl
e0c6f84546 AiFollow: target has to be seen in order to start following (Fixes #1637) 2014-12-09 22:25:28 +01:00
Digmaster
95219a7936 Show currently selected input type for settings window 2014-12-09 14:48:34 -06:00
Digmaster
bb6ed06a4e read gamecontrollerdb file location from settings file 2014-12-09 14:37:32 -06:00
Digmaster
a7a211860a Fixed binding controls to A on joystick 2014-12-09 12:12:38 -06:00
Digmaster
ad54e09593 Inital value for joysticks is 0.5 2014-12-09 11:16:17 -06:00
scrawl
109a3f78a1 Adjust AiFollow distance for groups of multiple followers (Fixes #1637) 2014-12-09 16:06:04 +01:00
scrawl
3ad0189982 Take sound listener y rotation (roll) into account, though currently unused for actors 2014-12-09 12:07:22 +01:00
Digmaster
073a2f0674 Fixed issue with walking 2014-12-09 00:02:18 -06:00
Digmaster
c37881ead1 Joystick Support 2014-12-08 21:57:32 -06:00