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
scrawl
5252ffa104
More cleanup
12 years ago
scrawl
289587b1a9
Cleanup
12 years ago
scrawl
6958940131
Ignore repeated keystrokes, except for text input events
12 years ago
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
12 years ago
Marek Kochanowicz
c174f57a2f
Git changes show that it should upload all the files this time. Let's
...
hope…
12 years ago
graffy76
a5d9d3fd7a
Updated status icons from sirherrbatka
12 years ago
graffy76
97cfbc31b5
Merge color icons
...
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
12 years ago
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
12 years ago
scrawl
9331a6380c
Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2
12 years ago
scrawl
4fb32f7f05
Moved window resize messages to sdlinputwrapper
12 years ago
Nikolay Kasyanov
9807eacb58
Removed obsolete OIS workaround
12 years ago
Nikolay Kasyanov
5984a15846
We don't need Carbon on OS X anymore
12 years ago
Nikolay Kasyanov
6abb7a18b0
SDL2 input: seems to work on OS X, has some input issues though
12 years ago
Nikolay Kasyanov
3fded2d8bf
Removed custom Carbon message pump
12 years ago
Nikolay Kasyanov
adf54cb735
SDL2 input: compilation fixed
12 years ago
Rohit Nirmal
e5ddaaf676
Fix wrong indenting from my last commits.
12 years ago
Marc Zinnschlag
df016778be
Merge remote-tracking branch 'rohitnirmal/journal-open-sound'
12 years ago
scrawl
0880805559
Minor cleanup
12 years ago
Rohit Nirmal
9d4ecc3e73
replace tabs with spaces.
12 years ago
Rohit Nirmal
aac3ada14b
Use mousewheel to turn book pages.
12 years ago
scrawl
fcf35d3871
Removed the UI cursor sensitivity slider
12 years ago
scrawl
ab3634d692
Removed some remains of OIS
12 years ago
scrawl
14a2a26a56
Fullscreen resizing fix
12 years ago
scrawl
c29699487f
forgot to add file
12 years ago
scrawl
403704b92a
Use openmw.png for SDL_SetWindowIcon
12 years ago