mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-13 23:39:41 +00:00
Code Issues Releases Wiki Activity
25360 commits 38 branches 54 tags 122 MiB
Commit graph

261 commits

Author SHA1 Message Date
Andrei Kortunov
9dfd775bf2 Implement GetPCTraveling console command 2018-08-13 08:30:50 +04:00
David Cernat
36ac2d9de4 [Client] Set packetOrigin for all ObjectList packets sent 2018-07-23 01:39:43 +03:00
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
 2018-07-14 03:57:05 +03:00
Andrei Kortunov
3d1daaebab Rework manual spellcasting (e.g. via scripts) 2018-07-12 16:24:25 +04:00
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.
 2018-07-08 00:39:07 +03:00
David Cernat
f3892d697b [Client] Disable clientside locking and unlocking of objects 2018-07-08 00:06:01 +03:00
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
 2018-07-04 01:52:29 +03:00
Miloslav Číž
c3d7ee5a9e Resolve merge conflicts 2018-06-13 08:22:37 +02:00
Miloslav Číž
db8aaa74d6 Start cell border debug drawing 2018-06-13 01:48:31 +02:00
David Cernat
669d4d3d7e
Merge pull request #440 from OpenMW/master 
Add OpenMW commits up to 27 May 2018
 2018-05-27 16:10:16 +03:00
scrawl
cfdf99f601
Revert "Merged pull request #1573" 
This reverts commit 7324bd368f, reversing
changes made to 810e4416f6.
 2018-05-26 11:39:30 +00:00
scrawl
99ffaafe30
Revert "Merge pull request #1701 from akortunov/standfix" 
This reverts commit da47fc79f5, reversing
changes made to 7324bd368f.
 2018-05-26 11:35:48 +00:00
David Cernat
74c2a0b311
Merge pull request #438 from OpenMW/master 
Add OpenMW commits up to 24 May 2018
 2018-05-24 12:16:11 +03:00
Bret Curtis
da47fc79f5
Merge pull request #1701 from akortunov/standfix 
Do not apply queue movement for standing actors
 2018-05-23 22:35:08 +02:00
David Cernat
78234f9071 [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
Andrei Kortunov
3636cf2015 Do not apply queue movement for standing actors 2018-05-05 22:41:26 +04:00
Andrei Kortunov
22fb1f3403 Play spellcasting effects from objects 2018-04-30 17:12:06 +04:00
David Cernat
bf906b3f0a
Merge pull request #393 from OpenMW/master 
Add OpenMW commits up to 10 March 2018
 2018-03-10 18:37:51 +02:00
Andrei Kortunov
62c04c6758 Unstack soulgem, added via AddSoulGem console command (bug #4351) 2018-03-09 21:49:27 +04:00
David Cernat
dd25c7db4e Merge pull request #324 from OpenMW/master 
Add OpenMW commits up to 24 Oct 2017
 2017-10-24 19:36:14 +03:00
scrawl
0c6ef17fb5 Add explicit variant of 'OnActivate' 2017-10-23 23:33:06 +00:00
David Cernat
870fd9a78b [General] Remove ObjectUnlock packet, use ObjectLock with 0 lock instead 2017-05-24 13:28:34 +03:00
David Cernat
dcc61a095a [Client] Allow multiple WorldObjects to be added to a WorldEvent 2017-05-06 20:44:39 +03:00
David Cernat
a82646a130 [Client] Delineate tes3mp-only code more clearly, part 2 2017-04-24 19:46:12 +03:00
David Cernat
9759764699 [Client] Clean up getting and resetting of WorldEvent 2017-04-05 09:04:41 +03:00
David Cernat
d7a760490e [Client] Simplify sending of world packets, part 2 2017-04-05 08:43:35 +03:00
David Cernat
4abe295a80 [Client] Simplify sending of world packets by adding WorldEvent methods 2017-04-05 07:54:23 +03:00
David Cernat
2bd81c3de0 [Client] Use mpNum for every WorldObject 2017-04-04 11:07:16 +03:00
Koncord
690211ad99 [General] Extract BaseEvent & BasePlayer from packets to functions 
Move Send and Read functions to BasePacket
 2017-03-06 18:40:07 +08:00
David Cernat
a2ef39c655 Merge pull request #178 from OpenMW/master 
Add OpenMW commits up to 2 Mar 2017
 2017-03-02 22:14:15 +02:00
Rafael Moura
6c2ce2b2a1 Porting more ContainerStoreIterator usage to const version #4 
removed const_cast revision
 2017-02-28 19:11:00 +00:00
David Cernat
a58601fb2b [Client] Delineate tes3mp-only code more clearly, part 1 2017-02-26 16:59:53 +02:00
David Cernat
ed2176c984 [Client] Reuse 1 BaseEvent over and over instead of creating new ones 2017-02-23 09:19:09 +02:00
David Cernat
ae23c6d6a5 Merge pull request #145 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
 2017-02-09 12:17:27 +02:00
scrawl
249fe9077b Handle 'tcb' command as an alias for 'tcg' 2017-02-08 18:51:07 +01:00
David Cernat
e703dd42aa [Client] Rename LocalEvent into WorldEvent 2017-02-06 17:40:32 +02:00
Koncord
f78c749981 [Client] Use "NULL" instead "nullptr" 
nullptr keyword introduced in C++11
 2017-02-01 15:58:29 +08:00
David Cernat
9f8f62b765 Merge pull request #137 from OpenMW/master 
Add OpenMW commits up to 1 Feb
 2017-02-01 09:28:23 +02: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
David Cernat
703f253712 [Client] Delete new LocalEvents after sending them 2017-01-31 09:48:37 +02:00
David Cernat
9f1e491a75 [General] Make WorldEvents store information about multiple objects 2017-01-28 12:34:45 +02:00
David Cernat
624b85347a [Client] Create LocalEvent class and use it instead of WorldEvent 2017-01-27 20:57:47 +02:00
Koncord
536715cf46 Cleanup tes3mp headers 2016-12-16 16:59:15 +08:00
David Cernat
ae39daf76a Add and implement ID_MUSIC_PLAY 2016-11-20 22:54:49 +02:00
David Cernat
fa9d6e810e Use lowerCamelCase in tes3mp client function names like OpenMW does 2016-11-15 21:54:06 +02:00
David Cernat
c25ebc34b3 Shorten WorldPacket IDs by removing WORLD from them 2016-10-25 12:15:27 +03:00
David Cernat
be73265848 Send ID_WORLD_VIDEO_PLAY from ingame scripts 2016-10-24 17:55:10 +03:00
David Cernat
aed884949c Send ID_WORLD_OBJECT_LOCK from ingame scripts 2016-10-24 13:22:46 +03:00
David Cernat
3a5a5e73a1 Send ID_WORLD_OBJECT_UNLOCK from ingame scripts and regular unlocking 2016-10-24 11:43:27 +03:00
David Cernat
025a847fd1 Send an ID_WORLD_OBJECT_DELETE whenever ingame scripts delete objects 2016-10-23 17:03:47 +03: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
Jordan Ayers
1ff49cc637 Improve Drop command behavior. (Fixes #1544) 2016-01-18 19:58:19 -06:00
scrawl
4f8f166f69 Fix GetPcInJail to work as in the original engine 2016-01-11 22:57:25 +01:00
scrawl
deb7f3caf6 Print deletion state in ObjectReferenceInfo 2015-12-17 20:17:38 +01:00
scrawl
bd68ebac62 GetEffect fix 2015-12-08 15:24:02 +01:00
scrawl
5f349b9a6e Support effects with attribute/skill argument in OpGetEffect 2015-12-03 21:12:58 +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
8e4e4e5e38 Fix infinite loop in addToLevList 2015-11-05 01:18:01 +01:00
dteviot
77a1d947cc extracted MWMechanics::getPlayer() 2015-08-21 21:12:39 +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
scrawl
ea0339d471 Make the string argument to BetaComment optional 2015-06-25 21:45:59 +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
scrawl
47758c11cd Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
scrawl
9d86e5b028 GetSpellEffects returns true for active abilities (Fixes #2530) 2015-05-11 16:38:16 +02:00
scrawl
9cf9c2876e Pathgrid rendering 2015-05-02 22:45:39 +02: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
dteviot
45b6538820 fixed MSVC 2013 warning C4800 
forcing value to bool 'true' or 'false'
 2015-03-06 23:19:57 +13:00
scrawl
8931ddf428 Remove unneeded casts 2015-03-03 23:46:53 +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
MiroslavR
2223a69ab8 Fix getpcinjail returning 0 when the console is open 2015-02-07 20:13:11 +01:00
MiroslavR
9bbe6f8c5e Remove todo 2015-02-07 18:39:05 +01:00
MiroslavR
1d9e973573 Add training progress bar, implement jail screen, tweak wait dialog (Fixes #1714) 2015-02-07 04:05:28 +01:00
scrawl
6d097fbfbd Normalise spelling of "levelled" throughout the code 2015-02-05 04:18:42 +01:00
scrawl
1780bcc238 Print RefNum in BetaComment 2015-01-11 17:04:58 +01:00
dteviot
7aa0f887c0 Minor changes to ESM::RefNum 
1. Changed mIndex to unsigned, to solve potential implementation defined behavior with right shift.
2. Refactoring to minimize use of magic number -1 to indicate "no Content File".
 2015-01-11 12:20:22 +13:00
scrawl
31d28e727f Implement leveled list script functions (Fixes #1546) 2014-12-17 01:24:22 +01:00
scrawl
886903d70e Implement HitAttemptOnMe function (Bug #2078) 2014-12-11 22:25:41 +01:00
scrawl
5f00a3d5c3 Reset lastHitObject when it is retrieved rather than every frame 
This seems to be how vanilla MW does it.
 2014-12-11 22:00:31 +01:00
scrawl
be16f1d0a5 Implement PcForce1stPerson, PcForce3rdPerson, PcGet3rdPerson (Bug #2078) 2014-12-11 21:00:02 +01:00
scrawl
f49fde3d5d Add support for undeleting references (Fixes #2193) 
Deleted references should be accessible via an explicit reference, and can be undeleted using "setdelete 0". Also the Resurrect function implicitely undeletes the given reference.
 2014-12-06 21:08:18 +01:00
MiroslavR
6e1a11f322 Queue screen fade operations invoked by scripts 2014-12-01 19:13:04 +01:00
scrawl
4fd3a994e9 Add model and script information to BetaComment 2014-11-28 16:27:18 +01:00
MiroslavR
925fa8d193 Reset ownership of items dropped via 'drop' instruction (Fixes #2053) 2014-10-24 19:04:47 +02:00
scrawl
8cb09e89ed Make spells cast by scripts always succeed (Fixes #1993) 2014-10-12 17:18:27 +02:00
scrawl
c010c28337 Implement ToggleWorld instruction 2014-09-30 15:54:09 +02:00
scrawl
603e558fb7 Fix broken getCollidingPc / getCollidingActor (cppcheck) 2014-09-26 14:16:46 +02:00
scrawl
f3d4b63aaf Fix AI moving load doors and throw an exception when trying to do this (Fixes #1907) 2014-09-11 05:53:56 +02:00
scrawl
457b96a8af Reset bounty and crime immediately when going to jail (Fixes #1892) 2014-09-09 00:00:55 +02:00
scrawl
d8943aef2f Encapsulate magic effect magnitude (Feature #1489) 2014-08-17 03:58:04 +02:00
scrawl
a18cec7c8e Use a MyGUI widget to render the screen fader (Fixes #1741, Fixes #1719) 2014-08-01 16:25:41 +02:00
scrawl
543bb22e8f Implement collision script instructions (Fixes #1111) 2014-07-29 19:01:40 +02:00
scrawl
ca45a63cf7 Close doors instantly when using Lock instruction 2014-07-22 17:55:54 +02:00