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

425 commits

Author SHA1 Message Date
David Cernat
df051a777a Merge pull request #181 from OpenMW/master 
Add OpenMW commits up to 4 Mar 2017
 2017-03-04 22:56:16 +02:00
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.
 2017-03-04 21:48:31 +01:00
David Cernat
9cffc1f661 [Client] Don't open up main menu when player's death animation finishes 2017-03-04 02:29:57 +02: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
David Cernat
4110fac629 Merge pull request #174 from OpenMW/master 
Add OpenMW commits up to 26 Feb 2017, part 2
 2017-02-27 01:05:02 +02:00
scrawl
6f4c03aa32 Avoid retrieving setting every frame 2017-02-26 17:34:24 +01:00
David Cernat
2ed9ae5739 Merge pull request #149 from OpenMW/master 
Add OpenMW commits up to 14 Feb 2017
 2017-02-14 10:27:53 +02:00
scrawl
183c46b0ef Fix summoning effects 2017-02-14 07:58:16 +01: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
scrawl
5a12407436 Revert "Rearranged check for better performance" 
This reverts commit 332ceb51a2.
 2017-02-11 17:53:11 +01: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
scrawl
332ceb51a2 Rearranged check for better performance 2017-02-10 06:48:03 +01: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
27242cdab9 Merge pull request #142 from OpenMW/master 
Add OpenMW commits up to 6 Feb 2017
 2017-02-06 09:13:19 +02:00
scrawl
bc29a99a53 Fix broken timer 2017-02-06 05:10:40 +01:00
David Cernat
3a29b2d41d Merge pull request #141 from OpenMW/master 
Add OpenMW commits up to 5 Feb 2017
 2017-02-05 07:11:45 +02:00
scrawl
3065600a86 Skip expensive visitEffectSources call if no summoned creatures or summon effects are active 2017-02-05 02:26:28 +01:00
scrawl
a2cede8f34 Add timer for updateEquippedLight 2017-02-05 02:26:28 +01:00
David Cernat
f376b8416e Merge pull request #127 from OpenMW/master 
Add OpenMW commits up to 15 Jan
 2017-01-15 02:51:15 +02:00
Allofich
f2240dde9c Allow command spells to work when cast by AI on AI 
(Fixes #3723)
 2017-01-15 01:56:22 +09:00
Allofich
e825010107 Apply command spell effects on impact 
Command spells should apply their effects, including taking an actor out
of combat, every time a spell successfully hits, even if a previous
command effect is still active.
 2017-01-15 01:53:22 +09: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
scrawl
212e85e810 Merge pull request #1174 from Allofich/combat 
Adjustments to AI combat engaging and disengaging
 2017-01-01 19:36:09 +01:00
David Cernat
fba4878fee Merge pull request #118 from OpenMW/master 
Add OpenMW changes up to 27 Dec
 2016-12-27 03:49:52 +02:00
Allofich
54fa921dad Change some AI combat engagements to not need LOS 2016-12-26 22:42:46 +09:00
Allofich
6fa0354a17 Make AI attack player also if it attacks follower 2016-12-26 22:42:45 +09:00
Allofich
5a6ea4e84e Cleanup 2016-12-26 22:42:44 +09:00
Allofich
e8c7ad2f4b Change environment check to canFight check 
Instead of just checking that combatants are in compatible environments,
allow combat if in attack range using canFight. Together with previous
commit, fixes #3690.
 2016-12-26 02:14:01 +09:00
Allofich
588442b6cc Make enemies start combat with player followers 
Recreates vanilla behavior of enemies starting combat with player
followers and escorters. (Fixes #3691)
 2016-12-26 02:13:54 +09:00
NeveHanter
8902bb5b13 Player now pays for the following actors when travelling, with the exception of the first follower who travels for free, refactored getFollowers to getActorsFollowing/getActorsSidingWith 2016-12-20 12:38:51 +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
12c8c3276a Disable NPC collision only when death animation has finished (#3666) 2016-12-15 19:33:14 +01:00
Allofich
6816e935f1 Fix fortify maximum magicka expiration (Fixes #3648) 2016-12-06 21:00:03 +09:00
David Cernat
234266755e Prevent player-controlled NPCs from auto-unequipping candles and torches 2016-11-18 02:47:59 +02: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
56959ebfda Implement magic 2016-11-12 19:39:16 +08: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
3136a12051 Resolve conflicts in pull request #75 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
 2016-10-14 18:34:17 +03:00
scrawl
454d1ffaef Make the cell change check during actor update more robust 2016-10-13 14:39:58 +02: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
a2e174a40f Don't let water-only creatures prevent resting 2016-10-01 22:15:31 +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
babba95413 Merge pull request #34 from OpenMW/master 
Add OpenMW commits from 1st week of August
 2016-08-08 15:53:56 +03:00
MiroslavR
b65f379b7f Save scripted animation state (Fixes #1931, #2150, #3393) 2016-08-03 03:52:35 +02: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