mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 08:19:56 +00:00
Code Issues Releases Wiki Activity
4132 commits 38 branches 54 tags 122 MiB
Commit graph

2521 commits

Author SHA1 Message Date
greye
0e3f70413e a very little comments 2012-07-31 16:52:21 +04:00
greye
288b63350c fixed objects update, local script handling 2012-07-31 11:46:57 +04:00
greye
37990b5133 fix player update 2012-07-30 23:54:26 +04:00
greye
d6150b7482 high-level implementation, unstable 2012-07-30 23:28:14 +04:00
gugus
d37d0b1947 build fix for windows 2012-07-30 19:45:40 +02:00
Marc Zinnschlag
db10baafe1 Merge branch 'scriptconsole' 2012-07-30 12:43:48 +02:00
Marc Zinnschlag
2ccecd839b improved the help text for --script-run; updated readme.txt 2012-07-30 12:43:23 +02:00
Marc Zinnschlag
fd6c155118 Issue #352: added --script-run switch 2012-07-30 12:37:46 +02:00
Marc Zinnschlag
23f8595b87 Issue #352: refactored script execution in console 2012-07-30 11:57:19 +02:00
Marc Zinnschlag
90de02b901 Issue #350: console only script instructions 2012-07-30 11:43:28 +02:00
Marc Zinnschlag
0da3f2cb59 Issue #314: Playing drink sound when using a potion 2012-07-27 12:27:22 +02:00
Marc Zinnschlag
8b08928dae Issue #351: Added sound playing to Action 2012-07-27 12:19:25 +02:00
Marc Zinnschlag
78fe6fdce5 Issue #351: Refactoring Action class 2012-07-27 12:00:10 +02:00
scrawl
7cf2fc4009 Merge branch 'master' into shadersystem 2012-07-26 23:11:16 +02:00
scrawl
6077965d27 fix the directx startup issue on windows 2012-07-26 23:09:46 +02:00
Marc Zinnschlag
7725190f89 removed some redundant code 2012-07-26 19:09:45 +02:00
greye
aa5f63ffcc disabled items placing handling 2012-07-26 19:06:48 +04:00
greye
26595f22f6 float* -> Vector3, moveToCell -> copyToCell, fixed placeObject() 2012-07-26 16:14:11 +04:00
greye
b734460dc9 Merge branch 'master' of https://github.com/zinnschlag/openmw 2012-07-26 16:02:58 +04:00
scrawl
06bd2cd919 Merge branch 'master' into shadersystem 2012-07-25 23:54:22 +02:00
greye
cd04911f3c dropping on the ground 2012-07-25 20:31:39 +04:00
greye
49b1d5e127 fix object placing 2012-07-25 20:31:39 +04:00
greye
e7666d3a7f move responsibility for cell changing from CellStore::insertObject to Class::moveToCell 2012-07-25 20:31:39 +04:00
greye
bcc47cd5fb local scripts, move placing to World::placeObject(Ptr, CellStore, Position) 2012-07-25 20:31:39 +04:00
greye
d5fe378a66 Revert "local script registration" 
This reverts commit 0686399a306319a4c49e1009d10215a9c0e65ec2.
 2012-07-25 20:31:39 +04:00
greye
aff05b9d36 local script registration 2012-07-25 20:31:39 +04:00
greye
e1c7d1f529 fixed item sinking 2012-07-25 20:31:39 +04:00
greye
6a3a728a56 Class::getModel implementation 2012-07-25 20:31:39 +04:00
greye
87050e48c8 physics getObjectHeight(), MWWorld::Class::getModel() definition 2012-07-25 20:31:39 +04:00
greye
71253c64ab moving part 2, adding position parameter, stable 2012-07-25 20:31:39 +04:00
greye
61cb012ee7 moving Scene::insertObject to CellStore::insertObject, part 1 2012-07-25 20:31:39 +04:00
Chris Robinson
9f0c1eeb7b Support playgroup mode 0 2012-07-24 14:54:12 -07:00
Chris Robinson
13ab2baef0 Use a struct to hold the current animation times and remaining loop count 2012-07-24 14:42:01 -07:00
Chris Robinson
fd1e3f6ec5 Add support for playgroup mode 2 2012-07-24 14:14:32 -07:00
Chris Robinson
20121f3b0a Remove some unused stuff 2012-07-24 13:56:28 -07:00
Chris Robinson
9a7a629d0f Add support for playing animation groups 2012-07-24 13:51:48 -07:00
Chris Robinson
f953d7f8c0 Store text keys from base NIF animations 2012-07-23 17:27:35 -07:00
Chris Robinson
36be1536d9 Return text keys from NIFs when creating entities 2012-07-23 17:20:47 -07:00
scrawl
8c8228a15c fix terrain num lights setting 2012-07-24 00:08:53 +02:00
Chris Robinson
44975854e5 Merge remote branch 'zini/master' into nif-cleanup 
Conflicts:
	apps/openmw/mwrender/sky.cpp
 2012-07-23 13:46:05 -07:00
Chris Robinson
f67983bbee Don't assume one sub-entity for the night sky entities 2012-07-23 13:37:05 -07:00
Marc Zinnschlag
2d080ce4ef compile fix 2012-07-23 21:47:53 +02:00
Marc Zinnschlag
483a6d8605 Merge remote branch 'scrawl/shadersystem' 2012-07-23 21:46:06 +02:00
scrawl
02a52c0ff1 fixed some more settings bugs 2012-07-23 21:39:22 +02:00
scrawl
3ebc6fd590 fixed a settings window bug 2012-07-23 20:50:56 +02:00
scrawl
a70f93b024 fix "Crash when running openmw with --start="XYZ", remove HLSL for windows 2012-07-23 20:12:42 +02:00
scrawl
ab35bfa32c fixed a sky issue 2012-07-23 18:19:34 +02:00
scrawl
cfa0519721 Merge branch 'master' into nif-cleanup 2012-07-23 15:37:08 +02:00
scrawl
1fef086088 Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup" 
This reverts commit 546b640022, reversing
changes made to fcaa8aae06.
 2012-07-23 15:36:12 +02:00
scrawl
f8d6a36196 Merge branch 'master' into nif-cleanup 
Conflicts:
	apps/openmw/mwrender/sky.cpp
	apps/openmw/mwrender/sky.hpp
	components/nifogre/ogre_nif_loader.cpp
	components/nifogre/ogre_nif_loader.hpp
 2012-07-23 15:35:31 +02:00
Marc Zinnschlag
a24e7c9de2 Merge remote branch 'scrawl/shadersystem' 2012-07-23 15:25:11 +02:00
scrawl
2eca27bba9 fix horizon color of the sky reflection 2012-07-23 14:21:40 +02:00
Marc Zinnschlag
2c5d3d8df9 Merge remote branch 'scrawl/shadersystem' into shadersystem 
Attention: We have submodules again. Don't forget to update!

Conflicts:
	components/files/configurationmanager.cpp
 2012-07-23 14:12:21 +02:00
scrawl
1dbfd60305 Merge branch 'nif-cleanup' of https://github.com/ChrisKCat/openmw into nif-cleanup 2012-07-23 13:48:12 +02:00
scrawl
afe7c41729 removed some unused code 2012-07-23 13:47:51 +02:00
greye
32b1350b63 CreatureStats class 2012-07-22 18:29:54 +04:00
Chris Robinson
77446a0d58 Fix skipAnim, only skip one animation update 2012-07-21 17:39:57 -07:00
Chris Robinson
e81fc42daa Remove the beast-race special cases from updateParts 
The special handling should happen at a much lower level, and prevent the
objects from being equipped in the first place.
 2012-07-21 17:12:41 -07:00
Chris Robinson
c5b9098517 Remove an unused field from EntityList 2012-07-21 17:09:16 -07:00
scrawl
546b640022 Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup 2012-07-21 23:50:56 +02:00
Chris Robinson
81ce8dbe12 Combine animation handling into the base class 2012-07-21 14:41:26 -07:00
Chris Robinson
fcaa8aae06 Don't skip animation state updates for NPCs 2012-07-21 11:26:09 -07:00
scrawl
acc5c3bbbf some fixes 2012-07-20 17:08:15 +02:00
scrawl
014396e80c remove the plugins.cfg files, do not enforce CG plugin 2012-07-20 16:44:03 +02:00
scrawl
21728020f6 fixed the water on local map 2012-07-20 14:45:42 +02:00
Chris Robinson
2db80a1504 Rename a couple methods to match their scripting counterparts 2012-07-20 00:53:12 -07:00
Chris Robinson
66860825cf Remove some unused and unneeded bits from the Animation class 2012-07-20 00:36:52 -07:00
Chris Robinson
8b5b74f9ee Add a quick hack to let "playgroup all" work on creatures and NPCs 2012-07-19 22:34:26 -07:00
scrawl
f5ffea4d4b new button, water timescale 2012-07-19 23:30:41 +02:00
scrawl
e077814a8c water 2012-07-19 22:23:07 +02:00
Chris Robinson
a86ed46ec4 Use the race ID specified in the ref base's record instead of the race record 
The latter is localized and doesn't match with international versions.
 2012-07-19 11:00:26 -07:00
scrawl
739455e6f8 new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc 2012-07-19 16:23:30 +02:00
Chris Robinson
6caa39629d Reimplement the skirt part 2012-07-18 22:32:26 -07:00
Chris Robinson
b505d4ace0 Fix feet and entity part detachment 2012-07-18 21:39:50 -07:00
Chris Robinson
4af1bce659 Restore and fix some missing parts 2012-07-18 20:14:23 -07:00
Chris Robinson
d9b64b77ec Attach skinned parts to the scene node instead of the named bone 2012-07-18 18:38:55 -07:00
Chris Robinson
db948969c9 Attach NPC parts to the proper bone 2012-07-18 11:14:13 -07:00
Chris Robinson
04e496a6ca Store the entity lists for NPC parts 2012-07-18 10:26:25 -07:00
Chris Robinson
6611b0b317 Use an array instead of a bunch of nearly-identical if blocks 2012-07-18 10:09:16 -07:00
Chris Robinson
02d39080c8 Destroy entities when they're done with. 2012-07-18 00:17:39 -07:00
Chris Robinson
4109d0d923 Destroy entities removed from the NPC 2012-07-17 22:47:56 -07:00
Chris Robinson
92546ca18d Move the last bits of code to createEntities 2012-07-17 20:23:09 -07:00
Chris Robinson
94f3e7a6c0 Store the entity list in the object 2012-07-17 16:00:03 -07:00
Chris Robinson
a590db2cf4 Create entities when loading NIFs for the NPC base 2012-07-17 15:43:40 -07:00
Chris Robinson
3efd2030e2 Create entities when loading NIFs for creatures 2012-07-17 14:11:07 -07:00
Chris Robinson
3dedac5cb1 Create mesh entities for objects when loading the NIF 2012-07-17 13:40:03 -07:00
Chris Robinson
c6cc82a51a Handle multiple entities per NPC part 2012-07-17 12:20:52 -07:00
Chris Robinson
89cfe778f0 Support multiple entities for the NPC base 2012-07-17 11:38:50 -07:00
Chris Robinson
0a4a141f2e Support multiple meshes for creatures 2012-07-17 11:23:34 -07:00
Chris Robinson
6047dc6a0c Merge remote branch 'zini/master' into nif-cleanup 
Conflicts:
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/animation.hpp
	apps/openmw/mwrender/creatureanimation.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/npcanimation.hpp
	components/nifogre/ogre_nif_loader.hpp
 2012-07-17 10:57:15 -07:00
scrawl
4434fb640e Merge branch 'master' into shadersystem 2012-07-17 19:12:02 +02:00
Marc Zinnschlag
483b125aad avoid locking up in case actor updates repeatedly throw exceptions 2012-07-17 18:37:20 +02:00
Marc Zinnschlag
6744375636 fixed a logic error in the auto equip code 2012-07-17 18:35:01 +02:00
Marc Zinnschlag
beb18282bb Issue #342: various fixes 2012-07-17 16:44:55 +02:00
Marc Zinnschlag
76de2f7360 Issue #342: handle magic effects 79-82 and 17-20 2012-07-17 15:49:37 +02:00
Marc Zinnschlag
a3652f16ce Issue #342: factored out dynamic stats calculation into a separate function 2012-07-17 12:18:43 +02:00
Marc Zinnschlag
2c70a93553 Merge branch 'master' into potions 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
 2012-07-17 10:32:18 +02:00
Marc Zinnschlag
0d3a7d482e Merge remote branch 'modred11/master' 2012-07-17 10:21:46 +02:00
Marc Zinnschlag
4bfed952bc Merge remote branch 'guidoj/master' 2012-07-17 10:17:06 +02:00
Marc Zinnschlag
e9b95d55cd Revert "Proper way to find and use libtbb" 
This reverts commit d6bf2b7d29.
 2012-07-17 09:49:52 +02:00
guidoj
a021165d9f Changed standard C lib includes to C++ format 2012-07-17 09:44:24 +02:00
guidoj
0549e949ba Mostly removal of unnecessary #include's and a little clean up 2012-07-17 09:27:12 +02:00
Dmitry Marakasov
d6bf2b7d29 Proper way to find and use libtbb 2012-07-17 00:11:56 +04:00
Dmitry Marakasov
0e934a52ca Include soundmanager.hpp for Play_Normal enum 2012-07-16 23:54:24 +04:00
Dmitry Marakasov
1c53add6c4 Include boost/shared_ptr.hpp for boost:shared_ptr 2012-07-16 23:54:21 +04:00
Chris Robinson
a539e98274 Handle all meshes when inserting objects into the scene 2012-07-16 10:48:48 -07:00
scrawl
509e9d7034 Merge branch 'master' into shadersystem 2012-07-15 21:58:45 +02:00
Chris Robinson
b4c8375f3c Merge remote branch 'zini/master' into nif-cleanup 
Conflicts:
	components/bsa/bsa_archive.cpp
 2012-07-15 12:04:43 -07:00
Marc Zinnschlag
da916cecfb fixed a bug in a cmake script that resulted in some files being compiled twice 2012-07-15 19:29:09 +02:00
scrawl
778e59ee37 terrain as it was before, with about 4x less code 2012-07-15 08:21:43 +02:00
scrawl
29f91753f7 correction 2012-07-14 18:44:03 +02:00
scrawl
93c641efa7 terrain albedo 2012-07-14 18:25:43 +02:00
scrawl
7d5b94709d Merge branch 'master' into shadersystem 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2012-07-14 11:16:35 +02:00
scrawl
16c2ea3a75 terrain colourmap 2012-07-14 11:13:38 +02:00
Chris Robinson
939d0d2fc5 Return a list of meshes and the skeleton from NIFLoader::load 2012-07-13 20:01:15 -07:00
Marc Zinnschlag
573d7e7e45 Issue #314: fix to potion use function (was mixing up potion with potion user) 2012-07-13 15:51:57 +02:00
Marc Zinnschlag
782d417d5b Issue #314: potion usage 2012-07-13 13:09:22 +02:00
Carl Maxwell
e4d046f69c Prepending m to the name of every member variable. 
I made a bunch of changes in apps/openmw/mwrender/animation.cpp
because the scope brackets didn't line up in a bunch of places
    npcanimations.cpp & creatureanimations.cpp were the same kind of
thing
 2012-07-13 03:51:58 -07:00
scrawl
d2fbb11475 temp commit 2012-07-13 11:26:36 +02:00
Marc Zinnschlag
29b4a5e5f7 Issue #314: added apply actions 2012-07-13 09:41:38 +02:00
Marc Zinnschlag
84d846cf07 Issue #314: implemented apply and skillUsageSucceeded functions for MWClass::Npc 2012-07-13 09:16:27 +02:00
scrawl
7731e9a6fa finished cleaning up sky 2012-07-13 09:13:12 +02:00
Marc Zinnschlag
805b81bf6e Issue #314: added skillUsageSucceeded function to Class 2012-07-13 09:03:17 +02:00
Marc Zinnschlag
7a2d613043 Issue #314: extended Class::apply function to cover the actor 2012-07-13 08:50:46 +02:00
scrawl
b8384162b6 merge 2012-07-13 06:16:55 +02:00
Chris Robinson
ecdd4ee23f Load NiMorphData and NiKeyframeData using proper key lists 2012-07-12 20:56:47 -07:00
Chris Robinson
386ac56bda Remove the NIF loader and code to manually transform the vertices 
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
 2012-07-12 20:12:18 -07:00
scrawl
ad7383be43 sky 2012-07-11 09:08:55 +02:00
scrawl
e0a99f104b settings tab "shadows" 2012-07-11 04:28:45 +02:00
scrawl
485adc8bdc shader mode button in settingswindow 2012-07-11 03:19:51 +02:00
scrawl
865bfc6f47 sync mrt_output setting 2012-07-11 02:31:03 +02:00
Marc Zinnschlag
ec9ebe6b58 Merge branch 'skillgain' into potions 
Conflicts:
	apps/openmw/mwmechanics/activespells.cpp
 2012-07-10 14:08:30 +02:00
Marc Zinnschlag
f11bf49a90 cmake fix; silenced some warnings 2012-07-10 13:23:41 +02:00
gugus
164a5c8fe4 rotation now also work with the physic representation 2012-07-10 12:10:50 +02:00
gugus
70c74ede05 changed rotation order 2012-07-10 11:53:12 +02:00
gugus
410b693555 setAngle improvement 2012-07-10 11:15:46 +02:00
scrawl
3537af051d removed the old shader helper 2012-07-10 00:17:52 +02:00
scrawl
5d1e6b6bf6 remove cg profile check 2012-07-10 00:09:47 +02:00
scrawl
1a9f59d5d4 shadows 2012-07-10 00:07:33 +02:00
Marc Zinnschlag
0d8150f4bd Issue #324: added useSkill function to NpcStats (adjust skill level according to use) 2012-07-09 21:15:52 +02:00
Marc Zinnschlag
a207c86fd1 Issue #324: added some range checks 2012-07-09 21:14:11 +02:00
Marc Zinnschlag
67c1c5ce18 Issue #324: adjusted setSkill script instructions according to the recent research 2012-07-09 20:42:45 +02:00
Marc Zinnschlag
25a5657d80 Issue #324: Modified the interface for modified stats 2012-07-09 20:34:12 +02:00
scrawl
07fd9986ef accidently removed the map. 2012-07-09 20:14:07 +02:00
scrawl
b803d0e949 converted shadow caster shader 2012-07-09 19:46:36 +02:00
gugus
557e114992 clean-up + getScale/Angle script instructions 2012-07-09 19:28:44 +02:00
scrawl
81d30ff63a temp commit 2012-07-09 19:20:41 +02:00
gugus
0a67f60a6e Clean-up 2012-07-09 18:47:59 +02:00
gugus
e6716c25c3 little correction. 2012-07-09 15:41:19 +02:00
gugus
feec67094f Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwworld/physicssystem.cpp
 2012-07-09 15:23:26 +02:00
gugus
03f7740474 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwworld/worldimp.hpp
 2012-07-09 10:39:57 +02:00
Jason Hooks
b5edad790d merge 2012-07-07 15:27:04 -04:00
Marc Zinnschlag
fe86ce5a2c DrawState workaround 2012-07-07 20:53:19 +02:00
Marc Zinnschlag
6277e39216 Merge branch 'master' into skillgain 2012-07-07 20:27:56 +02:00
Alexander "Ace" Olofsson
113457d934 Fixed some windows issues and got rid of a few tiny warnings while at it. 2012-07-07 01:14:18 +02:00
Marc Zinnschlag
0f41cc499d Issue #324: Added skill gain calculation function 2012-07-06 21:07:04 +02:00
Marc Zinnschlag
10723a149b Issue #324: Change a forward declartion to avoid potential problems with pesky MSVC 2012-07-06 18:25:16 +02:00
Marc Zinnschlag
d30ba14a17 Issue #324: Finished turning NpcStats into a proper class 2012-07-06 18:23:48 +02:00
Marc Zinnschlag
771863e73b Issue #324: Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue 2012-07-06 15:50:26 +02:00
scrawl
a095572205 fixed some textures, started with sky 2012-07-06 10:31:48 +02:00
scrawl
33c48b9481 update 2012-07-06 04:28:08 +02:00
scrawl
1a5203749f fix "error in framelistener" when trying to pick up lights that can't be picked up 2012-07-05 17:13:23 +02:00
scrawl
4ea6530772 hello world. 2012-07-04 00:26:57 +02:00
scrawl
a1e48b0feb builds now 2012-07-03 22:48:16 +02:00
scrawl
78efc31641 different default coordinates for container window to prevent it from going invsible when changing resolution (bug #308), fixed some windows not centering when resolution change 2012-07-03 16:51:29 +02:00
scrawl
085891879c fixed another resolution change bug introduced recently 2012-07-03 16:44:20 +02:00
Marc Zinnschlag
205ed0ce5b post merge fix 2012-07-03 15:53:42 +02:00
Marc Zinnschlag
cc7c6aa0ad Merge branch 'decouple' 2012-07-03 15:47:57 +02:00
Marc Zinnschlag
c85aaafac2 more include cleanup (most removing Ogre.h) 2012-07-03 15:32:38 +02:00
Marc Zinnschlag
87667ab57e Issue #107: Ptr related include cleanup 2012-07-03 13:55:53 +02:00
Marc Zinnschlag
5a7b95bf7a Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp 2012-07-03 13:15:20 +02:00
Marc Zinnschlag
4c39fefd1e Issue #107: World is accessed only through the interface class from now on; some include cleanup 2012-07-03 12:30:50 +02:00
scrawl
d27863bf8e rename layout files to .layout to get them recognized by layout editor 2012-07-03 11:34:20 +02:00
Marc Zinnschlag
035c1c4b6e added World interface class; cleanup of World interface 2012-07-03 01:06:38 +02:00
Marc Zinnschlag
efb95e2f83 Issue #317: check if spell actually exist in AddSpell 2012-07-02 14:25:46 +02:00
Marc Zinnschlag
7fcd41c69d Issue #107: Detemplateised CellStore; some include cleanup 2012-06-29 18:54:23 +02:00
Marc Zinnschlag
76174098c7 Issue #107: CellStore moved from ESMS to MWWorld 2012-06-29 16:48:50 +02:00
Marc Zinnschlag
70ac1c818d Merge remote branch 'scrawl/settingswindow' 2012-06-27 09:02:29 +02:00
scrawl
232fe0be8c fix for the directx crash 2012-06-26 18:03:52 +02:00
scrawl
30e86e1b9d settings window resolution sorting, aspect ratio 2012-06-26 15:41:13 +02:00
Marc Zinnschlag
83c3972a89 Issue #314: added return value to addSpell function 2012-06-24 16:23:43 +02:00
Marc Zinnschlag
aa827442e8 Issue #314: Generalised ActiveSpells class so that it can handle lasting effects from potions too 2012-06-24 11:39:21 +02:00
scrawl
797c2c538d fix some settings bugs 2012-06-23 12:25:28 +02:00
Marc Zinnschlag
2b68e4d489 Merge remote branch 'scrawl/trianglebatchcount' 2012-06-22 14:30:00 +02:00
scrawl
63ce143a04 fix triangle / batch counts with compositors 2012-06-22 12:56:04 +02:00
scrawl
98f13ebcc0 Merge branch 'misc' of github.com:scrawl/openmw into misc 2012-06-21 12:15:43 +02:00
Marc Zinnschlag
ad251065f4 removed more cout spam 2012-06-21 12:00:56 +02:00
Marc Zinnschlag
89ac0fa232 Issue #312: Implemented ID-search caching to speed up some badly written scripts 2012-06-21 11:43:18 +02:00
Jason Hooks
5c51674070 update 2012-06-20 13:14:27 -04:00
Jason Hooks
86d8a07fc7 Switching back to old scaling 2012-06-19 13:28:06 -04:00
Marc Zinnschlag
1f0efa9f7d Merge remote branch 'scrawl/guifixes' 2012-06-19 19:06:18 +02:00
scrawl
15e959868c make some of the gui mode changes a bit safer 2012-06-19 17:07:00 +02:00
Marc Zinnschlag
590dfe8d63 fixed the container fill problem on cell load 2012-06-19 16:42:10 +02:00
scrawl
ff278ab4ec chargen generate class: fix result not being shown in review dialog 2012-06-19 15:25:04 +02:00
scrawl
0aa01b93e2 don't put blue color on actions that are in the topic list, but are not topics (e.g. Barter) 2012-06-19 15:24:52 +02:00
Marc Zinnschlag
9a6f012578 Merge branch 'script' 2012-06-19 11:07:47 +02:00
Jason Hooks
4d55ecfdbe Deleting scaled shapes; scaleObject() 2012-06-18 13:03:00 -04:00
Marc Zinnschlag
09057daac5 Merge remote branch 'scrawl/containerunlocking' 2012-06-18 09:57:22 +02:00
Jason Hooks
33fe80723c btScaledBvhTriangleMeshShapes 2012-06-17 20:56:10 -04:00
scrawl
de3daf3dc1 allow the 'lock' and 'unlock' script commands to work on containers, like in morrowind 2012-06-18 00:21:55 +02:00
Marc Zinnschlag
3c42a71dae removed some cout spam 2012-06-16 16:42:35 +02:00
Marc Zinnschlag
e2a77037eb fixed a type in a script instruction 2012-06-16 16:38:54 +02:00
Marc Zinnschlag
8283f5f135 added setHello/Fight/Flee/Alarm instructions 2012-06-16 16:31:32 +02:00
Marc Zinnschlag
ea29b74bb4 added per NPC/creature basic AI-settings (hello, fight, flee, alarm) 2012-06-16 16:17:42 +02:00
Marc Zinnschlag
7454713a9b addet provisional implementation of AiWander (doesn't do anything yet) 2012-06-16 16:06:15 +02:00
Marc Zinnschlag
b16157a618 documentation fix 2012-06-16 15:49:39 +02:00
Marc Zinnschlag
3167ae9473 added force/clearforce instructions for run and sneak 2012-06-16 15:49:03 +02:00
Marc Zinnschlag
0795730a19 Merge branch 'xdoty' into script 2012-06-16 14:57:13 +02:00
Marc Zinnschlag
10b27e582b Issue #181: various fixed to member variable access 2012-06-16 13:51:13 +02:00
Marc Zinnschlag
6c5b21fa42 Issue #181: Member variable access in expressions; error reporting fix for the previous commit 2012-06-16 13:06:23 +02:00
Marc Zinnschlag
6a89d76321 Issue #181: Improved script error reporting for local and global scripts 2012-06-16 11:52:35 +02:00
gugus
5397b9dba6 Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling 2012-06-16 11:38:07 +02:00
gugus
974585d357 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 2012-06-15 14:53:58 +02:00
gugus
01fefca0a3 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-06-15 14:53:19 +02:00
scrawl
584ae30213 don't show diseases and curses in the spell list 2012-06-15 10:09:46 +02:00
Marc Zinnschlag
0f71439991 Merge remote branch 'garvek/master' 2012-06-15 08:22:56 +02:00
Jason Hooks
897a331244 NPC activation 2012-06-13 12:21:51 -04:00
Jason Hooks
20288de685 Post merge 2012-06-11 15:39:57 -04:00
Jason Hooks
b14c132a31 Merging in the latest master 2012-06-11 13:25:06 -04:00
Jason Hooks
595b0729da Few things changed 2012-06-10 21:08:58 -04:00
Mark Siewert
bef4bef5d2 - Add support for loading multiple esm/esp files. Selection in omwlauncher is recognized and applied. 
- Quick hack for multiple terrain palettes. Prevents crashes and/or wrong textures in masters/plugins beyond the first.
- Support deleting parent entries from the list.
 2012-06-10 11:14:46 +02:00
Jason Hooks
fb0a52809d Changing transformation processing 2012-06-09 15:19:15 -04:00
scrawl
447158e9d6 shutdown crash fix 2012-06-09 19:15:11 +02:00
Sylvain THESNIERES
fc3a3fc173 MSVC build compliance: 
- static const float member is not ISO
- callback do not match DLL signature
 2012-06-08 19:55:39 +02:00
Marc Zinnschlag
eb0be10e80 Merge branch 'script' into xdoty 2012-06-07 13:00:01 +02:00
Marc Zinnschlag
ff84fbbfa7 Added DontSaveObject script instruction 
We are ignoring it for now and unless users protest we will probably keep it that way.
 2012-06-07 12:36:51 +02:00
Marc Zinnschlag
72fca40090 Issue #181: member variable access in interpreter context 2012-06-07 11:59:45 +02:00
scrawl
42e44ac1b5 fixed some leaks 2012-06-06 21:08:20 +02:00
scrawl
c85c794c86 fixed some cppcheck issues 2012-06-06 20:29:30 +02:00
scrawl
dfac5f26c3 fixed some issues: 
- probes were not showing up in inventory category "misc"
- lights, probes, lockpicks were not equippable
- weapons could not be picked up
 2012-06-04 21:48:20 +02:00
scrawl
ea8e3ca1c8 fix item duplication bug when picking up object with the mouse and immediately dropping again 2012-06-04 21:09:51 +02:00
scrawl
1ecc6f97ed alchemy effect fix 2012-06-04 20:56:13 +02:00
scrawl
d56defd4f4 set input focus to console after selecting objects in console mode 2012-06-03 21:19:48 +02:00
scrawl
8e96871acd remove something unused 2012-06-03 18:40:10 +02:00
gugus
0012d7eb58 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-06-03 12:53:23 +02:00
scrawl
b8464d4ce5 allow picking up objects from the gameworld with the mouse in inventory mode 2012-06-02 14:19:02 +02:00
scrawl
b886aea298 change console skin to MW_Window and set the selected object refID as window title 2012-06-02 12:31:23 +02:00
scrawl
0ba0b2122e set the implicit object for script excution by clicking on it 2012-06-02 12:25:24 +02:00
scrawl
36d26e0681 set the camera orientation after using teleport doors 2012-05-30 15:52:39 +02:00
Marc Zinnschlag
2bbbff2b75 Merge remote branch 'scrawl/spellwindow' 2012-05-30 10:22:56 +02:00
scrawl
2c90654401 fix a typo that caused a crash when trying to disable an already disabled object 2012-05-30 09:21:41 +02:00
scrawl
72bb7a2d2c fix a typo 2012-05-30 08:04:07 +02:00
Jason Hooks
fb4e7f02b9 code correction 2012-05-29 22:03:00 -04:00
scrawl
c5a685d11f addition to last commit: show the selected weapon/spell names as inventory/spell window caption 2012-05-29 18:59:11 +02:00
scrawl
298ae4f7f8 HUD icons for selected weapon / selected spell / selected enchanted item 2012-05-29 18:33:01 +02:00
gugus
a711a3ebe1 Various fixes 2012-05-29 16:45:43 +02:00
gugus
f83ffecae5 SetAngle and SetScale script instruction 2012-05-29 15:57:13 +02:00
scrawl
8b7baa808e fixed the hud icon positioning issues 2012-05-29 15:36:48 +02:00
scrawl
48ba293e88 added the success formula, and spell deleting (shift+click) 2012-05-29 15:13:44 +02:00
scrawl
30461438f6 still left: spell success formula 2012-05-29 12:35:03 +02:00