greye
a3094b808e
update coc behaviour for interior cells
2013-07-07 13:47:58 +04:00
Marc Zinnschlag
de5898c953
post merge fixes
2013-07-06 18:34:14 +02:00
Marc Zinnschlag
4986b7d65d
Merge branch 'master' into ref
2013-07-06 17:54:19 +02:00
Marc Zinnschlag
1c4b70805b
added missing reference table columns
2013-07-06 17:41:06 +02:00
Marc Zinnschlag
9a39f32c32
store ID of cell in reference struct
2013-07-06 17:06:06 +02:00
Marc Zinnschlag
9a49125281
added references table
2013-07-06 17:03:18 +02:00
scrawl
72600a16cf
Fix chargen race menu bug, updating a render target from within MyGUI's ControllerManager update is not a good idea
2013-07-06 17:02:40 +02:00
scrawl
58fce74620
Use the already existing mScrollPage as step size for scrollbar button repeats; increased precision of options menu sliders
2013-07-06 16:40:57 +02:00
scrawl
5c8950f91c
Merge branch 'master' of git://github.com/zinnschlag/openmw
2013-07-06 16:08:29 +02:00
Marc Zinnschlag
f9d7c7574e
Merge remote-tracking branch 'swick/scrollbar'
2013-07-06 13:13:27 +02:00
Marc Zinnschlag
3dc42fb948
Merge remote-tracking branch 'greye/master'
2013-07-06 12:28:01 +02:00
greye
76d95dffb6
special case for loading StartScript records
2013-07-05 23:52:46 +04:00
Sebastian Wick
26bd2a5301
use the new scrollbar; range dependent step size; fix
2013-07-05 20:28:46 +02:00
Sebastian Wick
b43f41c2bd
use a mygui controller for scrollbar repeat
2013-07-05 19:17:00 +02:00
Sebastian Wick
e3d8bdbafe
autorepeat scrollbar
2013-07-02 17:29:47 +02:00
Marc Zinnschlag
847ec9fa56
Merge remote-tracking branch 'swick/master'
2013-07-01 10:16:39 +02:00
Sebastian Wick
8bdc9ff3ae
set position of the window for multiple monitors
2013-07-01 03:56:33 +02:00
Marc Zinnschlag
56637a39a3
Merge remote-tracking branch 'vheuken/master'
2013-06-29 12:27:01 +02:00
Marc Zinnschlag
cd538538b5
fixed weather code
2013-06-28 09:00:21 +02:00
Vincent Heuken
f43b48015e
remove actor's collisionbox on death
2013-06-27 19:42:27 -07:00
Vincent Heuken
b095c24854
resize actor collision boxes on death
2013-06-27 14:11:20 -07:00
scrawl
123a60581f
Only link to SDL2main on windows
2013-06-27 21:45:32 +02:00
Marc Zinnschlag
e88040662e
Merge remote-tracking branch 'glorf/master'
2013-06-27 12:24:09 +02:00
Marc Zinnschlag
afb120d5ce
Merge remote-tracking branch 'graffy76/recordStatusDelegate'
2013-06-27 08:11:27 +02:00
graffy76
6deddf7229
Fixed code conventions in user settings, changed top-level page names
2013-06-26 21:18:21 -05:00
Glorf
88f8637145
Bugfix #795
2013-06-26 22:20:24 +02:00
Glorf
5b81d124bb
Catched another exception
2013-06-26 18:43:27 +02:00
Glorf
f4d302501e
Bugfix #826
2013-06-26 18:29:09 +02:00
Marc Zinnschlag
623200b50e
Merge remote-tracking branch 'pakanek/libav_headers'
2013-06-26 10:58:43 +02:00
Marc Zinnschlag
8ffea60b72
some cleanup
2013-06-26 10:09:26 +02:00
Marc Zinnschlag
12cfe1fdfe
Merge remote-tracking branch 'graffy76/recordStatusDelegate'
2013-06-26 09:48:51 +02:00
Miroslav Puda
743b3dec99
Correction of libavutil version
2013-06-26 07:17:29 +02:00
graffy76
f0f895ad10
Fixed settings file error message
...
Errors only occur if both global and local settings files are not found.
All other file read errors fail silently.
2013-06-25 19:32:36 -05:00
Alexander "Ace" Olofsson
0a2ed8b0d7
Make OpenMW able to initialize SDL in windows builds
2013-06-25 15:05:10 +02:00
eroen
d75391de8e
libav-9 - fix missing includes
...
With libav-9 and ffmpeg-1.0, libavcodec/avcodec.h no longer defines the
AV_CH_LAYOUT_* constants. They have been defined in libavutil/channel_layout.h
for a long time prior to this.
2013-06-24 21:08:28 +02:00
Marc Zinnschlag
05649a1654
Merge remote-tracking branch 'swick/master'
2013-06-24 14:35:32 +02:00
Vincent Heuken
09cca0bf80
more detailed error message when SDL fails to initialize
2013-06-23 16:45:23 -07:00
Marc Zinnschlag
99508a6eaa
minor cleanup
2013-06-23 22:52:02 +02:00
Sebastian Wick
20e591fe18
use index instead of string manipulation
2013-06-23 21:56:27 +02:00
Sebastian Wick
357974a429
more minor stuff
2013-06-23 21:34:41 +02:00
mckibbenta
1f4d1d3b57
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-06-23 15:29:35 -04:00
mckibbenta
5803726233
modified gmst addition during creation of new base file
2013-06-23 15:19:08 -04:00
Sebastian Wick
c97fac8116
use QMessageBox to show errors
2013-06-23 21:16:51 +02:00
Sebastian Wick
89dee80dcf
simpler remove of duplicates
2013-06-23 21:04:49 +02:00
Sebastian Wick
6abb5d5f75
small fixes
2013-06-23 20:53:50 +02:00
Sebastian Wick
dbfc39468b
better workaround
2013-06-23 20:45:24 +02:00
Marc Zinnschlag
0829548106
Merge remote-tracking branch 'swick/multimonitor'
...
Conflicts:
apps/launcher/graphicspage.cpp
2013-06-23 08:34:35 +02:00
Sebastian Wick
6f7a7b4714
remove old code
2013-06-23 05:02:19 +02:00
Sebastian Wick
bb39a85f16
remove double entries
2013-06-23 04:43:34 +02:00
Sebastian Wick
14d074e3e7
select first screen if none is in the setting
2013-06-23 04:21:32 +02:00