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 |
|
Marc Zinnschlag
|
8f167a603c
|
split IdCollection into Collection and IdCollection class
|
12 years ago |
|
Marc Zinnschlag
|
4b2d920f9d
|
rewrote IdCollection::load (not using private members of IdCollection anymore)
|
12 years ago |
|
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
|
12 years ago |
|
Marc Zinnschlag
|
2968b96882
|
added a bit more documentation
|
12 years ago |
|
Marc Zinnschlag
|
f4e7916ec4
|
moved IdCollection base into its own source file pair and renamed it to Collection
|
12 years ago |
darkf
|
43455129d0
|
launcher: Instead of killing config writing due to no master files being selected, instead display a warning when Play is pressed.
|
12 years ago |
|
Marc Zinnschlag
|
b5926257f5
|
Merge remote-tracking branch 'scrawl/sdl_input2'
|
12 years ago |
scrawl
|
b16bc69479
|
Removed the no longer needed --debug switch
|
12 years ago |
|
Marc Zinnschlag
|
57ce87bf12
|
Merge remote-tracking branch 'scrawl/sdl_input2'
|
12 years ago |
|
scrawl
|
4fd7891d2c
|
Fix a message box issue
|
12 years ago |
|
Marc Zinnschlag
|
b93d3cc349
|
Merge remote-tracking branch 'corristo/master'
|
12 years ago |
Nikolay Kasyanov
|
de2868c0a3
|
Fixed 64-bit OS X build
|
12 years ago |
|
vorenon
|
76a2abcbe3
|
added missing line break in front of multiple choice questions
|
12 years ago |
|
scrawl
|
b16c92c2f5
|
Better handle SDL_TEXTINPUT events
|
12 years ago |
|
vorenon
|
ed6098388f
|
return false instead of std::exit
|
12 years ago |
|
vorenon
|
b97a051dc6
|
Merge branch 'bug813' of https://github.com/vorenon/openmw into bug813
|
12 years ago |
|
scrawl
|
03682184c6
|
Enable SDL_TEXTINPUT events only when a text input widget currently has key focus
|
12 years ago |
|
scrawl
|
bc6d5de1f4
|
Merge branch 'sdl_input2' of github.com:scrawl/openmw into sdl_input2
|
12 years ago |
|
scrawl
|
88acebf808
|
Fix an uninitalized member, and also make sure the mouse is captured when OpenMW starts
|
12 years ago |
|
Marc Zinnschlag
|
3e29506d5c
|
Merge remote-tracking branch 'vorenon/dialogue'
|
12 years ago |
|
scrawl
|
c71da1a2ff
|
Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2
|
12 years ago |
|
Nikolay Kasyanov
|
50e5aa8976
|
Custom rendering loop on OS X again. Prevents default Ogre message pump
from stealing input events.
|
12 years ago |
|
vorenon
|
9ac4a9c5eb
|
Don't start OpenMW if no master file is selected. This fixes bug #813
|
12 years ago |
|
vorenon
|
4c0086b54c
|
Workaround for bug #820
|
12 years ago |
|
scrawl
|
4c8a04d9cb
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
|
12 years ago |