Marc Zinnschlag
|
6c4c90ef2d
|
Merge branch 'script'
|
2010-09-01 21:04:16 +02:00 |
|
Marc Zinnschlag
|
044bf0ab48
|
fixed parsing explicit references in the body of control structures
|
2010-08-30 14:44:23 +02:00 |
|
Marc Zinnschlag
|
147dd57162
|
added Lock and Unlock instructions
|
2010-08-30 12:30:34 +02:00 |
|
Marc Zinnschlag
|
61c4fa0630
|
blocked using of locked doors (keys are not considered yet)
|
2010-08-30 12:02:47 +02:00 |
|
Marc Zinnschlag
|
459dd82896
|
implemented locking/unlocking for doors (can not be invoked by user interaction yet)
|
2010-08-30 11:56:55 +02:00 |
|
Marc Zinnschlag
|
a899a290c0
|
modified code to avoid a warning on MSVC
|
2010-08-29 23:40:59 +02:00 |
|
Marc Zinnschlag
|
d4bf916f18
|
fixed uninitialized variable in engine
|
2010-08-29 17:46:06 +02:00 |
|
Marc Zinnschlag
|
681761d875
|
more doxygen adjustments
|
2010-08-23 18:32:26 +02:00 |
|
Marc Zinnschlag
|
cb6996a90e
|
doxygen setup fix
|
2010-08-23 18:25:50 +02:00 |
|
Marc Zinnschlag
|
f3bf46f1a9
|
fixed AiTravel and changed GetAiPackageDone to return 0 (returning one would interfere with character creation testing at this point)
|
2010-08-22 15:16:11 +02:00 |
|
Marc Zinnschlag
|
68a788b2c8
|
added instructions for enabling/disabling player controls (they don't do anything yet)
|
2010-08-22 15:11:40 +02:00 |
|
Marc Zinnschlag
|
14cf007a3f
|
added first batch of AI-related instructions and functions (they don't do anything at this point)
|
2010-08-22 14:49:25 +02:00 |
|
Marc Zinnschlag
|
c18e83d7c0
|
extended scripting extensions to code segment 3 (instructions and functions with optional arguments)
|
2010-08-22 14:00:30 +02:00 |
|
Marc Zinnschlag
|
b3cc3073a3
|
changed encoding of segment 3 opcodes (increasing the number of opcodes, while reducing the width of the argument)
|
2010-08-22 13:15:56 +02:00 |
|
Marc Zinnschlag
|
08d2b80434
|
message box fix
|
2010-08-22 12:56:35 +02:00 |
|
Marc Zinnschlag
|
f4e79a48f0
|
implemented optional arguments
|
2010-08-22 12:47:56 +02:00 |
|
Marc Zinnschlag
|
17135a6403
|
routed message box output through window manager
|
2010-08-22 11:22:10 +02:00 |
|
Marc Zinnschlag
|
09a258253c
|
removed custom messageBox implementation for console
|
2010-08-22 11:17:19 +02:00 |
|
Marc Zinnschlag
|
276a9db6f7
|
added missing button implementation for MessageBox
|
2010-08-22 11:14:14 +02:00 |
|
Marc Zinnschlag
|
72cc0a3983
|
fixed typo in documentation
|
2010-08-22 09:17:05 +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
|
978c73add5
|
fixed sound removal on cell change
|
2010-08-20 15:24:05 +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 |
|
Nicolay Korslund
|
3127602c57
|
Added file_finder component. Used by sound system.
|
2010-08-20 12:56:46 +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 |
|