greye
29b7734b52
add qualifiers for names in templates to make gcc 4.7+ happy
2013-07-12 08:33:02 +04:00
Marc Zinnschlag
b17f383c6d
Merge remote-tracking branch 'graffy76/RefIdTypeDelegate'
...
Conflicts:
apps/opencs/view/world/table.cpp
2013-07-11 09:09:52 +02:00
graffy76
11178cc470
Repo permissions commit fix #3
2013-07-10 21:44:25 -05:00
graffy76
bb049806df
Repo permissions commit fix #2
2013-07-10 21:13:59 -05:00
graffy76
ae4e3181d9
Fixing repo permissions commit #1
2013-07-10 17:29:07 -05:00
scrawl
bbb5d2b98a
Change tooltip positioning to resemble vanilla
2013-07-10 03:40:13 +02:00
Marc Zinnschlag
71a6955182
Merge remote-tracking branch 'scrawl/master'
2013-07-08 09:46:00 +02:00
scrawl
91f6d87126
Fix an uninitialized variable
2013-07-07 16:57:46 +02:00
Marc Zinnschlag
602e40e19d
Merge remote-tracking branch 'greye/coc'
2013-07-07 13:34:28 +02:00
greye
e553f285b8
update player position on engine start
2013-07-07 15:06:05 +04:00
greye
f3d54a7ba4
move finding default cell positions to World
2013-07-07 15:03:06 +04:00
greye
0c303aa285
fix fading on cell transition when cell is loaded
2013-07-07 14:30:11 +04:00
greye
6bb3942288
use Land height data for position in coc
2013-07-07 13:47:58 +04:00
greye
a3094b808e
update coc behaviour for interior cells
2013-07-07 13:47:58 +04:00
scrawl
744c5804ed
Simplified doors, now they will stop after hitting an obstacle instead of trying to back off.
2013-07-07 03:52:17 +02: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
graffy76
9f6d250463
QDebug reference removal
2013-07-01 07:40:47 -05: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
graffy76
55b115935a
Implemented RefRecordTypeDelegate
...
Added accessor functions to CSMWorld::UniversalId for static const
sIdArg[]
2013-06-30 07:43:58 -05:00
graffy76
9d95a38934
Implementing delegate for referenceables table Type column
...
Added delegate skeleton class
Added delegate creation code in ViewManager
Added Display_RefRecordType enum to columnbase.hpp
Changed Type column'sDisplay type to Display_RefRecordType in
refidcollection.cpp
modified OpenCS CMakeLists.txt to incorporate RefRecordTypeDelegate
class
2013-06-29 08:54:32 -05: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