mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-20 21:53:52 +00:00
Code Issues Releases Wiki Activity
7068 commits 107 branches 66 tags 133 MiB
Commit graph

7068 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Marc Zinnschlag
8b909ff838 killed a stray srand 2013-06-21 08:58:52 +02: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
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
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
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