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
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
452df93973
updated credits file
2013-06-17 15:31:35 +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
Marc Zinnschlag
b93d3cc349
Merge remote-tracking branch 'corristo/master'
2013-06-16 20:00:11 +02:00
Nikolay Kasyanov
de2868c0a3
Fixed 64-bit OS X build
2013-06-16 21:47:26 +04: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
scrawl
bc6d5de1f4
Merge branch 'sdl_input2' of github.com:scrawl/openmw into sdl_input2
2013-06-16 17:48:40 +02:00
scrawl
88acebf808
Fix an uninitalized member, and also make sure the mouse is captured when OpenMW starts
2013-06-16 17:10:30 +02:00
Marc Zinnschlag
3e29506d5c
Merge remote-tracking branch 'vorenon/dialogue'
2013-06-16 17:03:50 +02:00
scrawl
c71da1a2ff
Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2
2013-06-16 15:01:09 +02:00
Nikolay Kasyanov
50e5aa8976
Custom rendering loop on OS X again. Prevents default Ogre message pump
...
from stealing input events.
2013-06-16 16:25:13 +04: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
6958940131
Ignore repeated keystrokes, except for text input events
2013-06-15 16:15:45 +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
Marek Kochanowicz
c174f57a2f
Git changes show that it should upload all the files this time. Let's
...
hope…
2013-06-15 14:40:36 +02:00
graffy76
a5d9d3fd7a
Updated status icons from sirherrbatka
2013-06-15 07:29:20 -05:00
graffy76
97cfbc31b5
Merge color icons
...
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
2013-06-15 06:46:27 -05: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
