gugus
|
379fbccf8c
|
Merge branch 'move_rotate_fix' of https://github.com/greye/openmw.git into object_movement_creation
|
2012-08-11 17:53:40 +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 |
|
gugus
|
eaf6a8df94
|
some correction
|
2012-08-11 14:06:58 +02:00 |
|
greye
|
355ca649c2
|
camera flip control rewritten
|
2012-08-11 14:54:33 +04:00 |
|
gugus
|
5d1c01a58e
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into object_movement_creation
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
|
2012-08-11 12:28:03 +02: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 |
|
gugus
|
54221aab89
|
Merge branch 'cross_cell-borders' of https://github.com/greye/openmw.git into object_movement_creation
|
2012-08-11 09:53:06 +02:00 |
|
gugus
|
7fa1dc93d7
|
2nd try: position/ PositionCell
|
2012-08-11 09:52:49 +02:00 |
|
greye
|
0042020385
|
should fix 'north direction' bug
not even compiled
|
2012-08-10 21:24:07 +04:00 |
|
greye
|
bed6545e45
|
still fix assertion fail
|
2012-08-10 21:06:09 +04:00 |
|
greye
|
56c9c4dbd9
|
remove some redundant code
|
2012-08-10 21:03:46 +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 |
|
gugus
|
b664b174f0
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into object_movement_creation
Conflicts:
apps/openmw/mwscript/transformationextensions.cpp
|
2012-08-09 23:50:44 +02:00 |
|
gugus
|
cb5b69104d
|
PositionCell
|
2012-08-09 23:45:06 +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 |
|
greye
|
b5bc7bc424
|
SoundManager dependency on camera pos/dir
|
2012-08-09 17:01:03 +04: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 |
|
greye
|
181d45661f
|
fix rotation angles
|
2012-08-09 13:43:52 +04:00 |
|
greye
|
6b996d8c34
|
fix disabled camera on start
|
2012-08-09 13:29:13 +04:00 |
|
greye
|
df60f4bf92
|
stub for soundmanager, adjust rotation mode
|
2012-08-09 13:27:32 +04: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 |
|
Marc Zinnschlag
|
e6ede480c7
|
Issue #107: fixed up some interfaces
|
2012-08-09 09:41:17 +02: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 |
|
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
|
79b7487c87
|
fix using deleted objects
|
2012-08-07 22:21:46 +04:00 |
|
greye
|
d32a61b928
|
fix object moving
|
2012-08-06 18:20:48 +04:00 |
|
greye
|
ee97a204f2
|
fix npc animation key update
|
2012-08-06 15:26:37 +04:00 |
|
gugus
|
8a485e213b
|
first try of the Position script instruction. Still missing: check if overlapp with an object.
|
2012-08-05 16:44:56 +02:00 |
|
gugus
|
d850a3ee49
|
some correction
|
2012-08-05 16:21:53 +02:00 |
|
Marc Zinnschlag
|
f5ee5a5414
|
Merge remote branch 'edmondo/master'
|
2012-08-05 00:03:16 +02:00 |
|
Marc Zinnschlag
|
1db7978361
|
silenced a warning
|
2012-08-04 22:03:14 +02:00 |
|