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
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
Sebastian Wick
a1fea97c3b
use SDL for resolution -> multimonitor support
2013-06-23 03:49:30 +02:00
mckibbenta
16a27e28f7
inluded gmsts with default values to creation of new base files
2013-06-22 21:01:27 -04:00
Marc Zinnschlag
d61c12ccfc
minor cleanup
2013-06-22 20:32:11 +02:00
Sebastian Wick
d364fd8561
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-06-22 19:17:39 +02:00
Sebastian Wick
0e29286856
fix custom resolution maximum
2013-06-22 19:15:13 +02:00
graffy76
62e164b2aa
Fixed load file error if no file is found
2013-06-22 07:43:28 -05:00
graffy76
a73b97d125
Fixed broken references and other bugs
...
Removed references to CSVSettings::SamplePage class
Removed multiple QDebug references
Fixed custom LineEdits (window size user pref) would not accept data
2013-06-21 23:23:43 -05:00
Marc Zinnschlag
f5ba2b37e7
Merge remote-tracking branch 'vorenon/fixes'
2013-06-21 20:28:45 +02:00
vorenon
efdcd9649c
Fading for Exterior->Interior cell transitions
2013-06-21 20:19:35 +02:00
Marc Zinnschlag
8b909ff838
killed a stray srand
2013-06-21 08:58:52 +02:00
graffy76
b3d185e421
Unsaved changes missed in previous commits
2013-06-20 18:08:53 -05:00
graffy76
f4a2cf64c2
Removed CSVSettings::SamplePage class files
2013-06-20 18:07:34 -05:00
graffy76
101c147217
Final changes for record status icon feature, incl. window size user
...
preference
1. Included updated status icons, added base.png
2. Added doxygen comments CSV / CSM Settings classes
3. Implemented Glorf's code for window size preference
4. Minor changes code that searches maps in CSV / CSM Settings classes
5. Removed CSVSettings::SamplePage class
6. Other minor code maintenance / improvements
2013-06-20 18:06:25 -05:00
Miroslav Puda
8da3494d74
Revert "Type of weather changed from string to enum."
...
This reverts commit 04d90b4c47
2013-06-20 21:51:07 +02:00
Miroslav Puda
26a6bdb27d
Correction of sigsegv.
2013-06-19 20:06:02 +02:00
Miroslav Puda
f9940413fd
Static for nextWeather()
2013-06-19 16:49:43 +02:00
Miroslav Puda
bf31e5385c
Removal of duplicit exterior checking and unneded string copiing.
2013-06-19 16:18:43 +02:00
Miroslav Puda
8a45686e0a
WeatherResult added as member variable.
2013-06-19 06:50:36 +02:00
Miroslav Puda
f01aa8f55e
Simpler statistical calculation of next weather; minus before parens.
2013-06-19 04:57:36 +02:00
Miroslav Puda
04d90b4c47
Type of weather changed from string to enum.
2013-06-19 03:24:30 +02:00
vorenon
4e8e048968
Added missing click sounds to dialogue
2013-06-19 01:46:38 +02:00
Marc Zinnschlag
94ec05c2c6
Revert "simplifying CSMWorld::CellRef"
...
With the refactored collection class we can now handle the more complex load function
This reverts commit 97f421df8a
2013-06-18 11:27:05 +02:00
Marc Zinnschlag
9c6fa29938
Merge remote-tracking branch 'glorf/bugfix2'
2013-06-17 23:33:09 +02:00
Glorf
09cc57381a
Bugfix #809
2013-06-18 00:43:31 +02:00
Thoronador
d26e721d10
no const for int and bool
2013-06-17 18:47:12 +02:00
Thoronador
9313b2b3fe
better const correctness for MwIniImporter
2013-06-17 17:44:40 +02:00
Marc Zinnschlag
f0718c477f
Merge remote-tracking branch 'darkf/issue-812'
2013-06-17 15:02:18 +02:00
Marc Zinnschlag
5b3d2f5da1
gave Collection class its own header file and removed an unsed cpp file
2013-06-17 14:28:09 +02:00
Marc Zinnschlag
8f167a603c
split IdCollection into Collection and IdCollection class
2013-06-17 14:16:26 +02:00
Marc Zinnschlag
4b2d920f9d
rewrote IdCollection::load (not using private members of IdCollection anymore)
2013-06-17 13:49:32 +02:00
graffy76
f87eb67968
Fixed conflicts
...
Merge branch 'cs-windows' of https://github.com/Glorf/openmw
Conflicts:
apps/opencs/model/settings/usersettings.cpp
apps/opencs/model/settings/usersettings.hpp
apps/opencs/view/settings/usersettingsdialog.cpp
2013-06-17 06:45:44 -05:00
Marc Zinnschlag
2968b96882
added a bit more documentation
2013-06-17 13:03:32 +02:00
Marc Zinnschlag
f4e7916ec4
moved IdCollection base into its own source file pair and renamed it to Collection
2013-06-17 11:42:02 +02:00
darkf
43455129d0
launcher: Instead of killing config writing due to no master files being selected, instead display a warning when Play is pressed.
2013-06-17 08:58:48 +00:00
Marc Zinnschlag
b5926257f5
Merge remote-tracking branch 'scrawl/sdl_input2'
2013-06-16 21:23:35 +02:00
scrawl
b16bc69479
Removed the no longer needed --debug switch
2013-06-16 20:39:40 +02:00
Marc Zinnschlag
57ce87bf12
Merge remote-tracking branch 'scrawl/sdl_input2'
2013-06-16 20:37:15 +02:00
scrawl
4fd7891d2c
Fix a message box issue
2013-06-16 20:26:27 +02:00
vorenon
76a2abcbe3
added missing line break in front of multiple choice questions
2013-06-16 19:46:55 +02:00
scrawl
b16c92c2f5
Better handle SDL_TEXTINPUT events
2013-06-16 19:43:59 +02:00
vorenon
ed6098388f
return false instead of std::exit
2013-06-16 18:13:14 +02:00
vorenon
b97a051dc6
Merge branch 'bug813' of https://github.com/vorenon/openmw into bug813
2013-06-16 18:12:09 +02:00
scrawl
03682184c6
Enable SDL_TEXTINPUT events only when a text input widget currently has key focus
2013-06-16 18:06:55 +02:00
Marc Zinnschlag
3e29506d5c
Merge remote-tracking branch 'vorenon/dialogue'
2013-06-16 17:03:50 +02:00
vorenon
9ac4a9c5eb
Don't start OpenMW if no master file is selected. This fixes bug #813
2013-06-16 04:59:34 +02:00
vorenon
4c0086b54c
Workaround for bug #820
2013-06-16 01:09:03 +02:00
scrawl
4c8a04d9cb
Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
2013-06-15 17:41:42 +02:00
scrawl
5252ffa104
More cleanup
2013-06-15 17:06:27 +02:00
scrawl
289587b1a9
Cleanup
2013-06-15 16:29:25 +02:00
scrawl
f1ff9b69b3
Mouse grab and relative input need to be disabled when the mouse leaves the window; Disabled resolution switching / window resizing for now due to several glitches
2013-06-15 15:33:47 +02:00
graffy76
700d55f1fb
Fixed / implemented missing features for RecordStatusDelegate
...
Implemented updating editor application from preferences menu, loading
settings when editor loads, adding Record Status Display prefernce.
Fixed multiple bugs, made changes to CSM(V)Settings classes to make
implementing new prefrences easier.
Rewrote CSMSettings::UserSettings to retain last-loaded settings.
Adjusted icon position in Record Status column
Capitalized status text
Added delegate to referenceables table
2013-06-15 06:40:18 -05:00
scrawl
9331a6380c
Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2
2013-06-15 13:25:27 +02:00
scrawl
4fb32f7f05
Moved window resize messages to sdlinputwrapper
2013-06-15 13:22:29 +02:00
Nikolay Kasyanov
9807eacb58
Removed obsolete OIS workaround
2013-06-15 15:17:29 +04:00
Nikolay Kasyanov
5984a15846
We don't need Carbon on OS X anymore
2013-06-15 14:47:33 +04:00
Rohit Nirmal
e5ddaaf676
Fix wrong indenting from my last commits.
2013-06-13 11:17:34 -05:00
Marc Zinnschlag
df016778be
Merge remote-tracking branch 'rohitnirmal/journal-open-sound'
2013-06-13 18:04:38 +02:00
scrawl
0880805559
Minor cleanup
2013-06-13 12:13:40 +02:00
Rohit Nirmal
9d4ecc3e73
replace tabs with spaces.
2013-06-13 00:52:26 -05:00
Rohit Nirmal
aac3ada14b
Use mousewheel to turn book pages.
2013-06-13 00:50:07 -05:00
scrawl
fcf35d3871
Removed the UI cursor sensitivity slider
2013-06-12 20:27:55 +02:00
scrawl
ab3634d692
Removed some remains of OIS
2013-06-12 20:13:19 +02:00
scrawl
14a2a26a56
Fullscreen resizing fix
2013-06-12 20:08:55 +02:00
scrawl
403704b92a
Use openmw.png for SDL_SetWindowIcon
2013-06-12 16:15:04 +02:00
scrawl
705488ddfb
Fix mouse movement events being discarded when there's more than one event in a frame
2013-06-12 16:07:46 +02:00
scrawl
cc077eaba6
Fix mouse wheel triggering a click event in mygui
2013-06-12 15:10:04 +02:00
scrawl
918a1655bb
Restored HW cursor rotation and resolution/fullscreen switching
2013-06-12 14:58:07 +02:00
scrawl
495aeb5d3b
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/mwgui/cursorreplace.cpp
apps/openmw/mwgui/cursorreplace.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwgui/windowmanagerimp.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
libs/openengine/ogre/renderer.cpp
2013-06-12 12:34:33 +02:00
Marc Zinnschlag
df1f1bd5c8
Merge remote-tracking branch 'glorf/cs-windows'
2013-06-12 10:58:08 +02:00
Glorf
548f4d683f
Globalization of user settings
2013-06-12 12:36:35 +02:00
Marc Zinnschlag
bd08677a7f
Merge branch 'openmw24'
2013-06-12 10:37:33 +02:00
Marc Zinnschlag
c891e529f3
Merge remote-tracking branch 'rohitnirmal/launcher-fix-rohit'
2013-06-12 10:32:53 +02:00
Rohit Nirmal
2fd4d71774
trim whitespace from key and value while reading settings file - stops ugly buildup in settings.cfg, and correctly reads settings from it.
2013-06-11 23:00:12 -05:00
darkf
fc0f04324c
Remove some superfluous mSkyManager NULL checks
2013-06-11 20:56:40 -07:00
darkf
fb462f1b1a
launcher: Throw error if no data files are selected
2013-06-11 20:28:38 -07:00
darkf
fd25616cab
launcher: Properly quit if settings write fails.
2013-06-11 20:28:36 -07:00
Rohit Nirmal
fdeac21f22
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal-open-sound
2013-06-11 21:36:00 -05:00
Rohit Nirmal
b5caa25e5c
Just move check if player owns journal to inputmanagerimp.cpp - prevents playing sound when going to main menu.
2013-06-10 19:42:38 -05:00
fstp
98e5cb6d7b
Added ifdef to keep backward compatibility with the FFmpeg library.
2013-06-10 15:10:39 +02:00
Rohit Nirmal
4eede86ce6
Moved journal open/close sound effect playback to JournalWindowImpl, and have opening sound play only if the player has the journal.
2013-06-09 23:27:47 -05:00
fstp
a3b2a76e60
Added virtual destructors to classes LocalMapBase and EffectEditorBase.
2013-06-09 23:08:57 +02:00
Glorf
10165d3c6b
Feature #468
2013-06-09 00:34:27 +02:00
Marc Zinnschlag
97f421df8a
simplifying CSMWorld::CellRef
2013-06-08 15:50:36 +02:00
Marc Zinnschlag
1e60ad3cd6
Promoted references to a top level record internally.
...
Note: This does not change the structure of the ESX format.
2013-06-08 12:45:13 +02:00
Marc Zinnschlag
48496a644f
Merge remote-tracking branch 'scrawl/master'
2013-06-06 23:42:21 +02:00
scrawl
daab4f55a3
Use Morrowind's fonts
2013-06-06 22:26:06 +02:00
pvdk
b3595a6a2e
Fix for duplicate key/value pairs being written to settings.cfg, Bug #755
2013-06-02 21:43:22 +02:00
Marc Zinnschlag
f586eef604
Merge remote-tracking branch 'torben/pathfindingoverhaul'
2013-06-01 10:44:23 +02:00
Torben Carrington
09beafd044
Pathfinding Overhaul - Master cleanup! Cleaned pathfinding entirely, all AI packages that are implemented as well, Increased buffer! This makes the intro guard no longer walk into you or go to far into the room (not tested against vanilla distances but it seems accurate enough until the next itteration of pathfinding fixes).
2013-05-31 17:49:52 -07:00
Torben Carrington
a4caec56cf
Pathfinding Overhaul - Fixed selecting cells that are inaccessable from AIWander and pathfinding in general (sadly requires minor effort on the AI Packages implementation but it is the quickest way I can see), minor cleanup again (there is a lot to cleanup, this will prolly be in every commit).
2013-05-31 17:01:42 -07:00
scrawl
8bd712cc95
Fix being able to move slowly when over encumbered
2013-05-31 04:08:44 +02:00
Torben Carrington
73a9671742
Pathfinding Overhaul - Changed the name of checkIfNextPointReached to a more intuitive name considering what it does (checkPathCompleted) and fixed a minor bug in it, modified buildPath() to take one final parameter, a bool which dictates whether or not to always use pathfinding (like AIWander should be doing) or to allow for "shortcuts", modified all ai packages to work with these two changes.
2013-05-29 20:05:17 -07:00
graffy76
1d93cf09bc
Cell formatting and code optimization changes
2013-05-29 21:55:19 -05:00
Torben Carrington
c080785235
Pathfinding Overhaul - Finished cleaning, removed unnecessary parameter in one function, fixed use of the function in ai packages and added use of clearPath() function in aiwander, fixed algorithms and got rid of excess subtractions in getDistance functions (thanks to Chris!).
2013-05-29 19:26:45 -07:00
Torben Carrington
7b465ae4f1
Pathfinding Overhaul - Even more cleanup and spacing corrections, small renaming (more to come), removed a few unnecessary actions that wasted CPU time and tmp RAM.
2013-05-29 17:33:33 -07:00
Torben Carrington
96fdaf7410
Pathfinding Overhaul - More cleanup.
2013-05-29 16:10:15 -07:00
Torben Carrington
4838678944
Pathfinding Overhaul - Cleanup, removed unnecessary include, fixed spacing, added a function for clearing a path, overall preperation to begin working on fixing pathfinding.
2013-05-29 15:59:23 -07:00
graffy76
35fb9b669a
Final details implemented
...
Png icons, alignments fixed.
2013-05-29 06:38:35 -05:00
