Sebastian Wick
357974a429
more minor stuff
12 years ago
mckibbenta
1f4d1d3b57
Merge branch 'master' of https://github.com/zinnschlag/openmw
12 years ago
mckibbenta
6f0bffe2be
Merge branch 'gmstadd'
12 years ago
mckibbenta
5803726233
modified gmst addition during creation of new base file
12 years ago
Sebastian Wick
c97fac8116
use QMessageBox to show errors
12 years ago
Sebastian Wick
89dee80dcf
simpler remove of duplicates
12 years ago
Sebastian Wick
6abb5d5f75
small fixes
12 years ago
Sebastian Wick
dbfc39468b
better workaround
12 years ago
Marc Zinnschlag
0829548106
Merge remote-tracking branch 'swick/multimonitor'
...
Conflicts:
apps/launcher/graphicspage.cpp
12 years ago
Sebastian Wick
6f7a7b4714
remove old code
12 years ago
Sebastian Wick
bb39a85f16
remove double entries
12 years ago
Sebastian Wick
14d074e3e7
select first screen if none is in the setting
12 years ago
Sebastian Wick
a1fea97c3b
use SDL for resolution -> multimonitor support
12 years ago
mckibbenta
16a27e28f7
inluded gmsts with default values to creation of new base files
12 years ago
Marc Zinnschlag
d61c12ccfc
minor cleanup
12 years ago
Sebastian Wick
d364fd8561
Merge branch 'master' of https://github.com/zinnschlag/openmw
12 years ago
Sebastian Wick
0e29286856
fix custom resolution maximum
12 years ago
graffy76
62e164b2aa
Fixed load file error if no file is found
12 years ago
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
12 years ago
Marc Zinnschlag
f5ba2b37e7
Merge remote-tracking branch 'vorenon/fixes'
12 years ago
vorenon
efdcd9649c
Fading for Exterior->Interior cell transitions
12 years ago
graffy76
75d7d3b7fc
Added base.png
12 years ago
Marc Zinnschlag
a2aa3aaa0e
workaround for - in names
12 years ago
Marc Zinnschlag
8b909ff838
killed a stray srand
12 years ago
graffy76
b3d185e421
Unsaved changes missed in previous commits
12 years ago
graffy76
f4a2cf64c2
Removed CSVSettings::SamplePage class files
12 years ago
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
12 years ago
graffy76
965d93ea40
Pull to get latest icons
...
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
12 years ago
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
12 years ago
Alex McKibben
4f4b41d4fa
added my real name where credited as podcaster
12 years ago
Miroslav Puda
26a6bdb27d
Correction of sigsegv.
12 years ago
Miroslav Puda
f9940413fd
Static for nextWeather()
12 years ago
Miroslav Puda
c467b1cf4e
Merge branch 'master' of https://github.com/zinnschlag/openmw into weather
12 years ago
Miroslav Puda
bf31e5385c
Removal of duplicit exterior checking and unneded string copiing.
12 years ago
Miroslav Puda
8a45686e0a
WeatherResult added as member variable.
12 years ago
Miroslav Puda
f01aa8f55e
Simpler statistical calculation of next weather; minus before parens.
12 years ago
Miroslav Puda
04d90b4c47
Type of weather changed from string to enum.
12 years ago
vorenon
4e8e048968
Added missing click sounds to dialogue
12 years ago
Bret Curtis
812f0b1b62
use static sdl2
12 years ago
Bret Curtis
5832467c1d
travis cleanup, remove CG and OIS
12 years ago
Bret Curtis
0d1e38740b
should fix travis building problems with sdl2
12 years ago
Bret Curtis
84a8ea4ef7
static sdl2 compilation option for Unixes that are not Apple
12 years ago
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
.
12 years ago
Marc Zinnschlag
9c6fa29938
Merge remote-tracking branch 'glorf/bugfix2'
12 years ago
Glorf
09cc57381a
Bugfix #809
12 years ago
Thoronador
d26e721d10
no const for int and bool
12 years ago
Thoronador
9313b2b3fe
better const correctness for MwIniImporter
12 years ago
Marc Zinnschlag
452df93973
updated credits file
12 years ago
Marc Zinnschlag
f0718c477f
Merge remote-tracking branch 'darkf/issue-812'
12 years ago
Marc Zinnschlag
5b3d2f5da1
gave Collection class its own header file and removed an unsed cpp file
12 years ago