Marc Zinnschlag
39b6659045
Merge remote-tracking branch 'scrawl/master'
2014-09-26 10:44:08 +02:00
scrawl
9fbc7ebc02
Tweak CountDialog layout
...
First time using the LayoutEditor. Success!
2014-09-25 21:04:59 +02:00
scrawl
b75b464495
Move Cancel buttons to right side of dialog ( Fixes #1715 )
2014-09-25 21:04:58 +02:00
scrawl
0bc840aadd
Add NumericEditBox widget
2014-09-25 21:04:51 +02:00
scrawl
e4c097b4f7
Fix wrong default ExpandDirection for AutoSizedButton
2014-09-25 19:22:26 +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 061c7813f6Fixes #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
f721b7adfb
Change skin files to use ResourceSkin (Skin is deprecated) - now the SkinEditor can load them
2014-09-25 16:41:27 +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
ad318c1f9d
Add XML definition file for the MyGUI plugin
2014-09-25 15:07:15 +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
Marc Zinnschlag
f5e493de7e
Merge remote-tracking branch 'scrawl/master'
2014-09-24 20:20:58 +02:00
scrawl
62ea913e69
Fix cmake warning
2014-09-24 20:09:48 +02:00
Marc Zinnschlag
16f4fbdbd8
Merge remote-tracking branch 'lgro/updated_credits'
2014-09-24 12:43:57 +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
Lukasz Gromanowski
aabbcd6ce4
Added Okulo's name and surname, moved Nekochan to the inactive contributors.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-23 23:01:52 +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
Marc Zinnschlag
147bffa7dd
Merge remote-tracking branch 'slothlife/msvc-warning-fix'
...
Conflicts:
CMakeLists.txt
2014-09-23 08:57:49 +02:00
slothlife
35ced14e45
Fix for MSVC warnings
2014-09-22 21:33:09 -05: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
eroen
0738e862cb
Make GLOBAL_CONFIG_PATH, GLOBAL_DATA_PATH configurable
2014-09-22 15:36:42 +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
Lukasz Gromanowski
f5589b42ea
Fix for compiler warnings and deprecated functions usage in videoplayer.
...
Added ifdefs because changes in API were introduced in libavc 56.1
and this code doesn't compile with older versions (ie. on Ubuntu, or Debian).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:09:16 +02:00
Lukasz Gromanowski
d77546b7dc
Fix for compiler warnings and deprecated functions usage in videoplayer.
...
Deprecated functions were:
- AVCodecContext::get_buffer
- AVCodecContext::release_buffer
Changed to:
AVCodecContext::get_buffer2 and setting AVCodecContext::refcounted_frames to 1
before call to avcodec_open2().
release_buffer usage was removed.
Also changed places when some fileds were compared to AV_NOPTS_VALUE
- it's signed, so removed unsigned int casting, or changed casting
to signed int.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 12:58:11 +02:00
Marc Zinnschlag
e4b6f135b6
catch exceptions from adding local scripts
2014-09-21 12:43:19 +02:00
Marc Zinnschlag
89beecad8c
Merge remote-tracking branch 'scrawl/master'
2014-09-21 12:24:53 +02:00
scrawl
fb26c2c2de
Fix autocalculated NPCs not having health/magicka/fatigue set correctly ( Fixes #1943 )
2014-09-21 11:39:17 +02:00
scrawl
b1e74e2a85
Remove support for Ogre 1.8 versions
2014-09-21 10:41:13 +02:00
scrawl
ef43196ef2
Add spacing to savegame dialog
2014-09-20 18:34:01 +02:00
scrawl
4d6ebfb496
Allow KeyFrameControllers on the RootCollisionNode and its children (Bug #1934 )
2014-09-20 17:13:51 +02:00
scrawl
3ac04060c1
Fix NPCs being able to practice Block skill
2014-09-20 16:17:09 +02:00
