Mark Siewert
28d4d7ea3f
Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging.
...
- Remove check for 255 master/plugin files.
12 years ago
Marc Zinnschlag
fd6c155118
Issue #352 : added --script-run switch
13 years ago
Marc Zinnschlag
90de02b901
Issue #350 : console only script instructions
13 years ago
guidoj
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
13 years ago
scrawl
d69501b061
change daedric font to .zip resource
13 years ago
Marc Zinnschlag
e26f39e563
fixed exception handling during subsystem setup
13 years ago
scrawl
7f15385dc5
unrelated cleanup
13 years ago
scrawl
1b5bfc52a1
Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwclass/apparatus.cpp
apps/openmw/mwclass/book.cpp
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/ingredient.cpp
apps/openmw/mwclass/misc.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/potion.cpp
apps/openmw/mwclass/repair.cpp
apps/openmw/mwgui/window_manager.cpp
13 years ago
Marc Zinnschlag
35f478071e
Issue #255 : deleted the old environment class and using the new one instead
13 years ago
scrawl
934caf7a2b
removed --report-focus which is now useless
13 years ago
Sebastian Wick
73705dadf6
parse fallback with boost program option custom validators
13 years ago
Sebastian Wick
ab9c430632
fallback in apps/openmw; fix for apps/mwiniimporter
13 years ago
Marc Zinnschlag
69f0ec99f1
implemented dialogue scripts
13 years ago
Marc Zinnschlag
be70d197e5
Merge branch 'next'
...
Conflicts:
.gitignore
cmake/FindOGRE.cmake
13 years ago
Marc Zinnschlag
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
13 years ago
Marc Zinnschlag
27caee664e
Merge remote branch 'lgro/config' into config
...
Conflicts:
components/files/path.hpp
13 years ago
Pieter van der Kloet
17b1546dc1
Changed the way screenshots are created (Bug #191 )
13 years ago
Lukasz Gromanowski
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
Cris Mihalache
daa8fb15ce
Removed all physics-related code from Engine
13 years ago
Cris Mihalache
6d4fa9274e
Moved OpenEngine systems into their appropriate classes
13 years ago
Lukasz Gromanowski
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
Marc Zinnschlag
0c2de2c00c
Merge branch 'animation2'
13 years ago
Jacob Essex
18e4b73a86
Added a more detailed fps counter displaying the triangle and batch count
13 years ago
Jason Hooks
eab69f18ac
File output switch
13 years ago
Marc Zinnschlag
abeb3a22d4
Issue #19 : Cleaned up Engine includes
13 years ago
Marc Zinnschlag
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
Marc Zinnschlag
38c0f36d44
Issue #19 : Finished cleaning out the Engine framelistener
13 years ago
Marc Zinnschlag
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
Marc Zinnschlag
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
Lukasz Gromanowski
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
Lukasz Gromanowski
54cb6deab9
Issue #168 : Configuration cleanup, part 2
14 years ago
Lukasz Gromanowski
ea7eb7a62d
fixes #128 Configuration cleanup.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
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>
14 years ago
Marc Zinnschlag
64d6ee26bd
changed OGRE framelistener function from frameStarted to frameRenderingQueued
14 years ago
Marc Zinnschlag
8829398bfc
added --fs-strict switch
14 years ago
Marc Zinnschlag
6e880cffb2
changed engine class to support multiple data directories for esm files
14 years ago
Jan-Peter Nilsson
a94de76801
Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline)
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
gugus
ff941b5963
add physic
14 years ago
sergoz
5132531f73
added fps counter
14 years ago
Jan-Peter Nilsson
429775d485
Store configuration in /etc/openmw/ and ~/.openmw/ on linux
...
Requires new openengine version.
14 years ago
Pieter van der Kloet
dd4d022301
Converted all tabs to four spaces
14 years ago
Marc Zinnschlag
5336b90149
music player and NPC rendering branch
14 years ago
Jason Hooks
a9892161af
MP3 functions moved to soundmanager
14 years ago
Jason Hooks
be1582a88f
Regional Sounds
14 years ago
Jason Hooks
cab2341259
Preliminary region sound framework
14 years ago
Jason Hooks
a7c3a29ffd
Music Player with directory mp3 lookup
14 years ago
Marc Zinnschlag
1c4db82a0e
added --script-all switch
14 years ago
Nicolay Korslund
31017447eb
Added --nosound switch
15 years ago
Marc Zinnschlag
15124601aa
stop local scripts from being run twice in case of activation
15 years ago
Marc Zinnschlag
2d695cc806
routed activate signal from input sub-system to engine-class
15 years ago
Armin Preiml
adc209d135
Implemented the faced handle method to the engine. Faced handles will
...
be written to stdout every 10th frame.
15 years ago
Nicolay Korslund
532ccbd1f8
Killed clientconsole, mwcompiler, mwinterpreter and command server
15 years ago
Nicolay Korslund
c84672a560
Added MyGUI to OpenMW, fully working (with events and script hooks)
15 years ago
Nicolay Korslund
13d3f9c87e
Integrated OpenEngine, replaces entire components/engine/ directory.
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
Marc Zinnschlag
a61b2c39f0
added scriptrunning/startscript/stopscript; sorted out more case problems
15 years ago
Marc Zinnschlag
4482884eb5
implemented global script execution
15 years ago
Marc Zinnschlag
d51e6fb7c4
second part of refactoring
15 years ago
Marc Zinnschlag
f8cb4c2502
moved sound manager from world to engine (first step of another round of refactoring)
15 years ago
Marc Zinnschlag
f0c492ae22
added CellChanged script function
15 years ago
Marc Zinnschlag
8e2732c60e
local scripts are now run every frame (running scripts itself is not implemented yet)
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
c7f76f51fb
added --debug option and finally cleaned up the merge mess
15 years ago
Nicolay Korslund
0de4bb9d6c
Merged athile's work
15 years ago
Marc Zinnschlag
ce37666dbc
factored world class out of main engine class
15 years ago
athile
7cc27d9b66
Add command output string and client/server response.
15 years ago
athile
7357ea2102
Add simple external console server/client
15 years ago
athile
de7087caf4
Move prepareMaster logic into addMaster. Having these separate only introduces the possibility for a bug.
15 years ago
athile
7db274f1c5
Sky rendering clean-up and correct resource configuration
15 years ago
Marc Zinnschlag
e4f85cb3e6
directory structure reorganisation (still missing the mangle stuff)
15 years ago