mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 11:23:51 +00:00
Code Issues Releases Wiki Activity
807 commits 38 branches 54 tags 122 MiB
Commit graph

365 commits

Author SHA1 Message Date
Marc Zinnschlag
bdb5749b57 temporarily removed statics from raycast test (makes object activation easier by removing inactive obstacles, that overlap the AABB of the object) 2010-08-25 09:19:15 +02:00
Marc Zinnschlag
9e8251e6b4 finally got rid of the nasty coordinates bug 2010-08-22 21:30:48 +02:00
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
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
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
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
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
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
Nicolay Korslund
358e1ca5a5 Added custom UTF8 converter. Removed iconv dependency. 2010-08-18 18:45:44 +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
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
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
05382f206e Merge commit 'upstream/master' 2010-08-16 17:16:55 +02:00
Nicolay Korslund
08289158d7 Added support for WAV files with libsndfile 2010-08-16 17:14:37 +02:00
Marc Zinnschlag
5543c84586 bug-fixes: actors were registered twice at cell change; disabled references were rendered at cell change 2010-08-14 21:58:54 +02:00
Nicolay Korslund
dbd42386da temporary try/catch around sound loading 2010-08-14 21:43:25 +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
6f28bd9adf handle sounds when enabling/disabling 2010-08-14 11:39:32 +02:00
Marc Zinnschlag
d57c984517 added enable and disable functions to class hierarchy; fixed a bug regarding actors in cellings being actived 2010-08-14 11:27:13 +02:00
Marc Zinnschlag
967f85875d reimplemented class-dependend rendering code in MWClass 2010-08-14 10:02:54 +02:00
Marc Zinnschlag
4649d7fa41 stop sounds on cell change 2010-08-14 09:29:38 +02:00
Marc Zinnschlag
a6858b0cc4 Merge branch 'master' into class2 2010-08-14 09:26:12 +02:00
Marc Zinnschlag
0a8d0fed40 added cell-wide stopSound function 2010-08-14 09:26:00 +02:00
Marc Zinnschlag
de2eeb4cde integrated insertObject function into class hierarchy 2010-08-14 09:20:47 +02:00
Marc Zinnschlag
1d91ac9d9e sound manager interface enhancement 2010-08-14 07:54:51 +02:00
Nicolay Korslund
05b3140740 Enabled crosshairs 2010-08-13 23:41:58 +02:00
Nicolay Korslund
912c8b1f2d Added mpg123 file reader 2010-08-13 22:30:22 +02:00
Nicolay Korslund
cad9712411 Implemented FFMpeg sound loading. Selecting sound library is controlled through the CMake file. 2010-08-13 17:11:03 +02:00
Nicolay Korslund
cf4185faef Added sound test (remember to git submodule update) 2010-08-13 14:43:57 +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
8067d62800 Decoupled SoundManager from Interpreter::Context 2010-08-12 16:29:22 +02:00
Nicolay Korslund
34572f0b19 Compiled and linked in sound system (not yet functional) 2010-08-12 16:13:54 +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
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
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
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
Marc Zinnschlag
7ba6bdb56c prepared InterpreterContext for activation implementation 2010-08-03 22:43:53 +02:00
Marc Zinnschlag
052d049a6c integrated name-lookup into ape's code; added missing implementation of a function 2010-08-03 22:06:48 +02:00
Marc Zinnschlag
5827591d05 Merge commit 'ape/master' 
Conflicts:
	apps/openmw/mwworld/world.hpp
 2010-08-03 21:52:19 +02:00
Marc Zinnschlag
69ea00455f Merge branch 'poly' 
Conflicts:
	apps/openmw/mwworld/world.cpp
 2010-08-03 21:43:05 +02:00
Armin Preiml
adc209d135 Implemented the faced handle method to the engine. Faced handles will 
be written to stdout every 10th frame.
 2010-08-03 20:40:45 +02:00
Armin Preiml
c000bfb43d moved object focus code to mwscene 2010-08-03 20:17:31 +02:00
Marc Zinnschlag
d1c000313f added getPtr function that works via Ogre handle 2010-08-03 20:01:52 +02:00
Marc Zinnschlag
002345270b implemented teleport doors (only for the player for now) 2010-08-03 18:44:52 +02:00
Marc Zinnschlag
7e5ddae3b3 modified action interface to allow other actors besides the player 2010-08-03 18:22:01 +02:00
Marc Zinnschlag
c38b02bd5c added action interface 2010-08-03 18:20:15 +02:00
Marc Zinnschlag
239498bcd4 added getName function 2010-08-03 17:11:41 +02:00
Armin Preiml
b50c7e0788 Some experimental implementation of a RaySceneQuery. 2010-08-03 16:26:43 +02:00
Marc Zinnschlag
f50ced4616 added missing record classes 2010-08-03 15:24:44 +02:00
Marc Zinnschlag
0851044fa6 removed superfluous includes 2010-08-03 14:43:14 +02:00
Marc Zinnschlag
bfc282779b added item health interface 2010-08-03 14:14:04 +02:00
Marc Zinnschlag
93754b2851 moved some includes around 2010-08-03 13:32:37 +02:00
Marc Zinnschlag
33b6a0b800 moved concrete record classes to separate sub-system (mwclass) 2010-08-03 13:17:31 +02:00
Marc Zinnschlag
9d6e658e05 previous commit was missing some files 2010-08-03 13:03:08 +02:00
Marc Zinnschlag
ca842d1b4d reimplemented access to creature stats via new class interface 2010-08-03 11:49:12 +02:00
Marc Zinnschlag
a70c3876a2 added foundation for esm record class hierarchy 2010-08-03 11:14:57 +02:00
Nicolay Korslund
69cc88bcaf Merge branch 'master' of http://github.com/apreiml/openmw 2010-08-03 08:30:03 +02:00
Armin Preiml
389a28a836 Added const reference to esmstore to some methods down to CellRenderImp. 
Body part mesh names will be now obtained by the bodypart id.
 2010-08-02 09:59:59 +02:00
Armin Preiml
fb3bf91dfb Added inserting of NPC meshes. Only heads and bodys and not well placed for now. 2010-08-01 20:46:51 +02:00
Marc Zinnschlag
b584215680 moved stats label <-> GMST text mapping from mwmechanics to mwgui; added missing stats window labels 2010-08-01 10:25:50 +02:00
Marc Zinnschlag
9fafac1ef8 removed encoding workaround for attribute names 2010-07-31 19:41:15 +02:00
Marc Zinnschlag
00c0a50f7f Merge commit 'ape/master' 2010-07-31 19:37:49 +02:00
Armin Preiml
f3ee9ced5c Added cmake file for the iconv library and extended relevant 
cmake files to use it.
Added convertToUTF8 to esm_reader. getString(int size) uses this
method now.
 2010-07-31 19:02:29 +02:00
Marc Zinnschlag
ebedef49c9 removed a special case, that wasn't a special case (MW Scripting for Dummies seems to be wrong here) 2010-07-28 19:45:06 +02:00
Marc Zinnschlag
6e3fdc5816 added special case implementation for GetHealth (max weapon and armor health) 2010-07-28 19:38:14 +02:00
Marc Zinnschlag
913d55a44e added GetHealthGetRatio 2010-07-28 19:12:50 +02:00
Marc Zinnschlag
a542ca22fd added ModCurrentHealth, ModCurrentMagicka, ModCurrentFatigue 2010-07-28 19:00:54 +02:00
Marc Zinnschlag
3b6b343c9b added GUI update for health, magicka and fatigue 2010-07-28 18:48:01 +02:00
Marc Zinnschlag
455bcf3b01 added get, set and mod instructions for health, magicka and fatigue 2010-07-28 18:27:46 +02:00
Marc Zinnschlag
63f686ffab update attribute values in stats window 2010-07-27 15:59:41 +02:00
Marc Zinnschlag
335425bb12 added MechanicsManager::update function (doesn't update anything yet) 2010-07-27 14:46:05 +02:00
Marc Zinnschlag
1d9df6cf40 implemented handling of disabled actors 2010-07-27 14:43:46 +02:00
Marc Zinnschlag
3d987f1b7a register actors in active cells with MechanicsManager 2010-07-27 14:05:05 +02:00
Marc Zinnschlag
8bbcbc05d5 removed duplicate code from World class 2010-07-27 13:09:35 +02:00
Marc Zinnschlag
5d40055b44 added comparison operators for Ptr class 2010-07-27 12:04:52 +02:00
Marc Zinnschlag
77a0215d53 added get-, set- and mod-instructions for attributes 2010-07-26 23:09:37 +02:00
Marc Zinnschlag
aa4e79c0de fixed a reclist bug induced a couple of commits ago 2010-07-26 22:00:50 +02:00
Marc Zinnschlag
e43b475ade changed PlayerPos::getPlayer return type from CellRef to Ptr 2010-07-26 13:09:44 +02:00
Marc Zinnschlag
fa50bbc77b added a CellStore pointer to PlayerPos 2010-07-26 12:59:50 +02:00
Marc Zinnschlag
04b86f7e1e added first set of character and creature stats (attributes) 2010-07-26 12:52:32 +02:00
Marc Zinnschlag
ecd05fd15e fixed an include guard 2010-07-26 11:58:49 +02:00
Marc Zinnschlag
61d09c4768 read attribute names from GMST instead of using hard-coded names (doesn't fully work yet, because of encoding issues) 2010-07-26 11:15:38 +02:00