1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 15:49:55 +00:00
Commit graph

945 commits

Author SHA1 Message Date
Marc Zinnschlag
a6e6411686 Merge remote-tracking branch 'scrawl/master' 2014-01-02 12:12:52 +01:00
scrawl
c558e12212 Don't try to move objects that are not in a cell 2014-01-02 03:06:48 +01:00
Marc Zinnschlag
e1355be47c Merge remote-tracking branch 'lgro/valgrind_warnings' 2014-01-01 19:41:52 +01:00
Marc Zinnschlag
c3482b6f24 Merge remote-tracking branch 'scrawl/master'
Conflicts:
	apps/openmw/mwmechanics/spellcasting.cpp
2014-01-01 15:05:42 +01:00
Marc Zinnschlag
5fa9aa5d1e Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting'
Conflicts:
	apps/openmw/mwworld/weather.cpp
	apps/openmw/mwworld/worldimp.cpp
2014-01-01 14:57:14 +01:00
Lukasz Gromanowski
e9844e1b37 Fixes #417: Apply weather instantly when teleporting
Changed teleporting detection from "position tracking" to manually
setting "teleportation" flag ( player->setTeleported(true) ).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-31 20:40:23 +01:00
scrawl
b02b966c44 Closes #994: Don't cap skills to 100 when set via console (except for modX variants) 2013-12-31 19:11:16 +01:00
Lukasz Gromanowski
1ce4663065 Updated compiler opcodes for COE, and setHello.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-31 18:13:38 +01:00
scrawl
2a8ab932ef Bug #951: Only recalculate derived stats when attributes change 2013-12-28 17:19:35 +01:00
Marc Zinnschlag
3590fa40bd store global script state in saved game files 2013-12-15 16:16:50 +01:00
Marc Zinnschlag
2a35c7d33a fixed running global scripts a second time after they have been stopped 2013-12-12 13:16:32 +01:00
Marc Zinnschlag
74793c1c2f globals script cleanup; fixed potential case folding bug 2013-12-12 13:15:38 +01:00
Marc Zinnschlag
b38bfe1f21 removed a redundant function for listing global variables 2013-12-10 15:22:38 +01:00
Lukasz Gromanowski
8d63f8eea2 Fixes #998: Setting the max health should also set the current health
Added setting current value of dynamic stat in OpSetDynamic class.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-07 21:00:46 +01:00
Marc Zinnschlag
030c733e2d Merge branch 'master' into savedgame
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg
2013-12-07 12:27:06 +01:00
Marc Zinnschlag
e818d43bc3 removed an outdated typedef and some dead code 2013-12-05 13:21:26 +01:00
scrawl
bb4bd999ba PlaceAt: Copy the rotation when placing a non-actor. Don't modify placement position by bounding box for non-actors. Fixes placement in Graphic Herbalism mod. 2013-11-30 08:29:22 +01:00
Marc Zinnschlag
b0eb5938bf removed some redundant code 2013-11-28 09:13:54 +01:00
Marc Zinnschlag
71436b1160 changed interface for global variable access 2013-11-28 09:10:38 +01:00
Marc Zinnschlag
bc6fe682c9 replaced getCurrentCellName function with a more general getCellName function 2013-11-26 11:39:58 +01:00
scrawl
b490e56ba1 Remove redundant setLocals (already done by ContainerStore::add) 2013-11-21 17:19:41 +01:00
scrawl
bab657fe2b Add a utility function to add items to a ContainerStore by RefID 2013-11-21 17:14:30 +01:00
Marc Zinnschlag
11e254aac8 Merge remote-tracking branch 'gus/AICombat'
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
2013-11-19 09:10:48 +01:00
gus
dff3cf162d ToggleAI script instruction 2013-11-18 23:03:44 +01:00
scrawl
00af6b5617 Use an inventory store listener for animation parts and VFX update instead of updating them directly. Slightly more flexible, reduces InventoryStore dependencies and solves a crash during character creation due to the preview doll's animation not being registered in World. 2013-11-15 02:08:36 +01:00
Emanuel Guevel
aefa54d72d Pass item count to ManualRef constructor
This remove the need to call setCount in multiple places.
2013-11-10 02:45:16 +01:00
Emanuel Guevel
f4f2586e8c Remove duplicate code for PlaceAtMe/PlaceAtPC using a template 2013-11-10 02:45:16 +01:00
Emanuel Guevel
8ff747fbef Move some deleteObject logic from OpDelete to MWWorld::deleteObject 2013-11-10 02:45:16 +01:00
Emanuel Guevel
10abb9d297 Call ContainerStore::remove() to remove items from inventory
Make placeObject() and dropObjectOnGround() in MWWorld to copy objects
(and indicate it clearly).

Enchanting an item now unequips it.
2013-11-10 02:45:16 +01:00
gus
d587f3c946 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwscript/docs/vmformat.txt
2013-10-31 09:51:17 +01:00
Emanuel Guevel
496f786c2a Implement Disable/EnableLevitation script functions
Totally copied on Disable/EnableTeleporting implementation.
Thanks KittyCat!
2013-10-02 15:33:20 +02:00
gus
46a734852b adding script instruction getLOS + some test about AI 2013-09-10 16:16:13 +02:00
mckibbenta
eef9df504a fiddlings 2013-08-29 20:25:36 -04:00
mckibbenta
60fa69139e minor changes 2013-08-25 19:20:14 -04:00
mckibbenta
8998b90e8b initial do-nothing implementation; registered opcode 2013-08-24 21:19:12 -04:00
vorenon
3bf3bd4b8c Silenced some warnings 2013-08-21 13:53:49 +02:00
Chris Robinson
73437dfdca GetEffect can accept an effect ID string as well 2013-08-13 19:18:21 -07:00
Chris Robinson
c1dfa980bf Combine ShowVarsImplicit and ShowVarsExplicit
Also removes an unnecessary else statement
2013-08-13 17:31:15 -07:00
Chris Robinson
30973352e8 Implement ShowVars (SV) console function 2013-08-13 04:54:41 -07:00
Chris Robinson
2353ac1739 Properly implement SetWerewolfAcrobatics 2013-08-13 04:54:41 -07:00
Chris Robinson
db1036e5e5 Handle SetWerewolfAcrobatics 2013-08-09 05:37:56 -07:00
Chris Robinson
75b6515915 Inherit NpcStats from CreatureStats 2013-08-08 23:28:02 -07:00
Chris Robinson
2bac4566c0 Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwscript/statsextensions.cpp
2013-08-08 00:09:29 -07:00
Emanuel Guevel
48d2554ac3 Auto-equip when items are added to the inventory
We limit that to armor pieces and clothing items.
No auto-equiping for the player nor werewolves.
2013-08-07 15:17:55 +02:00
Emanuel Guevel
fd0a159a64 MWScript: update first unused opcode number 2013-08-07 12:05:53 +02:00
Alex
de1f423bd7 initial move of script opcodes and registerExtensions functions to components/compiler 2013-08-06 20:38:41 -04:00
Emanuel Guevel
c59ad62c57 Fix UndoWerewolf script instruction 2013-08-06 14:30:01 +02:00
Emanuel Guevel
5188a1c2cd Implement script instructions Become/UndoWerewolf 2013-08-06 12:34:35 +02:00
scrawl
7dc30a01cd Some changes suggested by cppcheck 2013-07-31 18:46:32 +02:00
Chris Robinson
c94653dc49 Implement the ModRegion script function 2013-07-27 07:10:18 -07:00
Chris Robinson
1174b85ac8 Implement Disable/EnableTeleporting script functions 2013-07-27 00:14:55 -07:00
Chris Robinson
3298eb1b37 Implement HitOnMe script function 2013-07-26 10:50:23 -07:00
Chris Robinson
14e0c182f3 Allow specifying the sound type to playSound and playSound3D 2013-07-18 21:50:11 -07:00
greye
f3d54a7ba4 move finding default cell positions to World 2013-07-07 15:03:06 +04:00
greye
6bb3942288 use Land height data for position in coc 2013-07-07 13:47:58 +04:00
greye
a3094b808e update coc behaviour for interior cells 2013-07-07 13:47:58 +04:00
Marc Zinnschlag
b1a8dc35e0 minor adjustments 2013-05-24 15:03:46 +02:00
Torben Carrington
1cfe037d6b AIWander - Added support for the Repeat parameter to mimic vanilla. 2013-05-24 04:49:20 -07:00
Miroslav Puda
3cebb41459 missing break 2013-05-21 21:04:15 +02:00
Marc Zinnschlag
9fee99d56c Merge remote-tracking branch 'scrawl/master' 2013-05-15 22:43:00 +02:00
scrawl
c41f119ba6 Added new game button 2013-05-15 17:54:18 +02:00
Torben Carrington
4d10a1c407 Fixed an additional 0 being sent into the AIWander idle parameters vector (Thanks to Chris) 2013-05-13 02:57:52 -07:00
Marc Zinnschlag
af191c7382 fixed AiWander arguments 2013-05-13 11:27:36 +02:00
kpp
24d619d6b4 Changes the logic of WindowManager::messageBox()
Fixes removeItem
Fixes addItem
2013-05-10 14:06:25 +04:00
scrawl
6cd28d1156 Fix a bug in getPCNextRank 2013-05-04 12:28:12 +02:00
scrawl
67422c397c GetWindSpeed 2013-05-01 11:42:24 +02:00
scrawl
5063d90dda GetStartingAngle was implemented, but not registered 2013-05-01 11:22:46 +02:00
scrawl
627c3fdb6b Added GetStandingPC, GetStandingActor; Fixed GetStartingPos 2013-05-01 11:15:43 +02:00
Chris Robinson
24e503330b Merge remote-tracking branch 'zini/master' into animations 2013-04-28 09:41:31 -07:00
scrawl
7d61459ccd Added stub implementation for 'Fall'. There is no use for this function because our physics controller applies gravity constantly anyway. 2013-04-28 11:13:21 +02:00
Chris Robinson
ab52e68c05 Merge remote-tracking branch 'zini/master' into animations 2013-04-27 05:16:15 -07:00
Chris Robinson
137017b325 Don't allow forcing vanity mode 2013-04-27 01:24:36 -07:00
Glorf
ade871ce12 Corrected unused opcodes 2013-04-26 17:31:58 +02:00
Glorf
89f7ef2472 Move, moveworld script instructions 2013-04-26 17:28:19 +02:00
scrawl
7821610ec6 Make OnDeath work with explicit reference 2013-04-26 02:08:53 +02:00
scrawl
a373f53988 Added SetAtStart 2013-04-26 02:02:51 +02:00
Glorf
7cd4dd0c91 Improved local rotations 2013-04-25 19:14:10 +02:00
Glorf
53fb17da10 Rotation system fixes 2013-04-24 21:42:04 +02:00
Glorf
e3a9f73eb6 Improved getangle script behaviour 2013-04-16 21:40:34 +02:00
Glorf
1e92ffc314 Added rotation layer 2013-04-16 21:17:19 +02:00
Glorf
763308868d Fixed rotation speed 2013-04-15 17:45:18 +02:00
Glorf
972481f63f Working rotate, rotateworld 2013-04-15 16:45:53 +02:00
Glorf
4e0233cf06 Base local rotations implementation 2013-04-14 21:42:37 +02:00
Glorf
106ef4c936 Rotate script 2013-04-10 22:53:03 +02:00
Chris Robinson
41e410347e Merge remote-tracking branch 'zini/master' into nifogre 2013-04-06 10:35:01 -07:00
scrawl
1f3df4df0f Perform a sanity check on count arguments 2013-04-06 19:25:29 +02:00
Chris Robinson
1d934e3112 Reduce some stdout spam 2013-04-06 04:46:28 -07:00
Marc Zinnschlag
034ebf8ffd Merge remote-tracking branch 'scrawl/master' 2013-04-04 19:57:55 +02:00
scrawl
2e7d5377f4 Fix crash when moving npcs to an inactive cell 2013-04-04 16:51:22 +02:00
Marc Zinnschlag
111ebf84bb replaced an include with a forward declaration 2013-04-04 12:27:57 +02:00
Marc Zinnschlag
e8c32d0c3d MWWorld::Player cleanup 2013-04-04 12:05:03 +02:00
scrawl
ebaf80d539 Trace actors onto the ground after load, when moved to a different cell by the console or on player cell change. 2013-04-03 23:55:57 +02:00
scrawl
1a2daa3bc1 Merge branch 'master' of git://github.com/zinnschlag/openmw into companion 2013-03-31 14:50:03 +02:00
scrawl
b0199c703c Companion UI 2013-03-31 13:13:46 +02:00
Chris Robinson
c8606d2f63 Implement IsWerewolf script function 2013-03-30 13:22:33 -07:00
scrawl
e7af718b55 Remove unnecessary WindowManager::messageBox arguments 2013-03-30 12:56:37 +01:00
scrawl
918cdcffc2 Split up components/esm/loadlocks 2013-03-22 05:50:54 +01:00
Marc Zinnschlag
e4ed5b836e added ondeath script function 2013-03-18 11:04:47 +01:00
scrawl
c07b3ea61d Text defines for npc race, class, and faction should use the translated name 2013-03-17 04:20:30 +01:00
gus
3384d92761 oups introduced a bug.. 2013-03-04 12:28:43 +00:00
gus
5951abfae2 fix some script instructions 2013-03-03 13:59:38 +00:00
Chris Robinson
94be45e07e Merge remote-tracking branch 'zini/master' into animation2 2013-02-24 06:20:10 -08:00
Marc Zinnschlag
a95431c387 fix 2013-02-23 20:20:40 +01:00
Marc Zinnschlag
3472a6f180 workaround for infinite recursion during local variable access 2013-02-23 14:40:56 +01:00
Chris Robinson
bea460955d Merge remote-tracking branch 'zini/next' into animation2 2013-02-17 16:03:39 -08:00
scrawl
52d0f0b750 Fixed OpAddItem, OpRemoveItem 2013-02-17 19:44:00 +01:00
scrawl
e1ca0a15ae Add message box when item is added to player's inventory 2013-02-17 18:58:54 +01:00
Chris Robinson
34ddf69a31 Merge remote-tracking branch 'zini/next' into animation2 2013-02-09 09:46:57 -08:00
Tom Mason
ac112ef972 refactored special variable code 2013-02-03 13:27:27 +00:00
Tom Mason
f785659297 Implemented OnPCAdd special variable
Had to edit OpAddItem in miscextensions.cpp, as local variables were not being initialised
for items added through it.
Does not get reset on drop, as per original morrowind.
2013-02-02 17:36:12 +00:00
Chris Robinson
d2f5a886c7 Handle playgroup and skipanim through mwmechanics 2013-01-16 17:53:18 -08:00
Thoronador
3220330ce0 fix spelling in comment 2013-01-16 04:19:16 +01:00
Marc Zinnschlag
3053440462 Issue #539: fixed AiWander 2013-01-15 12:40:44 +01:00
Marc Zinnschlag
f4ee8e2642 Issue #479: Added additional magnitude parameter to known spells 2013-01-12 13:10:20 +01:00
Marc Zinnschlag
274ff530dc Merge remote-tracking branch 'wheybags/master' 2013-01-10 11:53:42 +01:00
Marc Zinnschlag
6e0b86c6f9 Merge remote-tracking branch 'potatoesmaster/getdisposition' 2013-01-10 01:29:02 +01:00
Tom Mason
8486a51535 fixed drop amounts thanks to zinnschlag 2013-01-09 22:55:28 +00:00
Tom Mason
3517635cfd added Drop and DropSoulGem functions 2013-01-09 21:16:45 +00:00
eduard
2dc0064cc2 more string lowercase 2013-01-09 20:51:52 +01:00
Emanuel Guevel
3e41a1118a GetDisposition: return calculated disposition instead of base disposition 2013-01-09 15:14:17 +01:00
Marc Zinnschlag
c6ff58d5b5 Merge remote-tracking branch 'scrawl/videoplayback'
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
2013-01-08 11:17:19 +01:00
Tom Mason
9ee823d8f8 fixed typo in vmformat.txt 2013-01-07 21:09:03 +00:00
Tom Mason
4c5ed43cc9 added removesoulgem, and fixed addsoulgem 2013-01-07 21:08:04 +00:00
Tom Mason
c2901fe6cc added addsoulgem scripting function 2013-01-07 18:16:50 +00:00
scrawl
f1b138d0a8 Merge branch 'master' into videoplayback
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
2013-01-07 13:25:15 +01:00
scrawl
282601d6e9 support the allowSkipping extra parameter for playBink command. 2013-01-07 13:19:52 +01:00
Marc Zinnschlag
0af7a2888a Merge remote-tracking branch 'scrawl/ai_script' 2013-01-03 09:56:36 +01:00
Marc Zinnschlag
25d9918765 post merge fix: bringing code more in line with our naming standards and fixing an invalid name (names starting with double underscore are reserved in C++) 2013-01-03 09:55:48 +01:00
scrawl
42e0501c67 fix typo 2013-01-03 02:40:21 +01:00
scrawl
a5ef669eb6 Merge branch 'master' of git://github.com/zinnschlag/openmw into HEAD
Conflicts:
	apps/openmw/mwscript/aiextensions.cpp
	apps/openmw/mwscript/docs/vmformat.txt
2013-01-03 02:34:31 +01:00
scrawl
ba7086cadf Use race/class names (instead of ID) in replaced escape sequences 2013-01-03 02:05:05 +01:00
greye
7e0713f6c4 fix string case update 2012-12-31 11:22:40 +04:00
eduard
69d9d22579 comparestring 2012-12-30 19:56:38 +01:00
eduard
c85400b809 Merge https://github.com/zinnschlag/openmw into comparestring
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/esm_store/reclists.hpp
	components/misc/stringops.hpp
2012-12-30 13:09:37 +01:00
Tom Mason
bed8fb69e6 added bounty related scripting functions 2012-12-28 22:26:21 +00:00
eduard
8545667bbd string compare and tolower 2012-12-28 17:54:56 +01:00
Tom Mason
ad9b86058b replaced explicit text with GMST entries, thanks to zinnschlag 2012-12-27 15:28:13 +00:00
Tom Mason
ba2301a156 removed redundant code thanks to scrawl 2012-12-27 00:49:39 +00:00
Tom Mason
716fbbbd74 messageboxes during dialogue show up in dialogue window, and messageboxes are generated when an item is removed from inventory 2012-12-26 22:57:53 +00:00
Tom Mason
8ac8fdff47 implemented all text defines except a few for keybindings that don't exist yet 2012-12-21 18:09:31 +00:00
Tom Mason
f2c6907244 Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work 2012-12-20 23:16:34 +00:00
Chris Robinson
7b2c3e6cd3 Pass a proper PlayMode enum to playSound and playSound3D 2012-12-18 06:01:21 -08:00
scrawl
f0f521a4e0 enableRestMenu -> enableRest 2012-12-16 16:55:59 +01:00
scrawl
5f676f9c6b Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwscript/miscextensions.cpp
2012-12-11 22:28:23 +01:00
Marc Zinnschlag
8bcd7d8fb1 fixed a type in a script instruction 2012-12-04 20:56:45 +01:00
scrawl
c4facc233e Merge branch 'master' into videoplayback
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
2012-12-01 11:30:51 +01:00
rpopovici
7079b9062f add AI script functions 2012-11-30 02:16:16 +02:00
scrawl
398eecc35e GetWeaponType fix 2012-11-28 02:51:46 +01:00
scrawl
00e46addc2 GetArmorType fix 2012-11-28 02:48:21 +01:00
scrawl
1def60dbe1 PcExpell, PcExpelled, PcClearExpelled, RaiseRank, LowerRank 2012-11-28 02:15:34 +01:00
scrawl
644dacf603 suggestion by Zini for SetDelete 2012-11-28 01:30:18 +01:00
scrawl
d6dd212ce8 GetWerewolfKills, ModScale, SetDelete, GetSquareRoot 2012-11-27 06:54:13 +01:00
scrawl
1ccad32877 GetWeaponType 2012-11-25 02:06:43 +01:00
scrawl
e68dc19256 GetCurrentTime, HasSoulGem 2012-11-25 01:54:37 +01:00
scrawl
0db48b29c7 GetSpellEffects, GetRace 2012-11-25 01:26:29 +01:00
scrawl
70aa7459f5 GetWeaponDrawn 2012-11-24 03:04:26 +01:00
scrawl
be82d1452f HasItemEquipped 2012-11-24 02:59:44 +01:00
scrawl
600ed5f38a GetAttacked 2012-11-24 02:48:53 +01:00
scrawl
50baf6dac7 moved to controlextensions 2012-11-24 02:45:25 +01:00
scrawl
a596d23203 GetArmorType 2012-11-24 02:38:10 +01:00
scrawl
d7811624d5 GetEffect 2012-11-24 02:15:55 +01:00
scrawl
e8ef4dba1e getPcRunning, getPcSneaking, getForceRun, getForceSneak 2012-11-24 02:02:49 +01:00
scrawl
10329c780d GetLocked 2012-11-23 21:31:10 +01:00
scrawl
d418e21371 <Mod|Get><Flee|Fight|Hello|Alarm> 2012-11-23 21:14:32 +01:00
scrawl
9c170af30c SameFaction 2012-11-23 20:57:08 +01:00
scrawl
d54ed557bf Equip 2012-11-23 20:48:59 +01:00
scrawl
0af869c816 GetReputation 2012-11-23 20:22:51 +01:00
scrawl
eb29b1593b ModReputation, SetReputation 2012-11-23 19:56:45 +01:00
scrawl
c8562d8442 toggleCollisionBoxes actually does something useful now 2012-11-20 02:20:54 +01:00
Marc Zinnschlag
9193f3b0ae implemented getCommon/BlightDisease script instructions 2012-11-16 13:32:40 +01:00
Marc Zinnschlag
fd5671e6db fixed argument lists for setpcfacrep and modpcfacrep 2012-11-16 12:45:07 +01:00
Marc Zinnschlag
b046687f46 added PCFacRep script instructions 2012-11-13 16:11:03 +01:00
Marc Zinnschlag
c621a9f7e4 added missing disposition script instructions 2012-11-13 14:29:00 +01:00
Marc Zinnschlag
8aa1fd921b fixed some stats related script instructions 2012-11-13 14:19:43 +01:00
Marc Zinnschlag
79706bf60f Issue #219: dialogue manager cleanup 2012-11-10 14:31:58 +01:00
Marc Zinnschlag
ceaf1677ce Issue #219: rewrote AI settings and implemented AI settings filters 2012-11-10 11:38:37 +01:00
greye
b3ad872845 new interface in manualref, fix various typos 2012-11-06 13:43:48 +04:00
greye
ff8da265ed applying new interface vol.9, inconsistent 2012-11-06 12:36:21 +04:00
greye
11567663a7 applying new interface vol.4, inconsistent 2012-11-05 22:34:08 +04:00
greye
d205723a17 resolving m prefix/ESMStore movement 2012-11-05 18:02:47 +04:00
greye
2057f5619e move ESMStore to MWWorld 2012-11-05 17:18:01 +04:00
greye
3c2ce25f5f m prefix for mwworld/cellstore.hpp 2012-11-05 16:07:59 +04:00
Marc Zinnschlag
453f347ee8 Issue #68: added getdeadcount script function 2012-10-27 11:33:18 +02:00
Marc Zinnschlag
a8f294c9ae fixed types of dynamic stats script instructions 2012-10-19 18:01:45 +02:00
Marc Zinnschlag
bdca5aff87 Issue #68: simplified the dynamic stats interface 2012-10-19 13:10:06 +02:00
Marc Zinnschlag
35d099a638 disabling gcc extensions 2012-10-09 17:10:25 +02:00
scrawl
dc33dee22e Merge branch 'master' into videoplayback
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwscript/miscextensions.cpp
2012-10-01 20:25:23 +02:00
greye
2fa4ac177a initial resolving 2012-10-01 00:23:49 +04:00
scrawl
0c6ad13364 WakeUpPc instruction 2012-09-29 09:41:34 +02:00
scrawl
73c69e8eda video playback 2012-09-25 02:35:50 +02:00
scrawl
f45a6b71a9 Merge branch 'master' into next 2012-09-22 20:48:55 +02:00
greye
18cc435aa1 resolving conflicts 2012-09-21 13:13:11 +04:00
scrawl
98c1dc1151 ShowMap & FillMap commands, merged next 2012-09-20 18:02:37 +02:00
Marc Zinnschlag
ede9a2b170 fixed an orientation problem 2012-09-19 19:56:02 +02:00
scrawl
be44810623 implemented GetPCSleep 2012-09-19 03:11:23 +02:00
scrawl
bf5e30b24f everything done except health/mana restore 2012-09-19 02:53:06 +02:00
Marc Zinnschlag
fcda3b6ca8 fixed some script argument types 2012-09-18 11:09:54 +02:00
Marc Zinnschlag
ea8eab4f34 more cleanup 2012-09-18 11:06:19 +02:00
Marc Zinnschlag
408c5b8bd4 some cleanup 2012-09-18 10:49:51 +02:00
Marc Zinnschlag
4469976be9 Merge remote-tracking branch 'gus/object_movement_creation' into object_movement_creation
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
2012-09-18 10:44:25 +02:00
gugus
3c1a9061de Fixed a bug of Ptr having a wrong orientation. But that's strange, seems CellRef isn't initialized properly 2012-09-17 14:12:27 +02:00
gugus
032ff7c879 Clean-up. There is still a little bug. 2012-09-17 13:36:48 +02:00
greye
7606ebafd6 resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
scrawl
896428c129 enableRestMenu & enableLevelupMenu 2012-09-15 20:18:41 +02:00
scrawl
76b494100e finished? 2012-09-15 17:12:42 +02:00
Marc Zinnschlag
6c03d7aec4 documentation fix 2012-09-10 21:12:35 +02:00
scrawl
9448ce5968 implemented "get<Control>Disabled" functions 2012-09-10 18:44:59 +02:00
gugus
d261263824 oups forgot vmformat 2012-09-02 21:09:07 +02:00
gugus
fa9f2b268b PlaceItem,PlaceItemCell,PlaceAtPC,PlaceAtMe 2012-09-02 17:57:03 +02:00
scrawl
6ad08dfd33 added settings for crosshair & subtitles 2012-08-29 11:15:17 +02:00
greye
e6c3e0744e tvm update and fix 2012-08-19 10:37:51 +04:00
greye
5b2b378f25 tvm script instruction 2012-08-18 18:05:10 +04:00
gugus
cc01a5ceed Merge branch 'next' of https://github.com/zinnschlag/openmw.git into object_movement_creation 2012-08-18 10:51:12 +02:00
gugus
f2d080d091 bugfix 2012-08-18 10:50:58 +02:00
Marc Zinnschlag
6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 2012-08-12 18:11:09 +02:00
Marc Zinnschlag
484cce12a8 Issue #107: removed redundant getStore function from window manager 2012-08-12 14:36:46 +02:00
gugus
fb91f76a2b fixed a crash 2012-08-11 22:08:04 +02:00
gugus
0c8045d606 allow exterior cell for positioncell. Crash! 2012-08-11 19:16:00 +02:00
gugus
0bc48cc5ea little fix (thanks greye!) 2012-08-11 18:07:20 +02:00
Marc Zinnschlag
0231533d05 Issue #107: InputManager is accessed only through the interface class from now on 2012-08-11 17:53:39 +02:00
gugus
eaf6a8df94 some correction 2012-08-11 14:06:58 +02:00
gugus
7fa1dc93d7 2nd try: position/ PositionCell 2012-08-11 09:52:49 +02:00
gugus
b664b174f0 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into object_movement_creation
Conflicts:
	apps/openmw/mwscript/transformationextensions.cpp
2012-08-09 23:50:44 +02:00
gugus
cb5b69104d PositionCell 2012-08-09 23:45:06 +02:00
Marc Zinnschlag
6bd48d12af Issue #107: SoundManager is accessed only through the interface class from now on 2012-08-09 14:33:21 +02:00
Marc Zinnschlag
d00d40cc3f Issue #107: Journal is accessed only through the interface class from now on 2012-08-09 12:56:03 +02:00
Marc Zinnschlag
923109b260 Issue #107: DialogueManager is accessed only through the interface class from now on 2012-08-09 10:35:53 +02:00
Marc Zinnschlag
28ecfb4290 Issue #107: ScriptManager is accessed only through the interface class from now on 2012-08-08 15:18:55 +02:00
gugus
8a485e213b first try of the Position script instruction. Still missing: check if overlapp with an object. 2012-08-05 16:44:56 +02:00
gugus
d850a3ee49 some correction 2012-08-05 16:21:53 +02:00
Marc Zinnschlag
0c5f886683 Merge remote branch 'greye/player_control' 2012-08-04 21:55:13 +02:00
greye
16ad97610d add support for some scripting player control switches 2012-08-04 11:54:42 +04:00
Marc Zinnschlag
e4dc01832b fixing object rotation script instructions (wrong argument type and missing error handling) 2012-08-04 09:18:20 +02:00
gugus
b2ce1dfd1a getStartingPos 2012-08-03 18:20:51 +02:00
gugus
7d6ad6ad94 setPos and getPos Script instructions. Cell-crossing is not tested yet. 2012-08-03 18:14:05 +02:00
Marc Zinnschlag
c251fbdf23 Merge branch 'master' into HEAD
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	libs/openengine/ogre/renderer.cpp
2012-08-02 14:57:35 +02:00
gugus
ebd8b064f6 getStartingAngle script instruction 2012-08-01 12:21:42 +02:00
Marc Zinnschlag
db10baafe1 Merge branch 'scriptconsole' 2012-07-30 12:43:48 +02:00
Marc Zinnschlag
90de02b901 Issue #350: console only script instructions 2012-07-30 11:43:28 +02:00
Marc Zinnschlag
78fe6fdce5 Issue #351: Refactoring Action class 2012-07-27 12:00:10 +02:00
greye
32b1350b63 CreatureStats class 2012-07-22 18:29:54 +04: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
guidoj
0549e949ba Mostly removal of unnecessary #include's and a little clean up 2012-07-17 09:27:12 +02:00
gugus
410b693555 setAngle improvement 2012-07-10 11:15:46 +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
gugus
557e114992 clean-up + getScale/Angle script instructions 2012-07-09 19:28:44 +02:00
gugus
0a67f60a6e Clean-up 2012-07-09 18:47:59 +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
Marc Zinnschlag
d30ba14a17 Issue #324: Finished turning NpcStats into a proper class 2012-07-06 18:23:48 +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
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
Marc Zinnschlag
efb95e2f83 Issue #317: check if spell actually exist in AddSpell 2012-07-02 14:25:46 +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
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
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
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
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
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
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
gugus
77084b27c0 some work for rotation/scaling 2012-05-28 16:01:35 +02:00
scrawl
7ebbc099b3 allow stacking gui modes 2012-05-23 12:23:35 +02:00
Marc Zinnschlag
7938566004 Merge remote branch 'scrawl/graphics'
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
2012-05-21 11:24:36 +02:00
scrawl
bda90b77bc oops, forgot something 2012-05-21 10:59:06 +02:00
scrawl
157dd81524 removed script instruction, will be in the settings window later 2012-05-21 10:57:49 +02:00
Marc Zinnschlag
3e85151c9d Merge remote branch 'scrawl/inventoryGUI'
Conflicts:
	apps/openmw/CMakeLists.txt
2012-05-21 10:13:27 +02:00
scrawl
76d71f86bc fixed a faction case folding issue 2012-05-21 03:10:55 +02:00
scrawl
ee884634b9 fixed item refID handling in the dialogue manager and container script extensions. 2012-05-19 13:19:26 +02:00
scrawl
471f6467ec Merge branch 'master' into graphics
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
2012-05-13 16:18:22 +02:00
scrawl
c4aae96d94 implemented "goodbye" script function that force-cancels dialogue 2012-05-11 07:18:41 +02:00
scrawl
aaa81397ed Merge branch 'master' into graphics
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
2012-04-30 18:24:05 +02:00
scrawl
11ebae3be2 toggleCompositors command useful for debugging 2012-04-29 03:33:10 +02:00
scrawl
1b5bfc52a1 Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwgui/window_manager.cpp
2012-04-24 02:02:03 +02:00
Marc Zinnschlag
35f478071e Issue #255: deleted the old environment class and using the new one instead 2012-04-23 15:27:03 +02:00
Marc Zinnschlag
7102a825c2 Issue 255: moved global scripts into script manager (simplifying the environment class) 2012-04-23 11:15:47 +02:00
scrawl
f5ab127a39 toggleFullHelp 2012-04-16 15:00:44 +02:00
Marc Zinnschlag
b5d12d0723 fixed ForceGreeting 2012-04-15 17:08:22 +02:00
gugus
c24a85848f forceGreeting script instruction 2012-04-15 15:56:36 +02:00
gugus
f68248e0d0 corrected a bug in getPCRank 2012-04-15 14:20:08 +02:00
gugus
45a5877b23 implement getPCRank. Does not work yet. 2012-04-15 12:05:46 +02:00
Marc Zinnschlag
3442ef17a8 fixed ModDisposition 2012-04-13 14:54:13 +02:00
Marc Zinnschlag
73df51695c Merge remote branch 'gus/Factions2'
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwscript/statsextensions.cpp
2012-04-13 14:49:37 +02:00
Marc Zinnschlag
e16daeed23 added GetSpell script function 2012-04-13 13:17:57 +02:00
Marc Zinnschlag
b099e1baf5 added addspell and removespell script instructions 2012-04-13 11:12:53 +02:00
gugus
7edc5c733c corrected a bug about rank. 2012-04-12 17:29:05 +02:00
gugus
0553227ee1 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwworld/player.cpp
	apps/openmw/mwworld/player.hpp
2012-04-09 14:43:35 +02:00
gugus
dd9a88cee2 clean up 2012-04-09 14:32:07 +02:00
gugus
6ca212b9e9 script instruction: PCJoinFaction 2012-04-09 14:30:42 +02:00
gugus
aa8418634f add PCLowerRank script instruction 2012-04-09 14:26:53 +02:00
gugus
e5b1e27fa6 pcRaiseRank works. Player can now join factions. 2012-04-09 13:24:19 +02:00
gugus
aaa5368fe9 added script instruction pcraiserank. Does not work yet. 2012-04-04 22:14:38 +02:00
gugus
07ea63c10c Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
2012-04-03 17:29:00 +02:00
scrawl
e0631dd9be Merge branch 'master' into minimap
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
2012-04-02 14:38:02 +02:00
Marc Zinnschlag
6022d3ab13 Merge remote branch 'corristo/pgrd-rendering'
reduced cout spam.

Conflicts:
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	components/bsa/bsa_archive.cpp
	libs/openengine/bullet/physic.hpp
2012-04-02 12:04:47 +02:00
scrawl
0a5757791c Merge branch 'master' into minimap 2012-04-01 20:17:07 +02:00
Chris Robinson
977e7ac9a3 Remove the Play_Single flag. It's not correct. 2012-03-31 07:41:26 -07:00
Chris Robinson
ae308b9b5f Use a set of flags instead of separate booleans 2012-03-31 07:31:55 -07:00
Nikolay Kasyanov
057c2f2e2a Merge branch 'master' into pgrd-rendering
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
2012-03-31 13:42:13 +04:00
scrawl
521b9eec6c Merge branch 'master' into minimap
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwworld/world.cpp
2012-03-30 15:31:07 +02:00
scrawl
d5c49fa036 getWaterLevel use CellStore ; attempted fix for morrowind without tribunal 2012-03-30 10:12:28 +02:00
Nikolay Kasyanov
b21a6291f7 Merge branch 'master' into pgrd-rendering
Conflicts:
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwscript/miscextensions.cpp
	apps/openmw/mwworld/world.hpp
2012-03-30 02:50:30 +04:00
scrawl
8d224f009f toggleFogOfWar script command 2012-03-29 19:45:19 +02:00
scrawl
79c2a2e465 implemented toggleWater (twa); formatting again 2012-03-29 18:33:08 +02:00
scrawl
2f096e131d throw exception if water level is attempted to be modified in exterior 2012-03-29 16:23:02 +02:00
scrawl
5a19d4ec45 implement water script functions and save water height in CellStore 2012-03-29 15:50:15 +02:00
Nikolay Kasyanov
c3357c4396 Merge branch 'master' into pgrd-rendering
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwscript/docs/vmformat.txt
2012-03-29 13:27:13 +04:00
gugus
0c61f0d294 test stuff 2012-03-28 11:45:46 +02:00
Marc Zinnschlag
187b8e58d6 fixed handling of optional instruction/function arguments; removed choice workaround 2012-03-17 19:32:44 +01:00
gugus
042d87f77f a lot of clean up 2012-03-16 17:53:34 +01:00
gugus
07d8d654cd one step toward function filters and end choices. 2012-03-14 18:47:29 +01:00
Nikolay Kasyanov
11f957a64d Feature #37 (In Progress) Render Path Grid
cubes for path grid points
strange crash when trying to get path grids from Debugging
2012-03-10 20:03:00 +04:00
Nikolay Kasyanov
6357adffcf Fixed typo 2012-03-10 18:13:44 +04:00
Nikolay Kasyanov
5328853445 Feature #37 (In Progress) Render Path Grid
added "togglepathgrid" script command
2012-03-10 18:13:44 +04:00
gugus
82c6b0f92a choice function. Do not work. 2012-03-07 18:52:27 +01:00
Marc Zinnschlag
69f0ec99f1 implemented dialogue scripts 2012-03-05 16:56:14 +01:00
Marc Zinnschlag
4bdfbb6d4f Merge branch 'master' into dialogue
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
2012-03-05 11:34:06 +01:00
Marc Zinnschlag
739870489a Merge remote branch 'scrawl/weather' into weather
Conflicts:
	apps/openmw/CMakeLists.txt
2012-02-27 15:02:03 +01:00
scrawl
528cff5a59 implemented ChangeWeather script function 2012-02-26 11:51:02 +01:00
scrawl
d77d5080bd implemented GetCurrentWeather script function 2012-02-25 21:34:38 +01:00
Marc Zinnschlag
26bd2be1e8 Merge branch 'equipment' into next 2012-02-23 13:02:20 +01:00
Marc Zinnschlag
1d551030d1 container related script instruction are using the new container interface now 2012-02-23 12:34:51 +01:00
scrawl
457d9fd9f8 updated vmformat.txt 2012-02-18 18:30:01 +01:00
scrawl
f81b615976 implemented script functions FadeIn, FadeOut, FadeTo 2012-02-18 18:25:28 +01:00
scrawl
899aa5b870 fix last commit, also reacts to ToggleWireframe and not only twf 2012-02-18 16:36:54 +01:00
scrawl
40e23fe26f added twf console command 2012-02-18 16:06:03 +01:00
Marc Zinnschlag
d9945a976d Merge remote branch 'gus/DialogueSystem' into dialogue 2012-02-12 13:47:04 +01:00
gugus
f1dc360720 added the script instruction addTopic 2012-02-10 22:02:24 +01:00
Marc Zinnschlag
00ac2deefb Merge remote branch 'pvdk/cmakeogre' into cmakeogre 2012-02-10 14:36:34 +01:00
Marc Zinnschlag
c4e028effe fixing a faulty include 2012-02-06 10:48:58 +01:00
Marc Zinnschlag
0b0254d30e spelling fix 2012-02-06 10:48:14 +01:00
Marc Zinnschlag
c6761e3470 replaced NPC stats in ref data with new custom data implementation 2012-01-25 16:56:49 +01:00
Marc Zinnschlag
0c2de2c00c Merge branch 'animation2' 2012-01-17 15:37:51 +01:00
Marc Zinnschlag
51d9c2c780 fixed argument type in ai related script instructions 2011-11-21 14:16:20 +01:00
Marc Zinnschlag
0f4adc39b3 added animation-related script instructions 2011-11-21 14:08:44 +01:00
Jacob Essex
9aac625000 Changes to move the mutable ESM::Position data to RefData 2011-11-08 00:08:00 +00:00
Marc Zinnschlag
39af941d6f Issue #19: Moved code from Engine to WindowManager and ScriptManager 2011-10-09 12:05:13 +02:00
Marc Zinnschlag
aded4608c0 added GetButtonPressed function 2011-07-12 21:26:58 +02:00
Marc Zinnschlag
80691250ec don't create a new virtual machine for each script and frame 2011-05-18 16:01:19 +02:00
Marc Zinnschlag
125319c441 splitting off console output from messageBox channel 2011-04-26 21:48:13 +02:00
Marc Zinnschlag
f52e6bd5ef made toggle-type script instructions more verbose 2011-04-26 21:38:21 +02:00
Marc Zinnschlag
53e0e38862 added missing TCL instruction 2011-04-06 09:49:00 +02:00
Marc Zinnschlag
f321e549a4 added instruction GetPCCell 2011-04-04 15:10:37 +02:00
Marc Zinnschlag
e4a0702bb4 added journal-related script instructions 2011-04-04 14:49:26 +02:00
Marc Zinnschlag
72a84356e2 added tcg/tcb instructions (toggle collision rendering); not fully working yet (problem in OpenEngine or MWScene) 2011-03-16 09:09:45 +01:00
Marc Zinnschlag
8ebdd77772 Merge branch 'collision' into script 2011-03-16 08:48:13 +01:00
Marc Zinnschlag
eb93ef68f1 fixed collision mode interface and redirected collision mode script instruction from Player class to MWScene class 2011-03-13 22:33:55 +01:00
Marc Zinnschlag
9a3158675a reworked cell changing mechanism 2011-02-10 10:38:45 +01:00
Marc Zinnschlag
18b8cdce29 added GetInterior script function 2011-01-17 10:18:12 +01:00
Marc Zinnschlag
46a8ccc2ff changed collision mode instruction from enable/disable to toggle 2011-01-09 21:07:27 +01:00
Marc Zinnschlag
bb34f6e7fc added Enable/DisableCollision instructions 2011-01-09 20:44:17 +01:00
Marc Zinnschlag
2ffe1206a6 merged opcode classes that came in explicit and implicit variants 2010-12-31 19:09:25 +01:00
Marc Zinnschlag
38ab9f7a3d Merge branch 'newchar'
Conflicts:
	components/esm_store/store.hpp
2010-10-22 10:27:32 +02:00
Marc Zinnschlag
a8c974d2e7 added set/get/mod instructions for skills 2010-10-20 11:31:42 +02:00
Marc Zinnschlag
1c4db82a0e added --script-all switch 2010-10-06 14:52:53 +02:00
Marc Zinnschlag
9a0618fbb8 fixed a comment 2010-09-25 20:23:38 +02:00
Jan Borsodi
1907aeb6c6 The game mode is now properly restored once a dialog is finished. Previously the game mode was only set in the window manager but it has to go through the input manager firs to get correct input state. Also updated the gui script commands to also use the input manager and not the window manager.
At some point the gui mode code should be moved to a class that handles all game mode (engine?).
2010-09-15 14:48:19 +02:00
Marc Zinnschlag
db2b238328 adjusted coordinates for coc/coe for exteriors (place player in the middle of the cell instead of at the border) 2010-09-11 12:21:55 +02:00
Marc Zinnschlag
5f84b680af implemented exterior coc 2010-09-11 11:55:28 +02:00
Marc Zinnschlag
7ea6a75a26 another merge fix 2010-09-10 13:01:37 +02:00
Marc Zinnschlag
1dc805d0d4 Merge branch 'master' into exterior
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
2010-09-08 15:38:19 +02:00
Marc Zinnschlag
6c4c90ef2d Merge branch 'script' 2010-09-01 21:04:16 +02:00
Marc Zinnschlag
147dd57162 added Lock and Unlock instructions 2010-08-30 12:30:34 +02:00
Marc Zinnschlag
a899a290c0 modified code to avoid a warning on MSVC 2010-08-29 23:40:59 +02:00
Marc Zinnschlag
9e8251e6b4 finally got rid of the nasty coordinates bug 2010-08-22 21:30:48 +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
17135a6403 routed message box output through window manager 2010-08-22 11:22:10 +02:00
Marc Zinnschlag
c6f4bcbf68 another coordinate system fix; still not working properly 2010-08-21 09:48:56 +02:00
Marc Zinnschlag
0111631ee9 very early implementation of exterior rendering 2010-08-20 13:33:03 +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
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
1902dfb7b2 added activate instruction 2010-08-05 15:52:07 +02:00
Marc Zinnschlag
7ba6bdb56c prepared InterpreterContext for activation implementation 2010-08-03 22:43:53 +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
ca842d1b4d reimplemented access to creature stats via new class interface 2010-08-03 11:49:12 +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
455bcf3b01 added get, set and mod instructions for health, magicka and fatigue 2010-07-28 18:27:46 +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
0e641f1246 implemented coc instruction 2010-07-22 12:29:23 +02:00
Marc Zinnschlag
2d8fbc6e55 implemented month variable and fixed some day/gamehour bugs 2010-07-22 11:48:27 +02:00
Marc Zinnschlag
77e03f0f31 fixed global variable search to properly handle injected variables (DaysPassed) 2010-07-21 15:01:35 +02:00
Nicolay Korslund
c61212202b Moved mwgui/ back to apps/openmw/. Fixed mouse position bug. 2010-07-20 20:23:37 +02:00
Marc Zinnschlag
a9825f92ee moved installOpcodes function from scriptmanager to extensions 2010-07-18 19:54:56 +02:00
Marc Zinnschlag
f3b70e05a9 added sky-related script functions and instructions 2010-07-18 19:48:02 +02:00
Marc Zinnschlag
d27c548710 implemented passing of time 2010-07-18 18:29:16 +02:00
Marc Zinnschlag
083b11c740 moved global variable handling into a separate class 2010-07-18 16:48:01 +02:00
Nicolay Korslund
c84672a560 Added MyGUI to OpenMW, fully working (with events and script hooks) 2010-07-17 19:38:32 +02:00
Nicolay Korslund
4d74f85ae0 Moved mwgui manager to components, ready for testing 2010-07-16 22:27:50 +02:00
Marc Zinnschlag
c9a6335918 replaced flat Type_Data stack with a union 2010-07-14 15:28:55 +02:00
Marc Zinnschlag
8134c5b760 integrated CellStore pointer into Ptr class 2010-07-10 13:19:04 +02:00
Marc Zinnschlag
7f48c64efe implemented sound related script instructions and functions with explicit references 2010-07-10 12:24:41 +02:00
Marc Zinnschlag
31b4d83fac moved sound extensions from mwsound to mwscript (reduces coupling between openmw components) 2010-07-10 11:48:05 +02:00
Marc Zinnschlag
69e607e140 implemented getdistance with explicit references 2010-07-09 20:55:39 +02:00
Marc Zinnschlag
c37b007be0 added verification for explicit references (check if the given ID exists) 2010-07-09 20:35:34 +02:00
Marc Zinnschlag
d4ac3b506e implemented enable, disable and getdisabled with explicit references 2010-07-09 19:32:17 +02:00
Marc Zinnschlag
592fa84e2d added Enable, Disable, GetDisabled 2010-07-09 16:07:03 +02:00
Marc Zinnschlag
6b3ff8a516 constness fixes 2010-07-07 20:14:50 +02:00
Marc Zinnschlag
0efe4742a6 added script-gui interface and gui-related script instructions 2010-07-07 20:12:00 +02:00
Nicolay Korslund
359f2903d7 Merged athile and zinnschlag 2010-07-07 09:46:11 +02:00
Marc Zinnschlag
9d73718ec1 added GetSecondsPassed 2010-07-06 12:06:50 +02:00
Marc Zinnschlag
f5a70abd4b added OnActivate 2010-07-06 12:05:48 +02:00
Marc Zinnschlag
3df5d377f2 added xbox function 2010-07-05 13:15:49 +02:00
Marc Zinnschlag
34b824cb70 implemented GetDistance function 2010-07-05 12:30:45 +02:00
athile
5fe4313b95 Various Windows fixes to CMake, compile errors, and a few warnings. Also made the command server optional and disabled by default since it is not currently working correctly on Linux. 2010-07-04 20:17:10 -07:00
Marc Zinnschlag
a61b2c39f0 added scriptrunning/startscript/stopscript; sorted out more case problems 2010-07-04 16:00:32 +02:00
Marc Zinnschlag
185f8bd56d added random function; global variable fix 2010-07-04 13:59:29 +02:00
Marc Zinnschlag
df8f8a315c added missing part of global variable implementation (storage and interpreter context) 2010-07-04 13:33:33 +02:00
Marc Zinnschlag
d57e67e722 added global variable handling to compiler context (not working yet because of case problems) 2010-07-04 12:55:55 +02:00
Marc Zinnschlag
f9c1548f80 added menumode script function; added global variable handling in compiler and interpreter (openmw context still ignores global variables) 2010-07-04 12:29:28 +02:00
Marc Zinnschlag
cdcc244fc5 automatically start start scripts at startup 2010-07-04 10:50:19 +02:00
Marc Zinnschlag
4482884eb5 implemented global script execution 2010-07-04 10:43:34 +02:00
Marc Zinnschlag
530caac39b merged CompilerScriptContext into base class 2010-07-04 09:59:29 +02:00
Marc Zinnschlag
5174679864 another bug-fix and missing documentation added 2010-07-03 20:51:21 +02:00
Marc Zinnschlag
5d46fc869c added missing sound script functionality; various script-related bug-fixes 2010-07-03 20:35:59 +02:00
Marc Zinnschlag
eeeb9b09f8 identify LiveCellRefs by ptr instead of render handle 2010-07-03 17:59:30 +02:00
Marc Zinnschlag
3fae68b403 added unifying LiveCellRef pointer class 2010-07-03 17:46:55 +02:00
Marc Zinnschlag
d51e6fb7c4 second part of refactoring 2010-07-03 15:41:20 +02:00
Marc Zinnschlag
f8cb4c2502 moved sound manager from world to engine (first step of another round of refactoring) 2010-07-03 15:17:02 +02:00
Marc Zinnschlag
c12752df4d added sound manager skeleton and sound script functions 2010-07-03 15:04:00 +02:00
Marc Zinnschlag
f0c492ae22 added CellChanged script function 2010-07-03 12:12:13 +02:00
Marc Zinnschlag
474b412b47 implemented local script execution 2010-07-02 18:08:00 +02:00
Marc Zinnschlag
076b01559f added local script compiling 2010-07-02 17:21:27 +02:00
Marc Zinnschlag
2064c43d89 added script manager (doesn't do anything yet); local scriptes for active cells are passed on to the script manager 2010-07-02 16:18:25 +02:00
Marc Zinnschlag
a06b84ac86 added local variables to ref data 2010-07-02 14:31:29 +02:00