mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-11-04 04:56:48 +00:00
Code Issues Releases Wiki Activity
11851 commits 38 branches 54 tags 122 MiB
Commit graph

418 commits

Author SHA1 Message Date
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
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