Vincent Heuken
09cca0bf80
more detailed error message when SDL fails to initialize
2013-06-23 16:45:23 -07:00
Sebastian Wick
acaba78a11
wrong number
2013-06-23 23:13:54 +02:00
Marc Zinnschlag
b6dd9ae337
updated credits file
2013-06-23 22:52:50 +02: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
6f0bffe2be
Merge branch 'gmstadd'
2013-06-23 15:24:17 -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
graffy76
75d7d3b7fc
Added base.png
2013-06-21 12:28:07 -05:00
Marc Zinnschlag
a2aa3aaa0e
workaround for - in names
2013-06-21 14:20:52 +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
graffy76
965d93ea40
Pull to get latest icons
...
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
2013-06-20 16:13:01 -05:00
Miroslav Puda
8da3494d74
Revert "Type of weather changed from string to enum."
...
This reverts commit 04d90b4c47
.
Conflicts:
apps/openmw/mwworld/weather.cpp
apps/openmw/mwworld/weather.hpp
2013-06-20 21:51:07 +02:00
Alex McKibben
4f4b41d4fa
added my real name where credited as podcaster
2013-06-20 00:06:15 -04: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
c467b1cf4e
Merge branch 'master' of https://github.com/zinnschlag/openmw into weather
2013-06-19 16:20:29 +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
Bret Curtis
812f0b1b62
use static sdl2
2013-06-18 15:32:58 +02:00
Bret Curtis
5832467c1d
travis cleanup, remove CG and OIS
2013-06-18 15:27:24 +02:00
Bret Curtis
0d1e38740b
should fix travis building problems with sdl2
2013-06-18 15:23:04 +02:00
Bret Curtis
84a8ea4ef7
static sdl2 compilation option for Unixes that are not Apple
2013-06-18 14:31:47 +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