mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 16:49:55 +00:00
Code Issues Releases Wiki Activity
14351 commits 38 branches 54 tags 122 MiB
Commit graph

8048 commits

Author SHA1 Message Date
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