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

835 commits

Author SHA1 Message Date
scrawl
249fe9077b Handle 'tcb' command as an alias for 'tcg' 2017-02-08 18:51:07 +01:00
scrawl
34deb6e7b1 Add 'showSceneGraph' command to export the scene or a particular object to .osgt for debugging purposes 2017-02-01 06:00:14 +01:00
MiroslavR
d97e9cfe7e Fix InterpreterContext::updatePtr updating mLocals to the implicit ref's locals when interpreting a targeted global script (Fixes #3738) 
The interpreter context of a targeted global script would point to the target's locals instead of the global script instance's locals when the target changed cell during script execution. Credit to scrawl for the solution.
 2017-01-29 13:29:53 +01:00
scrawl
45fb4f04b1 Update reference of the interpreter context when an Activate results in a take action (Fixes #3727) 2017-01-18 21:57:50 +01:00
scrawl
70c5f64caa Fix mLocals not being updated in InterpreterContext::updatePtr 2017-01-18 21:55:58 +01:00
Leon Krieg
739cd5ba45 Fixed more spelling mistakes 2016-12-15 13:09:40 +01:00
scrawl
e0f613661e Fix char -> int, fix shadowing warning 2016-10-30 20:10:33 +01:00
Allofich
125e94ef0e Fix shadowing warnings 2016-10-31 00:39:31 +09:00
Marc Zinnschlag
03a35c38df add missing item when executing the Equip instruction 2016-09-06 16:33:26 +02:00
Allofich
a381a15b19 Make loopgroup loop correct number of times 2016-08-14 21:57:06 +09:00
MiroslavR
b65f379b7f Save scripted animation state (Fixes #1931, #2150, #3393) 2016-08-03 03:52:35 +02:00
MiroslavR
dc0bc5b68c Implement Face instruction (Feature #1424) 2016-07-09 02:16:47 +02:00
scrawl
ab2089bbf3 Throw an exception if placeAt is passed an invalid direction parameter 2016-06-02 21:19:02 +02:00
scrawl
ba3f4f122a Account for the stack count in HasSoulGem (Bug #3340) 2016-04-12 21:39:05 +02:00
scrawl
5bd8ef247d Do not adjust the player position when loading a savegame (Fixes #2089) 2016-03-24 17:18:08 +01:00
scrawl
d7c7bb850b ToggleAI cleanup 2016-03-12 20:32:42 +01:00
scrawl
6df71f6250 Factor out safePlaceObject function 2016-02-29 17:19:22 +01:00
scrawl
11f00e3aa9 Rename safePlaceObject to placeObject 2016-02-29 17:05:18 +01:00
scrawl
be2f20f564 PlaceAt: attempt to select a safe spawn location (Fixes #2515, Fixes #1384, Fixes #2925) 2016-02-29 16:54:00 +01:00
scrawl
3a2dccad4b Implement 'Show' script instruction 2016-02-27 13:40:53 +01:00
scrawl
f99cd15f00 Vanilla-compatible activate / onActivate (Fixes #1629) 
See https://forum.openmw.org/viewtopic.php?f=6&t=3074&p=34618#p34635
 2016-02-26 13:08:35 +01:00
scrawl
5cdee454ef Fix degree/radians mixup (Fixes #3213) 2016-02-22 19:13:56 +01:00
scrawl
f0971ee8ad Implement Fixme script instruction 2016-01-20 04:07:07 +01:00
Jordan Ayers
1ff49cc637 Improve Drop command behavior. (Fixes #1544) 2016-01-18 19:58:19 -06:00
scrawl
f315a4386f Accept an implicit reference in Journal (Fixes #3135) 2016-01-11 23:07:01 +01:00
scrawl
4f8f166f69 Fix GetPcInJail to work as in the original engine 2016-01-11 22:57:25 +01:00
scrawl
e6619c5306 Rebuild actor animations on resurrection (Fixes #3124) 
A new animation is necessary to set up the correct InventoryStore listener, to get notified of changes like the actor no longer being a werewolf, etc.
 2016-01-04 20:27:38 +01:00
scrawl
f052c05018 Move werewolf functions from World to MechanicsManager 2015-12-26 18:23:13 +01:00
scrawl
04f7a8f8eb Remove redundant getId function 2015-12-18 16:58:38 +01:00
scrawl
2bd8d60e9f Accept a ConstPtr in getPrimaryFaction, getPrimaryFactionRank 2015-12-18 16:33:54 +01:00
scrawl
deb7f3caf6 Print deletion state in ObjectReferenceInfo 2015-12-17 20:17:38 +01:00
scrawl
271fcb80c6 Remove container scripts before deleting container 2015-12-14 02:57:55 +01:00
scrawl
bdae572264 Merge pull request #840 from scrawl/movedrefs 
Object movement between cells
 2015-12-09 14:10:57 +01:00
scrawl
a699b4128a Add isInCell checks to PlaceAt and PlaceItem (Fixes #2873) 
Avoids the game crashing when a script calls these functions before the player has been moved to the starting location.
 2015-12-09 00:49:50 +01:00
scrawl
bd68ebac62 GetEffect fix 2015-12-08 15:24:02 +01:00
scrawl
07b064f616 Rename to lowerCaseInPlace 2015-12-07 22:49:15 +01:00
scrawl
65b5cbe3f7 AiEscortCell complains if no cell was given or cell does not exist 2015-12-06 23:42:58 +01:00
scrawl
45a609bc54 Improve PositionCell warning message 2015-12-06 22:37:04 +01:00
scrawl
5f349b9a6e Support effects with attribute/skill argument in OpGetEffect 2015-12-03 21:12:58 +01:00
scrawl
389b168d5f Restore OpGetWaterLevel to vanilla behaviour 2015-12-03 15:48:27 +01:00
scrawl
14b143231c Don't crash OpGetTarget when the target disappeared (Fixes #3048) 2015-11-30 15:26:43 +01:00
scrawl
62169a7039 Use a single-precision PositionAttitudeTransform in speed critical places 2015-11-22 19:54:26 +01:00
Emmanuel Anne
af7b5e636e improves InterpreterContext::updatePtr 
This checks the update is really on the right pointer. It fixes the boat
disappearing in "fishing academy", and it allows scripts linked to objects
not to loose their default reference when using the object-> notation on
another object.
 2015-11-12 17:53:17 +01:00
scrawl
19cd987208 Fix Ptr updates in PositionCell 
This was not the proper way to get the updated Ptr, it will only work for the player which isn't owned by any cell. For other objects, moving between cells makes the object owned by that cell and thus the getBase() pointer will change.
 2015-11-12 14:32:39 +01:00
scrawl
90b6fa5ef1 PlaceItem, PlaceItemCell angle should be treated as degrees (Fixes #3007) 2015-11-12 01:44:29 +01:00
scrawl
b4ce73f179 Rotations: remove LocalRotation 
This never existed in vanilla MW in the first place. The reason we got confused was because of a strange behaviour where the order of applying rotations changes as soon as a script touches the object's rotation.
 2015-11-12 01:16:37 +01:00
scrawl
666fbba1e0 Rotations: World::rotateObject takes radians instead of degrees 
Cuts down on the amount of redundant degree<->radians conversions in the codebase.
 2015-11-12 01:09:39 +01:00
scrawl
8e4e4e5e38 Fix infinite loop in addToLevList 2015-11-05 01:18:01 +01:00
Marc Zinnschlag
2f808f957d fixed for compiler not recognising script names in some situations 2015-10-08 14:01:29 +02:00
Marc Zinnschlag
e8f6897376 fixed a possible script bug regarding ID-access for instances that did not yet existed when the script was compiled 2015-10-06 14:30:32 +02:00
Alexander "Ace" Olofsson
7d4125d97f Fixes for building with unity build 2015-09-24 15:21:42 +02:00
Marc Zinnschlag
2a981a5272 make sure local variables are loaded when trying to access them from outside of a script (Fixes #2659) 2015-09-15 13:58:07 +02:00
scrawl
5aa33fde43 Include cleanup 2015-09-07 22:16:15 +02:00
scrawl
fd48c1d6f4 Make the Equip script function "use" items (drink potion, use alchemy, etc) 2015-09-07 22:09:08 +02:00
dteviot
77a1d947cc extracted MWMechanics::getPlayer() 2015-08-21 21:12:39 +12:00
dteviot
0ee7407101 extracted common sub-expressions. 2015-08-20 18:17:02 +12:00
scrawl
67bd6cd708 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-08-18 23:06:12 +02:00
scrawl
3bca3e73d4 Fix GetWeaponDrawn and GetSpellReadied script functions for creatures 2015-07-25 02:11:59 +02:00
Koncord
6c3c85f0d4 Fix indent 
Remove misc.hpp in containerstore.cpp
 2015-07-20 21:53:20 +09:00
Koncord
7a86c8d8b6 Fix OpAddItem, OpGetItemCount and OpRemoveItem. 2015-07-20 12:48:19 +09:00
Alexander "Ace" Olofsson
b3b55a5842 Explicitly instantiate MWWorld::Store 2015-07-09 19:22:04 +02:00
scrawl
ea0339d471 Make the string argument to BetaComment optional 2015-06-25 21:45:59 +02:00
scrawl
4bb3cbf0fb Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
scrawl
b70383d127 Remove last remains of Ogre math 2015-06-03 21:37:21 +02:00
scrawl
de8e5f0db1 Restore projectiles 2015-06-01 21:41:13 +02:00
scrawl
22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
 2015-05-23 20:33:44 +02:00
Stanislav Bas
163c12d3eb Merge remote-tracking branch 'upstream/master' 2015-05-19 21:39:48 +03:00
Stanislav Bas
196be7283d Reset an activated reference after activation's exectution (Fix #1738) 2015-05-19 21:39:17 +03:00
scrawl
8bcfac1ea3 Fix adjustPosition not always working correctly (Fixes #2563) 
moveObject was returning an incorrect Ptr for cell movements.
 2015-05-17 18:16:42 +02:00
scrawl
7a3bc69df7 Readded sound listener 2015-05-12 19:02:56 +02:00
scrawl
47758c11cd Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
scrawl
c819180aa1 Minor cleanup 2015-05-11 16:38:16 +02:00
scrawl
9d86e5b028 GetSpellEffects returns true for active abilities (Fixes #2530) 2015-05-11 16:38:16 +02:00
scrawl
283b252142 Stub InputManager 2015-05-03 17:24:35 +02:00
scrawl
9cf9c2876e Pathgrid rendering 2015-05-02 22:45:39 +02:00
scrawl
c92592493e OpenMW: create a window and render the starting cell(s) 2015-04-12 15:38:30 +02:00
scrawl
4e69e7cc0f OpenMW compiles and runs w/o render window 2015-04-01 17:02:15 +02:00
Marc Zinnschlag
056bc66c6c Merge remote-tracking branch 'scrawl/master' 2015-03-12 10:29:39 +01:00
scrawl
3879ce6ac1 Get rid of "player" string checks (Fixes #2216) 2015-03-11 23:07:39 +01:00
Scott Howard
e2ef8c4022 fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
dteviot
36141b0c53 Merge remote-tracking branch 'OpenMW/master' into FixWarnings 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	extern/sdl4ogre/sdlcursormanager.cpp
 2015-03-08 18:29:12 +13:00
dteviot
e197f5318b fixing MSVC 2013 warning C4244: & C4305 
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
 2015-03-08 13:07:29 +13:00
Marc Zinnschlag
ba482fa41f Merge remote-tracking branch 'dteviot/FixWarnings' 2015-03-07 18:34:29 +01:00
Marc Zinnschlag
907ac5ef7f Merge remote-tracking branch 'scrawl/master' 2015-03-06 19:24:15 +01:00
dteviot
45b6538820 fixed MSVC 2013 warning C4800 
forcing value to bool 'true' or 'false'
 2015-03-06 23:19:57 +13:00
dteviot
407cd50890 fixed warning C4099: 
type name first seen using 'class' now seen using 'struct'
 2015-03-06 21:36:42 +13:00
Marc Zinnschlag
2e31f01585 Merge remote-tracking branch 'maqifrnswa/bug2407' 2015-03-04 16:55:46 +01:00
scrawl
8931ddf428 Remove unneeded casts 2015-03-03 23:46:53 +01:00
Scott Howard
d01e8cc97d PositionCell/PlaceItemCell: add console message if cell doesn't exist 2015-03-03 17:36:22 -05:00
Marc Zinnschlag
bf92d5cde9 removed redundant mScript field in ESM::StartScript 2015-03-03 13:04:57 +01:00
Scott Howard
53213bf236 if cell doesn't exist, PositionCell and PlaceItemCell warn std::err but still execute, bug #2407 2015-03-02 11:53:59 -05:00
scrawl
2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick 
Conflicts:
	CMakeLists.txt
 2015-02-27 22:37:22 +01:00
scrawl
97cc2522c0 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout
 2015-02-27 22:21:02 +01:00
Digmaster
1e4a845b6f Minor code cleanup 2015-02-27 22:19:08 +01:00
scrawl
3ccf4642b4 Implement ToggleScripts 2015-02-10 20:25:57 +01:00
Marc Zinnschlag
e9d6e4f6df Merge remote-tracking branch 'ace/include-cleanup' 2015-02-09 18:03:28 +01:00
Alexander "Ace" Olofsson
fce404acc5 Remove some including of mwbase/world.hpp 
Since ref.hpp is rather well used in OpenMW-CS this should help compile times there
 2015-02-09 17:45:48 +01:00
Alexander "Ace" Olofsson
d3128a12b6 Remove a large include form mwbase/windowmanager.hpp 2015-02-09 16:23:41 +01:00
Alexander "Ace" Olofsson
df5a08b6de Move manualref code out of header 2015-02-09 15:01:49 +01:00
MiroslavR
2223a69ab8 Fix getpcinjail returning 0 when the console is open 2015-02-07 20:13:11 +01:00