Marc Zinnschlag
8915e8a751
change in multi_es branch broke fps switch; fixed now
2011-04-21 18:10:35 +02:00
Marc Zinnschlag
9ea99a46ee
Merge branch 'multi_es'
2011-04-21 18:07:32 +02:00
Marc Zinnschlag
f3fecdc627
quest entries are added to main journal now
2011-04-21 11:05:49 +02:00
Marc Zinnschlag
792de880cf
another constness fix
2011-04-21 11:00:00 +02:00
Marc Zinnschlag
717b5e1784
fixed a constness problem
2011-04-21 10:49:45 +02:00
Marc Zinnschlag
23464e4035
added interface and container for main journal
2011-04-19 11:02:22 +02:00
Marc Zinnschlag
5851e0a28c
added journal entry struct
2011-04-19 10:54:11 +02:00
Jason Hooks
92509d3b70
Trying to animate creatures
2011-04-13 20:35:44 -04:00
Jason Hooks
2ac1cc8aee
Trying to animate creatures
2011-04-13 20:16:46 -04:00
Pieter van der Kloet
16aa591e3b
Merge branch 'master', remote-tracking branch 'upstream/master'
2011-04-13 23:00:05 +02:00
Jason Hooks
d035441876
Reintroducing animation
2011-04-11 20:56:06 -04:00
Jan-Peter Nilsson
f2faa34bd9
If there is an openmw.cfg in the current path, use it as global config
2011-04-09 11:31:06 +02:00
Nikolay Kasyanov
79911b16d0
Fixed enum formatting in components/esm headers
2011-04-08 22:26:27 +04:00
Marc Zinnschlag
7c506301b7
Merge remote branch 'corristo/header-refactoring' into header-refactoring
...
Conflicts:
CMakeLists.txt
2011-04-08 19:24:21 +02:00
Nikolay Kasyanov
1e5768170f
Refactored remaining headers in components/esm except defs.hpp.
...
Removed obsolete *.cpp files.
2011-04-08 17:58:21 +04:00
Nikolay Kasyanov
a2c42ab5a2
components/esm header refactoring in progress. Refactored:
...
esm_reader.hpp
loadacti.hpp
loadalch.hpp
loadappa.hpp
loadarmo.hpp
loadbody.hpp
loadbook.hpp
loadbsgn.hpp
loadcell.hpp
loadclas.hpp
loadclot.hpp
loadland.hpp
Updated code style in defs.hpp
2011-04-06 20:11:08 +04:00
Marc Zinnschlag
53e0e38862
added missing TCL instruction
2011-04-06 09:49:00 +02:00
Jason Hooks
2236f69645
te
2011-04-05 17:03:17 -04:00
Marc Zinnschlag
f321e549a4
added instruction GetPCCell
2011-04-04 15:10:37 +02:00
Marc Zinnschlag
e4a0702bb4
added journal-related script instructions
2011-04-04 14:49:26 +02:00
Marc Zinnschlag
b40117449a
added journal script interface
2011-04-04 11:23:15 +02:00
Marc Zinnschlag
190f77f6c9
added journal class
2011-04-04 11:16:56 +02:00
Jan-Peter Nilsson
dc4e6216c3
Initialize member variables in the same order they are defined to avoid compiler warning
2011-04-03 13:20:42 +02:00
Jan-Peter Nilsson
a94de76801
Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline)
2011-04-03 13:20:42 +02:00
Jan-Peter Nilsson
2e2d490c78
Remove unused variable (compiler warning)
2011-04-03 13:20:18 +02:00
Jan-Peter Nilsson
08784470bc
Update default version and add libbullet2.77 as a dependency
2011-04-03 13:20:18 +02:00
Jan-Peter Nilsson
0f7d59b4fb
Whitespace changes only (including new mangle with whitespace changes as well)
2011-04-03 13:12:12 +02:00
Jan-Peter Nilsson
f3c9694bf2
Whitespace changes only
2011-04-03 13:08:16 +02:00
Jan-Peter Nilsson
c78e61c96f
Initialize member variables in the same order they are defined to avoid compiler warning
2011-04-02 13:06:05 +02:00
Pieter van der Kloet
082902473b
Changed the readConfig function to work with the new master/plugin options in openmw.cfg
2011-03-29 22:15:44 +02:00
Pieter van der Kloet
1d873c56a8
Fixed the "Restore defaults" function.
2011-03-29 20:15:15 +02:00
Pieter van der Kloet
493018322d
Added function to write the list of plugins to openmw.cfg
2011-03-29 20:12:10 +02:00
Pieter van der Kloet
aa54975a2f
Removed the directoryLoaded() signal as it's only available in Qt 4.7.
2011-03-29 17:07:24 +02:00
Marc Zinnschlag
beb1422c77
allow multiple --master and --plugin command line arguments
2011-03-29 13:57:56 +02:00
Pieter van der Kloet
7a03266729
Initial commit of the launcher
2011-03-29 01:36:26 +02:00
Pieter van der Kloet
91fa147146
Modified CMake to include the launcher directory
2011-03-29 01:31:42 +02:00
Marc Zinnschlag
74d036a26a
getting rid of a cmake warning
2011-03-29 00:34:35 +02:00
Pieter van der Kloet
6e1e3b797c
Fixed a bug in the CMake file that prevented the plugins.cfg from being copied on Linux.
2011-03-28 20:25:55 +02:00
Pieter van der Kloet
833a61dd82
Fixed Boost errors with 1.46 caused by the deprecated name file_string()
2011-03-28 17:36:05 +02:00
Nikolay Kasyanov
4e7a056e9e
Now working mac app bundle generated during build
...
(includes plugins & resources).
Still need to copy frameworks before deployment.
FindOGRE.cmake finds Ogre plugins dir on OS X.
Default OS X data path set to the data subdir
near .app.
README_Mac updated.
2011-03-27 23:28:46 +04:00
Nikolay Kasyanov
5845e71dd8
Fixed indentation in README_Mac
2011-03-24 14:29:26 +03:00
Nikolay Kasyanov
db34640d75
Merge remote-tracking branch 'upstream/master'
2011-03-24 14:26:49 +03:00
Nikolay Kasyanov
bac457a232
Updated README_Mac
2011-03-24 14:25:38 +03:00
Marc Zinnschlag
53e1d0e7e7
more cleanup
2011-03-23 23:05:15 +01:00
Marc Zinnschlag
a70e582ae2
removed debugging leftovers from the tab_complition branch
2011-03-23 23:03:41 +01:00
Marc Zinnschlag
c571148bef
Merge branch 'collision'
2011-03-23 22:57:56 +01:00
Marc Zinnschlag
5661dc27c2
removed a leftover from physics debugging
2011-03-23 22:56:58 +01:00
Marc Zinnschlag
57c3414fcd
OpenEngine update (bug-fix)
2011-03-23 22:56:11 +01:00
gugus
32b475432f
fix the bug when changing cell.
2011-03-23 22:49:23 +01:00
Marc Zinnschlag
c99bdcd33b
Merge remote branch 'gus/collision' into collision
2011-03-23 19:26:31 +01:00