Marc Zinnschlag
e3631003e9
Merge remote branch 'yacoby/detailed_fps'
2012-01-17 14:04:00 +01:00
Marc Zinnschlag
f5a82931b6
some cleanup
2012-01-17 13:53:27 +01:00
Jacob Essex
e73640e720
Improved code, added labels to the counter
2012-01-17 11:58:06 +00:00
gugus
484b8a95f0
removed useless std::cout
2012-01-16 21:58:18 +01:00
gugus
edbf4f7bdc
forgot to update core.xml
2012-01-16 19:35:35 +01:00
Jacob Essex
3b15170d09
Cleaned up and simplified the code relating to the fps display
2012-01-16 18:16:33 +00:00
gugus
ba2fc27c2d
oups forgot Cmake stuff
2012-01-16 18:10:16 +01:00
gugus
eb4dea3d87
Previous/Next button implemented
2012-01-16 17:46:25 +01:00
Jacob Essex
18e4b73a86
Added a more detailed fps counter displaying the triangle and batch count
2012-01-16 15:33:21 +00:00
gugus
9031f62962
The journal is now in the center of the screen.
2012-01-11 12:58:39 +01:00
gugus
428d0ce820
journal formating. Problems with french accents.
2011-12-30 11:39:17 +01:00
gugus
5cfac197d4
Merge branch 'journalfix' of https://github.com/zinnschlag/openmw.git into journal
2011-12-29 17:59:21 +01:00
gugus
d59284a096
first attempt to read the journal
2011-12-29 17:58:58 +01:00
Marc Zinnschlag
33f8049a36
accessing topic index didn't work
2011-12-29 17:32:57 +01:00
Marc Zinnschlag
022f0fd5bd
link order fix for components
2011-12-26 22:28:53 +01:00
gugus
0178e22605
correct CMake error
2011-12-26 18:36:15 +01:00
gugus
dd14368f76
correct CMake
2011-12-11 11:24:25 +01:00
gugus
28bd9ce362
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal
2011-12-11 11:21:57 +01:00
gugus
7a3bc885d0
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal
...
Conflicts:
apps/openmw/CMakeLists.txt
2011-12-11 11:21:48 +01:00
gugus
4087ab3cda
correct CMake and add some text formating attempt.
2011-12-01 13:44:34 +01:00
gugus
62946cc79d
can now clear text.
2011-11-28 17:00:32 +01:00
gugus
bc51ba5a38
Add the journal window (J key). It's still not in the right position.
2011-11-28 16:51:11 +01:00
Marc Zinnschlag
51d9c2c780
fixed argument type in ai related script instructions
2011-11-21 14:16:20 +01:00
Marc Zinnschlag
fcb689fd82
Merge remote branch 'yacoby/master'
2011-11-12 15:54:32 +01:00
Jacob Essex
746c3dc297
Added some minor documentation
2011-11-11 11:25:01 +00:00
Marc Zinnschlag
7a1799d529
submodule update
2011-11-10 08:37:03 +01: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
Jacob Essex
9aac625000
Changes to move the mutable ESM::Position data to RefData
2011-11-08 00:08:00 +00:00
Marc Zinnschlag
9794c4b928
Merge branch 'cmake'
2011-11-06 14:42:18 +01:00
Marc Zinnschlag
cb1373a4c7
rewrote cmake scripts for components
2011-11-06 09:30:15 +01:00
Marc Zinnschlag
4e25200844
fixed usage of Qt exit
2011-11-03 09:08:40 +01: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
Alexander "Ace" Olofsson
255f948bae
A small fix to add all the files and not just the first one CMake finds
2011-10-30 18:43:27 +01:00
gugus
241cf2555d
Fixe collision shape bug.
2011-10-29 13:35:43 +02:00
Marc Zinnschlag
2ee6be1a34
finished cmake cleanup for apps/openmw source files
2011-10-29 13:17:04 +02:00
Marc Zinnschlag
dc878e2c30
testing MSVC fix, another try
2011-10-22 22:40:31 +02:00
Marc Zinnschlag
77d1f1f8a1
testing MSVC fix
2011-10-22 16:46:28 +02:00
Marc Zinnschlag
ad086312b8
testing: cmake script simplification
2011-10-22 13:55:06 +02:00
Pieter van der Kloet
5dbbc5bb7b
Changed error handling for Ogre config and made the launcher exit cleanly
2011-10-12 23:02:27 +02:00
Pieter van der Kloet
283a9183d0
Merge remote-tracking branch 'upstream/master'
2011-10-12 22:45:49 +02:00
Brother Brick
a3a1b82929
Updated deb dependancies against Ubuntu 11.10 which is more or less in parity with Debian Sid.
2011-10-12 13:58:59 +02: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
Marc Zinnschlag
896b7da23d
Issue #19 : fixed RNG in engine's frame listener
2011-10-06 12:36:16 +02:00
Marc Zinnschlag
3bef04cb1d
Issue #19 : fixed exception handling in engine's frame listener
2011-10-06 12:34:13 +02:00