Marc Zinnschlag
206c613b52
moved translation storage from GUI manager to engine
2012-12-26 17:03:37 +01:00
lazydev
1f71395660
renaming of translation component; removing of C++11 features
2012-12-25 23:20:39 +04:00
lazydev
74ae479780
Cell names localization fix
2012-12-23 23:23:24 +04:00
Mark Siewert
8ea9f00e6f
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/cellstore.hpp
apps/openmw/mwworld/containerstore.cpp
apps/openmw/mwworld/localscripts.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm_store/reclists.hpp
components/esm_store/store.cpp
extern/shiny
- Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp.
- NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.
2012-11-25 14:12:44 +01:00
Marc Zinnschlag
2a1727d4c5
improved error reporting for dialogue scripts (enabled via --script-verbose)
2012-11-13 15:35:46 +01:00
Marc Zinnschlag
79706bf60f
Issue #219 : dialogue manager cleanup
2012-11-10 14:31:58 +01:00
Mark Siewert
64c08eada4
Merge remote-tracking branch 'upstream/next' into multiple_esm_esp
2012-11-06 20:37:29 +01:00
emoose
cadc753216
Fixed: engine: Bug #437 Stop animations when paused better fix; scene: Bug #430 Teleporting and using loading doors linking within the same cell reloads the cell
...
Bug #437 fix only pauses the RenderingManager, and still updates the mOcclusionQuery
Bug #430 fix is only tested in interiors (ToddTest)
2012-11-03 19:29:55 +00:00
emoose
c8cc6b6e65
Fixed: engine: Bug #437 Stop animations when paused; tooltips: capitalize first letter (eg paper -> Paper)
2012-11-03 16:39:32 +00:00
Marc Zinnschlag
3f6afb13f1
Merge remote-tracking branch 'scrawl/alchemy'
2012-10-19 20:09:45 +02:00
scrawl
d76522e7a4
searchPtrViaHandle
2012-10-19 19:48:02 +02:00
scrawl
28cc480ce1
fix some alchemy issues and make the gui use the new implementation
2012-10-18 22:21:39 +02:00
scrawl
84a4fd56c3
consider all files in Splash directory
2012-10-17 12:39:45 +02:00
Mark Siewert
1f961d575e
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
components/esm/loadland.hpp
components/esm_store/reclists.hpp
2012-10-07 20:35:54 +02:00
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.
2012-10-07 20:00:55 +02:00
greye
2fa4ac177a
initial resolving
2012-10-01 00:23:49 +04:00
scrawl
9106e5307c
moved global map from RenderingManager to gui and removed world method
2012-09-21 14:11:01 +02:00
greye
18cc435aa1
resolving conflicts
2012-09-21 13:13:11 +04:00
scrawl
86cfc91ef3
global map rendering
2012-09-20 13:56:37 +02:00
scrawl
32de090079
Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities
2012-09-19 19:34:02 +02:00
greye
7606ebafd6
resolving conflicts, minor update
2012-09-17 11:37:50 +04:00
scrawl
7ad80e306b
fixed the disappearing
2012-09-13 12:33:09 +02:00
scrawl
2b339f6c0f
loading screen
2012-09-11 16:37:54 +02:00
scrawl
c27ff546e4
shader cache
2012-09-02 19:40:26 +02:00
scrawl
19ae30ee68
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwbase/inputmanager.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.hpp
apps/openmw/mwinput/mouselookevent.cpp
2012-08-19 22:09:22 +02:00
greye
392e6efcb5
initial player rendering
2012-08-17 15:19:43 +04:00
greye
c46eeaa100
initial 3d-person camera support
2012-08-17 15:19:43 +04:00
scrawl
bc6e4feedc
hotkey window first version
2012-08-13 01:26:15 +02:00
scrawl
976ad7a301
key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw
2012-08-12 22:59:58 +02:00
scrawl
86d6f190bf
Input system rewrite
2012-08-12 20:45:02 +02:00
Marc Zinnschlag
6534c2a55a
Issue #107 : WindowManager is accessed only through the interface class from now on
2012-08-12 18:11:09 +02:00
Marc Zinnschlag
0231533d05
Issue #107 : InputManager is accessed only through the interface class from now on
2012-08-11 17:53:39 +02:00
Marc Zinnschlag
b68f9d6a28
Issue #107 : MechanicsManager is accessed only through the interface class from now on
2012-08-11 17:30:55 +02:00
Marc Zinnschlag
6bd48d12af
Issue #107 : SoundManager is accessed only through the interface class from now on
2012-08-09 14:33:21 +02:00
Marc Zinnschlag
d00d40cc3f
Issue #107 : Journal is accessed only through the interface class from now on
2012-08-09 12:56:03 +02:00
Marc Zinnschlag
923109b260
Issue #107 : DialogueManager is accessed only through the interface class from now on
2012-08-09 10:35:53 +02:00
Marc Zinnschlag
28ecfb4290
Issue #107 : ScriptManager is accessed only through the interface class from now on
2012-08-08 15:18:55 +02:00
Marc Zinnschlag
fd6c155118
Issue #352 : added --script-run switch
2012-07-30 12:37:46 +02:00
Marc Zinnschlag
90de02b901
Issue #350 : console only script instructions
2012-07-30 11:43:28 +02:00
scrawl
1fef086088
Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup"
...
This reverts commit 546b640022
, reversing
changes made to fcaa8aae06
.
2012-07-23 15:36:12 +02:00
scrawl
f8d6a36196
Merge branch 'master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/sky.cpp
apps/openmw/mwrender/sky.hpp
components/nifogre/ogre_nif_loader.cpp
components/nifogre/ogre_nif_loader.hpp
2012-07-23 15:35:31 +02:00
scrawl
546b640022
Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup
2012-07-21 23:50:56 +02:00
scrawl
014396e80c
remove the plugins.cfg files, do not enforce CG plugin
2012-07-20 16:44:03 +02:00
Chris Robinson
6047dc6a0c
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/animation.hpp
apps/openmw/mwrender/creatureanimation.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/npcanimation.hpp
components/nifogre/ogre_nif_loader.hpp
2012-07-17 10:57:15 -07:00
guidoj
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
2012-07-17 09:27:12 +02:00
Chris Robinson
386ac56bda
Remove the NIF loader and code to manually transform the vertices
...
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
2012-07-12 20:12:18 -07:00
Marc Zinnschlag
4c39fefd1e
Issue #107 : World is accessed only through the interface class from now on; some include cleanup
2012-07-03 12:30:50 +02:00
Marc Zinnschlag
76174098c7
Issue #107 : CellStore moved from ESMS to MWWorld
2012-06-29 16:48:50 +02:00
scrawl
63ce143a04
fix triangle / batch counts with compositors
2012-06-22 12:56:04 +02:00
Mark Siewert
bef4bef5d2
- Add support for loading multiple esm/esp files. Selection in omwlauncher is recognized and applied.
...
- Quick hack for multiple terrain palettes. Prevents crashes and/or wrong textures in masters/plugins beyond the first.
- Support deleting parent entries from the list.
2012-06-10 11:14:46 +02:00
scrawl
51b8a76a68
merged by branches together, starting with alchemy window
...
Merge branch 'guimode_stacking' into next
Conflicts:
apps/openmw/mwgui/mode.hpp
2012-05-24 15:57:23 +02:00
scrawl
7ebbc099b3
allow stacking gui modes
2012-05-23 12:23:35 +02:00
scrawl
343bbaf0fd
integrated video settings in the settings file, the launcher is now useless
2012-05-22 03:36:03 +02:00
Marc Zinnschlag
bee03b5180
Merge remote branch 'scrawl/gui'
2012-05-10 12:08:49 +02:00
scrawl
d69501b061
change daedric font to .zip resource
2012-05-09 02:16:10 +02:00
scrawl
2b584300d6
throw an exception when no default settings file is found, which indicates a packaging error
2012-05-07 23:16:29 +02:00
Marc Zinnschlag
e26f39e563
fixed exception handling during subsystem setup
2012-05-04 17:20:57 +02:00
scrawl
7f15385dc5
unrelated cleanup
2012-05-01 20:58:09 +02:00
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
2012-04-24 02:02:03 +02:00
Marc Zinnschlag
35f478071e
Issue #255 : deleted the old environment class and using the new one instead
2012-04-23 15:27:03 +02:00
Marc Zinnschlag
7102a825c2
Issue 255: moved global scripts into script manager (simplifying the environment class)
2012-04-23 11:15:47 +02:00
scrawl
934caf7a2b
removed --report-focus which is now useless
2012-04-19 01:16:41 +02:00
scrawl
cac662ca98
basic tooltips
2012-04-14 17:47:44 +02:00
Marc Zinnschlag
a4fb71a0fc
Merge remote branch 'scrawl/graphics'
2012-04-12 18:46:02 +02:00
scrawl
800df7376c
use the cursors from morrowind.bsa and remove mwpointer.png
2012-04-12 14:26:21 +02:00
scrawl
a727bcd4a4
override nif transparency settings (part 1)
2012-04-11 20:13:15 +02:00
scrawl
2a4fcf42a3
basic shadows
2012-04-11 18:53:13 +02:00
scrawl
b1c84f28a9
Merge branch 'master' into water
...
Conflicts:
files/settings-default.cfg
2012-04-08 16:11:16 +02:00
Marc Zinnschlag
f52b9cc162
Merge branch 'autoequip'
2012-04-07 18:48:30 +02:00
scrawl
e492a69c8f
Merge branch 'inputfix' into water
2012-04-05 21:27:59 +02:00
scrawl
a3151fe525
fixed input handling priority in the main loop
2012-04-05 21:16:51 +02:00
scrawl
88c50c5171
Merge branch 'master' into water
2012-04-05 15:38:46 +02:00
scrawl
3f05aba76d
got MRT working, some minor quirks to solve (black viewport background)
2012-04-05 01:21:36 +02:00
Sebastian Wick
57ae1bdc43
Merge branch 'master' of https://github.com/zinnschlag/openmw into initocfg
...
Conflicts:
apps/openmw/main.cpp
2012-04-04 20:58:02 +02:00
Sebastian Wick
73705dadf6
parse fallback with boost program option custom validators
2012-04-03 02:14:39 +02:00
Sebastian Wick
ab9c430632
fallback in apps/openmw; fix for apps/mwiniimporter
2012-04-02 20:47:09 +02:00
scrawl
00cc45c537
FPS is now a setting instead of commandline option
2012-04-02 16:10:54 +02:00
scrawl
2b4b941192
Merge branch 'master' into gamesettings
2012-04-02 15:21:10 +02:00
scrawl
5accca385c
fix crash on exit when no user settings exist
2012-04-02 13:47:25 +02:00
scrawl
7b3adb27a3
backend changes, terrain num lights setting
2012-04-01 18:48:37 +02:00
scrawl
f4bbcb48a6
settings-default.cfg
2012-04-01 17:14:49 +02:00
scrawl
6091a0504d
first settings test (config file has to be created manually)
2012-04-01 16:59:35 +02:00
scrawl
30407d3a2c
Merge branch 'master' into occlusionquery
2012-04-01 14:16:25 +02:00
scrawl
4e63f89829
silence an error regarding faced handle
2012-04-01 13:09:30 +02:00
Marc Zinnschlag
509650d5f3
Merge remote branch 'ace/fs-fix'
2012-03-31 11:37:18 +02:00
Marc Zinnschlag
0892df0ad3
framework for gamemechanics-realted actor updated
2012-03-30 17:01:55 +02:00
Alexander "Ace" Olofsson
4a9a416d46
Can find files even if no .bsa file exists now
2012-03-30 14:45:32 +02:00
scrawl
e6303fc3f4
Merge branch 'master' into water
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
2012-03-28 21:37:20 +02:00
Chris Robinson
fa70a72b75
Remove some unused sound manager fields and constructor parameters
2012-03-24 00:22:54 -07:00
scrawl
6067053f08
Merge branch 'next' into water
...
Conflicts:
CMakeLists.txt
2012-03-22 21:41:32 +01:00
Chris Robinson
5ae47f783e
Use the sound manager's update to make sure music is still playing
2012-03-20 10:46:10 -07:00
Jason Hooks
51fb9e67cd
Merge
2012-03-18 21:31:31 -04:00
gugus
7ca0503205
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
2012-03-19 00:20:43 +01:00
Marc Zinnschlag
af875896ad
fix for issue #179
2012-03-18 11:09:38 +01:00
gugus
10321ff51a
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
2012-03-16 17:58:23 +01:00
gugus
6f7752633a
there was no extension in the compiler context. Corrected. But Choice doesn't work.
2012-03-07 18:44:09 +01:00
Michael Papageorgiou
054a176c86
Added new FileLibrary class to handle music, this fixes a number of issues.
2012-03-07 17:46:51 +02:00
Michael Papageorgiou
03ea3bb62f
SoundManager: first attempt at refactoring. BROKEN
2012-03-06 01:21:00 +02:00
Marc Zinnschlag
69f0ec99f1
implemented dialogue scripts
2012-03-05 16:56:14 +01:00
Marc Zinnschlag
1e998545c7
fixed log path
2012-03-02 15:15:44 +01:00
Marc Zinnschlag
be70d197e5
Merge branch 'next'
...
Conflicts:
.gitignore
cmake/FindOGRE.cmake
2012-03-02 12:11:44 +01:00
Marc Zinnschlag
771d50fe69
removed a redundant assert and a left-over comment
2012-02-24 20:20:32 +01:00
Marc Zinnschlag
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
2012-02-20 14:34:27 +01:00
Marc Zinnschlag
9af08ff18d
store screenshots in user directory instead of local directory
2012-02-13 18:34:21 +01:00
Marc Zinnschlag
77201d05bc
post-merge fix
2012-02-13 16:42:01 +01:00
Marc Zinnschlag
27caee664e
Merge remote branch 'lgro/config' into config
...
Conflicts:
components/files/path.hpp
2012-02-13 16:36:57 +01:00
Lukasz Gromanowski
bcc4d7a7c9
Issue #133 Handle resources across multiple data directories
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-12 14:21:07 +01:00
Pieter van der Kloet
17b1546dc1
Changed the way screenshots are created (Bug #191 )
2012-02-10 20:23:59 +01:00
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>
2012-01-29 20:27:03 +01:00
Cris Mihalache
daa8fb15ce
Removed all physics-related code from Engine
2012-01-29 20:51:20 +02:00
Cris Mihalache
6d4fa9274e
Moved OpenEngine systems into their appropriate classes
2012-01-29 17:31:18 +02:00
Marc Zinnschlag
16bc374921
animation updates were hooked up to the wrong update function
2012-01-23 14:33:06 +01:00
Jason Hooks
ec94ecacaf
Zinis branch merge
2012-01-22 15:02:38 -05:00
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>
2012-01-21 01:31:20 +01:00
Jason Hooks
84f45b1972
underwater view
2012-01-20 17:59:56 -05:00
Jason Hooks
ff2bbc9fc5
Transparent water
2012-01-18 22:42:07 -05:00
Marc Zinnschlag
0c2de2c00c
Merge branch 'animation2'
2012-01-17 15:37:51 +01:00
Jacob Essex
3b15170d09
Cleaned up and simplified the code relating to the fps display
2012-01-16 18:16:33 +00:00
Jacob Essex
18e4b73a86
Added a more detailed fps counter displaying the triangle and batch count
2012-01-16 15:33:21 +00:00
Jason Hooks
d1793bc4bd
Animation files in the correct directory
2012-01-12 20:09:55 -05:00
Jason Hooks
eab69f18ac
File output switch
2012-01-10 00:34:29 -05:00
Jason Hooks
653d999ac4
Animation creatures
2011-12-26 19:23:46 -05:00
Marc Zinnschlag
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
2011-11-21 12:52:28 +01:00
Jason Hooks
d8367f4968
Activation fix
2011-11-19 17:45:05 -05:00
Jacob Essex
3779aaba62
Now no longer need to handle this exception here as it is handled by the dispatcher in the OpenEngine submodule
2011-11-09 23:12:10 +00:00
Jason Hooks
c25b49d2b6
refdata change
2011-11-08 22:59:39 -05:00
Jacob Essex
0e3859385d
Now ensures that the directory to the config file exists before Ogre tries to access it
2011-11-02 11:11:27 +00:00
Jason Hooks
965ff24597
Removing Object:
2011-10-24 13:57:12 -04:00
Jason Hooks
0c8aa7fae3
Removing Object:
2011-10-24 13:55:10 -04:00
Jason Hooks
6efc61b9df
Removal of MWScene; Object listing fixed
2011-10-24 13:42:36 -04:00
Marc Zinnschlag
abeb3a22d4
Issue #19 : Cleaned up Engine includes
2011-10-09 13:12:44 +02:00
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.
2011-10-09 13:05:38 +02:00
Marc Zinnschlag
39af941d6f
Issue #19 : Moved code from Engine to WindowManager and ScriptManager
2011-10-09 12:05:13 +02:00
Marc Zinnschlag
38c0f36d44
Issue #19 : Finished cleaning out the Engine framelistener
2011-10-09 09:28:36 +02:00
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
2011-10-08 10:31:23 +02:00
Marc Zinnschlag
fbcb5fe681
Issue #19 : Some more framelistener cleanup
2011-10-08 10:15:03 +02:00
Marc Zinnschlag
8bebae17aa
Issue #19 : More local script related cleanup
2011-10-07 09:52:42 +02:00
Marc Zinnschlag
896b7da23d
Issue #19 : fixed RNG in engine's frame listener
2011-10-06 12:36:16 +02:00
Marc Zinnschlag
3bef04cb1d
Issue #19 : fixed exception handling in engine's frame listener
2011-10-06 12:34:13 +02:00
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)
2011-10-06 12:30:30 +02:00
Lukasz Gromanowski
d43455fd57
Issue #168 : Configuration cleanup, part 2
...
Corrected --data and --data-local parameters handling.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-09-02 22:45:21 +02:00
Lukasz Gromanowski
54cb6deab9
Issue #168 : Configuration cleanup, part 2
2011-09-02 20:01:24 +02:00
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