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

1114 commits

Author SHA1 Message Date
declan-millar
9346a552fa Use Rebalance soulgem values option to set soulgem value 2018-05-21 13:59:20 +01:00
declan-millar
78e79d5775 Add advanced option to Rebalance soulgem values to the launcher 2018-05-21 13:33:42 +01:00
declan-millar
4b1247597e Use soulgem value rebalance formula from morrowind code patch 2018-05-20 17:06:26 +01:00
David Cernat
dc9a3bf73f
Merge pull request #429 from OpenMW/master 
Add OpenMW commits up to 16 May 2018
 2018-05-16 19:20:01 +03:00
Bret Curtis
caf1760251
Merge pull request #1707 from akortunov/weaponreach 
Display weapon reach on tooltips in feet
 2018-05-16 10:27:53 +02:00
Andrei Kortunov
164e3d12fe Display weapon reach on tooltips in feet. 2018-05-16 11:18:22 +04:00
Capostrophic
1c9fba9a8c Fix jumping encumbrance calculation 2018-05-13 17:18:45 +03:00
David Cernat
78234f9071 [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
David Cernat
5458e09c8a
Merge pull request #420 from OpenMW/master 
Add OpenMW commits up to 11 May 2018
 2018-05-12 06:32:01 +03:00
Alf Henrik Sauge
feeee50a88 Dropping a separate NPDTstruct12 object and instead use NPDTstruct52 
NPDTstruct12 is now only used when loading and saving. Turning auto calc
on and off now no longer switches between to different set of values
 2018-05-09 00:25:07 +02:00
David Cernat
a86c68c5a1 [General] Add sync for ranged weapon & projectile strike enchantments 2018-04-03 14:12:27 +03:00
David Cernat
3f8d94b030 [General] Synchronize strike enchantments in combat 2018-04-03 10:27:02 +03:00
David Cernat
ec1311fcb7 [Client] Make it possible to check whether a class has a ContainerStore 2018-04-01 09:33:07 +03:00
David Cernat
ac82124a5d Merge pull request #395 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwmechanics/actors.cpp
 2018-03-29 07:28:30 +03:00
scrawl
c02920bcd1
Merge pull request #1634 
Conflicts:
	apps/openmw/mwworld/worldimp.hpp
 2018-03-20 22:48:20 +00:00
Andrei Kortunov
bd6c7de579 Do not unequip two-handed weapon when equipping torch 2018-03-19 08:03:53 +04:00
David Cernat
b7c6261e16 Merge pull request #392 from OpenMW/master while resolving conflicts 
# Conflicts:
#	README.md
 2018-03-09 21:07:46 +02:00
scrawl
870c658500
Remove missing souls, remove some runaway exceptions (Fixes #4111) 2018-03-08 23:38:04 +00:00
Harald H
d3b623b5d3 http to https for supported urls (#1625) 
* http to https for supported urls

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http tp https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* some url fixes

* http to https
 2018-03-08 21:23:24 +01:00
David Cernat
ecb0ad0d77 Merge pull request #359 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
 2017-12-25 02:03:02 +02:00
Andrei Kortunov
744859f327 Take in account armor condition in the armor rating calculation (bug #4246) 2017-12-07 22:43:32 +04:00
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
 2017-10-06 04:10:04 +03:00
Andrei Kortunov
b8fd530ee1 Do not speak with unconscious creatures 2017-09-30 21:20:38 +04:00
scrawl
84657271c7 Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window 2017-09-24 19:08:12 +02:00
David Cernat
960b91a53c Merge pull request #290 from OpenMW/master 
Add OpenMW commits up to 17 Sep 2017
 2017-09-17 10:53:33 +03:00
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
b64f379949 Merge pull request #286 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/actors.hpp
 2017-09-04 18:05:24 +03:00
Andrei Kortunov
0d7279ea2a Fixes a regression with bound weapons equipping (bug #4050) 2017-09-01 08:59:05 +04: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
6f22d819c5 Do not allow to switch weapon to probe or lockpick during attack 2017-08-31 12:36:54 +04:00
scrawl
dc53573de4 Merge pull request #1405 from akortunov/stancechangefixes 
Do not allow player to change weapon/spell during attack or spellcast
 2017-08-29 23:11:23 +00:00
Andrei Kortunov
fb45995a41 Do not allow player to change weapon/spell during attack or spellcasting (bug #2445) 2017-08-29 15:53:23 +04:00
scrawl
2611377081 Merge pull request #1350 from akortunov/deathanimationfix 
Do not allow to loot fighting actors during death animation (bug #3528)
 2017-08-18 22:04:12 +00:00
Andrei Kortunov
7c80ddc9de Owned crosshair improvements (bug #2789) 2017-08-18 17:08:15 +04:00
Andrei Kortunov
3f159960b7 Restored pickpocket and werewolf check 2017-08-12 21:18:05 +04:00
Andrei Kortunov
dd919b9f2c Do not allow to loot fighting actors during death animation (bug #3528) 2017-08-07 09:55:50 +04:00
Koncord
6222c20e82 [Client] Convert MechanicsHelper to namespace 2017-06-27 16:43:53 +08:00
David Cernat
c6aee3b780 [Client] Fix build by changing boost::shared_ptr into std::shared_ptr 2017-06-18 19:36:06 +03: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
d48b829b45 replace and purge boost::lexical_cast 2017-06-09 19:08:53 +02: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
1c6e359fe9 [Client] Set and clear hitAttemptActorId for DedicatedPlayers 
This allows a DedicatedPlayer's follower NPCs to target enemies attacking the DedicatedPlayer.
 2017-05-30 08:20:45 +03: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
David Cernat
34f0a5e076 [Client] Disable leveled creatures from their class instead of scene.cpp 2017-05-07 03:18:15 +03:00
David Cernat
4d81455020 [General] Rework and simplify death reasons so they work with NPCs 2017-05-05 22:16:31 +03:00
David Cernat
809b4d78ba [Client] Split off DedicatedPlayer and PlayerList into different files 2017-04-30 14:57:43 +03:00
David Cernat
ea7c3f2dc7 [Client] Make tes3mp combat code work with Creatures, not just NPCs 2017-04-24 21:06:23 +03:00
David Cernat
2e8714afaa [Client] Rethink and restructure tes3mp combat code so it works for NPCs 2017-04-19 22:06:04 +03:00
David Cernat
014ff7a059 [Client] Replace usage of Networking::isDedicatedPlayer() 2017-04-18 18:07:39 +03:00
David Cernat
07c2d4251e [Client] Add and use mwmp::PlayerList::isDedicatedPlayer() 2017-04-17 20:36:20 +03:00
David Cernat
0aaf68c994 [Client] Rename mwmp::Players into mwmp::PlayerList for clarity 2017-04-17 19:10:33 +03:00
David Cernat
a650683bae [General] Add and use Target struct in mwmp::Attack 2017-04-17 18:31:39 +03:00
David Cernat
9882ceedf3 [General] Remove attackerGuid from mwmp::Attack because it is redundant 2017-04-17 18:03:33 +03:00
David Cernat
caf5428532 [General] Rename mwmp::Attack vars in preparation for Actor support 2017-04-17 17:24:11 +03:00
David Cernat
2565816b22 [Client] Delimit and clarify combat changes made by tes3mp 
Additionally, revert unneeded small changes to the formatting of OpenMW code
 2017-04-17 11:55:22 +03:00
David Cernat
678edffb5a [Client] Rename updateDynamicStats() into updateStatsDynamic() 2017-04-16 14:11:55 +03:00
David Cernat
bf17464074 Merge pull request #198 from OpenMW/master 
Add OpenMW commits up to 14 Apr 2017
 2017-04-15 05:36:50 +03:00
scrawl
f63b1e81cd Merge pull request #1228 from akortunov/master 
Options to show hidden weapon parameters
 2017-04-14 20:01:08 +02:00
David Cernat
c6cd0a2953 Merge pull request #196 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
 2017-04-13 07:07:49 +03:00
Andrei Kortunov
506cc47c9d Add option to show reach and attack speed for melee weapons 2017-04-12 09:12:25 +04:00
Andrei Kortunov
14b59e0e4b Vanilla-like tgm (fixes #3798) 2017-03-25 22:40:11 +04:00
David Cernat
c10dd1b002 Merge pull request #188 from OpenMW/master 
Add OpenMW commits up to 24 Mar 2017
 2017-03-24 07:24:55 +02:00
Allofich
5282556ae0 Show names on combat actors when RMB GUI is active 
Fixes (#3797)
 2017-03-22 20:04:29 +09:00
Andrei Kortunov
1286754fb3 Add a new option to show arrow damage (feature #2923) 2017-03-18 08:07:36 +04: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
scrawl
1692b7f38e Merge pull request #1209 from dhustkoder/master 
Added ConstContainerStoreIterator (Task #3092)
 2017-03-02 18:36:21 +01:00
Rafael Moura
18a4b64f1a Porting more ContainerStoreIterator usage to const version #2 2017-02-27 21:50:10 +00:00
Rafael Moura
05cc69f6f1 Porting more ContainerStoreIterator usage to const version 2017-02-26 21:24:51 +00:00
David Cernat
a1988ac6ef Merge pull request #161 from OpenMW/master 
Add OpenMW commits up to 21 Feb 2017
 2017-02-21 07:02:59 +02: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
Rafael Moura
ecbde7b11e Added ConstContainerStoreIterator 
using base template for ContainerStoreIterators

less template arguments for ContainerStoreIteratorBase
 2017-02-18 13:47:18 +00:00
David Cernat
0d75264221 Merge pull request #155 from OpenMW/master 
Add OpenMW commits up to 17 Feb 2017, part 2
 2017-02-17 23:19:30 +02:00
MiroslavR
f883951d75 Fix incorrect calculation of armor rating (Bug #3754) 2017-02-17 03:11:37 +01:00
David Cernat
a5d7c5fd39 Merge pull request #148 from OpenMW/master 
Add OpenMW commits up to 13 Feb 2017
 2017-02-13 21:29:51 +02:00
Allofich
6b53541571 Prevent AI actors from hitting unintended targets 
(Fixes #3254)
 2017-02-12 19:51:19 +09:00
David Cernat
d528a0edb5 Merge pull request #147 from OpenMW/master 
Add OpenMW commits up to 11 Feb 2017
 2017-02-11 21:27:51 +02:00
Allofich
e047679595 Fix trying to access stats on non-actors 2017-02-11 19:59:42 +09:00
David Cernat
6763718412 Merge pull request #146 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/actors.cpp
 2017-02-10 21:39:16 +02:00
Allofich
5d2090684a Store mHitAttemptActorId in save files 2017-02-07 01:26:26 +09:00
Allofich
25c64dbb0f Make combat engagement logic more like vanilla 
(Fixes #2678, Fixes #3705)
 2017-02-07 01:25:12 +09:00
David Cernat
2158e94a96 [Client] Fix setting of attack parameters after recent changes 2017-01-25 18:04:20 +02:00
David Cernat
63c8a98083 [General] Stop using virtual functions in BasePlayer 2017-01-25 17:06:15 +02:00
David Cernat
dfb87e9e0d Merge pull request #124 from OpenMW/master 
Add OpenMW commits up to 11 Jan
 2017-01-11 13:30:22 +02:00
MiroslavR
f1f9209814 Creatures now auto-equip shields (Fixes #3704) 2017-01-08 20:52:04 +01:00
David Cernat
973db7c78a Merge pull request #113 from OpenMW/master 
Add OpenMW commits up to 17 Dec
 2016-12-17 23:27:09 +02:00
Koncord
536715cf46 Cleanup tes3mp headers 2016-12-16 16:59:15 +08:00
Leon Krieg
739cd5ba45 Fixed more spelling mistakes 2016-12-15 13:09:40 +01:00
David Cernat
3a733eb122 Make tes3mp includes consistent 2016-11-17 17:16:25 +02:00
David Cernat
fa9d6e810e Use lowerCamelCase in tes3mp client function names like OpenMW does 2016-11-15 21:54:06 +02:00
Koncord
799842b5da Reduce using of the CPU 2016-11-12 20:11:27 +08:00
Koncord
56959ebfda Implement magic 2016-11-12 19:39:16 +08:00
David Cernat
cd798d5f23 Merge pull request #89 from OpenMW/master 
Add OpenMW commits up to 30 Oct
 2016-10-30 21:49:07 +02:00
Allofich
125e94ef0e Fix shadowing warnings 2016-10-31 00:39:31 +09:00
David Cernat
e27d1857ef Fix formatting in previous changes made by tes3mp to OpenMW's core 2016-10-19 22:06:11 +03:00
David Cernat
6eae017561 Merge pull request #74 from OpenMW/master 
Add OpenMW commits up to 5 Oct
 2016-10-06 06:16:09 +03:00
Allofich
506d0e8e54 Correction to display of 0-weight tooltips 2016-10-04 23:02:45 +09:00
Allofich
160da0b149 Treat 0-weight armor as light armor in some respects 2016-10-04 23:02:25 +09:00
David Cernat
728a09e423 Reorder functions in LocalPlayer and make their names more consistent 2016-09-30 08:59:58 +03:00
David Cernat
ce4b326b02 Rename ID_GAME_UPDATE_BASESTATS into ID_GAME_DYNAMICSTATS_CURRENT 2016-09-28 07:50:16 +03:00
David Cernat
7e4543ffcb Merge pull request #64 from OpenMW/master 
Add OpenMW commits up to 24 Sep
 2016-09-25 11:06:07 +03:00
MiroslavR
52e00f5fef Do not show uncarriable lights in item views 2016-09-24 18:01:31 +02:00
David Cernat
cdada00a8a Merge pull request #56 from OpenMW/master 
Add OpenMW commits up to 15 Sep
 2016-09-15 22:19:02 +03:00
MiroslavR
f323f231db Allow activating actors without a name (Fixes #3551) 2016-09-15 16:47:50 +02:00
David Cernat
3b7693c719 Resolve conflicts in pull request #55 
# Conflicts:
#	README.md
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/combat.cpp
 2016-09-15 08:49:57 +03:00
Allofich
34851349de Pass hitPosition by const reference 2016-09-13 00:59:56 +09:00
Allofich
bce0166931 Don't play blood effects for resisted hits 2016-09-12 22:46:32 +09:00
David Cernat
4d2ca20445 Resolve conflicts in pull request #43 
# Conflicts:
#	README.md
 2016-08-24 22:03:35 +03:00
Allofich
7db31ab58a Correct telekinesis glow length 2016-08-24 01:21:15 +09:00
David Cernat
d9cfd5bac2 Resolve conflicts with OpenMW 2016-08-15 19:14:13 +03:00
scrawl
8c44334409 Merge pull request #1021 from Allofich/weight 
Corrections to tooltip displays of zero-weight items
 2016-08-14 15:14:58 +02:00
Allofich
7bf04b5014 Allow showing value of zero-weight lights 2016-08-14 21:15:22 +09:00
Allofich
502a26a7ff Use getWeightString() to avoid casting to int 2016-08-14 19:38:53 +09:00
Allofich
4f5d676b4e Allow weight tooltips for gold and keys if not 0 2016-08-14 19:32:43 +09:00
Allofich
caf025f93d Don't show 0 weight tooltips except for potions 2016-08-14 19:27:59 +09:00
Allofich
cf7278f8ae Don't show weight tooltip for 0-weight equipment 2016-08-14 18:37:41 +09:00
Allofich
ee2702087c Make zero-weight boots play light boot footsteps 2016-08-14 17:27:47 +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
David Cernat
09d564424f Translate Russian code comment into English 2016-08-01 19:26:42 +03:00
Aesylwinn
b4a000913c Merge remote-tracking branch 'yar/master' into Even 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwdialogue/filter.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/localscripts.cpp
#	components/CMakeLists.txt
#	components/compiler/exprparser.cpp
#	components/sceneutil/workqueue.cpp
 2016-07-17 23:50:52 -04: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
Koncord
1b259e2d33 Syncing inventory, animations, position, 8 key attributes 
Created Package system
 2016-07-07 23:50:48 +08:00
scrawl
0720a19fc0 Add support for placing BodyParts in a cell (Bug #3118) 2016-07-07 23:50:48 +08:00
Allofich
35a23c3b49 Implement and use new method allowTelekinesis() 2016-07-07 21:54:31 +09:00
scrawl
a825882c6b Process death events at the end of the death animation (Fixes #1873) 2016-06-12 00:04:50 +02:00
scrawl
8fcc1911d9 Use fCombatDistance as the creature attack range 2016-06-10 23:47:01 +02:00
scrawl
11f00e3aa9 Rename safePlaceObject to placeObject 2016-02-29 17:05:18 +01:00
scrawl
c3ef387208 Vanilla-compatible creature/NPC respawning (Fixes #2369, Fixes #2467) 2016-02-27 12:53:07 +01:00
scrawl
d05603c7fe Directly apply On Target 'When Strikes' enchantments instead of launching a projectile (Fixes #3212) 2016-02-22 19:42:54 +01:00
scrawl
c5d3e6c993 Disable preloading of levelled lists 2016-02-22 14:31:02 +01:00
scrawl
fb219fea17 Fix respawning of NPCs/creatures when they were moved to a different cell 2016-02-10 19:07:01 +01:00
scrawl
f6f9eff9a6 Preload levelled creatures 2016-02-09 03:06:00 +01:00
scrawl
1b8e82e929 Preload NPC body parts 2016-02-09 00:26:22 +01:00
scrawl
84dcf59c50 Fix preloading of equipment parts that don't separate gender 2016-02-08 22:57:47 +01:00
scrawl
effe022bb2 Move preload model list to MWClass, preload NPC head/hair 2016-02-08 20:52:32 +01:00
scrawl
b9d1d6144a Don't reveal unknown potion effects in alchemy window (Fixes #3146) 2016-02-02 22:50:11 +01:00
scrawl
1905f0bf2d Add support for placing BodyParts in a cell (Bug #3118) 2016-01-02 01:30:06 +01:00
scrawl
e5d9ee30f4 Add count argument to copyObjectToCell 
Fixes the gold bug introduced in c9ca5bc946
 2015-12-19 16:48:32 +01: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
7a2ca5580a Accept a ConstPtr in RippleSimulation 2015-12-19 15:51:41 +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
c43f80633a Accept a ConstPtr in getEnchantmentPoints 2015-12-18 16:48:19 +01:00
scrawl
303521002d Accept a ConstPtr in adjustScale 2015-12-18 16:46:02 +01:00
scrawl
09bdb0ad4b Accept a ConstPtr in getServices 2015-12-18 16:44:35 +01:00
scrawl
648ee6e7fb Accept a ConstPtr in applyEnchantment 2015-12-18 16:43:11 +01:00
scrawl
3c98f8dde3 Accept a ConstPtr in isPersistent 2015-12-18 16:41:37 +01:00
scrawl
3fe3091275 Accept a ConstPtr in isEssential 2015-12-18 16:39:35 +01:00
scrawl
4a47fc32fa Accept a ConstPtr in getBloodTexture 2015-12-18 16:39:08 +01:00
scrawl
2bd8d60e9f Accept a ConstPtr in getPrimaryFaction, getPrimaryFactionRank 2015-12-18 16:33:54 +01:00
scrawl
2ac92012e8 Accept a ConstPtr in isClass 2015-12-18 16:29:30 +01:00
scrawl
5b082be79f Accept a ConstPtr in getBaseGold 2015-12-18 16:28:20 +01:00
scrawl
da7ebfde99 Accept a ConstPtr in copyToCell 2015-12-18 16:27:18 +01:00
scrawl
954186fe1e Accept a ConstPtr in canFly, canSwim & canWalk 2015-12-18 16:27:18 +01:00
scrawl
b09bdd6af5 Accept a ConstPtr in isBipedal 2015-12-18 16:27:18 +01:00
scrawl
92a3acfa56 Accept a ConstPtr in getBaseFightRating 2015-12-18 16:12:35 +01:00
scrawl
d120f76031 Accept a ConstPtr in getSound 2015-12-18 16:11:03 +01:00
scrawl
d77f785cbc Accept a ConstPtr in get*SoundId 2015-12-18 16:09:54 +01:00
scrawl
dc92fefd2b Accept a ConstPtr in canBeEquipped, getEquipmentSlots & hasItemHealth 2015-12-18 16:06:31 +01:00
scrawl
e0bb284804 Accept a ConstPtr in getWeight 2015-12-18 16:00:50 +01:00
scrawl
0047a2d330 Accept a ConstPtr in canSell 2015-12-18 15:58:45 +01:00
scrawl
2bc851c7d3 Accept a ConstPtr in getEnchantment 2015-12-18 15:56:45 +01:00
scrawl
beb8805a12 Accept a ConstPtr in getInventoryIcon 2015-12-18 15:53:47 +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
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
3890afd6f5 Merge pull request #843 from kcat/master 
Add HRTF options and fix an incorrect SoundID
 2015-12-08 13:59:15 +01:00
scrawl
07b064f616 Rename to lowerCaseInPlace 2015-12-07 22:49:15 +01:00
Chris Robinson
91cd6be11b Use the correct SoundId for NPC "land" sounds 2015-12-05 18:00:28 -08: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
scrawl
bd9dc58560 Use the correct scale for actor swim height (Fixes #2833) 2015-11-01 21:45:58 +01:00
Emmanuel Anne
944dfa5372 a light without the carry flag can't be equipped ! 
it fixes Antares big mod teaching disciplines, it adds a light which should
not be equipped to npcs which have learnt something.
 2015-10-07 12:28:25 +02:00
Emmanuel Anne
29a84452ab durations in tooltips : use "show effect duration" setting 2015-09-16 22:42:54 +02:00
Emmanuel Anne
1472711583 add duration to spell icons too 
and use gmststrings instead of direct strings in tooltips
durations can display minutes and hours
I don't know any effect lasting an hour or more but you never know...
 2015-09-16 17:53:14 +02:00
Emmanuel Anne
47e29480ce show duration of light sources in tooltip 
I had forgotten light sources disappear after a while, this way at least
you know it's normal !
 2015-09-16 17:53:06 +02:00
dteviot
300c48329d Creature::isFlagBitSet() changed to free function. 2015-08-28 18:38:05 +12:00
dteviot
95d2d82abf extracted isFlagBitSet() 2015-08-27 18:36:46 +12:00
dteviot
541d7fb4fb Fixed assorted issues 
* destructor is virtual
* renamed class to Actor
* corrected indentation of case statement
 2015-08-25 18:19:16 +12:00
dteviot
bb54bbd273 Pulled duplicated functions into common base class 2015-08-24 19:54:02 +12: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
211deeb63e Don't attempt to lock or unlock unsuitable objects (Fixes #2826) 2015-08-13 17:08:21 +02:00
scrawl
7f66339790 Remove a redundant function 2015-07-24 20:23:27 +02:00
Koncord
75e5023590 fix code duplication 2015-07-20 08:06:43 +09:00
scrawl
278a078e9d Unify magic effect tick functions 
- Removes duplicated code
- Handle some zero-duration instant effects that were not handled before (disintegrate, sun damage, elemental damage)
 2015-07-18 20:39:45 +02:00
scrawl
4637750601 Savegame loading optimization 2015-06-30 16:47:41 +02:00
scrawl
882e359008 Move attackStrength to the CharacterController, where it should have been to begin with 
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
 2015-06-26 05:15:07 +02:00
scrawl
04010b8a1a Set OnPcHitMe even for missed hits 2015-06-18 15:00:04 +02:00
scrawl
7bacb9418d Various math code ported to osg 2015-06-03 19:41:19 +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
de8e5f0db1 Restore projectiles 2015-06-01 21:41:13 +02:00
scrawl
152d690a7a Minor cleanup 2015-05-23 23:10:53 +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
d1b6289cad Don't teleport followers when using teleportation spells 2015-05-22 19:57:02 +02:00
scrawl
85345e663a Restore getHitContact 2015-05-22 04:36:33 +02:00
scrawl
375b736e74 Use SDL to create the window 
No input nor event loop handling yet, so the window will "stop responding" after a few seconds.

Thanks to KittyCat for the GraphicsWindowSDL2 code.
 2015-05-13 02:53:09 +02:00
scrawl
4036978718 Empty model exception fix 2015-05-12 16:50:31 +02:00
scrawl
e8ec4387d6 Creature collision fix 2015-05-12 16:50:11 +02:00
scrawl
47758c11cd Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
scrawl
5abeab21ed Various integer/floating point roll adjustments based on wiki 2015-05-11 16:55:09 +02:00
scrawl
c31b416ba1 Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
scrawl
9f12e53956 Scale NPCs by their Weight property (Fixes #814) 2015-04-24 14:49:20 +02:00
scrawl
8c810e3620 Move rng to components 2015-04-22 17:58:55 +02:00
scrawl
68f93294da Port EffectManager 2015-04-19 17:55:56 +02:00
scrawl
c92592493e OpenMW: create a window and render the starting cell(s) 2015-04-12 15:38:30 +02:00
scrawl
642c1d2d36 Build fix 2015-04-10 15:31:19 +02:00
scrawl
4e69e7cc0f OpenMW compiles and runs w/o render window 2015-04-01 17:02:15 +02:00
dteviot
3f28634d1f consolidate random number logic 
Note, I suspect Rng::rollClosedProbability() is not needed.  The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
 2015-03-15 14:07:47 +13:00
Rohit Nirmal
2540a901d5 Remove unused variable. 2015-03-13 20:04:47 -05:00
scrawl
767624f518 Combat mechanic fixes 2015-03-12 03:08:58 +01:00
scrawl
3879ce6ac1 Get rid of "player" string checks (Fixes #2216) 2015-03-11 23:07:39 +01: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
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
scrawl
239c0071f5 Armor tooltip should show the effective armor rating 2015-03-01 19:40:38 +01:00
scrawl
75db4d6473 Merge remote-tracking branch 'upstream/openmw-35' into HEAD 2015-02-11 12:11:59 +01:00
scrawl
dfaab1188f Fix for broken levelled creature spawning (Fixes #2365) 2015-02-11 12:10:46 +01:00
Alexander "Ace" Olofsson
df5a08b6de Move manualref code out of header 2015-02-09 15:01:49 +01:00
scrawl
bea88c3643 Stolen item tracking overhaul part 2 (Fixes #2338) 2015-02-06 01:27:16 +01:00
scrawl
7e33471edb Fix code duplication 2015-01-31 22:40:43 +01: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
0497a40d09 Fix incorrect sound for thrown weapons 2015-01-31 22:40:40 +01:00
scrawl
431f540791 ESSImport: fix NPC factions 2015-01-27 23:12:21 +01:00
scrawl
c7d15e6f74 Revert "Revert "Light charge handling fix"" 
This reverts commit b95748d044.
 2015-01-23 15:33:39 +01:00
scrawl
b95748d044 Revert "Light charge handling fix" 
This reverts commit 5e0428243b.
 2015-01-23 02:32:38 +01:00