Chris Robinson
94b93227d3
Treat activators as actors for rendering and mechanics
...
Kinda hacky, but it's the only way to get animated activators (flags, silt
striders, etc) to work properly.
2013-01-16 14:37:32 -08:00
Chris Robinson
771a5f7316
Add the beginnings of a character controller
2013-01-10 08:35:24 -08:00
scrawl
f1b138d0a8
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2013-01-07 13:25:15 +01:00
scrawl
35f4d09288
swscale handled better (cmake)
2013-01-07 13:06:16 +01:00
scrawl
1718d735b5
Fix menu/journal/book/scroll buttons when using localised MW-installations
...
This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.
2013-01-03 01:09:03 +01:00
scrawl
c4facc233e
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-12-01 11:30:51 +01:00
Marc Zinnschlag
5d45bcd03a
Merge remote-tracking branch 'trombonecot/master'
...
Conflicts:
apps/openmw/mwclass/light.cpp
2012-11-19 21:21:00 +01:00
eduard
82ea547ce4
Failed action
2012-11-17 18:17:08 +01:00
Marc Zinnschlag
3dc013ceae
Merge remote-tracking branch 'gohan/Gohan'
2012-11-16 20:15:58 +01:00
marcin
4b939c7521
Feature #391 Dummy AI package classes
2012-11-15 22:15:20 +01:00
marcin
698afbec3e
Feature #391 Dummy AI package classes
2012-11-14 18:40:32 +01:00
Marc Zinnschlag
4614d2bc8e
Issue #219 : added basic select struct analysis and type checking
2012-11-08 16:49:38 +01:00
Marc Zinnschlag
1502b3f6f8
Issue #219 : Begin of refactoring; added filter class (doesn't do anything yet)
2012-11-08 14:09:40 +01:00
greye
7cf0b8a680
just replace esmstore, inconsistent
2012-11-05 18:09:58 +04:00
greye
2057f5619e
move ESMStore to MWWorld
2012-11-05 17:18:01 +04:00
Marc Zinnschlag
510674aa5e
Merge branch 'master' into alchemy
...
Conflicts:
components/esm/loadmgef.hpp
2012-10-18 14:37:05 +02:00
scrawl
c64eb96952
Merge branch 'Travel_Dialogue' into training_travel
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwrender/globalmap.cpp
files/mygui/CMakeLists.txt
2012-10-17 18:17:53 +02:00
scrawl
1a2034b4dd
training window
2012-10-17 18:03:02 +02:00
gugus
4f5c4bf89a
Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwgui/dialogue.hpp
apps/openmw/mwgui/mode.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
2012-09-28 17:09:15 +02:00
Marc Zinnschlag
cd343c4fbd
Issue #61 : Basic alchemy class (doesn't do anything yet)
2012-09-27 11:59:40 +02:00
scrawl
ac0c1ea986
Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
...
Conflicts:
apps/openmw/mwgui/dialogue.cpp
2012-09-27 08:47:47 +02:00
gugus
3060fbee60
TravelGUI, not completly finished.
2012-09-26 18:30:47 +02:00
scrawl
73c69e8eda
video playback
2012-09-25 02:35:50 +02:00
scrawl
9d7c35ae48
and go
2012-09-23 00:36:20 +02:00
scrawl
8214966d44
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
2012-09-20 17:41:14 +02:00
scrawl
86cfc91ef3
global map rendering
2012-09-20 13:56:37 +02:00
scrawl
0ba996f290
dialog layout
2012-09-18 18:29:03 +02:00
scrawl
95f3a20e2c
Merge branch 'master' into levelup
2012-09-15 14:25:37 +02:00
scrawl
2793096b50
Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwbase/world.hpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
2012-09-15 00:57:29 +02:00
Marc Zinnschlag
b7c9285b24
added support for out of world rendering
2012-09-14 21:12:16 +02:00
scrawl
b76a28f69c
beginnings of the gui
2012-09-14 19:44:00 +02:00
scrawl
d90af9c524
Merge branch 'master' into characterpreview
2012-09-13 14:22:17 +02:00
Marc Zinnschlag
835c530e06
Merge branch 'ingredients'
2012-09-13 13:31:46 +02:00
Marc Zinnschlag
fe68a252d5
Issue #356 : Implemented ingredient eating
2012-09-13 13:02:26 +02:00
scrawl
4f3eb3c34a
character preview WIP
2012-09-13 00:54:32 +02:00
scrawl
2b339f6c0f
loading screen
2012-09-11 16:37:54 +02:00
Adam Hogan
08410b9062
Renamed SpellBuyingWindow, took some suggestions from scrawl
2012-09-09 14:10:07 -04:00
Adam Hogan
562df5388f
Merge branch 'master' of git://github.com/zinnschlag/openmw
2012-09-09 08:38:56 -04:00
Adam Hogan
ebf80943a9
Added spell buying window
2012-09-08 18:17:03 -04:00
Lukasz Gromanowski
99c46093dd
Merge branch 'master' of git://github.com/zinnschlag/openmw into jenkins-code-coverage-and-unittests
2012-09-08 22:18:25 +03:00
Marc Zinnschlag
345eec1135
Issue #389 : added AI package base class and AI packages management class
2012-09-04 13:25:53 +02:00
scrawl
5ebcaeb098
Merge branch 'next' into quick_keys
2012-08-27 11:04:23 +02:00
scrawl
fab4cfecb1
some unfinished work on quick keys window
2012-08-26 10:52:06 +02:00
Nikolay Kasyanov
5395721c26
more appropriate fix for #189
2012-08-20 21:05:02 +04: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
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
