Marc Zinnschlag
|
15878b12fd
|
Merge branch 'master' into exterior
|
2010-08-22 21:12:16 +02:00 |
|
Marc Zinnschlag
|
0fce360908
|
more refactoring
|
2010-08-22 20:55:22 +02:00 |
|
Marc Zinnschlag
|
9a7c72cdbe
|
Merge commit 'ape/master'
|
2010-08-21 20:23:40 +02:00 |
|
Armin Preiml
|
27166b4ee4
|
added bone assignment, skeleton is disabled for meshes
Skeleton isn't assigned to the meshes for now, because it crashes on some.
|
2010-08-21 19:40:08 +02:00 |
|
Marc Zinnschlag
|
033c771be8
|
load/unload cells while player is moving around in the exteriors
|
2010-08-21 12:41:59 +02:00 |
|
Marc Zinnschlag
|
0d20719158
|
re-routed player movement through MWWorld::World
|
2010-08-21 12:31:04 +02:00 |
|
Marc Zinnschlag
|
fe3b6230fc
|
refactored cell unloading
|
2010-08-21 11:43:07 +02:00 |
|
Marc Zinnschlag
|
b8fee8f1ee
|
removed stray debugging output
|
2010-08-21 09:58:47 +02:00 |
|
Marc Zinnschlag
|
c6f4bcbf68
|
another coordinate system fix; still not working properly
|
2010-08-21 09:48:56 +02:00 |
|
Marc Zinnschlag
|
1f077a5d5f
|
partial coordinates fix (slightly better results when changing cells, but still not completely correct)
|
2010-08-20 17:14:07 +02:00 |
|
Marc Zinnschlag
|
978c73add5
|
fixed sound removal on cell change
|
2010-08-20 15:24:05 +02:00 |
|
Marc Zinnschlag
|
bdd5e2f064
|
modified teleport action to support exteriors; coordinates are wrong here too
|
2010-08-20 14:56:26 +02:00 |
|
Marc Zinnschlag
|
13409b546f
|
Merge commit 'upstream/master'
|
2010-08-20 14:23:18 +02:00 |
|
Nicolay Korslund
|
2ad9850070
|
Added .wav -> .mp3 sound file lookup
|
2010-08-20 14:20:05 +02:00 |
|
Marc Zinnschlag
|
f98012d143
|
Merge commit 'upstream/master'
|
2010-08-20 13:34:16 +02:00 |
|
Marc Zinnschlag
|
0111631ee9
|
very early implementation of exterior rendering
|
2010-08-20 13:33:03 +02:00 |
|
Marc Zinnschlag
|
6583b66e82
|
added load function for exteriors to cell sstore
|
2010-08-20 13:06:01 +02:00 |
|
Nicolay Korslund
|
3127602c57
|
Added file_finder component. Used by sound system.
|
2010-08-20 12:56:46 +02:00 |
|
Marc Zinnschlag
|
d52e2f68cd
|
added searchExt function to cell RecList
|
2010-08-20 12:52:51 +02:00 |
|
Marc Zinnschlag
|
de6e8b4cad
|
Merge commit 'upstream/master'
|
2010-08-20 09:42:14 +02:00 |
|
Nicolay Korslund
|
104f3fdd50
|
Added path conversion for say() sounds
|
2010-08-20 09:36:34 +02:00 |
|
Marc Zinnschlag
|
b15c917c01
|
Merge commit 'upstream/master'
|
2010-08-19 16:13:16 +02:00 |
|
Nicolay Korslund
|
064bc4b6c9
|
Finished sound system
|
2010-08-19 16:05:48 +02:00 |
|
Marc Zinnschlag
|
67a067e49c
|
changed name of teleport doors to the name of the destination cell
|
2010-08-19 13:19:23 +02:00 |
|
Marc Zinnschlag
|
6e46ddae33
|
more detailed report of unhandled info record fields
|
2010-08-19 13:06:15 +02:00 |
|
Marc Zinnschlag
|
3b49d6c826
|
added NPC stats
|
2010-08-19 12:49:13 +02:00 |
|
Nicolay Korslund
|
38ad2d98f9
|
Fixed windows issues + one minor optimization on to_utf8
|
2010-08-18 19:50:59 +02:00 |
|
Armin Preiml
|
a67b49be57
|
Merge remote branch 'upstream/master'
|
2010-08-18 19:28:28 +02:00 |
|
Nicolay Korslund
|
358e1ca5a5
|
Added custom UTF8 converter. Removed iconv dependency.
|
2010-08-18 18:45:44 +02:00 |
|
Armin Preiml
|
927879d23e
|
Merge remote branch 'upstream/master'
|
2010-08-18 17:07:12 +02:00 |
|
Nicolay Korslund
|
9a5e7816eb
|
Renabled music. WILL CRASH WITH MPG123 v1.12.1.
|
2010-08-18 14:50:49 +02:00 |
|
Nicolay Korslund
|
65c2070086
|
Temporarily disabled music
|
2010-08-18 13:05:31 +02:00 |
|
Nicolay Korslund
|
9300e60514
|
Merge branch 'master' of http://github.com/zinnschlag/openmw
|
2010-08-18 11:22:51 +02:00 |
|
Nicolay Korslund
|
31017447eb
|
Added --nosound switch
|
2010-08-18 11:16:15 +02:00 |
|
Marc Zinnschlag
|
4f3f174016
|
fixed a dialogue bug
|
2010-08-18 11:06:41 +02:00 |
|
Nicolay Korslund
|
304692dc8e
|
Merge branch 'master' of http://github.com/zinnschlag/openmw
|
2010-08-18 10:49:55 +02:00 |
|
Nicolay Korslund
|
ef9ed99622
|
Mangle update (not important)
|
2010-08-18 10:49:45 +02:00 |
|
Marc Zinnschlag
|
6258654383
|
fixed a very sloppy merge
|
2010-08-18 09:32:36 +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 |
|
Marc Zinnschlag
|
e42f1bbc11
|
open dialogue window, if a matching greetings info record is found
|
2010-08-18 09:19:16 +02:00 |
|
Marc Zinnschlag
|
bbfb134991
|
Merge commit 'ape/master'
|
2010-08-18 00:33:41 +02:00 |
|
Armin Preiml
|
cd842f3e52
|
Merge remote branch 'upstream/master'
|
2010-08-17 19:24:57 +02:00 |
|
Armin Preiml
|
47a28fe02b
|
If nif has a skeleton vertices are placed on the right position.
|
2010-08-17 19:02:22 +02:00 |
|
Nicolay Korslund
|
6cdb0f1152
|
Enabled music streaming
|
2010-08-17 13:30:53 +02:00 |
|
Nicolay Korslund
|
88f10eb222
|
Merge branch 'sound_system'
|
2010-08-17 13:21:52 +02:00 |
|
Nicolay Korslund
|
f2b2fe560f
|
Mangle update: Implemented streaming, fixed various bugs.
|
2010-08-17 13:18:37 +02:00 |
|
Nicolay Korslund
|
80383fe60e
|
Merge branch 'master' of http://github.com/zinnschlag/openmw
|
2010-08-17 11:20:17 +02:00 |
|
Marc Zinnschlag
|
e69a924036
|
Merge commit 'ape/master'
|
2010-08-16 20:39:16 +02:00 |
|
Armin Preiml
|
6a936100a7
|
Merge remote branch 'upstream/master'
|
2010-08-16 20:11:38 +02:00 |
|
Armin Preiml
|
d8f8bd12d3
|
Disabled loading skins.nif. NifLoader builds now a skeleton (if available)
|
2010-08-16 19:31:59 +02:00 |
|