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
Jan-Peter Nilsson
08784470bc
Update default version and add libbullet2.77 as a dependency
2011-04-03 13:20:18 +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
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
Marc Zinnschlag
647e88003e
build and activation fix
2011-03-19 19:54:37 +01:00
gugus
0fb2107265
Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
2011-03-15 13:36:25 +01:00
Nikolay Kasyanov
edcac879d7
Oops. Used tabs instead of 4 spaces. Fixed.
2011-03-12 03:00:42 +03:00
Nikolay Kasyanov
768c9bdf07
On OS X openmw now sets current directory to bundle root, openmw.cfg values is relative to bundle root
2011-03-09 01:42:04 +03:00
Nikolay Kasyanov
943eea8104
.app bundle finally works
2011-03-08 22:27:57 +03:00
Nikolay Kasyanov
527ac956a7
More correct MacOS X bundle generation
2011-03-07 06:03:39 +03:00
Nikolay Kasyanov
4028600768
Builds on OS X now
2011-03-07 05:09:29 +03:00
Jan-Peter Nilsson
e290f2f82f
Get physic fix in openengine and build nifbullet
2011-02-27 00:47:56 +01:00
Marc Zinnschlag
1e9dc4b435
de-Windownizing and some build-fixes
2011-02-26 16:37:47 +01:00
gugus
ee0d73e142
Merge branch 'bullet' of git://github.com/zinnschlag/openmw.git into collisions
2011-02-19 15:54:00 +01:00
Marc Zinnschlag
8b2252e7a1
first attempt at building with bullet
2011-01-30 13:19:41 +01:00
gugus
a6c5bd0c41
correction of a spelling error
2011-01-25 18:29:04 +01:00
gugus
d1bcfcb94d
Merge branch 'movement' of git://github.com/zinnschlag/openmw.git into collisions
2011-01-23 21:42:04 +01:00
gugus
a8ade56c80
Add a bullet Shape Loader
2011-01-13 17:51:50 +01:00
Jan-Peter Nilsson
4221824681
Build debian package using cpack if dpkg is available
...
Derive version from last tag and get name and email for package maintainer from user's git config if .git is available
2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
d1b482d64a
Update plugins.cfg based on where cmake found ogre libraries
2011-01-12 18:18:06 +01:00
athile
c459eb7c55
Visual Studio 2010 build fixes. Don't let MyGUI redefine the C++0x keyword nullptr and use _MSC_VER to check if Visual Studio is being used. MSVER is not necessarily defined on VS2010.
2011-01-10 13:48:16 -07:00
Diggory Hardy
39614c6813
CMake configuration tweaks
...
Make the PkgConfig search for OGRE libraries and headers happy when custom paths are set.
Check the uuid/uuid.h header is found.
2011-01-09 10:22:21 +01:00
Yuri Krupenin
e7d853bb3c
Corrected subsystem link flags for MinGW.
2011-01-08 23:58:47 +03:00
Yuri Krupenin
15a7cc0674
That should solve link-time problems when building with mingw.
...
Not supplying "SUBSYSTEM:" flags to mingw linker.
Linking mygui with libwinmm - should resolve reference to timeGetTime().
2011-01-04 14:40:28 +03:00
Jan Borsodi
ee101440a2
Continued work on Class Create dialog. Added sub-dialogs for picking specialization, attribute and skill. Also added some definitions in ESM for attributes and specializations.
2010-09-24 15:28:14 +02:00
Jan Borsodi
54996684aa
Merge branch 'master' into gui-windows
2010-09-19 02:04:36 +02:00
Jan Borsodi
64fce8d321
Added an option (USE_DEBUG_CONSOLE) to cmake file to disable the console for debug builds on windows. If set to false all debug output is redirect to the debug output of Visual Studio.
2010-09-19 02:01:01 +02:00
Jan Borsodi
e47568ea2e
Merge branch 'master' into gui-windows
2010-09-14 23:27:35 +02:00
Jan Borsodi
e34b86e5c2
Added new define CAELUM_STATIC which will disable all dllexport for the caelum project. Made sure the define is set for both openmw and caelum.
2010-09-14 23:27:11 +02:00
Jan Borsodi
4416e71a0a
Fix for linker warnings on windows, this makes sure headers of MyGUI does not use dllexport for windows as we are supposed to link statically to the library.
2010-09-14 23:27:10 +02:00
Jan Borsodi
1c79a62957
Added a static list of skill names to ESM::Skill.
2010-09-14 23:26:29 +02:00
Nicolay Korslund
0eae9d1504
Removed -Werror again
2010-09-10 19:34:38 +02:00
Jan Borsodi
0f860e2fbd
openmw.cfg is now created with a configurable path (via cmake), the default is still "data"
2010-09-10 13:38:17 +02:00
Nicolay Korslund
5552c44753
Cleaned up strnlen in esm_reader. Added -Werror switch to g++.
2010-09-07 10:40:00 +02:00
athile
336fb1636c
Windows fixes
2010-08-30 11:19:45 +01:00
athile
d955a0efc4
WIP Windows build
2010-08-30 02:12:54 +01:00
Nicolay Korslund
3127602c57
Added file_finder component. Used by sound system.
2010-08-20 12:56:46 +02:00
Nicolay Korslund
358e1ca5a5
Added custom UTF8 converter. Removed iconv dependency.
2010-08-18 18:45:44 +02:00
Nicolay Korslund
08289158d7
Added support for WAV files with libsndfile
2010-08-16 17:14:37 +02:00
Nicolay Korslund
9875d74abf
Implemented 3D sound placement. Sound management / lookup system not
...
done yet.
2010-08-14 21:01:20 +02:00
Nicolay Korslund
912c8b1f2d
Added mpg123 file reader
2010-08-13 22:30:22 +02:00
Nicolay Korslund
ebcbff255e
Changed how avcodec/avformat (ffmpeg) is included
2010-08-13 19:38:58 +02:00
Marc Zinnschlag
76492ea60b
cmake improvements for sound options
2010-08-13 18:16:38 +02:00
Nicolay Korslund
cad9712411
Implemented FFMpeg sound loading. Selecting sound library is controlled through the CMake file.
2010-08-13 17:11:03 +02:00
Nicolay Korslund
5d4dba981f
Fixed mistake in NPC record struct
2010-08-13 15:51:42 +02:00
Nicolay Korslund
cf4185faef
Added sound test (remember to git submodule update)
2010-08-13 14:43:57 +02:00
Nicolay Korslund
34572f0b19
Compiled and linked in sound system (not yet functional)
2010-08-12 16:13:54 +02:00
Armin Preiml
f3ee9ced5c
Added cmake file for the iconv library and extended relevant
...
cmake files to use it.
Added convertToUTF8 to esm_reader. getString(int size) uses this
method now.
2010-07-31 19:02:29 +02:00
Nicolay Korslund
532ccbd1f8
Killed clientconsole, mwcompiler, mwinterpreter and command server
2010-07-22 14:15:02 +02:00
Nicolay Korslund
f87810ce7a
Moved esmtool to apps/
2010-07-21 13:52:28 +02:00
Nicolay Korslund
c61212202b
Moved mwgui/ back to apps/openmw/. Fixed mouse position bug.
2010-07-20 20:23:37 +02:00
Nicolay Korslund
5472a8c760
Killed mygui_dev
2010-07-17 19:40:12 +02:00
Nicolay Korslund
c84672a560
Added MyGUI to OpenMW, fully working (with events and script hooks)
2010-07-17 19:38:32 +02:00
Nicolay Korslund
4d74f85ae0
Moved mwgui manager to components, ready for testing
2010-07-16 22:27:50 +02:00
Nicolay Korslund
4eb2863db4
Added input to apps/mygui_dev/
2010-07-16 21:49:36 +02:00
Nicolay Korslund
13d3f9c87e
Integrated OpenEngine, replaces entire components/engine/ directory.
2010-07-16 14:56:14 +02:00
Nicolay Korslund
6966c66091
Gave apps/openmw/ its own CMakeLists.txt
2010-07-08 22:53:14 +02:00
Nicolay Korslund
9c839e220e
Moved GUI stuff into components
2010-07-08 22:34:35 +02:00
Nicolay Korslund
b2d54a619e
Implemented all MW window layouts
2010-07-08 15:23:35 +02:00
Nicolay Korslund
3896fd218a
Added stand-alone GUI test, compiles and runs
2010-07-08 11:53:59 +02:00
Nicolay Korslund
0558664aa6
Added MyGUI source (cut down) and CMake files
2010-07-08 00:23:28 +02:00
Marc Zinnschlag
0efe4742a6
added script-gui interface and gui-related script instructions
2010-07-07 20:12:00 +02:00
Marc Zinnschlag
2c63d67ceb
added gui manager skeleton and a cmake fix
2010-07-07 18:48:06 +02:00
Nicolay Korslund
b97def39b3
Minor fixes to Mac stuff
2010-07-07 10:07:15 +02:00
Nicolay Korslund
2ec96ed7de
Merge branch 'master' of http://github.com/ardekantur/openmw
2010-07-07 09:53:13 +02:00
Nicolay Korslund
359f2903d7
Merged athile and zinnschlag
2010-07-07 09:46:11 +02:00
Marc Zinnschlag
3df5d377f2
added xbox function
2010-07-05 13:15:49 +02:00
athile
5fe4313b95
Various Windows fixes to CMake, compile errors, and a few warnings. Also made the command server optional and disabled by default since it is not currently working correctly on Linux.
2010-07-04 20:17:10 -07:00
Ardekantur
ee6c933156
Merge branch 'master' of git://github.com/korslund/openmw
...
Conflicts:
CMakeLists.txt
apps/openmw/main.cpp
game/engine.cpp
2010-07-04 17:16:57 -04:00
Ardekantur
bace14c45e
Mac Build - adding architectures and Apple build locations
2010-07-04 17:07:22 -04:00
Marc Zinnschlag
d57e67e722
added global variable handling to compiler context (not working yet because of case problems)
2010-07-04 12:55:55 +02:00
Marc Zinnschlag
4482884eb5
implemented global script execution
2010-07-04 10:43:34 +02:00
Marc Zinnschlag
530caac39b
merged CompilerScriptContext into base class
2010-07-04 09:59:29 +02:00
Marc Zinnschlag
3fae68b403
added unifying LiveCellRef pointer class
2010-07-03 17:46:55 +02:00
Marc Zinnschlag
d51e6fb7c4
second part of refactoring
2010-07-03 15:41:20 +02:00
Marc Zinnschlag
c12752df4d
added sound manager skeleton and sound script functions
2010-07-03 15:04:00 +02:00
Marc Zinnschlag
f0c492ae22
added CellChanged script function
2010-07-03 12:12:13 +02:00
Marc Zinnschlag
474b412b47
implemented local script execution
2010-07-02 18:08:00 +02:00
Marc Zinnschlag
076b01559f
added local script compiling
2010-07-02 17:21:27 +02:00
Marc Zinnschlag
2064c43d89
added script manager (doesn't do anything yet); local scriptes for active cells are passed on to the script manager
2010-07-02 16:18:25 +02:00
Marc Zinnschlag
a06b84ac86
added local variables to ref data
2010-07-02 14:31:29 +02:00
Marc Zinnschlag
def0a773bd
replaced void * entry in cell store with a generic type
2010-07-02 13:48:48 +02:00
Nicolay Korslund
0de4bb9d6c
Merged athile's work
2010-07-02 10:11:05 +02:00
Marc Zinnschlag
ea6d342a24
split CellRender into CellRender and CellRenderImp
2010-07-02 09:25:55 +02:00
Marc Zinnschlag
ce37666dbc
factored world class out of main engine class
2010-07-02 09:00:06 +02:00
athile
9b2fa58b88
Add separate CMakeLists.txt files for mwcompiler and mwinterpreter
2010-07-01 16:29:22 -07:00
athile
7cc27d9b66
Add command output string and client/server response.
2010-07-01 15:50:24 -07:00
athile
d44f322b8a
Add nesting to Visual Studio source groupings.
2010-07-01 12:09:05 -07:00
athile
056194baa2
Merge upstream
2010-07-01 12:01:59 -07:00
athile
7357ea2102
Add simple external console server/client
2010-07-01 11:49:00 -07:00
Marc Zinnschlag
1ad9b234f0
Merge branch 'mwscript'
...
Conflicts:
CMakeLists.txt
2010-07-01 17:08:27 +02:00
Marc Zinnschlag
a9c2deb86e
bad lineendings; as usual Windows is to blame
2010-07-01 17:00:54 +02:00
Marc Zinnschlag
bceb7ebcbd
reimplemented expression parsing as a separate parser (still only handling non-negative integers)
2010-06-29 10:22:55 +02:00
Marc Zinnschlag
c6a37b2e18
added first batch of opcodes
2010-06-28 21:49:48 +02:00
athile
59a2e8dcf7
Merge upstream
2010-06-28 12:44:55 -07:00
Marc Zinnschlag
770eb14d95
added context for standalone interpreter
2010-06-28 20:07:17 +02:00
Marc Zinnschlag
487a70388f
added interpreter framework
2010-06-28 19:20:45 +02:00
Marc Zinnschlag
fdcd34941b
added parsing for set statement (only integer values so far); added code generator
2010-06-28 18:27:45 +02:00
