Marc Zinnschlag
7610a330ef
Merge remote-tracking branch 'edmondo/master'
2012-08-16 22:07:29 +02:00
Edmondo Tommasina
d576985019
credits.txt: fix name
2012-08-16 20:52:08 +02:00
Marc Zinnschlag
573cc169a1
Merge remote-tracking branch 'mmd/vsdebugfixes'
2012-08-16 20:37:16 +02:00
Michael Mc Donnell
ebe131b326
Use debug dlls when debugging in vs2010
...
Using the Debug build in vs2010 is not working because the debug dlls are
not loaded when debugging. The reason they are not loaded is that
CMAKE_BUILD_TYPE is not defined when doing multiple builds. This in turns
causes OGRE_PLUGIN_DEBUG_SUFFIX not to be set. This patch makes sure that
OGRE_PLUGIN_DEBUG_SUFFIX is always set but only used when debugging.
There are still other bugs that have broken Debug mode in vs2010 but those
will be addressed in other patches.
2012-08-16 11:18:16 -04:00
Marc Zinnschlag
e97d23e626
Issue #361 : reset skill level in race selection stage
2012-08-16 15:42:37 +02:00
scrawl
132da92391
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
2012-08-16 13:20:53 +02:00
Marc Zinnschlag
b0506e2220
re-enabling support for multiple data directories
2012-08-16 12:59:28 +02:00
Marc Zinnschlag
f9693ab33a
Merge remote-tracking branch 'scrawl/shadersystem'
2012-08-16 12:03:03 +02:00
Marc Zinnschlag
c015283679
Merge remote-tracking branch 'pvdk/fontfix'
2012-08-16 12:02:24 +02:00
Marc Zinnschlag
0a82185cf7
Merge remote-tracking branch 'pvdk/credits'
2012-08-16 12:02:09 +02:00
scrawl
4ae0a5c02e
fix silhouettes around objects above the water
2012-08-15 19:29:00 +02:00
Pieter van der Kloet
9501e133f5
Updated the EB Garamond font to a higher-resolution version
2012-08-14 03:23:57 +02:00
Pieter van der Kloet
b1bd2aab74
Added font creators and a formulae researcher to credits.txt
2012-08-14 02:24:46 +02:00
scrawl
f9efd543e4
use float for the mouse position tracking, should be more accurate for sensitivity multipliers != 1
2012-08-13 21:33:53 +02:00
Michael Mc Donnell
b373d0ec7b
Correct struct to class in forward declarations
...
Fixes http://bugs.openmw.org/issues/362
2012-08-13 13:58:35 -04:00
scrawl
67577c6192
UI cursor & camera sensitivity sliders
2012-08-13 18:48:50 +02:00
scrawl
c7b8787c32
"reset to defaults" button, invert y axis button
2012-08-13 02:55:22 +02:00
scrawl
bc6e4feedc
hotkey window first version
2012-08-13 01:26:15 +02:00
scrawl
c4fe2e4e2a
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
2012-08-12 23:01:25 +02:00
scrawl
976ad7a301
key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw
2012-08-12 22:59:58 +02:00
scrawl
90f1d9c2f2
OSX suggestion by corristo
2012-08-12 21:25:13 +02:00
scrawl
97c45455fd
fix WindowManager destruction
2012-08-12 21:21:23 +02:00
scrawl
86d6f190bf
Input system rewrite
2012-08-12 20:45:02 +02:00
scrawl
39f87bee0e
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
2012-08-12 18:46:52 +02:00
Marc Zinnschlag
c4bf6214db
Merge remote branch 'scrawl/master'
2012-08-12 18:11:36 +02:00
Marc Zinnschlag
88e70cb5bd
Merge branch 'decouple'
2012-08-12 18:11:17 +02:00
Marc Zinnschlag
6534c2a55a
Issue #107 : WindowManager is accessed only through the interface class from now on
2012-08-12 18:11:09 +02:00
scrawl
b6f427bf5e
fix OpenMW not exiting when the window is closed (alt f4 etc)
2012-08-12 17:20:46 +02:00
Marc Zinnschlag
35a64edf2a
Issue #107 : removed a template from the window manager
2012-08-12 16:07:04 +02:00
scrawl
12a5bd1208
Merge branch 'decouple' of https://github.com/zinnschlag/openmw into inputsystem
2012-08-12 15:45:32 +02:00
scrawl
6c72b77718
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
2012-08-12 15:43:22 +02:00
Marc Zinnschlag
484cce12a8
Issue #107 : removed redundant getStore function from window manager
2012-08-12 14:36:46 +02:00
Marc Zinnschlag
f37d3cd3c9
Issue #107 : added a few todo comments
2012-08-12 14:09:55 +02:00
Marc Zinnschlag
4ca3cb81d4
Issue #107 : some include clean up
2012-08-12 14:07:48 +02:00
Marc Zinnschlag
e0ba7cf952
Issue #107 : Fixing up the window manager interface
2012-08-12 13:46:14 +02:00
Marc Zinnschlag
020fde70b8
Issue #107 : moving function implementations from hpp to cpp file
2012-08-12 11:10:17 +02:00
Marc Zinnschlag
dbac3d2e5f
Issue #107 : fixing WindowManager::removeDialog
2012-08-12 10:52:29 +02:00
Marc Zinnschlag
a3b27ae756
Issue #107 : Moved ClassPoint from window manager to character creation
2012-08-12 10:50:03 +02:00
Marc Zinnschlag
1328c2b434
Merge remote branch 'corristo/master'
2012-08-12 10:10:42 +02:00
Nikolay Kasyanov
2beaa9d9ae
Workaround to allow main loop to know Ogre::Root's mQueuedEnd value
...
This change is needed because of changes in exit handling
2012-08-11 23:26:20 +04:00
Marc Zinnschlag
0231533d05
Issue #107 : InputManager is accessed only through the interface class from now on
2012-08-11 17:53:39 +02:00
Marc Zinnschlag
b68f9d6a28
Issue #107 : MechanicsManager is accessed only through the interface class from now on
2012-08-11 17:30:55 +02:00
scrawl
dcf1e66456
fix main menu placement after resolution changes
2012-08-11 17:26:01 +02:00
greye
f7f8ac0a73
fix move/rotateObject code
2012-08-11 18:28:37 +04:00
scrawl
2ebf4721d1
small main menu fix
2012-08-11 15:15:09 +02:00
Marc Zinnschlag
380defa52f
Merge remote branch 'greye/cross_cell-borders'
2012-08-11 15:08:17 +02:00
Marc Zinnschlag
5e33d49970
Merge remote branch 'scrawl/shadersystem'
2012-08-11 15:06:04 +02:00
greye
47f7a5e988
fix double pos/rot adjustment
2012-08-11 17:01:55 +04:00
Marc Zinnschlag
bc16dc81b9
Merge remote branch 'greye/cross_cell-borders'
2012-08-11 14:44:39 +02:00
scrawl
8ac2d11f56
changed shading to be more like MW (completely replace material ambient with vertex colors if present), fixes some too dark daedric ruins
2012-08-11 14:42:14 +02:00
