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

193 commits

Author SHA1 Message Date
Chris Robinson
780e82480d Make the PlayMode and PlayType enums scoped 
Also shorten them by putting them in the MWSound namespace
 2017-09-15 02:36:59 -07:00
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
 2017-08-31 15:14:13 +03:00
Andrei Kortunov
7c80ddc9de Owned crosshair improvements (bug #2789) 2017-08-18 17:08:15 +04:00
David Cernat
fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
 2017-06-18 18:16:10 +03:00
scrawl
dd3f612e88 Merge pull request #1316 from akortunov/doorfix 
Doors usage improvements
 2017-06-12 23:34:40 +02:00
Andrei Kortunov
cab51d26cc Doors: small key search optimizations 2017-06-10 22:33:14 +04:00
Bret Curtis
d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 2017-06-09 19:08:53 +02:00
Ewan Higgs
38a2de3c51 convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis 2017-06-09 16:49:25 +02:00
David Cernat
20a72ec807 [Client] Send ObjectTrap packets when disarming traps with keys & probes 2017-05-26 01:47:59 +03:00
David Cernat
b1264cca92 [Client] Send ObjectLock whenever using spells or keys to unlock objects 2017-05-24 16:25:44 +03:00
scrawl
1692b7f38e Merge pull request #1209 from dhustkoder/master 
Added ConstContainerStoreIterator (Task #3092)
 2017-03-02 18:36:21 +01:00
scrawl
22482b7eec Don't use xmesh.nif over mesh.nif for classes that don't make use of the separated keyframes 2017-02-20 19:04:02 +01:00
Rafael Moura
9963601484 Porting code to ConstContainerStoreIterator #1 2017-02-19 15:18:35 +00:00
Leon Krieg
739cd5ba45 Fixed more spelling mistakes 2016-12-15 13:09:40 +01:00
Allofich
7db31ab58a Correct telekinesis glow length 2016-08-24 01:21:15 +09:00
Allofich
cb9bb92b26 Play locked sounds on locked objects instead of actors 2016-08-10 21:31:14 +09:00
Allofich
cad41599cf Fix travis build error and warnings 2016-08-09 22:56:53 +09:00
Allofich
35c14bb9bb Minor rewrite, make "open" spells play glow effect 2016-08-09 22:56:53 +09:00
Allofich
e132b52a69 Handle spell glows within updatecallback 2016-08-09 22:56:53 +09:00
Allofich
123c626f2d Add glow when using telekinesis on doors 2016-08-09 22:56:53 +09:00
Allofich
599e6708ec Allow using keys to open trapped objects of lock level 0 2016-07-10 23:08:11 +09:00
Allofich
249918612d Play trap disarm sound when key used on trapped object 2016-07-10 22:06:35 +09:00
Allofich
d4e656ceaf Play trap activation sound on trapped object, not actor 2016-07-10 21:39:53 +09:00
Allofich
53ceefa46a Allow some telekinesis on teleport doors 2016-07-09 01:08:00 +09:00
Allofich
35a23c3b49 Implement and use new method allowTelekinesis() 2016-07-07 21:54:31 +09:00
scrawl
32d5dece58 Add count argument to getToolTipInfo 2015-12-19 16:29:07 +01:00
scrawl
0d4729dcd5 Use the const version of CustomData::as* 2015-12-19 16:19:52 +01:00
scrawl
b0894ea20d Accept a ConstPtr in hasToolTip 2015-12-19 16:15:45 +01:00
scrawl
51c77c5045 Accept a ConstPtr in getDoorState 2015-12-19 16:15:45 +01:00
scrawl
2c51e7345f Use a separate collision type for doors (Fixes #1962) 2015-12-18 18:32:42 +01:00
scrawl
04f7a8f8eb Remove redundant getId function 2015-12-18 16:58:38 +01:00
scrawl
266fbbef48 Accept a ConstPtr in canLock 2015-12-18 16:50:32 +01:00
scrawl
da7ebfde99 Accept a ConstPtr in copyToCell 2015-12-18 16:27:18 +01:00
scrawl
f258c5c508 Accept a ConstPtr in getModel 2015-12-18 15:51:05 +01:00
scrawl
d9bbd83b09 Accept a ConstPtr in getToolTipInfo 
Accept a ConstPtr in functions used by getToolTipInfo
 2015-12-18 15:47:16 +01:00
scrawl
ed3486e816 Improve const-correctness in writeAdditionalState 2015-12-18 00:19:06 +01:00
scrawl
b48445dea7 Accept a ConstPtr in getScript 2015-12-18 00:12:03 +01:00
scrawl
eb51e2838f Utilize the mHasCustomData flag in writeAdditionalState 2015-12-18 00:07:40 +01:00
scrawl
bdae572264 Merge pull request #840 from scrawl/movedrefs 
Object movement between cells
 2015-12-09 14:10:57 +01:00
scrawl
07b064f616 Rename to lowerCaseInPlace 2015-12-07 22:49:15 +01:00
scrawl
fc449233be Restore support for inserting objects into a cell 2015-12-04 18:29:41 +01:00
scrawl
0975f60d59 Stub out CellStore::get<T> accessors in preparation of reference movement between cells 2015-12-04 18:29:41 +01:00
scrawl
cd4a1ffd16 Fast version of dynamic_cast for MWClass 2015-11-29 14:26:52 +01:00
Chris Robinson
82f3651f81 Treat the sound offset as the offset in seconds 2015-11-27 02:01:17 -08:00
scrawl
6405049add Rotations: move doors via Rotation rather than LocalRotation 
Now LocalRotation is unneeded, will remove in next commit.
 2015-11-12 00:58:29 +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
211deeb63e Don't attempt to lock or unlock unsuitable objects (Fixes #2826) 2015-08-13 17:08:21 +02:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
scrawl
d1b6289cad Don't teleport followers when using teleportation spells 2015-05-22 19:57:02 +02:00
scrawl
c31b416ba1 Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
scrawl
c92592493e OpenMW: create a window and render the starting cell(s) 2015-04-12 15:38:30 +02:00
dteviot
e6cd8484a2 fixing MSVC 2013 warning C4244: & C4305 
fixes for mistakes in last commit.
 2015-03-08 13:22:56 +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
scrawl
7542fb5cd9 Show map notes on door marker leading to the cell with the note (Fixes #2284) 2015-01-31 22:40:41 +01:00
scrawl
41b3a9dba9 Rewrite animated collision shape support (Fixes #2123) 2015-01-13 05:37:37 +01:00
scrawl
363d1f9207 Merge remote-tracking branch 'upstream/master' 2014-12-30 23:01:45 +01:00
scrawl
d55fe43fc9 Support animation groups for Light and Door objects (Fixes #2039) 2014-12-24 15:45:14 +01:00
Alexander "Ace" Olofsson
462b41a3a8 Missing files, aka; Why you shouldn't stresscommit 2014-12-19 11:26:54 +01: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
Marc Zinnschlag
c9cd7fb6b7 Merge branch 'scripts' 2014-07-28 09:02:24 +02:00
scrawl
75366b2e37 Implement CellRef's faction rank (rank requirement to use item) 2014-07-24 02:17:38 +02:00
scrawl
ca45a63cf7 Close doors instantly when using Lock instruction 2014-07-22 17:55:54 +02:00
scrawl
2b57c7fa67 Use CellRef's global variable to disable owner (Fixes #1677) 2014-07-22 17:06:40 +02:00
Marc Zinnschlag
4fb897f2f8 added missing getId functions to classes derived from MWWorld::Class 2014-07-18 09:56:58 +02:00
scrawl
048d07b299 Show owner of doors in tooltip 2014-07-11 11:57:21 +02:00
scrawl
869fa08a32 Fix disarming a trap when key is used (Fixes #1556) 2014-06-26 14:30:19 +02:00
scrawl
31a4e10c6f Fix incorrect trigger of change flag for static doors 2014-06-15 14:18:16 +02:00
scrawl
039398c8ae Basic RefData and CellRef change tracking 
Wrapped item charge handling in getItemHealth function
 2014-05-25 14:30:07 +02:00
Emanuel Guevel
1e4a854433 Remove static method MWWorld::Class::get(&Ptr) 
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
 2014-05-22 20:50:00 +02:00
scrawl
a76e391ad0 Savegame: store door movement state (Closes #747) 2014-05-15 09:54:10 +02:00
Thomas
f6deca7c80 Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors 2014-04-23 13:02:51 -04:00
Thomas
61341d4206 Removed mLocked, kept it as "Negative lock level means unlocked" 2014-04-23 10:00:18 -04:00
Thomas
cac8e52154 Seperated locked and lock level, to allow for relocking doors to previous lock level. 
The data is stored in the esm as -lockLevel if unlocked; lockLevel if locked. While not tested, it should not present any problems.
 2014-04-23 05:12:07 -04:00
Marc Zinnschlag
83ded18af0 encapsulated reference collections 2014-02-23 21:21:27 +01:00
gus
e5b19cf3c6 clean up 2014-02-17 10:37:11 +01:00
gus
a315d5cc2b aiactivate works. Bug when you try to use it on a reference that doesn't exist. Need to clran up door.cpp 2014-02-14 12:55:14 +01:00
scrawl
098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 2014-01-08 18:39:44 +01:00
scrawl
9b0e82a37f Projectile models are now spawned (no movement or impact yet). Refactored trap activation to apply range types properly. Handle ContinuousVFX for magic effects (note they aren't stopped yet when the effect ends) 2013-11-13 14:02:15 +01:00
Emanuel Guevel
a47c76001c Apply trap magic effects 2013-08-13 04:56:15 +02:00
Chris Robinson
72a399054f Don't assume only players activate doors 2013-08-09 01:35:29 -07:00
Chris Robinson
076e7d8e16 Make insertBegin internal 2013-08-07 03:56:07 -07:00
Chris Robinson
0458fd5531 Remove unused/unneeded parameters 2013-08-07 03:56:06 -07:00
PLkolek
f297c21e4d Old door sound fades out on door open/close. Door sound is synchronised to angle on action. 2013-07-31 15:46:23 +02:00
scrawl
867c7db014 Fix wrong door sounds 2013-04-29 11:00:15 +02:00
scrawl
9343b4459e Opening doors 2013-04-28 14:59:15 +02:00
scrawl
e7af718b55 Remove unnecessary WindowManager::messageBox arguments 2013-03-30 12:56:37 +01:00
eduard
2dc0064cc2 more string lowercase 2013-01-09 20:51:52 +01:00
lazydev
74ae479780 Cell names localization fix 2012-12-23 23:23:24 +04:00
Marc Zinnschlag
5d45bcd03a Merge remote-tracking branch 'trombonecot/master' 
Conflicts:
	apps/openmw/mwclass/light.cpp
 2012-11-19 21:21:00 +01:00
eduard
4e4d15f8ac Failed action 2012-11-19 21:04:49 +01:00
eduard
82ea547ce4 Failed action 2012-11-17 18:17:08 +01:00
Marc Zinnschlag
918316168f Merge remote-tracking branch 'greye/store' into next 
Conflicts:
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwworld/worldimp.cpp
 2012-11-07 19:34:28 +01:00
emoose
7a7825577a Changed: use MWWorld::Ptr for PhysicsSystem arguments 2012-11-05 19:37:27 +00:00
greye
bd1bb2e55d applying new interface vol.1, inconsistent 2012-11-05 18:39:42 +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
emoose
4a9821dc65 fix kdevelop indentation... 2012-11-02 20:43:07 +00:00
emoose
15f972cc62 fixes: compile: cast error; doors: key id case comparison; character creation: going from CharacterCreation to BirthDialog loses data; character creation: Class/Race/BirthDialog allowing no data; code: clean up a bit 
todo: going from CharacterCreation back to CreateClassDialog loses data
 2012-11-02 20:33:08 +00:00