Brother Brick
|
05c3936797
|
Merge remote-tracking branch 'upstream/master' into static
|
2012-09-17 11:57:38 +02:00 |
|
Brother Brick
|
ff54508633
|
during cleanup we now delete all plugins created
|
2012-09-17 11:57:29 +02:00 |
|
Marc Zinnschlag
|
4eae810de3
|
Merge remote-tracking branch 'edmondo/master'
|
2012-09-16 10:37:45 +02:00 |
|
Edmondo Tommasina
|
f21faf197c
|
selectionbuffer.cpp: fix ‘runtime_error’ is not a member of ‘std’
|
2012-09-15 22:19:44 +02:00 |
|
Michael Mc Donnell
|
c161a3850f
|
Use correct type for iterator
Fixes building on Windows with vs2010.
|
2012-09-15 15:37:18 -04: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 |
|
Brother Brick
|
44c644dd7b
|
make it statically compilable
|
2012-09-14 15:30:48 +02:00 |
|
scrawl
|
565aad3783
|
changed a method for ogre 1.8.0
|
2012-09-14 14:49:56 +02:00 |
|
scrawl
|
1f7e044fad
|
removed some debug stuff
|
2012-09-14 14:41:19 +02:00 |
|
scrawl
|
6ac2a12296
|
item selection working on the preview
|
2012-09-14 14:34:18 +02:00 |
|
scrawl
|
eef750e6b0
|
race selection preview
|
2012-09-13 19:03:31 +02:00 |
|
scrawl
|
86d6f190bf
|
Input system rewrite
|
2012-08-12 20:45:02 +02:00 |
|
Nikolay Kasyanov
|
2beaa9d9ae
|
Workaround to allow main loop to know Ogre::Root's mQueuedEnd value
This change is needed because of changes in exit handling
|
2012-08-11 23:26:20 +04:00 |
|
Marc Zinnschlag
|
91f0eed9c4
|
Merge remote branch 'scrawl/master'
|
2012-08-11 11:34:40 +02:00 |
|
Nikolay Kasyanov
|
ebf1fe415e
|
tiny fix
|
2012-08-11 01:11:52 +04:00 |
|
Nikolay Kasyanov
|
225530c690
|
implemented better main loop for OS X (carbon version). Input feels far less laggy
|
2012-08-10 23:32:10 +04: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 |
|
Marc Zinnschlag
|
c251fbdf23
|
Merge branch 'master' into HEAD
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
libs/openengine/ogre/renderer.cpp
|
2012-08-02 14:57:35 +02:00 |
|
Nikolay Kasyanov
|
b05dfeae70
|
bug #348: cleanup
moved files to appropriate component, moved function to namespace,
added docs
|
2012-07-31 01:01:00 +04:00 |
|
gugus
|
d37d0b1947
|
build fix for windows
|
2012-07-30 19:45:40 +02:00 |
|
Nikolay Kasyanov
|
e9d4195500
|
removed cout spam
|
2012-07-28 02:03:34 +04:00 |
|
Nikolay Kasyanov
|
fbe9a94568
|
bug #348: fixed OS X deployment
just enable CMake option "OPENMW_OSX_DEPLOYMENT" and it will search
plugins inside application bundle instead of Ogre prefix
|
2012-07-28 01:55:37 +04:00 |
|
Nikolay Kasyanov
|
94ce95c679
|
bug #348: works again on OS X
|
2012-07-25 00:13:33 +04:00 |
|
scrawl
|
e7ab3544ac
|
removed some redundant code
|
2012-07-21 13:52:12 +02:00 |
|
scrawl
|
014396e80c
|
remove the plugins.cfg files, do not enforce CG plugin
|
2012-07-20 16:44:03 +02:00 |
|
guidoj
|
a021165d9f
|
Changed standard C lib includes to C++ format
|
2012-07-17 09:44:24 +02:00 |
|
guidoj
|
0549e949ba
|
Mostly removal of unnecessary #include's and a little clean up
|
2012-07-17 09:27:12 +02:00 |
|
scrawl
|
87127775e8
|
fix shutdown crash if ogre was not initialised yet
|
2012-06-26 19:10:47 +02:00 |
|
scrawl
|
447158e9d6
|
shutdown crash fix
|
2012-06-09 19:15:11 +02:00 |
|
scrawl
|
c85c794c86
|
fixed some cppcheck issues
|
2012-06-06 20:29:30 +02:00 |
|
Edmondo Tommasina
|
a9a582f858
|
renderer.cpp: fix std::runtime_error compile error
|
2012-05-30 23:18:59 +02:00 |
|
scrawl
|
5d03e86613
|
added field of view and texture filtering to settings window
|
2012-05-29 04:54:54 +02:00 |
|
scrawl
|
14f4f09f83
|
proper resolution switching (reposition GUI & adjust mouse clipping region)
|
2012-05-28 09:19:25 +02:00 |
|
scrawl
|
f6a6684685
|
when the resolution changes, adjust camera aspect ratio and recreate compositors
|
2012-05-27 21:39:18 +02:00 |
|
scrawl
|
656a8f1be9
|
working menu transparency slider
|
2012-05-23 01:32:36 +02:00 |
|
scrawl
|
343bbaf0fd
|
integrated video settings in the settings file, the launcher is now useless
|
2012-05-22 03:36:03 +02:00 |
|
scrawl
|
a4d6d1baff
|
added a utility for creating texture atlas at runtime
|
2012-05-04 18:09:45 +02:00 |
|
scrawl
|
10398723d8
|
use different image pixel format
|
2012-04-15 22:44:38 +02:00 |
|
scrawl
|
4a6a8e5420
|
don't write to disk
|
2012-04-12 14:28:35 +02:00 |
|
scrawl
|
800df7376c
|
use the cursors from morrowind.bsa and remove mwpointer.png
|
2012-04-12 14:26:21 +02:00 |
|
scrawl
|
33f360f52f
|
transparency fix
|
2012-04-09 15:36:51 +02:00 |
|
scrawl
|
944654f263
|
image rotating function
|
2012-04-09 15:20:57 +02:00 |
|
Lukasz Gromanowski
|
5185a28b60
|
Issue #225: Initialize all class members in constructor.
|
2012-03-26 19:09:55 +02:00 |
|
k1ll
|
b83b7d0650
|
Added OGRE_STATIC as cmake option and removed the code for the BSPSceneManager plugin.
|
2012-03-17 20:03:37 +01:00 |
|
k1ll
|
b7eb7ff8e3
|
Added support for linking static Ogre libraries and plugins into the launcher and openmw.
|
2012-03-15 15:51:39 +01:00 |
|
Nikolay Kasyanov
|
b4343431c6
|
Merged openengine into openmw
|
2012-03-11 18:16:29 +04:00 |
|