greye
2fa4ac177a
initial resolving
2012-10-01 00:23:49 +04:00
scrawl
9106e5307c
moved global map from RenderingManager to gui and removed world method
2012-09-21 14:11:01 +02:00
greye
18cc435aa1
resolving conflicts
2012-09-21 13:13:11 +04:00
scrawl
86cfc91ef3
global map rendering
2012-09-20 13:56:37 +02:00
scrawl
32de090079
Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities
2012-09-19 19:34:02 +02:00
greye
7606ebafd6
resolving conflicts, minor update
2012-09-17 11:37:50 +04:00
scrawl
7ad80e306b
fixed the disappearing
2012-09-13 12:33:09 +02:00
scrawl
2b339f6c0f
loading screen
2012-09-11 16:37:54 +02:00
scrawl
c27ff546e4
shader cache
2012-09-02 19:40:26 +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
392e6efcb5
initial player rendering
2012-08-17 15:19:43 +04:00
greye
c46eeaa100
initial 3d-person camera support
2012-08-17 15:19:43 +04: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
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
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
923109b260
Issue #107 : DialogueManager is accessed only through the interface class from now on
2012-08-09 10:35:53 +02: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
fd6c155118
Issue #352 : added --script-run switch
2012-07-30 12:37:46 +02:00
Marc Zinnschlag
90de02b901
Issue #350 : console only script instructions
2012-07-30 11:43:28 +02:00
scrawl
1fef086088
Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup"
...
This reverts commit 546b640022
, reversing
changes made to fcaa8aae06
.
2012-07-23 15:36:12 +02:00
scrawl
f8d6a36196
Merge branch 'master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/sky.cpp
apps/openmw/mwrender/sky.hpp
components/nifogre/ogre_nif_loader.cpp
components/nifogre/ogre_nif_loader.hpp
2012-07-23 15:35:31 +02:00
scrawl
546b640022
Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup
2012-07-21 23:50:56 +02:00
scrawl
014396e80c
remove the plugins.cfg files, do not enforce CG plugin
2012-07-20 16:44:03 +02:00
Chris Robinson
6047dc6a0c
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/animation.hpp
apps/openmw/mwrender/creatureanimation.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/npcanimation.hpp
components/nifogre/ogre_nif_loader.hpp
2012-07-17 10:57:15 -07:00
guidoj
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
2012-07-17 09:27:12 +02:00
Chris Robinson
386ac56bda
Remove the NIF loader and code to manually transform the vertices
...
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
2012-07-12 20:12:18 -07: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
76174098c7
Issue #107 : CellStore moved from ESMS to MWWorld
2012-06-29 16:48:50 +02:00
scrawl
63ce143a04
fix triangle / batch counts with compositors
2012-06-22 12:56:04 +02:00
Mark Siewert
bef4bef5d2
- Add support for loading multiple esm/esp files. Selection in omwlauncher is recognized and applied.
...
- Quick hack for multiple terrain palettes. Prevents crashes and/or wrong textures in masters/plugins beyond the first.
- Support deleting parent entries from the list.
2012-06-10 11:14:46 +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
7ebbc099b3
allow stacking gui modes
2012-05-23 12:23:35 +02:00
scrawl
343bbaf0fd
integrated video settings in the settings file, the launcher is now useless
2012-05-22 03:36:03 +02:00
Marc Zinnschlag
bee03b5180
Merge remote branch 'scrawl/gui'
2012-05-10 12:08:49 +02:00
scrawl
d69501b061
change daedric font to .zip resource
2012-05-09 02:16:10 +02:00
scrawl
2b584300d6
throw an exception when no default settings file is found, which indicates a packaging error
2012-05-07 23:16:29 +02:00
Marc Zinnschlag
e26f39e563
fixed exception handling during subsystem setup
2012-05-04 17:20:57 +02:00
scrawl
7f15385dc5
unrelated cleanup
2012-05-01 20:58:09 +02:00
scrawl
1b5bfc52a1
Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwclass/apparatus.cpp
apps/openmw/mwclass/book.cpp
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/ingredient.cpp
apps/openmw/mwclass/misc.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/potion.cpp
apps/openmw/mwclass/repair.cpp
apps/openmw/mwgui/window_manager.cpp
2012-04-24 02:02:03 +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
scrawl
934caf7a2b
removed --report-focus which is now useless
2012-04-19 01:16:41 +02:00
scrawl
cac662ca98
basic tooltips
2012-04-14 17:47:44 +02:00
Marc Zinnschlag
a4fb71a0fc
Merge remote branch 'scrawl/graphics'
2012-04-12 18:46:02 +02:00
scrawl
800df7376c
use the cursors from morrowind.bsa and remove mwpointer.png
2012-04-12 14:26:21 +02:00