scrawl
e6303fc3f4
Merge branch 'master' into water
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
2012-03-28 21:37:20 +02:00
Chris Robinson
fa70a72b75
Remove some unused sound manager fields and constructor parameters
2012-03-24 00:22:54 -07:00
scrawl
6067053f08
Merge branch 'next' into water
...
Conflicts:
CMakeLists.txt
2012-03-22 21:41:32 +01:00
Chris Robinson
5ae47f783e
Use the sound manager's update to make sure music is still playing
2012-03-20 10:46:10 -07:00
Jason Hooks
51fb9e67cd
Merge
2012-03-18 21:31:31 -04:00
gugus
7ca0503205
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
2012-03-19 00:20:43 +01:00
Marc Zinnschlag
af875896ad
fix for issue #179
2012-03-18 11:09:38 +01:00
gugus
10321ff51a
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
2012-03-16 17:58:23 +01:00
gugus
6f7752633a
there was no extension in the compiler context. Corrected. But Choice doesn't work.
2012-03-07 18:44:09 +01:00
Michael Papageorgiou
054a176c86
Added new FileLibrary class to handle music, this fixes a number of issues.
2012-03-07 17:46:51 +02:00
Michael Papageorgiou
03ea3bb62f
SoundManager: first attempt at refactoring. BROKEN
2012-03-06 01:21:00 +02:00
Marc Zinnschlag
69f0ec99f1
implemented dialogue scripts
2012-03-05 16:56:14 +01:00
Marc Zinnschlag
1e998545c7
fixed log path
2012-03-02 15:15:44 +01:00
Marc Zinnschlag
be70d197e5
Merge branch 'next'
...
Conflicts:
.gitignore
cmake/FindOGRE.cmake
2012-03-02 12:11:44 +01:00
Marc Zinnschlag
771d50fe69
removed a redundant assert and a left-over comment
2012-02-24 20:20:32 +01:00
Marc Zinnschlag
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
2012-02-20 14:34:27 +01:00
Marc Zinnschlag
9af08ff18d
store screenshots in user directory instead of local directory
2012-02-13 18:34:21 +01:00
Marc Zinnschlag
77201d05bc
post-merge fix
2012-02-13 16:42:01 +01:00
Marc Zinnschlag
27caee664e
Merge remote branch 'lgro/config' into config
...
Conflicts:
components/files/path.hpp
2012-02-13 16:36:57 +01:00
Lukasz Gromanowski
bcc4d7a7c9
Issue #133 Handle resources across multiple data directories
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-12 14:21:07 +01:00
Pieter van der Kloet
17b1546dc1
Changed the way screenshots are created (Bug #191 )
2012-02-10 20:23:59 +01:00
Lukasz Gromanowski
b004e2479c
Issue #133 Handle resources across multiple data directories - WIP
...
Work In Progress - added support for multiple paths in SoundManager.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-01-29 20:27:03 +01:00
Cris Mihalache
daa8fb15ce
Removed all physics-related code from Engine
2012-01-29 20:51:20 +02:00
Cris Mihalache
6d4fa9274e
Moved OpenEngine systems into their appropriate classes
2012-01-29 17:31:18 +02:00
Marc Zinnschlag
16bc374921
animation updates were hooked up to the wrong update function
2012-01-23 14:33:06 +01:00
Jason Hooks
ec94ecacaf
Zinis branch merge
2012-01-22 15:02:38 -05:00
Lukasz Gromanowski
7c24ae9ac7
Issue #168 - Configuration cleanup - WIP
...
This is "work in progress" commit, it shall not be merged alone,
without succeeding commits (it's not fully functional).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-01-21 01:31:20 +01:00
Jason Hooks
84f45b1972
underwater view
2012-01-20 17:59:56 -05:00
Jason Hooks
ff2bbc9fc5
Transparent water
2012-01-18 22:42:07 -05:00
Marc Zinnschlag
0c2de2c00c
Merge branch 'animation2'
2012-01-17 15:37:51 +01:00
Jacob Essex
3b15170d09
Cleaned up and simplified the code relating to the fps display
2012-01-16 18:16:33 +00:00
Jacob Essex
18e4b73a86
Added a more detailed fps counter displaying the triangle and batch count
2012-01-16 15:33:21 +00:00
Jason Hooks
d1793bc4bd
Animation files in the correct directory
2012-01-12 20:09:55 -05:00
Jason Hooks
eab69f18ac
File output switch
2012-01-10 00:34:29 -05:00
Jason Hooks
653d999ac4
Animation creatures
2011-12-26 19:23:46 -05:00
Marc Zinnschlag
51d5c7cd59
Merge remote branch 'jhooks/mwrender' into mwrender
...
Conflicts:
apps/openmw/engine.cpp
- fixed code that did not compile
- removed tons of tabs
- more clean up
2011-11-21 12:52:28 +01:00
Jason Hooks
d8367f4968
Activation fix
2011-11-19 17:45:05 -05:00
Jacob Essex
3779aaba62
Now no longer need to handle this exception here as it is handled by the dispatcher in the OpenEngine submodule
2011-11-09 23:12:10 +00:00
Jason Hooks
c25b49d2b6
refdata change
2011-11-08 22:59:39 -05:00
Jacob Essex
0e3859385d
Now ensures that the directory to the config file exists before Ogre tries to access it
2011-11-02 11:11:27 +00:00
Jason Hooks
965ff24597
Removing Object:
2011-10-24 13:57:12 -04:00
Jason Hooks
0c8aa7fae3
Removing Object:
2011-10-24 13:55:10 -04:00
Jason Hooks
6efc61b9df
Removal of MWScene; Object listing fixed
2011-10-24 13:42:36 -04:00
Marc Zinnschlag
abeb3a22d4
Issue #19 : Cleaned up Engine includes
2011-10-09 13:12:44 +02:00
Marc Zinnschlag
bc8db3612a
Issue #19 : Create OGRE renderer in go function instead of Engine's constructor
...
This avoids setting up a renderer each time openmw is called with the --help switch.
2011-10-09 13:05:38 +02:00
Marc Zinnschlag
39af941d6f
Issue #19 : Moved code from Engine to WindowManager and ScriptManager
2011-10-09 12:05:13 +02:00
Marc Zinnschlag
38c0f36d44
Issue #19 : Finished cleaning out the Engine framelistener
2011-10-09 09:28:36 +02:00
Marc Zinnschlag
8bf4abf53b
Issue #19 : Focus Reporting Improvements
...
- moved focus reporting code out of the framelistener
- made focus reporting optional (new --report-focus switch)
- report based on tiem passed instead of number of frames passed
- only report if focus has changed
2011-10-08 10:31:23 +02:00
Marc Zinnschlag
fbcb5fe681
Issue #19 : Some more framelistener cleanup
2011-10-08 10:15:03 +02:00
Marc Zinnschlag
8bebae17aa
Issue #19 : More local script related cleanup
2011-10-07 09:52:42 +02:00
