scrawl
|
5834b4baa5
|
door markers on the local map
|
2012-08-28 17:30:34 +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
|
9af0b48ad6
|
show/hide crosshair correctly
|
2012-08-27 19:18:55 +02:00 |
|
scrawl
|
c5e55d3cac
|
fix screenshot function
|
2012-08-27 15:51:01 +02:00 |
|
Marc Zinnschlag
|
1fd4d84173
|
Merge remote-tracking branch 'mmd/windowswarnings' into next
|
2012-08-24 15:07:19 +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 |
|
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 |
|
greye
|
d2b451eb7d
|
entering vanity mode
|
2012-08-17 23:25:29 +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
|
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
|
c46eeaa100
|
initial 3d-person camera support
|
2012-08-17 15:19:43 +04: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
|
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
|
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 |
|
Marc Zinnschlag
|
b68f9d6a28
|
Issue #107: MechanicsManager is accessed only through the interface class from now on
|
2012-08-11 17:30:55 +02:00 |
|
Marc Zinnschlag
|
f3edea77b2
|
MSCV compatibility fix
|
2012-08-11 12:03:22 +02:00 |
|
greye
|
38b06aee6c
|
resolving conflicts
|
2012-08-09 21:49:00 +04:00 |
|
Marc Zinnschlag
|
aca08eb4c2
|
Merge branch 'decouple' into player_control
Conflicts:
apps/openmw/mwsound/soundmanagerimp.hpp
|
2012-08-09 16:12:10 +02:00 |
|
Marc Zinnschlag
|
6bd48d12af
|
Issue #107: SoundManager is accessed only through the interface class from now on
|
2012-08-09 14:33:21 +02:00 |
|
Marc Zinnschlag
|
d00d40cc3f
|
Issue #107: Journal is accessed only through the interface class from now on
|
2012-08-09 12:56:03 +02:00 |
|
Marc Zinnschlag
|
a84145a087
|
Issue #107: minor corrections
|
2012-08-09 12:05:47 +02:00 |
|
Marc Zinnschlag
|
923109b260
|
Issue #107: DialogueManager is accessed only through the interface class from now on
|
2012-08-09 10:35:53 +02:00 |
|
greye
|
ec9cf4d3c6
|
rotateObject() added, input system rewritten
|
2012-08-09 00:15:52 +04:00 |
|
Marc Zinnschlag
|
28ecfb4290
|
Issue #107: ScriptManager is accessed only through the interface class from now on
|
2012-08-08 15:18:55 +02:00 |
|
Marc Zinnschlag
|
9b567e4ba6
|
Issue #107: Removed a redundant function in world interface; added a comment
|
2012-08-08 14:54:35 +02:00 |
|
greye
|
b6f7f21bcf
|
fix player cell assertion fail, moveObject(Ptr&, CellStore&, f, f, f) added
|
2012-08-08 14:51:33 +04:00 |
|
greye
|
ff62770657
|
World::isUnderwater(), World::isSwimming()
|
2012-08-03 14:42:09 +04:00 |
|
greye
|
bcc47cd5fb
|
local scripts, move placing to World::placeObject(Ptr, CellStore, Position)
|
2012-07-25 20:31:39 +04:00 |
|
guidoj
|
0549e949ba
|
Mostly removal of unnecessary #include's and a little clean up
|
2012-07-17 09:27:12 +02:00 |
|
gugus
|
0a67f60a6e
|
Clean-up
|
2012-07-09 18:47:59 +02:00 |
|
gugus
|
feec67094f
|
Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwworld/physicssystem.cpp
|
2012-07-09 15:23:26 +02:00 |
|
Marc Zinnschlag
|
4c39fefd1e
|
Issue #107: World is accessed only through the interface class from now on; some include cleanup
|
2012-07-03 12:30:50 +02:00 |
|
Marc Zinnschlag
|
035c1c4b6e
|
added World interface class; cleanup of World interface
|
2012-07-03 01:06:38 +02:00 |
|
Marc Zinnschlag
|
e26f39e563
|
fixed exception handling during subsystem setup
|
2012-05-04 17:20:57 +02:00 |
|
Marc Zinnschlag
|
35f478071e
|
Issue #255: deleted the old environment class and using the new one instead
|
2012-04-23 15:27:03 +02:00 |
|
Marc Zinnschlag
|
7102a825c2
|
Issue 255: moved global scripts into script manager (simplifying the environment class)
|
2012-04-23 11:15:47 +02:00 |
|
Marc Zinnschlag
|
2bfd90f3f9
|
Issue #255: added new environment class (not in use yet)
|
2012-04-23 10:57:16 +02:00 |
|