scrawl
5834b4baa5
door markers on the local map
2012-08-28 17:30:34 +02:00
Marc Zinnschlag
40d4dad15e
Issue #378 : Fix (record wasn't build fully)
2012-08-28 09:32:38 +02:00
Marc Zinnschlag
160b52162b
Merge remote-tracking branch 'scrawl/quick_keys'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
2012-08-28 09:06:40 +02:00
scrawl
321f7c3419
fix an infinite recursion regression on several dialogs.
2012-08-27 21:29:04 +02:00
scrawl
5c28a67203
broke something in the last commit.
2012-08-27 20:55:39 +02:00
scrawl
4f19b7fb9b
fix leaks.
2012-08-27 20:52:32 +02:00
scrawl
bc36b0e2bd
remove the restriction on the last quick key
2012-08-27 20:51:13 +02:00
scrawl
6161f81c24
last bits of the quick key menu.
2012-08-27 20:44:14 +02:00
Marc Zinnschlag
14b4263143
Merge remote-tracking branch 'scrawl/alttab'
2012-08-27 20:32:56 +02:00
scrawl
dc8f9bd923
workaround for alt tab view mode toggle
2012-08-27 19:25:30 +02:00
scrawl
9af0b48ad6
show/hide crosshair correctly
2012-08-27 19:18:55 +02:00
scrawl
a4c1d979d6
Merge branch 'master' into quick_keys
2012-08-27 18:14:41 +02:00
scrawl
c5e55d3cac
fix screenshot function
2012-08-27 15:51:01 +02:00
greye
61923349e5
resolving conflicts
2012-08-27 14:52:54 +04:00
scrawl
5ebcaeb098
Merge branch 'next' into quick_keys
2012-08-27 11:04:23 +02:00
scrawl
b1a394552d
mouse click sounds
2012-08-27 10:01:53 +02:00
Marc Zinnschlag
d0cebea580
some cleanup
2012-08-26 18:50:47 +02:00
Marc Zinnschlag
450656a890
Merge remote-tracking branch 'dgdiniz/MoveSoundtoAction-Task339' into next
2012-08-26 18:39:09 +02:00
Marc Zinnschlag
ef4910293b
Merge remote-tracking branch 'corristo/osx_f_keys_fix' into next
2012-08-26 18:35:26 +02:00
Douglas Diniz
5cbb08fee1
Task 339 - Moving all sounds to actions
2012-08-26 11:47:45 -03:00
scrawl
c0f27bd5ef
magic selection window
2012-08-26 11:37:33 +02:00
scrawl
fab4cfecb1
some unfinished work on quick keys window
2012-08-26 10:52:06 +02:00
Marc Zinnschlag
1fd4d84173
Merge remote-tracking branch 'mmd/windowswarnings' into next
2012-08-24 15:07:19 +02:00
Nikolay Kasyanov
71a6ce2202
removed cout spam
2012-08-20 21:14:29 +04:00
Nikolay Kasyanov
5395721c26
more appropriate fix for #189
2012-08-20 21:05:02 +04:00
Douglas Diniz
82e7c04c0a
Changing sounds to Action.
...
Adding onActor to Action to choose between playSound and playSound3D.
2012-08-19 20:11:50 -03:00
scrawl
f7d537cb28
very small correction
2012-08-19 22:15:31 +02:00
scrawl
19ae30ee68
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwbase/inputmanager.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.hpp
apps/openmw/mwinput/mouselookevent.cpp
2012-08-19 22:09:22 +02:00
Lukasz Gromanowski
34513cf16b
Added support for code coverage checking and unittests.
...
Added support for code coverage checking with gcov and
unittests with Google C++ unittest and GMock frameworks.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-08-19 22:23:46 +03:00
greye
e6c3e0744e
tvm update and fix
2012-08-19 10:37:51 +04:00
greye
5b2b378f25
tvm script instruction
2012-08-18 18:05:10 +04:00
Marc Zinnschlag
d1656b2f5d
Merge remote-tracking branch 'greye/player_control'
...
Conflicts:
apps/openmw/mwrender/player.cpp
2012-08-18 13:38:54 +02:00
greye
b8e56d61d3
update camera code, add idle time
2012-08-18 01:31:57 +04:00
greye
3f3972eb3b
no vanity in gui mode (thanks scrawl)
2012-08-17 23:44:28 +04:00
greye
d2b451eb7d
entering vanity mode
2012-08-17 23:25:29 +04:00
greye
b6954a4e8d
use the same height on non-1st person modes
2012-08-17 22:08:16 +04:00
scrawl
8817a9634c
don't switch to vanity mode as a result of idle time when the gui is opened (e.g. when talking to someone)
2012-08-17 16:55:21 +02:00
Marc Zinnschlag
1da56e2832
removed some unused variables
2012-08-17 15:37:14 +02:00
greye
14f293882c
still resolving
2012-08-17 16:42:42 +04:00
greye
83356d5505
resolving conflicts
2012-08-17 16:25:54 +04:00
greye
7303d595dd
resolving conflicts
2012-08-17 15:36:51 +04:00
greye
4f10138a04
using real player sight angles on ray cast
2012-08-17 15:20:57 +04:00
greye
0e6e141fd4
camera control related script instructions
2012-08-17 15:20:57 +04:00
greye
60fb1e8df6
fix sky in preview mode movement
2012-08-17 15:19:44 +04:00
greye
6961830efb
using real player eye direction when moving
2012-08-17 15:19:44 +04:00
greye
e8fc942bef
reverse Z-axis rotation to make doors happy
2012-08-17 15:19:44 +04:00
greye
a453a7f035
camera adjustment, fix view mode on start
2012-08-17 15:19:44 +04:00
scrawl
34f796c38e
removed the far clip distance hack which is not needed anymore
2012-08-17 15:19:44 +04:00
scrawl
b97b3d7b71
fix sky position when reflection is enabled, fix delay in sky reflection
2012-08-17 15:19:44 +04:00
greye
575244bd35
fix SkaManager issue
2012-08-17 15:19:44 +04:00
greye
783e81afc3
fix 1st/preview/1st change; 1st invisible model
2012-08-17 15:19:43 +04:00
greye
392e6efcb5
initial player rendering
2012-08-17 15:19:43 +04:00
greye
6f87c0c36d
preview mode, advanced vanity support
2012-08-17 15:19:43 +04:00
greye
fe1a9ac3c5
poor camera with some fixes
2012-08-17 15:19:43 +04:00
greye
db94018865
far better camera movement
2012-08-17 15:19:43 +04:00
greye
a7aeda9a3b
initial vanity mode support
2012-08-17 15:19:43 +04:00
greye
c46eeaa100
initial 3d-person camera support
2012-08-17 15:19:43 +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
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
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
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
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
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
greye
355ca649c2
camera flip control rewritten
2012-08-11 14:54:33 +04:00
Marc Zinnschlag
766e782aae
Merge remote branch 'greye/cross_cell-borders'
2012-08-11 12:05:10 +02:00
Marc Zinnschlag
f3edea77b2
MSCV compatibility fix
2012-08-11 12:03:22 +02:00
Marc Zinnschlag
b53b27533a
fixes some include guards
2012-08-11 12:02:51 +02:00
Marc Zinnschlag
6eb9f15b6d
fixed time stamp operator
2012-08-11 11:38:26 +02:00
greye
45306e4bc3
fixed rotation adjustment
2012-08-11 13:23:54 +04:00
greye
5018db3332
removed some redundant code, added some comments
2012-08-11 12:13:16 +04:00
scrawl
11fadf4a07
forgot something
2012-08-10 16:25:27 +02:00
scrawl
44ff31b50a
removed world exit methods
2012-08-10 16:21:53 +02:00
scrawl
f72956b918
- added a simple main menu (with Return, Options and Exit buttons)
...
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
2012-08-10 15:15:48 +02:00