f4bbcb48a6
settings-default.cfg
13 years ago
6091a0504d
first settings test (config file has to be created manually)
13 years ago
30407d3a2c
Merge branch 'master' into occlusionquery
13 years ago
4e63f89829
silence an error regarding faced handle
13 years ago
509650d5f3
Merge remote branch 'ace/fs-fix'
13 years ago
0892df0ad3
framework for gamemechanics-realted actor updated
13 years ago
4a9a416d46
Can find files even if no .bsa file exists now
13 years ago
e6303fc3f4
Merge branch 'master' into water
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
13 years ago
fa70a72b75
Remove some unused sound manager fields and constructor parameters
13 years ago
6067053f08
Merge branch 'next' into water
...
Conflicts:
CMakeLists.txt
13 years ago
5ae47f783e
Use the sound manager's update to make sure music is still playing
13 years ago
51fb9e67cd
Merge
13 years ago
7ca0503205
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
13 years ago
af875896ad
fix for issue #179
13 years ago
10321ff51a
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
13 years ago
6f7752633a
there was no extension in the compiler context. Corrected. But Choice doesn't work.
13 years ago
054a176c86
Added new FileLibrary class to handle music, this fixes a number of issues.
13 years ago
03ea3bb62f
SoundManager: first attempt at refactoring. BROKEN
13 years ago
69f0ec99f1
implemented dialogue scripts
13 years ago
1e998545c7
fixed log path
13 years ago
be70d197e5
Merge branch 'next'
...
Conflicts:
.gitignore
cmake/FindOGRE.cmake
13 years ago
771d50fe69
removed a redundant assert and a left-over comment
13 years ago
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
13 years ago
9af08ff18d
store screenshots in user directory instead of local directory
13 years ago
77201d05bc
post-merge fix
13 years ago
27caee664e
Merge remote branch 'lgro/config' into config
...
Conflicts:
components/files/path.hpp
13 years ago
bcc4d7a7c9
Issue #133 Handle resources across multiple data directories
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
17b1546dc1
Changed the way screenshots are created (Bug #191 )
13 years ago
b004e2479c
Issue #133 Handle resources across multiple data directories - WIP
...
Work In Progress - added support for multiple paths in SoundManager.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
daa8fb15ce
Removed all physics-related code from Engine
13 years ago
6d4fa9274e
Moved OpenEngine systems into their appropriate classes
13 years ago
16bc374921
animation updates were hooked up to the wrong update function
13 years ago
ec94ecacaf
Zinis branch merge
13 years ago
7c24ae9ac7
Issue #168 - Configuration cleanup - WIP
...
This is "work in progress" commit, it shall not be merged alone,
without succeeding commits (it's not fully functional).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
84f45b1972
underwater view
13 years ago
ff2bbc9fc5
Transparent water
13 years ago
0c2de2c00c
Merge branch 'animation2'
13 years ago
3b15170d09
Cleaned up and simplified the code relating to the fps display
13 years ago
18e4b73a86
Added a more detailed fps counter displaying the triangle and batch count
13 years ago
d1793bc4bd
Animation files in the correct directory
13 years ago
eab69f18ac
File output switch
13 years ago
653d999ac4
Animation creatures
13 years ago
51d5c7cd59
Merge remote branch 'jhooks/mwrender' into mwrender
...
Conflicts:
apps/openmw/engine.cpp
- fixed code that did not compile
- removed tons of tabs
- more clean up
13 years ago
d8367f4968
Activation fix
13 years ago
3779aaba62
Now no longer need to handle this exception here as it is handled by the dispatcher in the OpenEngine submodule
13 years ago
c25b49d2b6
refdata change
13 years ago
0e3859385d
Now ensures that the directory to the config file exists before Ogre tries to access it
13 years ago
965ff24597
Removing Object:
13 years ago
0c8aa7fae3
Removing Object:
13 years ago
6efc61b9df
Removal of MWScene; Object listing fixed
13 years ago
abeb3a22d4
Issue #19 : Cleaned up Engine includes
13 years ago
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.
13 years ago
39af941d6f
Issue #19 : Moved code from Engine to WindowManager and ScriptManager
13 years ago
38c0f36d44
Issue #19 : Finished cleaning out the Engine framelistener
13 years ago
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
13 years ago
fbcb5fe681
Issue #19 : Some more framelistener cleanup
13 years ago
8bebae17aa
Issue #19 : More local script related cleanup
13 years ago
896b7da23d
Issue #19 : fixed RNG in engine's frame listener
13 years ago
3bef04cb1d
Issue #19 : fixed exception handling in engine's frame listener
13 years ago
10778d8c3e
Issue #19 : factored out local script handling into a separate class
...
This also fixes a bug related to self-destructing references (introduced during the cell handling improvements)
13 years ago
d43455fd57
Issue #168 : Configuration cleanup, part 2
...
Corrected --data and --data-local parameters handling.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
54cb6deab9
Issue #168 : Configuration cleanup, part 2
14 years ago
ea7eb7a62d
fixes #128 Configuration cleanup.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
b157273cd9
Merge branch 'next'
...
Conflicts:
apps/openmw/main.cpp
14 years ago
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>
14 years ago
31749fc97b
Added include for Ogre::macBundlePath to main.cpp and removed such
...
include from engine.cpp (no longer needed there).
14 years ago
8446619ac4
Merge branch 'components_namespaces' into next
...
Conflicts:
apps/openmw/mwrender/interior.cpp
components/bsa/bsa_archive.cpp
14 years ago
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>
14 years ago
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>
14 years ago
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>
14 years ago
e3d05e90d4
Merge remote branch 'swick/MessageBox' into MessageBox
14 years ago
a4217f8fb8
Everything should work fine but deleting the existing MessageBox'es.
14 years ago
0f2df4e2b8
more cleanup
14 years ago
9eefee7168
Say strict
14 years ago
65cc0e8317
trying strict
14 years ago
2aaa0f4578
Backslash working in linux
14 years ago
b92955763a
Introducing Dir Archive
14 years ago
51b74c2f05
starting
14 years ago
b945ce61a5
Merge remote branch 'upstream/master'
14 years ago
64d6ee26bd
changed OGRE framelistener function from frameStarted to frameRenderingQueued
14 years ago
8829398bfc
added --fs-strict switch
14 years ago
6e880cffb2
changed engine class to support multiple data directories for esm files
14 years ago
58cbdfd762
Merge branch 'journal'
14 years ago
8b9ee30924
user/global mixup
14 years ago
bdfd28f44d
adjusted components/files namespace; some related cleanup
14 years ago
7131c08ca4
moved path.hpp/path.cpp to a new component
14 years ago
2ac1cc8aee
Trying to animate creatures
14 years ago
190f77f6c9
added journal class
14 years ago
dc4e6216c3
Initialize member variables in the same order they are defined to avoid compiler warning
14 years ago
833a61dd82
Fixed Boost errors with 1.46 caused by the deprecated name file_string()
14 years ago
2aee958789
Not sure about this commit: the PhysicEngine was initialized twice...
14 years ago
0fb2107265
Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
14 years ago
4100a72e8d
don't do physics calculations while the GUI is up
14 years ago
edcac879d7
Oops. Used tabs instead of 4 spaces. Fixed.
14 years ago
768c9bdf07
On OS X openmw now sets current directory to bundle root, openmw.cfg values is relative to bundle root
14 years ago
943eea8104
.app bundle finally works
14 years ago
fb2f6f3c02
Delete mPhysicEngine when we are done with it
14 years ago
1ce77229c0
Don't create physics before we have initialized ogre
14 years ago
ff941b5963
add physic
14 years ago
5132531f73
added fps counter
14 years ago
9a3158675a
reworked cell changing mechanism
14 years ago
ca44b3640a
pasing movement data from mwmechanics to mwscene and fixed a very stupid interface bug
14 years ago
40d772b33a
call doPhysics function once per frame
14 years ago
8cb8481b37
Use a local plugins.cfg if available (allow us to run without installing)
14 years ago
0b1f18cc12
plugins.cfg is global config
14 years ago
429775d485
Store configuration in /etc/openmw/ and ~/.openmw/ on linux
...
Requires new openengine version.
14 years ago
42ef7a61a0
Merge branch 'script'
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwworld/world.cpp
apps/openmw/mwworld/world.hpp
14 years ago
4dd8616f87
Merge remote branch 'pvdk/master'
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwsound/soundmanager.cpp
14 years ago
dd4d022301
Converted all tabs to four spaces
14 years ago
ba18dc46ef
Don't try to play random tunes when sound is disabled
14 years ago
4a12be11bf
moved PlayerPos class from MWRender to MWWorld and renamed it to Player
14 years ago
67a745cdf6
workaround for NPC activation crash
14 years ago
5336b90149
music player and NPC rendering branch
14 years ago
a9892161af
MP3 functions moved to soundmanager
14 years ago
be1582a88f
Regional Sounds
14 years ago
a038c67e5a
Preliminary region sound framework2
14 years ago
cab2341259
Preliminary region sound framework
14 years ago
a7c3a29ffd
Music Player with directory mp3 lookup
14 years ago
74aba13053
Music Player
14 years ago
38b434771a
Merge remote branch 'zini/master' into gui-windows
14 years ago
38ab9f7a3d
Merge branch 'newchar'
...
Conflicts:
components/esm_store/store.hpp
14 years ago
c45811770a
Added a custom widget for displaying dynamic stats (health, magicka, fatigue). Can show a title/label, graphical bar and detailed text.
14 years ago
1c4db82a0e
added --script-all switch
14 years ago
8659ce3a82
extended --start switch for exterior cell support
14 years ago
cd3e976b7c
Added birthsign dialog and spell effect widget.
14 years ago
3e611b5d4c
Added widget for spells, updated race dialog to use that.
14 years ago
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.
14 years ago
7cd40fc7e4
made engine framelistener more crash-resistant
15 years ago
8de9619579
Merge commit 'amos/gui-windows' into newchar
15 years ago
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?).
15 years ago
9dffa75a15
handle name change during character creation
15 years ago
d4bf916f18
fixed uninitialized variable in engine
15 years ago
31017447eb
Added --nosound switch
15 years ago
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
15 years ago
9875d74abf
Implemented 3D sound placement. Sound management / lookup system not
...
done yet.
15 years ago
b94e09e030
fixed a bug that prevented local scripts from running
15 years ago
7516e4ca53
Added music playing as a test
15 years ago
34572f0b19
Compiled and linked in sound system (not yet functional)
15 years ago
c806415f08
changed namespace, class and function names to ensure consistent spelling
15 years ago
d6541d4f3c
changed file names to ensure consistent spelling
15 years ago
8045320ac9
added dialog manager
15 years ago
15124601aa
stop local scripts from being run twice in case of activation
15 years ago
7a313f24ab
integrated activation into script system
15 years ago
f630157bf8
implemented basic object activation
15 years ago
2d695cc806
routed activate signal from input sub-system to engine-class
15 years ago
87c84e6fcd
limited activation range according to GMST settings
15 years ago
052d049a6c
integrated name-lookup into ape's code; added missing implementation of a function
15 years ago
5827591d05
Merge commit 'ape/master'
...
Conflicts:
apps/openmw/mwworld/world.hpp
15 years ago
adc209d135
Implemented the faced handle method to the engine. Faced handles will
...
be written to stdout every 10th frame.
15 years ago
33b6a0b800
moved concrete record classes to separate sub-system (mwclass)
15 years ago
a70c3876a2
added foundation for esm record class hierarchy
15 years ago
b584215680
moved stats label <-> GMST text mapping from mwmechanics to mwgui; added missing stats window labels
15 years ago
335425bb12
added MechanicsManager::update function (doesn't update anything yet)
15 years ago
3d987f1b7a
register actors in active cells with MechanicsManager
15 years ago
8bbcbc05d5
removed duplicate code from World class
15 years ago
61d09c4768
read attribute names from GMST instead of using hard-coded names (doesn't fully work yet, because of encoding issues)
15 years ago
532ccbd1f8
Killed clientconsole, mwcompiler, mwinterpreter and command server
15 years ago
f693a2942e
fixed handling of cell changes during local and global script execution
15 years ago
0e641f1246
implemented coc instruction
15 years ago
74f3eb6ad4
stop time while GUI is up
15 years ago
c8a18b7d70
use global variable timescale instead of fixed factor
15 years ago
a87175446c
disable windows on startup when --new-game is used
15 years ago
d72ed19460
implemented script compiler for console
15 years ago
c61212202b
Moved mwgui/ back to apps/openmw/. Fixed mouse position bug.
15 years ago
f3b70e05a9
added sky-related script functions and instructions
15 years ago
d27c548710
implemented passing of time
15 years ago
608ddd0a58
Splitt inputmanager into hpp/cpp
15 years ago
c84672a560
Added MyGUI to OpenMW, fully working (with events and script hooks)
15 years ago
4d74f85ae0
Moved mwgui manager to components, ready for testing
15 years ago
2c63d67ceb
added gui manager skeleton and a cmake fix
15 years ago
97ad6592ea
Fixed innocent compiler warning in engine.cpp
15 years ago
359f2903d7
Merged athile and zinnschlag
15 years ago
9d73718ec1
added GetSecondsPassed
15 years ago
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
a61b2c39f0
added scriptrunning/startscript/stopscript; sorted out more case problems
15 years ago
d57e67e722
added global variable handling to compiler context (not working yet because of case problems)
15 years ago
4482884eb5
implemented global script execution
15 years ago
530caac39b
merged CompilerScriptContext into base class
15 years ago
5d46fc869c
added missing sound script functionality; various script-related bug-fixes
15 years ago
3fae68b403
added unifying LiveCellRef pointer class
15 years ago
d51e6fb7c4
second part of refactoring
15 years ago
f8cb4c2502
moved sound manager from world to engine (first step of another round of refactoring)
15 years ago
f0c492ae22
added CellChanged script function
15 years ago
474b412b47
implemented local script execution
15 years ago
8e2732c60e
local scripts are now run every frame (running scripts itself is not implemented yet)
15 years ago
076b01559f
added local script compiling
15 years ago
2064c43d89
added script manager (doesn't do anything yet); local scriptes for active cells are passed on to the script manager
15 years ago
c7f76f51fb
added --debug option and finally cleaned up the merge mess
15 years ago
417df63302
partial fix for merge problems
15 years ago
4a3f6b0ff1
Various fixes to get openmw to compile and run properly
15 years ago
0de4bb9d6c
Merged athile's work
15 years ago
ce37666dbc
factored world class out of main engine class
15 years ago
7cc27d9b66
Add command output string and client/server response.
15 years ago
7357ea2102
Add simple external console server/client
15 years ago
de7087caf4
Move prepareMaster logic into addMaster. Having these separate only introduces the possibility for a bug.
15 years ago
59a2e8dcf7
Merge upstream
15 years ago
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
82bbc69453
Only push the far clip plane out if the sky is enabled
15 years ago
7db274f1c5
Sky rendering clean-up and correct resource configuration
15 years ago
e4f85cb3e6
directory structure reorganisation (still missing the mangle stuff)
15 years ago
scrawl
Marc Zinnschlag
Alexander "Ace" Olofsson
Chris Robinson
Jason Hooks
gugus
Michael Papageorgiou
Lukasz Gromanowski
Pieter van der Kloet
Cris Mihalache
Jacob Essex
Jason Hooks
Nikolay Kasyanov
Sebastian Wick
Jason Hooks
Jan-Peter Nilsson
sergoz
Jan Borsodi
Nicolay Korslund
Armin Preiml
athile