Commit graph

8707 commits

Author SHA1 Message Date
Marc Zinnschlag
ce52735df6 Merge remote-tracking branch 'cc9cii/Bug-No-1750' 2014-10-02 08:43:59 +02:00
Marc Zinnschlag
850a40d4e2 fixed resources table drag source problem 2014-09-30 13:15:15 +02:00
scrawl
3e153d0a9b Optimize actor physics: Use only one convexSweepTest for stepping down and checking onGround status, instead of 2 2014-09-29 22:30:21 +02:00
scrawl
b345c50a86 Run stepSimulation before moving actors
Shouldn't make too much of a difference, but a nice side effect is seeing the convexSweepTest calls for actor movements in the profiler results.
2014-09-29 14:55:31 +02:00
scrawl
7f18f85a1d Forgot const 2014-09-29 12:04:19 +02:00
scrawl
bdab3fa321 Bullet optimization: Don't update AABBs of static objects every frame 2014-09-28 18:02:57 +02:00
scrawl
ff0b4e0583 Add debug window (F10), displays Bullet's profiler output 2014-09-28 18:02:49 +02:00
scrawl
7c52d05f85 Disable topics list visually when in a choice 2014-09-28 14:00:15 +02:00
scrawl
e9ed0211c9 Attempt to fix Clang warnings 2014-09-28 12:44:47 +02:00
scrawl
58571f7ac2 Revert "Transfer item ownership to the buyer if item wasn't stolen"
Fixes #1953.

This reverts commit 5d77c5e8ca.
2014-09-28 12:18:46 +02:00
scrawl
02dec787fd Cache GMSTs in getDerivedDisposition 2014-09-27 22:44:20 +02:00
scrawl
ea956b537c Don't search for fFatigueReturnBase and fFatigueReturnMult every frame 2014-09-27 22:37:53 +02:00
cc9cii
d790b8edfa Revert old fix. 2014-09-27 23:39:22 +10:00
cc9cii
a2d043f43a Re-check unknown record id after loading. 2014-09-27 23:36:27 +10:00
cc9cii
810ba61909 While loading overwrite records with the same id. Should resolve bug #1750. 2014-09-27 17:46:48 +10:00
scrawl
e868a48a63 Don't trigger OnPcHitMe for friendly hits (Fixes #1950)
Don't consider actors as followers if they are also in combat with the follow target
2014-09-26 22:08:07 +02:00
scrawl
7252cb63a6 Fix cppcheck issues 2014-09-26 17:48:14 +02:00
scrawl
790e0150b1 Fix global map markers being duplicated when cell is visited again 2014-09-26 16:51:48 +02:00
scrawl
18be152ab1 Allow dragging map even when a marker is hovered 2014-09-26 14:27:52 +02:00
scrawl
603e558fb7 Fix broken getCollidingPc / getCollidingActor (cppcheck) 2014-09-26 14:16:46 +02:00
scrawl
97df7c9b22 Get rid of markers.png and use original MW texture, cleanup 2014-09-26 13:40:10 +02:00
scrawl
4f0fc79ea4 Change global map cell size from 24 to 18 and make it configurable 2014-09-26 12:47:33 +02:00
scrawl
0bc840aadd Add NumericEditBox widget 2014-09-25 21:04:51 +02:00
scrawl
f56711f443 Fix crash caused by teleportation spells (Fixes #1904) 2014-09-25 18:14:04 +02:00
scrawl
8ad2b95208 Revert "AiFollow: return from execute() if target is not player"
This reverts commit 061c7813f6.

Fixes #1898.
2014-09-25 17:57:10 +02:00
scrawl
40ce5add59 Don't report crime for attacking an NPC that is already in combat with another NPC (Fixes #1908, Fixes #1821) 2014-09-25 17:33:26 +02:00
scrawl
6b65502557 Add properties for new widget classes to MyGUI plugin 2014-09-25 16:25:08 +02:00
scrawl
2066097202 Fix incorrect reading of global map state in some cases when the map size changed (Fixes #1946) 2014-09-25 15:28:02 +02:00
scrawl
40587f984d Implement price-based mercantile skill progress (Fixes #1947), thanks Hrnchamd
Correct barter formula (removed erroneous clamping)
2014-09-25 13:02:42 +02:00
scrawl
1afcc7adb5 Add imported font colors from openmw.cfg to MyGUI plugin 2014-09-25 00:04:38 +02:00
scrawl
62ab35881e Don't advance skills in werewolf mode (thanks Hrnchamd) 2014-09-25 00:03:55 +02:00
scrawl
088d01d727 Minor cleanup 2014-09-24 23:50:28 +02:00
scrawl
0f99a959eb Update barter offer for all items when another item is added (Fixes #1935) 2014-09-24 12:21:19 +02:00
scrawl
a7c0e07d78 Add missing World cleanup for mLevitationEnabled 2014-09-24 12:21:19 +02:00
scrawl
5d77c5e8ca Transfer item ownership to the buyer if item wasn't stolen (Fixes #1933) 2014-09-24 12:21:19 +02:00
scrawl
45b4304237 Store levitation/teleport enabled state in savegames (Fixes #1923) 2014-09-24 12:21:19 +02:00
Marc Zinnschlag
175d4f3d44 Merge remote-tracking branch 'ragora/playdeathlevelupmusic' 2014-09-23 13:30:50 +02:00
Marc Zinnschlag
56858c98b1 Merge remote-tracking branch 'miroslavr/master' 2014-09-23 13:23:00 +02:00
Ragora
06e683d378 Added code to play music on level up and on death 2014-09-23 04:58:19 -04:00
MiroslavR
22c71cec18 Check for text size 2014-09-22 23:17:44 +02:00
MiroslavR
608e1518a5 Hack to prevent newlines at the end of books possibly creating unnecessary pages for mygui versions lower than 3.2.2 2014-09-22 21:47:21 +02:00
MiroslavR
f87d7c3fce Book formatter: Do not insert last page if it's empty, code cleanup 2014-09-22 21:25:41 +02:00
MiroslavR
4b1df64fba Book parser: Fix comparison between signed and unsigned integer expressions 2014-09-22 16:28:17 +02:00
Marc Zinnschlag
aa7fc8ee47 fix for potential script problem during saved game loading 2014-09-22 10:12:07 +02:00
Marc Zinnschlag
5c8ef842b6 Merge branch 'edit' 2014-09-22 09:54:44 +02:00
Marc Zinnschlag
51151bc43e minor fix 2014-09-22 09:53:07 +02:00
MiroslavR
51cd2678ae Book formatter: Fix last block of text not displaying 2014-09-21 22:25:54 +02:00
MiroslavR
c362ec0f95 Book formatting: Handle line endings as per vanilla, fix tall images causing infinite loop, cleanup 2014-09-21 19:47:52 +02:00
Marc Zinnschlag
3cd717cd47 Merge remote-tracking branch 'lgro/videoplayer' 2014-09-21 19:04:15 +02:00
Lukasz Gromanowski
b40c1ff26c Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
Corrected ifdef from previous commit around codecCtx->refcounted_frames = 1;

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:23:05 +02:00