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
cc9cii
66852d5392
Code cleanup and revert incorrect settings.
2014-09-24 22:41:49 +10: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
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
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
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
Marc Zinnschlag
7ab4881661
added sound gen table
2014-09-23 13:21:54 +02:00
cc9cii
d41230a0c5
Tweak the look of the recordfilterbox. Keep titlebar if floating.
2014-09-23 20:51:14 +10:00
Marc Zinnschlag
02247fe712
load and save sound gen records
2014-09-23 12:20:02 +02: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
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
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
eroen
0738e862cb
Make GLOBAL_CONFIG_PATH, GLOBAL_DATA_PATH configurable
2014-09-22 15:36:42 +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
