David Cernat
a083439139
Merge pull request #469 from davidcernat/master while resolving conflicts
...
# Conflicts:
# apps/openmw/main.cpp
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/worldimp.hpp
6 years ago
Andrei Kortunov
31f8bea1dd
Rework spell effects management
6 years ago
Marc Zinnschlag
088463ebe6
Merged pull request #1868
6 years ago
Capostrophic
ce78a34010
Use container ID in Equip command warning
6 years ago
Bret Curtis
dcd381049c
Merge pull request #1872 from akortunov/extended_logging
...
Use new logging system
6 years ago
Andrei Kortunov
5a4d0cec3a
Use new logging system for game itself
6 years ago
Allofich
2cc1b52baf
Drain and fortify fixes for dynamicStats
...
(Fixes #3049 )
6 years ago
Andrei Kortunov
9dfd775bf2
Implement GetPCTraveling console command
6 years ago
Andrei Kortunov
b0f2e00e7f
Make forcegreeting a non-op for non-actor objects (bug #4553 )
7 years ago
David Cernat
d93b67ef21
[General] Sync soul refIds for items and add related script functions
7 years ago
Capostrophic
51d369d4da
Add resumeGame method
7 years ago
David Cernat
36ac2d9de4
[Client] Set packetOrigin for all ObjectList packets sent
7 years ago
David Cernat
63a86f145d
[Client] Record type of each InterpreterContext for later checking
7 years ago
David Cernat
b891acd46e
[Client] Send Container packets when items are added/removed via scripts
...
Additionally, disable unilateral addition and removal of items on clients, and expect the server to reply back with an approved addition or removal.
7 years ago
David Cernat
6cb5ac6e63
Merge pull request #457 from OpenMW/master while resolving conflicts
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/main.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwmechanics/character.cpp
components/CMakeLists.txt
7 years ago
David Cernat
6d43c8d63d
[Client] Send ActorAI with combat when an NPC's fight is set to 100
7 years ago
David Cernat
743933134d
[Client] Simplify sending of ActorAI packets for uninitialized actors
7 years ago
David Cernat
5f4ec1331f
[Client] Send ActorAI packet when combat is started via a client script
7 years ago
David Cernat
528bd26a3b
[General] Allow followers to follow non-authority players through cells
7 years ago
David Cernat
09da24f1ea
[General] Rename all instances of refNumIndex into refNum
...
This creates symmetry with mpNum and should cause less confusion in the future.
7 years ago
David Cernat
f0d4f1bbe5
[Client] Send ActorAI packets when followed by an NPC
...
The packet is sent regardless of whether we are the cell authority or not, so the server can decide what it wants to do with it.
7 years ago
Andrei Kortunov
3d1daaebab
Rework manual spellcasting (e.g. via scripts)
7 years ago
David Cernat
59a56ca35e
[Client] Disallow clients from scaling their associated players
...
Additionally, display messages when trying to scale players.
7 years ago
Andrei Kortunov
c77c50e92b
Make Equip console command to bypass most of restrictions (bug #4460 )
7 years ago
David Cernat
04ba324290
[Client] Disable clientside disabling and enabling of objects
7 years ago
David Cernat
acdaf1a282
[Client] Disable clientside deletion of objects through console/scripts
...
Unfortunately, disabling clientside deletion of summons and items that can be picked up requires extra work on actors and inventories respectively, to avoid buggy situations.
7 years ago
David Cernat
8d9fde810e
[Client] Disable clientside scaling of objects
7 years ago
David Cernat
f3892d697b
[Client] Disable clientside locking and unlocking of objects
7 years ago
David Cernat
a236ffc4be
Merge pull request #456 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
# apps/openmw/mwgui/quickkeysmenu.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/combat.cpp
7 years ago
Andrei Kortunov
97d8cc0efe
Check if the local was not found, just for sure
7 years ago
Andrei Kortunov
f3f7487664
Fix arguments parsing for AiWander console command (bug #4458 )
7 years ago
Miloslav Číž
c3d7ee5a9e
Resolve merge conflicts
7 years ago
Miloslav Číž
db8aaa74d6
Start cell border debug drawing
7 years ago
David Cernat
2a3c74bfcc
Merge pull request #447 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
Andrei Kortunov
24863f620b
RotateWorld: rotate around world axis (bug #4426 )
7 years ago
David Cernat
669d4d3d7e
Merge pull request #440 from OpenMW/master
...
Add OpenMW commits up to 27 May 2018
7 years ago
scrawl
cfdf99f601
Revert "Merged pull request #1573"
...
This reverts commit 7324bd368f
, reversing
changes made to 810e4416f6
.
7 years ago
scrawl
99ffaafe30
Revert "Merge pull request #1701 from akortunov/standfix"
...
This reverts commit da47fc79f5
, reversing
changes made to 7324bd368f
.
7 years ago
David Cernat
c8ec77875c
[Client] Update old comments for changes made by tes3mp
7 years ago
David Cernat
74c2a0b311
Merge pull request #438 from OpenMW/master
...
Add OpenMW commits up to 24 May 2018
7 years ago
Bret Curtis
da47fc79f5
Merge pull request #1701 from akortunov/standfix
...
Do not apply queue movement for standing actors
7 years ago
David Cernat
78234f9071
[General] Rename Event into ObjectList & WorldObject into BaseObject
7 years ago
Andrei Kortunov
3636cf2015
Do not apply queue movement for standing actors
7 years ago
Andrei Kortunov
22fb1f3403
Play spellcasting effects from objects
7 years ago
David Cernat
7db74509e0
Merge pull request #412 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwscript/transformationextensions.cpp
7 years ago
scrawl
ec4e2f0064
Merge pull request #1684
7 years ago
Capostrophic
37dc3200d1
Inherit the calling object scale in PlaceAt ( fixes #4308 )
7 years ago
David Cernat
9e5ddeac50
Merge pull request #408 from OpenMW/master
...
Add OpenMW commits up to 18 Apr 2018
7 years ago
tri4ng1e
d4d1703bcf
Some PVS-Studio and cppcheck fixes
...
cppcheck:
[apps/esmtool/record.cpp:697]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1126]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1138]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/niftest/niftest.cpp:36]: (performance) Function parameter 'filename' should be passed by reference.
[apps/niftest/niftest.cpp:41]: (performance) Function parameter 'filename' should be passed by reference.
[apps/opencs/model/prefs/boolsetting.cpp:25]: (warning) Possible leak in public function. The pointer 'mWidget' is not deallocated before it is allocated.
[apps/opencs/model/prefs/shortcuteventhandler.cpp:52]: (warning) Return value of std::remove() ignored. Elements remain in container.
[apps/openmw/mwstate/quicksavemanager.cpp:5]: (performance) Variable 'mSaveName' is assigned in constructor body. Consider performing initialization in initialization list.
PVS-Studio:
apps/opencs/model/filter/parser.cpp 582 warn V560 A part of conditional expression is always true: allowPredefined.
apps/opencs/view/world/referencecreator.cpp 67 warn V547 Expression '!errors.empty()' is always false.
apps/opencs/view/world/referencecreator.cpp 74 warn V547 Expression '!errors.empty()' is always false.
apps/opencs/view/doc/loader.cpp 170 warn V560 A part of conditional expression is always true: !completed.
apps/opencs/view/doc/loader.cpp 170 warn V560 A part of conditional expression is always true: !error.empty().
apps/opencs/model/tools/pathgridcheck.cpp 32 err V517 The use of 'if (A) {...} else if (A) {...}' pattern was detected. There is a probability of logical error presence. Check lines: 32, 34.
apps/opencs/model/world/refidadapterimp.cpp 1376 err V547 Expression 'subColIndex < 3' is always true.
apps/openmw/mwgui/widgets.hpp 318 warn V703 It is odd that the 'mEnableRepeat' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:318, MyGUI_ScrollBar.h:179.
apps/openmw/mwgui/widgets.hpp 319 warn V703 It is odd that the 'mRepeatTriggerTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:319, MyGUI_ScrollBar.h:180.
apps/openmw/mwgui/widgets.hpp 320 warn V703 It is odd that the 'mRepeatStepTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:320, MyGUI_ScrollBar.h:181
apps/openmw/mwmechanics/actors.cpp 1425 warn V547 Expression '!detected' is always true.
apps/openmw/mwmechanics/character.cpp 2155 err V547 Expression 'mode == 0' is always true.
apps/openmw/mwmechanics/character.cpp 1192 warn V592 The expression was enclosed by parentheses twice: ((expression)). One pair of parentheses is unnecessary or misprint is present.
apps/openmw/mwmechanics/character.cpp 521 warn V560 A part of conditional expression is always true: (idle == mIdleState).
apps/openmw/mwmechanics/pathfinding.cpp 317 err V547 Expression 'mPath.size() >= 2' is always true.
apps/openmw/mwscript/interpretercontext.cpp 409 warn V560 A part of conditional expression is always false: rank > 9.
apps/openmw/mwgui/windowbase.cpp 28 warn V560 A part of conditional expression is always true: !visible.
apps/openmw/mwgui/journalwindow.cpp 561 warn V547 Expression '!mAllQuests' is always false.
apps/openmw/mwgui/referenceinterface.cpp 18 warn V571 Recurring check. The '!mPtr.isEmpty()' condition was already verified in line 16.
apps/openmw/mwworld/scene.cpp 463 warn V547 Expression 'adjustPlayerPos' is always true.
apps/openmw/mwworld/worldimp.cpp 409 err V766 An item with the same key '"sCompanionShare"' has already been added.
apps/openmw/mwworld/cellstore.cpp 691 warn V519 The 'state.mWaterLevel' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 689, 691.
apps/openmw/mwworld/weather.cpp 1125 warn V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1123, 1125.
apps/openmw/mwworld/weather.cpp 1137 warn V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1135, 1137.
apps/wizard/unshield/unshieldworker.cpp 475 warn V728 An excessive check can be simplified. The '(A && B) || (!A && !B)' expression is equivalent to the 'bool(A) == bool(B)' expression.
apps/wizard/installationpage.cpp 163 warn V735 Possibly an incorrect HTML. The "</p" closing tag was encountered, while the "</span" tag was expected.
components/fontloader/fontloader.cpp 427 err V547 Expression 'i == 1' is always true.
components/nifosg/nifloader.cpp 282 warn V519 The 'created' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 278, 282.
components/esm/loadregn.cpp 119 err V586 The 'clear' function is called twice for deallocation of the same resource. Check lines: 112, 119.
components/esm/cellref.cpp 178 warn V581 The conditional expressions of the 'if' statements situated alongside each other are identical. Check lines: 175, 178.
components/esmterrain/storage.cpp 235 warn V560 A part of conditional expression is always true: colStart == 0.
components/esmterrain/storage.cpp 237 warn V560 A part of conditional expression is always true: rowStart == 0.
7 years ago
David Cernat
bf906b3f0a
Merge pull request #393 from OpenMW/master
...
Add OpenMW commits up to 10 March 2018
7 years ago
Andrei Kortunov
62c04c6758
Unstack soulgem, added via AddSoulGem console command (bug #4351 )
7 years ago
David Cernat
029dfc56ba
[General] Implement player scale as part of PlayerShapeshift
7 years ago
David Cernat
595bc5a152
[Client] Only send ObjectScale packets when scale actually changes
7 years ago
David Cernat
5d4b97645d
Merge pull request #374 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/CMakeLists.txt
7 years ago
scrawl
1522bda60b
Fix crash in getDistance when invoked before the game starts
7 years ago
David Cernat
cac2c6c1e8
Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts
7 years ago
David Cernat
ecb0ad0d77
Merge pull request #359 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
7 years ago
Andrei Kortunov
ba46473038
Do not skip weather transitions from SetPos script command (bug #3603 )
7 years ago
Andrei Kortunov
c908ad2fba
Do not allow to place actors underground via SetPos (bug #3783 )
7 years ago
David Cernat
c9c363ebef
[General] Allow GameSettings to set bed & wilderness resting separately
7 years ago
David Cernat
3508a16836
[General] Use GameSettings packet to set ability to rest and wait
7 years ago
David Cernat
dd25c7db4e
Merge pull request #324 from OpenMW/master
...
Add OpenMW commits up to 24 Oct 2017
7 years ago
scrawl
0c6ef17fb5
Add explicit variant of 'OnActivate'
7 years ago
David Cernat
38247ff086
Merge pull request #303 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwbase/dialoguemanager.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
7 years ago
scrawl
64e27c032b
Merge pull request #1481 from scrawl/keyfocus
...
WindowManager overhaul & improved keyboard support
7 years ago
scrawl
2ce79e07a4
Refactor dialogue GUI to talk to the dialogue manager, not the other way around and not both ways.
...
- Fix memory leaks in DialogueWindow
- Fix Link objects being deleted from their own event handler
7 years ago
scrawl
32f9c8058a
Remove redundant RestBed gui mode
7 years ago
scrawl
ad4b91131f
toggleGui renamed to toggleHud, remove unused variable
7 years ago
David Cernat
73e7aa838d
Merge pull request #296 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwgui/container.cpp
7 years ago
scrawl
0e648222b8
Merge pull request #1446 from akortunov/takeallfix
...
Do not allow to equip a replacement, when take all items from a dead corpse
7 years ago
Andrei Kortunov
4580024d76
Unequip all items from dead corpse when take all items (bug #4095 )
7 years ago
David Cernat
7f0ea7d01f
Merge pull request #294 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/character.cpp
7 years ago
Andrei Kortunov
65d8e2ff5d
Allow to use GetDetected without a reference (bug #3110 )
7 years ago
David Cernat
960b91a53c
Merge pull request #290 from OpenMW/master
...
Add OpenMW commits up to 17 Sep 2017
7 years ago
Chris Robinson
780e82480d
Make the PlayMode and PlayType enums scoped
...
Also shorten them by putting them in the MWSound namespace
7 years ago
David Cernat
bd541b1e5b
Merge pull request #287 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
7 years ago
Andrei Kortunov
c6fd75bf42
Take in account elemental shields for GetResist and SetResist script commands (bug #4093 )
7 years ago
David Cernat
4468e6ec4a
Merge pull request #280 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .gitignore
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
David Cernat
a883c8f8aa
[Client] Prevent scripts from creating PlayerTopic packet spam
7 years ago
David Cernat
056d54e9f7
[Client] Only send ObjectScale packets for objects located in cells
7 years ago
David Cernat
ac27ca663b
[Client] Don't send ObjectState packets for items in containers
7 years ago
Andrei Kortunov
bc7353f100
Check animation state for GetPCRunning and GetPCSneaking
7 years ago
David Cernat
d51736d68f
[Client] Fix crashes caused by inventory items with disabling scripts
8 years ago
David Cernat
2f551aba02
[Client] Don't start dialogue via client scripts if already in dialogue
...
This prevents infinite greeting spam in scripts such as hlormarScript.
8 years ago
David Cernat
7173a48f4b
[Client] Prevent ObjectState packet spam
8 years ago
David Cernat
fd046e42ef
Merge pull request #242 from OpenMW/master
...
Add OpenMW commits up to 16 Jul 2017
8 years ago
Andrei Kortunov
3b163ce6ce
Disable sound distortion for PlaySound script command
8 years ago
David Cernat
43a3daf0aa
[General] Add & implement PlayerShapeshift packet for werewolf states
8 years ago
David Cernat
e36c0afc59
[General] Send faction reputation via PlayerFaction packets
8 years ago
David Cernat
be93ec8ef6
[General] Implement ObjectState packet
8 years ago
David Cernat
1d504a665f
[General] Add RANK, EXPULSION and BOTH actions to PlayerFaction packets
8 years ago
David Cernat
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
8 years ago
Allofich
42402976e3
Fixes for building in MSVC
8 years ago
Bret Curtis
c781d1f8ed
purge unnecessary imports
...
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
8 years ago
Bret Curtis
d785344fad
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
8 years ago
David Cernat
4e5c8873e0
[General] Use ObjectSpawn instead of ObjectPlace for actors
8 years ago
David Cernat
7f6c5e2f48
[Client] Only send PlayerJournal packets for new journal entries
8 years ago
David Cernat
97768be14b
[Client] Send ObjectPlace packet for random creatures interrupting rest
8 years ago
David Cernat
11369f6513
[General] Implement sending and reading of PlayerTopic packets
8 years ago
David Cernat
870fd9a78b
[General] Remove ObjectUnlock packet, use ObjectLock with 0 lock instead
8 years ago
David Cernat
48ee8fd536
[Client] Send PlayerFaction packets when getting expelled from factions
8 years ago
David Cernat
e6983993c2
[General] Implement sending and reading of PlayerFaction packets
8 years ago
David Cernat
dcc61a095a
[Client] Allow multiple WorldObjects to be added to a WorldEvent
8 years ago
David Cernat
a82646a130
[Client] Delineate tes3mp-only code more clearly, part 2
8 years ago
David Cernat
a5484d237b
Merge pull request #203 from OpenMW/master
...
Add OpenMW commits up to 21 Apr 2017, part 2
8 years ago
Allofich
143ee387cc
Add enabled check to animation script commands
...
(Fixes #3793 )
8 years ago
Allofich
ff3e307059
Pass parameters by const reference
8 years ago
David Cernat
11a9e3bdb1
Merge pull request #197 from OpenMW/master
...
Add OpenMW commits up to 14 Apr 2017
8 years ago
Allofich
6e405aed8c
Adjustments to RemoveItem behavior
...
(Fixes #3796 )
8 years ago
David Cernat
9759764699
[Client] Clean up getting and resetting of WorldEvent
8 years ago
David Cernat
d7a760490e
[Client] Simplify sending of world packets, part 2
8 years ago
David Cernat
4abe295a80
[Client] Simplify sending of world packets by adding WorldEvent methods
8 years ago
David Cernat
8b8c01f389
[General] Make ID_OBJECT_PLACE take effect only when sent back by server
8 years ago
David Cernat
2bd81c3de0
[Client] Use mpNum for every WorldObject
8 years ago
David Cernat
e5cf632e1d
[Client] Stop creating new reference numbers for placed/spawned objects
8 years ago
David Cernat
c10dd1b002
Merge pull request #188 from OpenMW/master
...
Add OpenMW commits up to 24 Mar 2017
8 years ago
Allofich
57aeec59d5
Change bounds behavior of stat script commands
...
Fixes (#3776 )
8 years ago
David Cernat
e0234dc362
Merge pull request #183 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
8 years ago
MiroslavR
af1fe64408
GetSoundPlaying called on an equipped item now also looks for sounds played by the equipping actor ( Fixes #3781 )
8 years ago
Koncord
690211ad99
[General] Extract BaseEvent & BasePlayer from packets to functions
...
Move Send and Read functions to BasePacket
8 years ago
David Cernat
df051a777a
Merge pull request #181 from OpenMW/master
...
Add OpenMW commits up to 4 Mar 2017
8 years ago
scrawl
29556a1802
More consistent wording of errors/warnings
...
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.
An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.
The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.
Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
8 years ago
Koncord
cea1425db1
[Client] Remove redundant newlines & keep ~120 columns
8 years ago
David Cernat
a2ef39c655
Merge pull request #178 from OpenMW/master
...
Add OpenMW commits up to 2 Mar 2017
8 years ago
scrawl
1692b7f38e
Merge pull request #1209 from dhustkoder/master
...
Added ConstContainerStoreIterator (Task #3092 )
8 years ago
Rafael Moura
6c2ce2b2a1
Porting more ContainerStoreIterator usage to const version #4
...
removed const_cast revision
8 years ago
David Cernat
a58601fb2b
[Client] Delineate tes3mp-only code more clearly, part 1
8 years ago
David Cernat
ed2176c984
[Client] Reuse 1 BaseEvent over and over instead of creating new ones
8 years ago
David Cernat
a1988ac6ef
Merge pull request #161 from OpenMW/master
...
Add OpenMW commits up to 21 Feb 2017
8 years ago
scrawl
3f27c8cc97
Always print context for script warnings to remove the need for verbose option
...
(Fixes #2813 )
8 years ago
David Cernat
b320910c5f
[Client] Don't add/remove all spells from ingame scripts for LocalPlayer
8 years ago
scrawl
05ad0dca34
Use ActionTeleport in COE/COC commands
8 years ago
Rafael Moura
9963601484
Porting code to ConstContainerStoreIterator #1
8 years ago
David Cernat
c8cbfbef62
[General] Sketch out server requests to players for container data
8 years ago
David Cernat
ae23c6d6a5
Merge pull request #145 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
8 years ago
scrawl
249fe9077b
Handle 'tcb' command as an alias for 'tcg'
8 years ago
David Cernat
e703dd42aa
[Client] Rename LocalEvent into WorldEvent
8 years ago
David Cernat
cdd796aba1
[Client] Send ID_PLAYER_INVENTORY from two more locations
8 years ago
David Cernat
ecc456fea9
[General] Include charge int in WorldObject & send it w/ ID_OBJECT_PLACE
8 years ago
Koncord
f78c749981
[Client] Use "NULL" instead "nullptr"
...
nullptr keyword introduced in C++11
8 years ago
David Cernat
9f8f62b765
Merge pull request #137 from OpenMW/master
...
Add OpenMW commits up to 1 Feb
8 years ago
scrawl
34deb6e7b1
Add 'showSceneGraph' command to export the scene or a particular object to .osgt for debugging purposes
8 years ago
David Cernat
703f253712
[Client] Delete new LocalEvents after sending them
8 years ago
David Cernat
da2f66d6ba
Merge pull request #135 from OpenMW/master
...
Add OpenMW commits up to 29 Jan
8 years ago
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.
8 years ago
David Cernat
9f1e491a75
[General] Make WorldEvents store information about multiple objects
8 years ago
David Cernat
624b85347a
[Client] Create LocalEvent class and use it instead of WorldEvent
8 years ago
David Cernat
ee86c9161d
[Client] Set InterpreterContext's sendPackets to false in constructor
8 years ago
David Cernat
e2c595fc5d
Add preliminary structure for journal changes
8 years ago
David Cernat
c77120df6d
Merge pull request #129 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwworld/actiontake.cpp
8 years ago
scrawl
45fb4f04b1
Update reference of the interpreter context when an Activate results in a take action ( Fixes #3727 )
8 years ago
scrawl
70c5f64caa
Fix mLocals not being updated in InterpreterContext::updatePtr
8 years ago
David Cernat
973db7c78a
Merge pull request #113 from OpenMW/master
...
Add OpenMW commits up to 17 Dec
8 years ago
Koncord
804259b2c9
Change some printf to LOG_MESSAGE_SIMPLE
...
printf is not streamed to files
8 years ago
Koncord
536715cf46
Cleanup tes3mp headers
8 years ago
Leon Krieg
739cd5ba45
Fixed more spelling mistakes
8 years ago
David Cernat
95efb77e53
Implement sending of ID_GAME_SPELLBOOK from client
8 years ago
David Cernat
ae39daf76a
Add and implement ID_MUSIC_PLAY
8 years ago
David Cernat
fa9d6e810e
Use lowerCamelCase in tes3mp client function names like OpenMW does
8 years ago
David Cernat
cd798d5f23
Merge pull request #89 from OpenMW/master
...
Add OpenMW commits up to 30 Oct
8 years ago
scrawl
e0f613661e
Fix char -> int, fix shadowing warning
8 years ago
Allofich
125e94ef0e
Fix shadowing warnings
8 years ago
David Cernat
41504bd02a
Use more accurate position for ID_OBJECT_PLACE
8 years ago
David Cernat
a4647de048
Break away from OpenMW by giving RefNum indexes to new created objects
8 years ago
David Cernat
180aa3f2f3
Send item count ID_WORLD_OBJECT_PLACE
8 years ago
David Cernat
7f98cddfdf
Don't send animation packets from blacklisted scripts
8 years ago
David Cernat
e414261121
Send ID_OBJECT_ANIM_PLAY from ingame scripts
8 years ago
David Cernat
344f2b535a
Fix setting of index for ID_SCRIPT_MEMBER_SHORT in InterpreterContext
8 years ago
David Cernat
fff6833950
Send ID_SCRIPT_MEMBER_SHORT from MWScript::InterpreterContext
8 years ago
David Cernat
d5fca115f7
Fix variable name for ID_SCRIPT_GLOBAL_SHORT in InterpreterContext
8 years ago
David Cernat
749c6db49e
Send WorldPackets with script values from MWScript::InterpreterContext
8 years ago
David Cernat
e7ebeb8eec
Stop sending ID_OBJECT_MOVE and ID_OBJECT_ROTATE from scripts, because it clashes with syncing script variable values across players and makes movements and rotations happen twice
8 years ago
David Cernat
75f6d82f08
Add a way of filtering out ingame scripts for upcoming script packets
8 years ago
David Cernat
aaf4cc0d7e
Prevent being in a menu from disabling script execution or actor damage
8 years ago
David Cernat
cc40b85034
Don't send packets for floating objects
8 years ago
David Cernat
b1051255e0
Send ID_OBJECT_ROTATE from ingame scripts
8 years ago
David Cernat
54ed9a7ab4
Implement ID_OBJECT_MOVE and send it from ingame scripts
8 years ago
David Cernat
c25ebc34b3
Shorten WorldPacket IDs by removing WORLD from them
8 years ago
David Cernat
7264f13b8e
Implement ID_WORLD_OBJECT_SCALE and send it from ingame scripts
8 years ago
David Cernat
be73265848
Send ID_WORLD_VIDEO_PLAY from ingame scripts
8 years ago
David Cernat
aed884949c
Send ID_WORLD_OBJECT_LOCK from ingame scripts
8 years ago
David Cernat
3a5a5e73a1
Send ID_WORLD_OBJECT_UNLOCK from ingame scripts and regular unlocking
8 years ago
David Cernat
6bfaf3be50
Send an ID_WORLD_OBJECT_PLACE whenever ingame scripts place objects
8 years ago
David Cernat
025a847fd1
Send an ID_WORLD_OBJECT_DELETE whenever ingame scripts delete objects
8 years ago
Marc Zinnschlag
03a35c38df
add missing item when executing the Equip instruction
8 years ago
Allofich
a381a15b19
Make loopgroup loop correct number of times
9 years ago
MiroslavR
b65f379b7f
Save scripted animation state ( Fixes #1931 , #2150 , #3393 )
9 years ago
MiroslavR
dc0bc5b68c
Implement Face instruction (Feature #1424 )
9 years ago
scrawl
ab2089bbf3
Throw an exception if placeAt is passed an invalid direction parameter
9 years ago
scrawl
ba3f4f122a
Account for the stack count in HasSoulGem (Bug #3340 )
9 years ago
scrawl
5bd8ef247d
Do not adjust the player position when loading a savegame ( Fixes #2089 )
9 years ago
scrawl
d7c7bb850b
ToggleAI cleanup
9 years ago
scrawl
6df71f6250
Factor out safePlaceObject function
9 years ago
scrawl
11f00e3aa9
Rename safePlaceObject to placeObject
9 years ago
scrawl
be2f20f564
PlaceAt: attempt to select a safe spawn location ( Fixes #2515 , Fixes #1384 , Fixes #2925 )
9 years ago
scrawl
3a2dccad4b
Implement 'Show' script instruction
9 years ago
scrawl
f99cd15f00
Vanilla-compatible activate / onActivate ( Fixes #1629 )
...
See https://forum.openmw.org/viewtopic.php?f=6&t=3074&p=34618#p34635
9 years ago
scrawl
5cdee454ef
Fix degree/radians mixup ( Fixes #3213 )
9 years ago
scrawl
f0971ee8ad
Implement Fixme script instruction
9 years ago
Jordan Ayers
1ff49cc637
Improve Drop command behavior. ( Fixes #1544 )
9 years ago
scrawl
f315a4386f
Accept an implicit reference in Journal ( Fixes #3135 )
9 years ago
scrawl
4f8f166f69
Fix GetPcInJail to work as in the original engine
9 years ago
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.
9 years ago
scrawl
f052c05018
Move werewolf functions from World to MechanicsManager
9 years ago
scrawl
04f7a8f8eb
Remove redundant getId function
9 years ago
scrawl
2bd8d60e9f
Accept a ConstPtr in getPrimaryFaction, getPrimaryFactionRank
9 years ago
scrawl
deb7f3caf6
Print deletion state in ObjectReferenceInfo
9 years ago
scrawl
271fcb80c6
Remove container scripts before deleting container
9 years ago
scrawl
bdae572264
Merge pull request #840 from scrawl/movedrefs
...
Object movement between cells
9 years ago
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.
9 years ago
scrawl
bd68ebac62
GetEffect fix
9 years ago
scrawl
07b064f616
Rename to lowerCaseInPlace
9 years ago
scrawl
65b5cbe3f7
AiEscortCell complains if no cell was given or cell does not exist
9 years ago
scrawl
45a609bc54
Improve PositionCell warning message
9 years ago
scrawl
5f349b9a6e
Support effects with attribute/skill argument in OpGetEffect
9 years ago
scrawl
389b168d5f
Restore OpGetWaterLevel to vanilla behaviour
9 years ago
scrawl
14b143231c
Don't crash OpGetTarget when the target disappeared ( Fixes #3048 )
9 years ago
scrawl
62169a7039
Use a single-precision PositionAttitudeTransform in speed critical places
9 years ago
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.
9 years ago
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.
9 years ago
scrawl
90b6fa5ef1
PlaceItem, PlaceItemCell angle should be treated as degrees ( Fixes #3007 )
9 years ago
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.
9 years ago
scrawl
666fbba1e0
Rotations: World::rotateObject takes radians instead of degrees
...
Cuts down on the amount of redundant degree<->radians conversions in the codebase.
9 years ago
scrawl
8e4e4e5e38
Fix infinite loop in addToLevList
9 years ago
Marc Zinnschlag
2f808f957d
fixed for compiler not recognising script names in some situations
9 years ago
Marc Zinnschlag
e8f6897376
fixed a possible script bug regarding ID-access for instances that did not yet existed when the script was compiled
9 years ago
Alexander "Ace" Olofsson
7d4125d97f
Fixes for building with unity build
9 years ago
Marc Zinnschlag
2a981a5272
make sure local variables are loaded when trying to access them from outside of a script ( Fixes #2659 )
9 years ago
scrawl
5aa33fde43
Include cleanup
9 years ago
scrawl
fd48c1d6f4
Make the Equip script function "use" items (drink potion, use alchemy, etc)
9 years ago
dteviot
77a1d947cc
extracted MWMechanics::getPlayer()
10 years ago
dteviot
0ee7407101
extracted common sub-expressions.
10 years ago
scrawl
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
10 years ago
scrawl
3bca3e73d4
Fix GetWeaponDrawn and GetSpellReadied script functions for creatures
10 years ago
Koncord
6c3c85f0d4
Fix indent
...
Remove misc.hpp in containerstore.cpp
10 years ago
Koncord
7a86c8d8b6
Fix OpAddItem, OpGetItemCount and OpRemoveItem.
10 years ago
Alexander "Ace" Olofsson
b3b55a5842
Explicitly instantiate MWWorld::Store
10 years ago
scrawl
ea0339d471
Make the string argument to BetaComment optional
10 years ago
scrawl
4bb3cbf0fb
Remove last remains of Ogre
10 years ago
scrawl
b70383d127
Remove last remains of Ogre math
10 years ago
scrawl
de8e5f0db1
Restore projectiles
10 years ago
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
10 years ago
Stanislav Bas
163c12d3eb
Merge remote-tracking branch 'upstream/master'
10 years ago
Stanislav Bas
196be7283d
Reset an activated reference after activation's exectution ( Fix #1738 )
10 years ago
scrawl
8bcfac1ea3
Fix adjustPosition not always working correctly ( Fixes #2563 )
...
moveObject was returning an incorrect Ptr for cell movements.
10 years ago
scrawl
7a3bc69df7
Readded sound listener
10 years ago
scrawl
47758c11cd
Readded collision objects and movement physics
10 years ago
scrawl
c819180aa1
Minor cleanup
10 years ago
scrawl
9d86e5b028
GetSpellEffects returns true for active abilities ( Fixes #2530 )
10 years ago
scrawl
283b252142
Stub InputManager
10 years ago