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 |
|