Commit Graph

719 Commits (move)

Author SHA1 Message Date
Pieter van der Kloet 7c1f00884d Merge remote-tracking branch 'upstream/master' into newlauncher 14 years ago
Marc Zinnschlag d260e5c1bd added file collection class 14 years ago
Pieter van der Kloet 7b554897e7 Merge remote-tracking branch 'upstream/master' into newlauncher
Conflicts:
	CMakeLists.txt
	apps/openmw/main.cpp
	components/esm/defs.hpp
	components/esm/loadappa.hpp
	components/esm/loadbody.hpp
	components/esm/loadclas.hpp
	components/esm/loadcrea.hpp
	components/esm/loadsndg.hpp
	components/interpreter/installopcodes.cpp
14 years ago
Marc Zinnschlag d8fa2f201a improved description of openmw.cfg related cmake-variable 14 years ago
Marc Zinnschlag d47abff25d create local openmw.cfg file for uninstalled version 14 years ago
Pieter van der Kloet 94f3bc115f Added missing resource file 14 years ago
Nikolay Kasyanov fcfe267fc9 Refactored remaining headers in components/esm except defs.hpp.
Removed obsolete *.cpp files.
14 years ago
Nikolay Kasyanov 7168795ae6 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
14 years ago
Nikolay Kasyanov eaea48011d 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.
14 years ago
Marc Zinnschlag 7131c08ca4 moved path.hpp/path.cpp to a new component 14 years ago
Marc Zinnschlag 042c179ce7 fixed the openmw.cfg install problem (I hope) 14 years ago
Jan-Peter Nilsson 73f2fdfa72 Update default version and add libbullet2.77 as a dependency 14 years ago
Marc Zinnschlag 573090a07f improved description of openmw.cfg related cmake-variable 14 years ago
Marc Zinnschlag 0c4e9d9207 create local openmw.cfg file for uninstalled version 14 years ago
Marc Zinnschlag 7c506301b7 Merge remote branch 'corristo/header-refactoring' into header-refactoring
Conflicts:
	CMakeLists.txt
14 years ago
Nikolay Kasyanov 1e5768170f Refactored remaining headers in components/esm except defs.hpp.
Removed obsolete *.cpp files.
14 years ago
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
14 years ago
Jan-Peter Nilsson 08784470bc Update default version and add libbullet2.77 as a dependency 14 years ago
Pieter van der Kloet 91fa147146 Modified CMake to include the launcher directory 14 years ago
Marc Zinnschlag 74d036a26a getting rid of a cmake warning 14 years ago
Pieter van der Kloet 6e1e3b797c Fixed a bug in the CMake file that prevented the plugins.cfg from being copied on Linux. 14 years ago
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.
14 years ago
Marc Zinnschlag 647e88003e build and activation fix 14 years ago
gugus 0fb2107265 Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
Conflicts:
	apps/openmw/mwclass/npc.cpp
14 years ago
Nikolay Kasyanov edcac879d7 Oops. Used tabs instead of 4 spaces. Fixed. 14 years ago
Nikolay Kasyanov 768c9bdf07 On OS X openmw now sets current directory to bundle root, openmw.cfg values is relative to bundle root 14 years ago
Nikolay Kasyanov 943eea8104 .app bundle finally works 14 years ago
Nikolay Kasyanov 527ac956a7 More correct MacOS X bundle generation 14 years ago
Nikolay Kasyanov 4028600768 Builds on OS X now 14 years ago
Jan-Peter Nilsson e290f2f82f Get physic fix in openengine and build nifbullet 14 years ago
Marc Zinnschlag 1e9dc4b435 de-Windownizing and some build-fixes 14 years ago
gugus ee0d73e142 Merge branch 'bullet' of git://github.com/zinnschlag/openmw.git into collisions 14 years ago
Marc Zinnschlag 8b2252e7a1 first attempt at building with bullet 14 years ago
gugus a6c5bd0c41 correction of a spelling error 14 years ago
gugus d1bcfcb94d Merge branch 'movement' of git://github.com/zinnschlag/openmw.git into collisions 14 years ago
gugus a8ade56c80 Add a bullet Shape Loader 14 years ago
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
14 years ago
Jan-Peter Nilsson d1b482d64a Update plugins.cfg based on where cmake found ogre libraries 14 years ago
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. 14 years ago
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.
14 years ago
Yuri Krupenin e7d853bb3c Corrected subsystem link flags for MinGW. 14 years ago
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().
14 years ago
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. 14 years ago
Jan Borsodi 54996684aa Merge branch 'master' into gui-windows 14 years ago
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. 14 years ago
Jan Borsodi e47568ea2e Merge branch 'master' into gui-windows 15 years ago
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. 15 years ago
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. 15 years ago
Jan Borsodi 1c79a62957 Added a static list of skill names to ESM::Skill. 15 years ago
Nicolay Korslund 0eae9d1504 Removed -Werror again 15 years ago
Jan Borsodi 0f860e2fbd openmw.cfg is now created with a configurable path (via cmake), the default is still "data" 15 years ago
Nicolay Korslund 5552c44753 Cleaned up strnlen in esm_reader. Added -Werror switch to g++. 15 years ago
athile 336fb1636c Windows fixes 15 years ago
athile d955a0efc4 WIP Windows build 15 years ago
Nicolay Korslund 3127602c57 Added file_finder component. Used by sound system. 15 years ago
Nicolay Korslund 358e1ca5a5 Added custom UTF8 converter. Removed iconv dependency. 15 years ago
Nicolay Korslund 08289158d7 Added support for WAV files with libsndfile 15 years ago
Nicolay Korslund 9875d74abf Implemented 3D sound placement. Sound management / lookup system not
done yet.
15 years ago
Nicolay Korslund 912c8b1f2d Added mpg123 file reader 15 years ago
Nicolay Korslund ebcbff255e Changed how avcodec/avformat (ffmpeg) is included 15 years ago
Marc Zinnschlag 76492ea60b cmake improvements for sound options 15 years ago
Nicolay Korslund cad9712411 Implemented FFMpeg sound loading. Selecting sound library is controlled through the CMake file. 15 years ago
Nicolay Korslund 5d4dba981f Fixed mistake in NPC record struct 15 years ago
Nicolay Korslund cf4185faef Added sound test (remember to git submodule update) 15 years ago
Nicolay Korslund 34572f0b19 Compiled and linked in sound system (not yet functional) 15 years ago
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.
15 years ago
Nicolay Korslund 532ccbd1f8 Killed clientconsole, mwcompiler, mwinterpreter and command server 15 years ago
Nicolay Korslund f87810ce7a Moved esmtool to apps/ 15 years ago
Nicolay Korslund c61212202b Moved mwgui/ back to apps/openmw/. Fixed mouse position bug. 15 years ago
Nicolay Korslund 5472a8c760 Killed mygui_dev 15 years ago
Nicolay Korslund c84672a560 Added MyGUI to OpenMW, fully working (with events and script hooks) 15 years ago
Nicolay Korslund 4d74f85ae0 Moved mwgui manager to components, ready for testing 15 years ago
Nicolay Korslund 4eb2863db4 Added input to apps/mygui_dev/ 15 years ago
Nicolay Korslund 13d3f9c87e Integrated OpenEngine, replaces entire components/engine/ directory. 15 years ago
Nicolay Korslund 6966c66091 Gave apps/openmw/ its own CMakeLists.txt 15 years ago
Nicolay Korslund 9c839e220e Moved GUI stuff into components 15 years ago
Nicolay Korslund b2d54a619e Implemented all MW window layouts 15 years ago
Nicolay Korslund 3896fd218a Added stand-alone GUI test, compiles and runs 15 years ago
Nicolay Korslund 0558664aa6 Added MyGUI source (cut down) and CMake files 15 years ago
Marc Zinnschlag 0efe4742a6 added script-gui interface and gui-related script instructions 15 years ago
Marc Zinnschlag 2c63d67ceb added gui manager skeleton and a cmake fix 15 years ago
Nicolay Korslund b97def39b3 Minor fixes to Mac stuff 15 years ago
Nicolay Korslund 2ec96ed7de Merge branch 'master' of http://github.com/ardekantur/openmw 15 years ago
Nicolay Korslund 359f2903d7 Merged athile and zinnschlag 15 years ago
Marc Zinnschlag 3df5d377f2 added xbox function 15 years ago
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. 15 years ago
Ardekantur ee6c933156 Merge branch 'master' of git://github.com/korslund/openmw
Conflicts:
	CMakeLists.txt
	apps/openmw/main.cpp
	game/engine.cpp
15 years ago
Ardekantur bace14c45e Mac Build - adding architectures and Apple build locations 15 years ago
Marc Zinnschlag d57e67e722 added global variable handling to compiler context (not working yet because of case problems) 15 years ago
Marc Zinnschlag 4482884eb5 implemented global script execution 15 years ago
Marc Zinnschlag 530caac39b merged CompilerScriptContext into base class 15 years ago
Marc Zinnschlag 3fae68b403 added unifying LiveCellRef pointer class 15 years ago
Marc Zinnschlag d51e6fb7c4 second part of refactoring 15 years ago
Marc Zinnschlag c12752df4d added sound manager skeleton and sound script functions 15 years ago
Marc Zinnschlag f0c492ae22 added CellChanged script function 15 years ago
Marc Zinnschlag 474b412b47 implemented local script execution 15 years ago
Marc Zinnschlag 076b01559f added local script compiling 15 years ago
Marc Zinnschlag 2064c43d89 added script manager (doesn't do anything yet); local scriptes for active cells are passed on to the script manager 15 years ago
Marc Zinnschlag a06b84ac86 added local variables to ref data 15 years ago
Marc Zinnschlag def0a773bd replaced void * entry in cell store with a generic type 15 years ago
Nicolay Korslund 0de4bb9d6c Merged athile's work 15 years ago
Marc Zinnschlag ea6d342a24 split CellRender into CellRender and CellRenderImp 15 years ago
Marc Zinnschlag ce37666dbc factored world class out of main engine class 15 years ago
athile 9b2fa58b88 Add separate CMakeLists.txt files for mwcompiler and mwinterpreter 15 years ago
athile 7cc27d9b66 Add command output string and client/server response. 15 years ago
athile d44f322b8a Add nesting to Visual Studio source groupings. 15 years ago
athile 056194baa2 Merge upstream 15 years ago
athile 7357ea2102 Add simple external console server/client 15 years ago
Marc Zinnschlag 1ad9b234f0 Merge branch 'mwscript'
Conflicts:
	CMakeLists.txt
15 years ago
Marc Zinnschlag a9c2deb86e bad lineendings; as usual Windows is to blame 15 years ago
Marc Zinnschlag bceb7ebcbd reimplemented expression parsing as a separate parser (still only handling non-negative integers) 15 years ago
Marc Zinnschlag c6a37b2e18 added first batch of opcodes 15 years ago
athile 59a2e8dcf7 Merge upstream 15 years ago
Marc Zinnschlag 770eb14d95 added context for standalone interpreter 15 years ago
Marc Zinnschlag 487a70388f added interpreter framework 15 years ago
Marc Zinnschlag fdcd34941b added parsing for set statement (only integer values so far); added code generator 15 years ago
Marc Zinnschlag 5cf3264bd3 added literal container and reworked output container handling 15 years ago
Marc Zinnschlag a3ad61b4d0 write code file after successfull parsing 15 years ago
Marc Zinnschlag 0cfeab622d added storage class for local variable declarations; added checks for variable re-declaration 15 years ago
Marc Zinnschlag 21e0182ae2 added skip parser for skipping faulty lines 15 years ago
Marc Zinnschlag bff0855af0 added parsing for local variable declarations 15 years ago
Marc Zinnschlag 16f6f27a90 added line parser (doesn't parse anything yet) 15 years ago
Marc Zinnschlag aa99a0dd56 added basic script parser (can only parse empty script bodies for now) 15 years ago
athile 819c146ad1 Project clean-up: move 'misc' into the platform lib, update CMake to build 'platform' as a lib, and various fixes for Visual Studio compiler warnings 15 years ago
athile f1278232d2 Add CMakeLists.txt - should have been part of the last commit 15 years ago
athile 7db274f1c5 Sky rendering clean-up and correct resource configuration 15 years ago
athile d67f0c74b0 Merge remote branch 'upstream/master' 15 years ago
athile 52a3233243 Work in progress Caelum integration 15 years ago
Marc Zinnschlag ddcbc8cd62 added tokenizing of MW scripts 15 years ago
Marc Zinnschlag 31e22186ef added mwscript compiler standalone-executable (doesn't do anything yet) 15 years ago
Ardekantur 25ba9933f6 Mac Build - heinous additions for bundle management 15 years ago
Marc Zinnschlag e4f85cb3e6 directory structure reorganisation (still missing the mangle stuff) 15 years ago
Marc Zinnschlag 261af208cd increased warning level for gcc; fixed code to remove resulting warnings (except mangle) 15 years ago
athile 3c04479919 Add source groupings for Visual Studio, fix missing return true, add filename increment to screenshots. 15 years ago
Nicolay Korslund 6b6f5b95ec Added camera movement (arrows/WASD). No mouse look yet. 15 years ago
Nicolay Korslund af7c87e8dc Merge branch 'master' of http://github.com/zinnschlag/openmw 15 years ago
Ardekantur 4337f2619f Mistakes in previous commit 15 years ago
Ardekantur 5187d5bb17 Mac build - make bundle do everything except data copying 15 years ago
Ardekantur 9c6663019d Mac build - Link Carbon so window can receive focus/input 15 years ago
Marc Zinnschlag 04037fb01a first round of main refactoring; moving functionality out to a separate class 15 years ago
Marc Zinnschlag 47790e6feb cell render refactoring 15 years ago
Marc Zinnschlag 9a041d7c01 added data option and openmw.cfg file 15 years ago
Marc Zinnschlag f346adb6e1 implemented program argument handling via boost program options 15 years ago
Nicolay Korslund f3d7f2e25a Finished basic key binding system. Minor other cleanups. 15 years ago
Marc Zinnschlag 4fbada8605 CMakeLists was missing a complete directory full of headers 15 years ago
Nicolay Korslund 86b78b18f4 Created cell renderer w/NIF loading. Runs but is WIP. 15 years ago
Nicolay Korslund fdb41f0774 Merged in CMake and header cleanups from zinnschlag 15 years ago
Marc Zinnschlag aa59d9244f listed header files, so they will show up in IDE project files (excluding mangle for now) 15 years ago
Marc Zinnschlag e973270f9b fixed minor bug in previous commit; more clean up 15 years ago
Nicolay Korslund 4cadf70abe Merged in ardekanurs Boost changes 15 years ago
Marc Zinnschlag c4a6fa56ea cmake modifications for out of source build 15 years ago
Nicolay Korslund 4c1d07adb6 Added missing CMake files. 15 years ago
Nicolay Korslund 855ca8ee74 Added camera and scene, started adding input. MISSING FindOIS.cmake! 15 years ago
Ardekantur ad1e9e7078 boost::filesystem cross-platform config file check
* introduces the use of the Boost.System and Boost.Filesystem libraries,
  which must be built and linked to rather than just compiled into
  OpenMW. May be a pain in the neck to get working on other platforms,
  but once it works, we have all of Boost to work with.
15 years ago
Nicolay Korslund 4d8040f96c Mac port from ardekantur, minor fix to CMakeLists 15 years ago
Ardekantur a803c32733 Updated to work with latest changes upstream 15 years ago
Ardekantur 1004ab7ea2 Merge branch 'mac-build'
Conflicts:
	.gitignore
15 years ago
Ardekantur 0de198980c initial commit of mac build 15 years ago
Nicolay Korslund 2d3a56a464 Set up OGRE window and config reading 15 years ago
Nicolay Korslund dc2c9f06d0 Renamed all .h to .hpp. Started porting rendering code. 15 years ago
Nicolay Korslund 2d2804b30c Fixed unbearably slow cell loader. Faster now. 15 years ago
Nicolay Korslund bdb6896c3f Created (a very slow) cell loader. Will optimize. 15 years ago
Nicolay Korslund e534431022 Main program now stores ESM data in memory 15 years ago
Nicolay Korslund ccfc63ab9f Updated and tested CMakeLists.txt, now confirmed on Linux. 15 years ago
Nicolay Korslund 7238847b8b CMake for Windows-patch by Sylvain T (NOT YET TESTED). Includes update to Mangle.
Details:
- create a sub directory to store CMake scripts (later more to come)
- add a search Ogre package script (may be replaced later by "official" Ogre 1.7 search script, since they switched to CMake, yeah !)
- fixed header issues being not available with MSVC and replaced by equivalent functions if assumed portable enough
15 years ago
Nicolay Korslund ef871c813b CMake patch from Andrew Belitsky: Improved Linux handling. 15 years ago
Nicolay Korslund 320fb3f8b8 Added very early CMakeLists.txt, builds main executable from game/main.cpp 15 years ago
nkorslund 6ba4040f08 - Added some non-working code (for later use)
- Removed CMakeLists for now. It's enough work to keep the
  existing build alternatives updated. We can add it back later when
  things stabilize.


git-svn-id: https://openmw.svn.sourceforge.net/svnroot/openmw/trunk@56 ea6a568a-9f4f-0410-981a-c910a81bb256
16 years ago
nkorslund ff4e120f12 Added CMake file, fixed minor build issues with avcodec/ffmpeg.
git-svn-id: https://openmw.svn.sourceforge.net/svnroot/openmw/trunk@44 ea6a568a-9f4f-0410-981a-c910a81bb256
17 years ago