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
cc9cii
8e71f092c5
Comment out setMinimum which is broken.
2014-09-26 12:36:55 +10:00
cc9cii
a1c0ec2feb
Repair collateral damage from a purging session gone out of control.
2014-09-26 11:26:33 +10:00
cc9cii
111a35bc38
More strip back.
2014-09-26 07:16:34 +10: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 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
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
cc9cii
d5c8ff7d73
More removal.
2014-09-25 18:15:34 +10:00
cc9cii
127f9bb30d
Fix reverting to wrong version.
2014-09-25 09:16:10 +10:00
cc9cii
61bab6b1f1
Sanitised version. Some settings are only accessible via manually editing the config file.
2014-09-25 08:15:07 +10: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
cc9cii
31fb160376
More cleanup.
2014-09-25 06:59:04 +10:00
cc9cii
66852d5392
Code cleanup and revert incorrect settings.
2014-09-24 22:41:49 +10: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
cc9cii
fdf375fb4d
Reusing subviews implemented.
2014-09-24 13:49:19 +10:00
cc9cii
3f9b73812b
Minor fixes and workarounds.
2014-09-24 11:55:22 +10:00
cc9cii
970f3609c9
Fixed spinbox issue with integer entry via keyboard. Removed shader settings as per feedback comments.
2014-09-24 09:33:19 +10:00
cc9cii
67503c93b2
Added some scenewidget user settings but noticed during testing that the spinbox view resets the value if enter key is pressed.
2014-09-23 22:33:49 +10: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
cc9cii
d41230a0c5
Tweak the look of the recordfilterbox. Keep titlebar if floating.
2014-09-23 20:51:14 +10:00
Ragora
06e683d378
Added code to play music on level up and on death
2014-09-23 04:58:19 -04:00
cc9cii
ffae816aab
Max subviews setting working. However there is no way to remove the last subview once the title bar is removed and the look of the filter box is broken without the title bar.
2014-09-23 17:01:08 +10:00
cc9cii
62406d5322
Use reasonable values for the spinbox.
2014-09-23 07:28:55 +10:00
MiroslavR
22c71cec18
Check for text size
2014-09-22 23:17:44 +02:00
cc9cii
437fb774c5
Re-implemented subview minimum size setting.
2014-09-23 07:16:07 +10:00
cc9cii
c8ae8f4a6d
Added minimum width setting for subviews - regionmap, table, scene, preview and dialogue. It should be noted that the setting is not the starting minimum width, i.e. it won't be possible to reduce the width of the subview after the creation. Also, one setting applies to all subviews. It may be desirable to have individual settings.
2014-09-23 06:30:41 +10: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
cc9cii
c4f11785ec
Added a window size change easter egg.
2014-09-22 21:12:26 +10:00
cc9cii
48f96df29d
Fixed checkboxes saving invalid values.
2014-09-22 18:50:48 +10: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
cc9cii
fc8d6da6a2
Added more shader settings.
2014-09-22 16:24:06 +10:00
cc9cii
71a3880884
Added workarounds to add QLabel. Add stylesheet option to apply to View's QGroupBox. RangeViews are now right aligned. Added content margins to the page/tab's layout.
2014-09-22 12:19:18 +10:00
cc9cii
02f8f54192
Fixed checkbox behaviour. Added some shader settings.
2014-09-22 07:50:35 +10: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
cc9cii
17a74da650
Cleaned up comments and dead code.
2014-09-21 21:10:18 +10: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
cc9cii
dbd1ab05d3
Integrated into the original settings design, except using tabs rather than list & stacked widgets. Works but visuals need updating.
2014-09-21 20:55:52 +10: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
3ac04060c1
Fix NPCs being able to practice Block skill
2014-09-20 16:17:09 +02:00
Marc Zinnschlag
cf5c5cbce7
Merge remote-tracking branch 'corristo/osx-openmw-launch-fix'
2014-09-20 14:13:42 +02:00
Marc Zinnschlag
9d316a8745
Merge branch 'records'
2014-09-20 13:59:45 +02:00
scrawl
023d7072f9
Don't play battle music for enemies out of AI processing range
2014-09-20 13:55:57 +02:00
scrawl
d3554084ad
Fix weird behaviour of options menu sliders when value was changed out of bounds via cfg file
2014-09-20 13:50:23 +02:00
Marc Zinnschlag
8499ceb35d
set default value for topic when cloning info records
2014-09-20 13:30:36 +02:00
scrawl
f5868f7ae1
Fix layout problems in generate class result dialog
2014-09-20 13:07:38 +02:00
Marc Zinnschlag
8ce87803c4
set default value for cell when cloning references
2014-09-20 12:54:25 +02:00
Marc Zinnschlag
b39cdb7645
fixed referenceable cloning (and as a side-effect enabled showing the type of the refereceable in the clone UI)
2014-09-20 12:48:51 +02:00
Marc Zinnschlag
90ad3f332a
extending refnum functionality to cloning (and also enable cloning of references to a different cell)
2014-09-20 12:37:25 +02:00
Nikolay Kasyanov
9f7a8462d8
Fix build & OpenCS game runner code on OS X
2014-09-20 13:42:11 +04:00
scrawl
e42cb8020e
Change all skins to get font colors from fallback settings ( Fixes #704 )
2014-09-20 10:40:09 +02:00
Marc Zinnschlag
7733df239e
made CloneCommand a subclass of CreateCommand
2014-09-20 10:36:43 +02:00
scrawl
25e96b8c7b
InteractiveMessageBox: Define a maximum width for the message text
2014-09-20 08:57:16 +02:00
MiroslavR
84d27d55e2
Remove redundant includes
2014-09-20 00:51:46 +02:00
MiroslavR
4f89c3e77a
Rework book formatter ( Fixes #1148 )
2014-09-20 00:11:04 +02:00
Marc Zinnschlag
65ddf7acfe
Merge remote-tracking branch 'scrawl/master'
2014-09-19 15:59:59 +02:00
Marc Zinnschlag
bc1eaa035d
Merge remote-tracking branch 'scrawl/fontcolors'
2014-09-19 15:59:10 +02:00
Marc Zinnschlag
2a48c377a8
Merge remote-tracking branch 'miroslavr/master'
2014-09-19 15:55:24 +02:00
scrawl
9c0649c11d
Add basic framework to retrieve font colors from fallback settings (Feature #704 )
2014-09-19 11:53:35 +02:00
scrawl
cbc242d857
Move item count text to ItemWidget
2014-09-19 09:29:00 +02:00
scrawl
b145d183ae
Fix incorrect alchemy failure handling when an effect has a zero magnitude/duration ( Fixes #1922 )
2014-09-19 09:11:21 +02:00
scrawl
ab9d9c7001
Add magic effect flags from ESM files to esmtool
2014-09-19 08:09:40 +02:00
scrawl
8a3a3baed4
Tweak AiEscort maximum distances
2014-09-19 05:47:45 +02:00
scrawl
b6c6bfe943
Merge cell names when merging cells ( Fixes #1929 )
2014-09-19 05:02:54 +02:00
cc9cii
5dfcd2ed01
Removed standard window size combobox. Rearranged widgets.
2014-09-19 08:29:06 +10:00
scrawl
b39fe85a51
Implement fPCbaseMagickaMult and fNPCbaseMagickaMult
2014-09-18 14:56:43 +02:00
cc9cii
52354b14fc
Fixed compilation issue on linux. Updated shader mode selection logic (thanks scrawl). Cleaned up a little but needs more once things are settled.
2014-09-18 22:17:37 +10:00
Marc Zinnschlag
3add4bdf35
rewrote refnum handling code (fixes broken reference creation, but not reference cloning yet)
2014-09-18 13:41:29 +02:00
Marc Zinnschlag
6fbffdb98f
fixed reference creator error handling
2014-09-18 12:39:29 +02:00
Marc Zinnschlag
e93ab383ea
set refnum and increment refnum counter when creating a new reference
2014-09-18 12:25:17 +02:00
Marc Zinnschlag
33243c8c16
move code for storing old value from ModifyCommand constructor to redo function (allows use of the command on records that haven't been created at the time of construction)
2014-09-18 11:37:23 +02:00
Marc Zinnschlag
144f6ca79a
Merge remote-tracking branch 'scrawl/master'
2014-09-18 09:22:33 +02:00
cc9cii
575780ec0d
Display format settings working.
2014-09-18 17:13:53 +10:00
cc9cii
d9b0c81299
Show status bar setting working (feature #854 ). Turns out signals were not needed, may need to clean up later.
2014-09-18 16:05:32 +10:00
