mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 06:49:55 +00:00
Code Issues Releases Wiki Activity
5102 commits 38 branches 54 tags 122 MiB
Commit graph

288 commits

Author SHA1 Message Date
Lukasz Gromanowski
ea7eb7a62d fixes #128 Configuration cleanup. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-08-19 21:06:09 +02:00
Marc Zinnschlag
b157273cd9 Merge branch 'next' 
Conflicts:
	apps/openmw/main.cpp
 2011-07-31 19:28:12 +02:00
Lukasz Gromanowski
ac9b1715d5 Added new command line option: "encoding" 
Added new command line option: "encoding" which allow to
change font encoding used in game messages.

Currently there are three evailable encodings:

    win1250 - Central and Eastern European (languages
              that use Latin script, such as Polish,
              Czech, Slovak, Hungarian, Slovene, Bosnian,
              Croatian, Serbian (Latin script),
              Romanian and Albanian)

    win1251 - languages that use the Cyrillic alphabet
              such as Russian, Bulgarian, Serbian Cyrillic
              and others

    win1252 - Western European (Latin) - default

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-07-17 22:16:50 +02:00
Nikolay Kasyanov
31749fc97b Added include for Ogre::macBundlePath to main.cpp and removed such 
include from engine.cpp (no longer needed there).
 2011-06-25 19:29:11 +04:00
Marc Zinnschlag
8446619ac4 Merge branch 'components_namespaces' into next 
Conflicts:
	apps/openmw/mwrender/interior.cpp
	components/bsa/bsa_archive.cpp
 2011-06-19 20:22:29 +02:00
Lukasz Gromanowski
2ddd5dba11 Mantis: #18 - Move components from global namespace into their own namespace. 
Moving classes from components/nifbullet into NifBullet namespace.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-06-19 18:45:23 +02:00
Lukasz Gromanowski
90985e849e Mantis: #18 - Move components from global namespace into their own namespace. 
Moving classes from components/misc into Misc namespace.

Note: Misc namespace introduced conflict with ESM::Misc and MWClass::Misc
classes, so both of them are renamed to ESM::Miscellaneous
and MWClass::Miscellaneous.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-06-19 18:14:03 +02:00
Lukasz Gromanowski
8a84201ba2 Mantis: #18 - Move components from global namespace into their own namespace. 
Moving classes from components/bsa into Bsa namespace.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-06-19 16:46:34 +02:00
Marc Zinnschlag
e3d05e90d4 Merge remote branch 'swick/MessageBox' into MessageBox 2011-06-16 14:11:53 +02:00
Sebastian Wick
a4217f8fb8 Everything should work fine but deleting the existing MessageBox'es. 2011-06-15 22:53:05 +02:00
Marc Zinnschlag
0f2df4e2b8 more cleanup 2011-06-15 22:33:31 +02:00
Jason Hooks
9eefee7168 Say strict 2011-06-11 20:01:21 -04:00
Jason Hooks
65cc0e8317 trying strict 2011-06-08 17:15:13 -04:00
Jason Hooks
2aaa0f4578 Backslash working in linux 2011-06-04 01:29:57 -04:00
Jason
b92955763a Introducing Dir Archive 2011-06-03 20:28:47 -04:00
Jason Hooks
51b74c2f05 starting 2011-05-23 19:01:36 -04:00
Jason Hooks
b945ce61a5 Merge remote branch 'upstream/master' 2011-05-23 15:01:47 -04:00
Marc Zinnschlag
64d6ee26bd changed OGRE framelistener function from frameStarted to frameRenderingQueued 2011-05-18 16:37:09 +02:00
Marc Zinnschlag
8829398bfc added --fs-strict switch 2011-05-05 19:56:16 +02:00
Marc Zinnschlag
6e880cffb2 changed engine class to support multiple data directories for esm files 2011-05-05 19:32:42 +02:00
Marc Zinnschlag
58cbdfd762 Merge branch 'journal' 2011-04-28 10:27:18 +02:00
Marc Zinnschlag
8b9ee30924 user/global mixup 2011-04-28 10:15:04 +02:00
Marc Zinnschlag
bdfd28f44d adjusted components/files namespace; some related cleanup 2011-04-28 09:56:50 +02:00
Marc Zinnschlag
7131c08ca4 moved path.hpp/path.cpp to a new component 2011-04-28 09:39:40 +02:00
Jason Hooks
2ac1cc8aee Trying to animate creatures 2011-04-13 20:16:46 -04: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
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
gugus
2aee958789 Not sure about this commit: the PhysicEngine was initialized twice... 2011-03-18 13:22:51 +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
Marc Zinnschlag
4100a72e8d don't do physics calculations while the GUI is up 2011-03-13 22:39:44 +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
Jan-Peter Nilsson
fb2f6f3c02 Delete mPhysicEngine when we are done with it 2011-02-27 13:37:17 +01:00
Jan-Peter Nilsson
1ce77229c0 Don't create physics before we have initialized ogre 2011-02-27 00:50:08 +01:00
gugus
ff941b5963 add physic 2011-02-19 17:59:40 +01:00
sergoz
5132531f73 added fps counter 2011-02-18 17:46:24 +03:00
Marc Zinnschlag
9a3158675a reworked cell changing mechanism 2011-02-10 10:38:45 +01:00
Marc Zinnschlag
ca44b3640a pasing movement data from mwmechanics to mwscene and fixed a very stupid interface bug 2011-02-01 10:11:41 +01:00
Marc Zinnschlag
40d772b33a call doPhysics function once per frame 2011-01-29 17:39:34 +01:00
Jan-Peter Nilsson
8cb8481b37 Use a local plugins.cfg if available (allow us to run without installing) 2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
0b1f18cc12 plugins.cfg is global config 2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
429775d485 Store configuration in /etc/openmw/ and ~/.openmw/ on linux 
Requires new openengine version.
 2011-01-12 18:18:06 +01:00
Marc Zinnschlag
42ef7a61a0 Merge branch 'script' 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwworld/world.cpp
	apps/openmw/mwworld/world.hpp
 2011-01-09 20:56:21 +01:00
Marc Zinnschlag
4dd8616f87 Merge remote branch 'pvdk/master' 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwsound/soundmanager.cpp
 2011-01-06 09:45:14 +01:00
Pieter van der Kloet
dd4d022301 Converted all tabs to four spaces 2011-01-05 22:18:21 +01:00
Jan-Peter Nilsson
ba18dc46ef Don't try to play random tunes when sound is disabled 2011-01-05 02:12:43 +01:00
Marc Zinnschlag
4a12be11bf moved PlayerPos class from MWRender to MWWorld and renamed it to Player 2011-01-04 15:58:22 +01:00
Marc Zinnschlag
67a745cdf6 workaround for NPC activation crash 2010-12-31 15:50:54 +01:00
Marc Zinnschlag
5336b90149 music player and NPC rendering branch 2010-12-30 14:50:35 +01:00
Jason Hooks
a9892161af MP3 functions moved to soundmanager 2010-11-11 19:47:26 -05:00
Jason Hooks
be1582a88f Regional Sounds 2010-11-08 18:01:33 -05:00
Jason Hooks
a038c67e5a Preliminary region sound framework2 2010-11-07 12:51:59 -05:00
Jason Hooks
cab2341259 Preliminary region sound framework 2010-11-06 13:11:09 -04:00
Jason Hooks
a7c3a29ffd Music Player with directory mp3 lookup 2010-11-01 17:06:13 -04:00
Jason Hooks
74aba13053 Music Player 2010-10-31 12:23:03 -04:00
Jan Borsodi
38b434771a Merge remote branch 'zini/master' into gui-windows 2010-10-23 01:13:11 +02:00
Marc Zinnschlag
38ab9f7a3d Merge branch 'newchar' 
Conflicts:
	components/esm_store/store.hpp
 2010-10-22 10:27:32 +02:00
Jan Borsodi
c45811770a Added a custom widget for displaying dynamic stats (health, magicka, fatigue). Can show a title/label, graphical bar and detailed text. 2010-10-20 21:39:18 +02:00
Marc Zinnschlag
1c4db82a0e added --script-all switch 2010-10-06 14:52:53 +02:00
Marc Zinnschlag
8659ce3a82 extended --start switch for exterior cell support 2010-10-05 18:23:53 +02:00
Jan Borsodi
cd3e976b7c Added birthsign dialog and spell effect widget. 2010-09-21 12:34:47 +02:00
Jan Borsodi
3e611b5d4c Added widget for spells, updated race dialog to use that. 2010-09-20 13:36:55 +02:00
Jan Borsodi
cd8b88dea1 Introduced custom widgets (skill and attribute) which should make it easier to make new windows. Changed race and class dialog to use the new skill and attribute widgets. 2010-09-20 13:17:02 +02:00
Marc Zinnschlag
7cd40fc7e4 made engine framelistener more crash-resistant 2010-09-18 08:39:21 +02:00
Marc Zinnschlag
8de9619579 Merge commit 'amos/gui-windows' into newchar 2010-09-15 22:20:00 +02:00
Jan Borsodi
1907aeb6c6 The game mode is now properly restored once a dialog is finished. Previously the game mode was only set in the window manager but it has to go through the input manager firs to get correct input state. Also updated the gui script commands to also use the input manager and not the window manager. 
At some point the gui mode code should be moved to a class that handles all game mode (engine?).
 2010-09-15 14:48:19 +02:00
Marc Zinnschlag
9dffa75a15 handle name change during character creation 2010-09-15 12:22:06 +02:00
Marc Zinnschlag
d4bf916f18 fixed uninitialized variable in engine 2010-08-29 17:46:06 +02:00
Nicolay Korslund
31017447eb Added --nosound switch 2010-08-18 11:16:15 +02:00
Marc Zinnschlag
2cfe5f0697 Merge branch 'master' into dialogue 
Conflicts:
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
	apps/openmw/mwworld/class.cpp
	apps/openmw/mwworld/class.hpp
 2010-08-18 09:25:07 +02:00
Nicolay Korslund
9875d74abf Implemented 3D sound placement. Sound management / lookup system not 
done yet.
 2010-08-14 21:01:20 +02:00
Marc Zinnschlag
b94e09e030 fixed a bug that prevented local scripts from running 2010-08-12 18:44:16 +02:00
Nicolay Korslund
7516e4ca53 Added music playing as a test 2010-08-12 17:58:29 +02:00
Nicolay Korslund
34572f0b19 Compiled and linked in sound system (not yet functional) 2010-08-12 16:13:54 +02:00
Marc Zinnschlag
c806415f08 changed namespace, class and function names to ensure consistent spelling 2010-08-06 19:16:44 +02:00
Marc Zinnschlag
d6541d4f3c changed file names to ensure consistent spelling 2010-08-06 19:10:56 +02:00
Marc Zinnschlag
8045320ac9 added dialog manager 2010-08-06 18:01:34 +02:00
Marc Zinnschlag
15124601aa stop local scripts from being run twice in case of activation 2010-08-05 15:46:50 +02:00
Marc Zinnschlag
7a313f24ab integrated activation into script system 2010-08-05 15:40:03 +02:00
Marc Zinnschlag
f630157bf8 implemented basic object activation 2010-08-05 13:51:26 +02:00
Marc Zinnschlag
2d695cc806 routed activate signal from input sub-system to engine-class 2010-08-05 13:36:33 +02:00
Marc Zinnschlag
87c84e6fcd limited activation range according to GMST settings 2010-08-05 13:29:49 +02:00
Marc Zinnschlag
052d049a6c integrated name-lookup into ape's code; added missing implementation of a function 2010-08-03 22:06:48 +02:00
Marc Zinnschlag
5827591d05 Merge commit 'ape/master' 
Conflicts:
	apps/openmw/mwworld/world.hpp
 2010-08-03 21:52:19 +02:00
Armin Preiml
adc209d135 Implemented the faced handle method to the engine. Faced handles will 
be written to stdout every 10th frame.
 2010-08-03 20:40:45 +02:00
Marc Zinnschlag
33b6a0b800 moved concrete record classes to separate sub-system (mwclass) 2010-08-03 13:17:31 +02:00
Marc Zinnschlag
a70c3876a2 added foundation for esm record class hierarchy 2010-08-03 11:14:57 +02:00
Marc Zinnschlag
b584215680 moved stats label <-> GMST text mapping from mwmechanics to mwgui; added missing stats window labels 2010-08-01 10:25:50 +02:00
Marc Zinnschlag
335425bb12 added MechanicsManager::update function (doesn't update anything yet) 2010-07-27 14:46:05 +02:00
Marc Zinnschlag
3d987f1b7a register actors in active cells with MechanicsManager 2010-07-27 14:05:05 +02:00
Marc Zinnschlag
8bbcbc05d5 removed duplicate code from World class 2010-07-27 13:09:35 +02:00
Marc Zinnschlag
61d09c4768 read attribute names from GMST instead of using hard-coded names (doesn't fully work yet, because of encoding issues) 2010-07-26 11:15:38 +02:00
Nicolay Korslund
532ccbd1f8 Killed clientconsole, mwcompiler, mwinterpreter and command server 2010-07-22 14:15:02 +02:00
Marc Zinnschlag
f693a2942e fixed handling of cell changes during local and global script execution 2010-07-22 12:46:24 +02:00
Marc Zinnschlag
0e641f1246 implemented coc instruction 2010-07-22 12:29:23 +02:00
Marc Zinnschlag
74f3eb6ad4 stop time while GUI is up 2010-07-21 14:12:50 +02:00
Marc Zinnschlag
c8a18b7d70 use global variable timescale instead of fixed factor 2010-07-21 14:10:52 +02:00
Marc Zinnschlag
a87175446c disable windows on startup when --new-game is used 2010-07-21 10:28:58 +02:00
Marc Zinnschlag
d72ed19460 implemented script compiler for console 2010-07-20 23:21:48 +02:00
Nicolay Korslund
c61212202b Moved mwgui/ back to apps/openmw/. Fixed mouse position bug. 2010-07-20 20:23:37 +02:00
Marc Zinnschlag
f3b70e05a9 added sky-related script functions and instructions 2010-07-18 19:48:02 +02:00
Marc Zinnschlag
d27c548710 implemented passing of time 2010-07-18 18:29:16 +02:00
Nicolay Korslund
608ddd0a58 Splitt inputmanager into hpp/cpp 2010-07-17 19:58:15 +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
Marc Zinnschlag
2c63d67ceb added gui manager skeleton and a cmake fix 2010-07-07 18:48:06 +02:00
Nicolay Korslund
97ad6592ea Fixed innocent compiler warning in engine.cpp 2010-07-07 09:55:44 +02:00
Nicolay Korslund
359f2903d7 Merged athile and zinnschlag 2010-07-07 09:46:11 +02:00
Marc Zinnschlag
9d73718ec1 added GetSecondsPassed 2010-07-06 12:06:50 +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
Marc Zinnschlag
a61b2c39f0 added scriptrunning/startscript/stopscript; sorted out more case problems 2010-07-04 16:00:32 +02: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
5d46fc869c added missing sound script functionality; various script-related bug-fixes 2010-07-03 20:35:59 +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
f8cb4c2502 moved sound manager from world to engine (first step of another round of refactoring) 2010-07-03 15:17:02 +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
8e2732c60e local scripts are now run every frame (running scripts itself is not implemented yet) 2010-07-02 17:30:26 +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
c7f76f51fb added --debug option and finally cleaned up the merge mess 2010-07-02 13:12:05 +02:00
Marc Zinnschlag
417df63302 partial fix for merge problems 2010-07-02 12:30:30 +02:00
Nicolay Korslund
4a3f6b0ff1 Various fixes to get openmw to compile and run properly 2010-07-02 10:41:39 +02:00
Nicolay Korslund
0de4bb9d6c Merged athile's work 2010-07-02 10:11:05 +02:00
Marc Zinnschlag
ce37666dbc factored world class out of main engine class 2010-07-02 09:00:06 +02:00
athile
7cc27d9b66 Add command output string and client/server response. 2010-07-01 15:50:24 -07:00
athile
7357ea2102 Add simple external console server/client 2010-07-01 11:49:00 -07:00
athile
de7087caf4 Move prepareMaster logic into addMaster. Having these separate only introduces the possibility for a bug. 2010-06-30 11:32:40 -07:00
athile
59a2e8dcf7 Merge upstream 2010-06-28 12:44:55 -07:00
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 2010-06-27 18:05:01 -07:00
athile
82bbc69453 Only push the far clip plane out if the sky is enabled 2010-06-27 17:28:49 -07:00
athile
7db274f1c5 Sky rendering clean-up and correct resource configuration 2010-06-27 16:44:15 -07:00
Marc Zinnschlag
e4f85cb3e6 directory structure reorganisation (still missing the mangle stuff) 2010-06-25 22:28:59 +02:00
Renamed from game/engine.cpp (Browse further)