Nicolay Korslund
|
b9d4dc448b
|
Switched to local include for OpenMW
|
2010-08-12 15:46:11 +02:00 |
|
Nicolay Korslund
|
2aa41dfffe
|
Added tests for 3d sound and pausing.
|
2010-08-12 14:49:58 +02:00 |
|
Nicolay Korslund
|
e2e5a2138d
|
Added clone() to ManagedSound
|
2010-08-11 14:38:20 +02:00 |
|
Nicolay Korslund
|
6443c16146
|
Made SoundManager and test
|
2010-08-11 14:16:56 +02:00 |
|
Nicolay Korslund
|
87f6e73975
|
pure sound filter: made 'client' protected
|
2010-08-11 11:59:08 +02:00 |
|
Armin Preiml
|
181b538e4a
|
restructured ogre nif code (struct -> class with singleton), formated code
|
2010-08-08 17:20:55 +02:00 |
|
Marc Zinnschlag
|
19c5ace602
|
added test for actor faction
|
2010-08-08 15:17:49 +02:00 |
|
Marc Zinnschlag
|
594d3cef4f
|
added test for actor class
|
2010-08-08 15:12:53 +02:00 |
|
Marc Zinnschlag
|
11bc131417
|
added test for global variables
|
2010-08-08 15:09:44 +02:00 |
|
Marc Zinnschlag
|
fbe11956a6
|
added dummy test for select type '1' (Function); always yields false for now
|
2010-08-08 14:43:20 +02:00 |
|
Marc Zinnschlag
|
c7fab9aad6
|
added test for actor race
|
2010-08-08 14:36:45 +02:00 |
|
Marc Zinnschlag
|
2acfe22975
|
added test for actor ID
|
2010-08-08 14:28:35 +02:00 |
|
Marc Zinnschlag
|
8086933282
|
Merge branch 'master' into dialogue
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
|
2010-08-08 14:14:43 +02:00 |
|
Marc Zinnschlag
|
8d85211fa1
|
modified Npc and Creature class to let them store a copy of their own ID
|
2010-08-08 14:09:09 +02:00 |
|
Marc Zinnschlag
|
8f4359db08
|
added test for select type '3' (Local)
|
2010-08-08 13:21:03 +02:00 |
|
Marc Zinnschlag
|
a25c7bb2c0
|
added test for cell name
|
2010-08-08 11:37:59 +02:00 |
|
Marc Zinnschlag
|
9d25e74a05
|
on dialogue start run through the info records of dialogue record 'hello'; currently no testing done -> the first info recrod will match
|
2010-08-08 11:34:03 +02:00 |
|
Armin Preiml
|
fa077ccdc4
|
Merge remote branch 'upstream/master'
|
2010-08-08 10:09:10 +02:00 |
|
Armin Preiml
|
305563e595
|
disabled char encoding method for windows, although you'll need to add the iconv libs
|
2010-08-08 10:07:02 +02:00 |
|
Marc Zinnschlag
|
7afc8ffd2e
|
Merge branch 'container'
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
|
2010-08-07 20:33:07 +02:00 |
|
Marc Zinnschlag
|
2eee3d32f1
|
fixed World::disable function
|
2010-08-07 20:29:10 +02:00 |
|
Marc Zinnschlag
|
a7fe28ecbe
|
implemented take action
|
2010-08-07 20:25:17 +02:00 |
|
Marc Zinnschlag
|
aa637cb9d4
|
added RemoveItem
|
2010-08-07 17:00:04 +02:00 |
|
Marc Zinnschlag
|
db24a55e36
|
added sanity check for AddItem arguments
|
2010-08-07 16:34:49 +02:00 |
|
Marc Zinnschlag
|
589f8b5ede
|
added GetItemCount
|
2010-08-07 16:21:07 +02:00 |
|
Marc Zinnschlag
|
3ea85b4619
|
added AddItem instruction
|
2010-08-07 15:11:31 +02:00 |
|
Marc Zinnschlag
|
0a60bde834
|
added insertIntoContainer function to class hierarchy
|
2010-08-06 22:20:20 +02:00 |
|
Marc Zinnschlag
|
b5d59edd44
|
re-routed talk action from gui to dialogue manager (master branch should not incooperate this change, because the dialogue window implementer will need the original code for testing)
|
2010-08-06 19:25:26 +02:00 |
|
Marc Zinnschlag
|
d42747e85b
|
Merge branch 'master' into dialogue
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
|
2010-08-06 19:20:05 +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 |
|
Marc Zinnschlag
|
09c42589cc
|
implemented npc/creature activation (enters dialog gui mode for now)
|
2010-08-06 18:15:46 +02:00 |
|
Marc Zinnschlag
|
8045320ac9
|
added dialog manager
|
2010-08-06 18:01:34 +02:00 |
|
Marc Zinnschlag
|
7611572065
|
cleanup
|
2010-08-06 15:25:54 +02:00 |
|
Marc Zinnschlag
|
6b1b3b20fd
|
store info records in dialogue records
|
2010-08-06 15:23:13 +02:00 |
|
Marc Zinnschlag
|
d47de55ce9
|
read info records
|
2010-08-06 15:19:39 +02:00 |
|
Marc Zinnschlag
|
10a63b10b5
|
Merge branch 'master' into container
Conflicts:
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/container.hpp
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-06 14:37:53 +02:00 |
|
Marc Zinnschlag
|
8e6a765603
|
fixed a stats bug (reducing modified stats via setModified didn't work correctly
|
2010-08-05 16:40:21 +02:00 |
|
Marc Zinnschlag
|
c883921af3
|
minor cell change fix
|
2010-08-05 15:57:06 +02:00 |
|
Marc Zinnschlag
|
1902dfb7b2
|
added activate instruction
|
2010-08-05 15:52:07 +02:00 |
|
Marc Zinnschlag
|
15124601aa
|
stop local scripts from being run twice in case of activation
|
2010-08-05 15:46:50 +02:00 |
|
Marc Zinnschlag
|
7a313f24ab
|
integrated activation into script system
|
2010-08-05 15:40:03 +02:00 |
|
Marc Zinnschlag
|
f630157bf8
|
implemented basic object activation
|
2010-08-05 13:51:26 +02:00 |
|
Marc Zinnschlag
|
2d695cc806
|
routed activate signal from input sub-system to engine-class
|
2010-08-05 13:36:33 +02:00 |
|
Marc Zinnschlag
|
87c84e6fcd
|
limited activation range according to GMST settings
|
2010-08-05 13:29:49 +02:00 |
|
Nicolay Korslund
|
3a6912b04c
|
Added pure sound filters
|
2010-08-05 12:35:17 +02:00 |
|
Nicolay Korslund
|
e181b71cc9
|
Minor fix to input_filter.hpp
|
2010-08-05 12:14:42 +02:00 |
|
Nicolay Korslund
|
073cc246b6
|
Fixed include guards on std::ostream wrappers
|
2010-08-04 19:59:11 +02:00 |
|
Marc Zinnschlag
|
ee7570f7e7
|
added containerstore
|
2010-08-04 14:37:23 +02:00 |
|
Marc Zinnschlag
|
e0a3b1b1db
|
implemented item count
|
2010-08-04 14:04:22 +02:00 |
|