krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
6447 commits 35 branches 0 tags 65 MiB
Commit graph

163 commits

Author SHA1 Message Date
scrawl
21e0cde914 changed OIS includes since OIS_INCLUDE_DIR is already an include directory 2012-11-06 15:26:51 +01:00
scrawl
896428c129 enableRestMenu & enableLevelupMenu 2012-09-15 20:18:41 +02:00
scrawl
76b494100e finished? 2012-09-15 17:12:42 +02:00
scrawl
2b339f6c0f loading screen 2012-09-11 16:37:54 +02:00
scrawl
9448ce5968 implemented "get<Control>Disabled" functions 2012-09-10 18:44:59 +02:00
scrawl
760f05c454 the HUD can be toggled with F12 key; useful for screenshots 2012-08-30 20:47:39 +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
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
scrawl
fab4cfecb1 some unfinished work on quick keys window 2012-08-26 10:52:06 +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
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
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
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
0e6e141fd4 camera control related script instructions 2012-08-17 15:20:57 +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
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
c46eeaa100 initial 3d-person camera support 2012-08-17 15:19:43 +04: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
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
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
86d6f190bf Input system rewrite 2012-08-12 20:45:02 +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
Marc Zinnschlag
0231533d05 Issue #107: InputManager is accessed only through the interface class from now on 2012-08-11 17:53:39 +02:00
scrawl
2ebf4721d1 small main menu fix 2012-08-11 15:15:09 +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
greye
6b996d8c34 fix disabled camera on start 2012-08-09 13:29:13 +04:00
greye
378fcc2460 fix DisablePlayerControl logic 2012-08-09 11:10:18 +04:00
greye
1511eb3549 implemented enable/disable player looking switch 2012-08-09 10:55:49 +04:00
greye
a2d87d5f5b added camera flip control, fixed input rotation axis 2012-08-09 10:24:18 +04:00
greye
ec9cf4d3c6 rotateObject() added, input system rewritten 2012-08-09 00:15:52 +04:00
greye
16ad97610d add support for some scripting player control switches 2012-08-04 11:54:42 +04:00
Marc Zinnschlag
fe86ce5a2c DrawState workaround 2012-07-07 20:53:19 +02:00
Marc Zinnschlag
771863e73b Issue #324: Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue 2012-07-06 15:50:26 +02:00
scrawl
14f4f09f83 proper resolution switching (reposition GUI & adjust mouse clipping region) 2012-05-28 09:19:25 +02:00
scrawl
51b8a76a68 merged by branches together, starting with alchemy window 
Merge branch 'guimode_stacking' into next

Conflicts:
	apps/openmw/mwgui/mode.hpp
 2012-05-24 15:57:23 +02:00
scrawl
6ea7bdb224 vsync & fps buttons, sound volume apply fix 2012-05-24 11:50:48 +02:00
scrawl
7ebbc099b3 allow stacking gui modes 2012-05-23 12:23:35 +02:00
scrawl
313294c522 settings window (hotkey F2) which does nothing. Yay! 2012-05-22 21:40:42 +02:00
scrawl
7fbee0d488 use MyGUI::InputManager instead of MWInputManager to detect ctrl/shift 2012-05-15 13:00:26 +02:00
scrawl
320cc7d020 implemented ctrl and shift-keys for item drag&drop (take all, take 1) 2012-05-15 11:02:50 +02:00
scrawl
d266b4fe87 hide the cursor during drag&drop and don't allow hotkeys that change guimode 2012-05-13 10:18:17 +02:00
scrawl
ad5753ba91 Merge branch 'master' of https://github.com/zinnschlag/openmw into gui 2012-05-04 07:34:38 +02:00
scrawl
dd8c66b479 notification when screenshot was taken 2012-05-01 21:54:30 +02:00
scrawl
4655ec94f0 Merge branch 'master' into physicsaedra2 & fix warnings 
Conflicts:
	apps/openmw/mwworld/scene.cpp
 2012-04-30 18:46:51 +02:00
scrawl
4949576984 disable some player controls in gui mode 2012-04-18 19:03:26 +02:00
scrawl
75b336baea Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2 
Conflicts:
	apps/openmw/mwinput/inputmanager.cpp
	apps/openmw/mwworld/player.cpp
	libs/openengine/bullet/physic.cpp
 2012-04-18 13:43:15 +02:00
Jason Hooks
1ce759af06 Merging in master 2012-04-17 18:12:05 -04:00
scrawl
f2fae770d4 Merge branch 'master' into physicsaedra2 
Conflicts:
	apps/openmw/mwworld/player.cpp
 2012-04-13 13:55:13 +02:00
scrawl
e3486931ae F10 hotkey toggle FPS 2012-04-13 13:17:50 +02:00
scrawl
9e1a9e5758 Merge branch 'master' into physicsaedra2 
Conflicts:
	apps/openmw/mwinput/inputmanager.cpp
	libs/openengine/bullet/physic.cpp
 2012-04-08 17:08:36 +02:00
Aleksandar Jovanov
15526d6110 only fists support lacks 2012-04-08 13:17:16 +02:00
Aleksandar Jovanov
c1afd534fc all stuff added 2012-04-08 12:37:59 +02:00
Aleksandar Jovanov
b4ee01e691 missing file 2012-04-08 12:26:59 +02:00
Marc Zinnschlag
8bf9b371c7 removed remains of input framelistener 2012-04-06 10:39:55 +02:00
scrawl
a3151fe525 fixed input handling priority in the main loop 2012-04-05 21:16:51 +02:00
Jason Hooks
18a139cd66 adding up and down move buttons 2012-03-24 22:03:08 -04:00
Marc Zinnschlag
bc71fb47e0 minor fix 2012-02-10 21:24:33 +01:00
Pieter van der Kloet
17b1546dc1 Changed the way screenshots are created (Bug #191) 2012-02-10 20:23:59 +01:00
gugus
bc51ba5a38 Add the journal window (J key). It's still not in the right position. 2011-11-28 16:51:11 +01:00
Marc Zinnschlag
64d6ee26bd changed OGRE framelistener function from frameStarted to frameRenderingQueued 2011-05-18 16:37:09 +02:00
Marc Zinnschlag
f773cf27cb replaced old movement input system 2011-02-03 12:16:59 +01:00
Marc Zinnschlag
36cb10572a fixed tab problem 2011-01-18 15:20:36 +01:00
Star-Demon
588e6e9995 Fixed a syntax error! Oops! 2011-01-18 08:36:42 -05:00
Star-Demon
09023bb853 Toggle now toggles, conventions... 2011-01-18 00:16:01 -05:00
Star-Demon
962b8c9781 Cleaned up inputmanager, tightened up player.exectueAutoMove() 2011-01-17 16:36:44 -05:00
Star-Demon
1bc9a46c6b Cleaned up and changed executeAutoMove() 2011-01-17 15:48:12 -05:00
Star-Demon
90e6029bad Fixed object reference error in player gets 2011-01-16 13:45:54 -05:00
Star-Demon
1a56ef9a67 More AutoMove, now including walking - ready for a look and then test 2011-01-16 11:05:03 -05:00
Star-Demon
5aec3815fd The player should now be able to run AND walk... 2011-01-16 10:47:03 -05:00
Star-Demon
f96f53484c More AutoMove stuff, Sneak bools, cleaning 2011-01-16 10:25:33 -05:00
Star-Demon
60c9c31c7a Silly error Fixed in binding 2011-01-14 10:03:45 -05:00
Star-Demon
bfcfcecab6 Most of AutoMove finished - just needs some speed in Player class. 2011-01-14 09:52:28 -05:00
Star-Demon
3ab4a4487f Sneak State, Bound Sneak and AutoMove, began outlining AutoMove 2011-01-12 12:19:33 -05:00
Star-Demon
43c33ee85f Merge remote branch 'zinnschlag/master' 2011-01-09 16:43:33 -05:00
Star-Demon
e98eef8cd3 corrected grammar for merge 2011-01-09 16:42:38 -05:00
Marc Zinnschlag
f01a3d5e35 split Player class into a MWWorld and a MWRender component 2011-01-08 15:11:37 +01:00
Marc Zinnschlag
4a12be11bf moved PlayerPos class from MWRender to MWWorld and renamed it to Player 2011-01-04 15:58:22 +01:00
Star-Demon
fec90122c3 Added enumerated States to inputmanager to handle future standard actions. 2011-01-02 11:55:00 -05:00