Commit graph

18080 commits

Author SHA1 Message Date
scrawl
45fb4f04b1 Update reference of the interpreter context when an Activate results in a take action (Fixes #3727) 2017-01-18 21:57:50 +01:00
scrawl
70c5f64caa Fix mLocals not being updated in InterpreterContext::updatePtr 2017-01-18 21:55:58 +01:00
David Cernat
cf8a507860 Set window title for netlauncher 2017-01-18 16:44:59 +02:00
David Cernat
b2577498a9 Use tes3mp icon for netlauncher 2017-01-18 16:37:06 +02:00
David Cernat
fa8650f99a Merge pull request #128 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
2017-01-18 15:38:18 +02:00
scrawl
c6822b9eb6 Merge pull request #1192 from damiel/water_refactor
Added refactoring of shader handling from visvalda's fog shader
2017-01-16 18:26:28 +01:00
scrawl
8f5418c12c Merge pull request #1170 from NeveHanter/bugfix-3617
Enchanted arrows don't explode when hitting the ground (Bug #3617)
2017-01-15 23:00:25 +01:00
Martin-Kevin Neumann
5a8efa1649 added refactoring of shader handling from visvalda's fog shader 2017-01-15 14:17:22 +01:00
NeveHanter
e82d542d89 Merge remote-tracking branch 'upstream/master' into bugfix-3617 2017-01-15 09:49:45 +01:00
NeveHanter
811e9ad9f3 Fixed bug https://bugs.openmw.org/issues/3617 by allowing touch and target enchantments from ranged weapons and their projectiles to explode even when colliding with non-activable objects, terrain, water slab or when shoot underwater.
Also allowed projectiles to fly through the dead bodies as in vanilla.
2017-01-15 09:49:25 +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
scrawl
edf04667e0 Merge pull request #1191 from Allofich/ai
Stop combat when adding an AI package to an actor
2017-01-14 19:28:33 +01: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
Allofich
a46c4de918 Stop combat when adding an AI package to an actor
(Fixes #3722)
2017-01-15 01:53:22 +09:00
David Cernat
afebc9c60f Don't require C++14 for netlauncher 2017-01-14 17:56:29 +02:00
David Cernat
ba493435f3 Prevent crash when trying to remove -1 rows in netlauncher 2017-01-14 17:54:50 +02:00
David Cernat
b1bcba3055 Use Qt 5 by default 2017-01-14 17:31:13 +02:00
David Cernat
76162fbfde Fix netlauncher target properties in CMake for Visual Studio 2017-01-14 17:14:04 +02:00
scrawl
b87abb0456 Reset activation flags when an object is copied (Fixes #3671, Fixes #3719) 2017-01-14 15:29:36 +01:00
David Cernat
70b43ecef6 Merge pull request #126 from OpenMW/master
Add OpenMW commits up to 14 Jan
2017-01-14 05:59:16 +02:00
Koncord
0ab02006de Detect ARM CPUs 2017-01-14 11:17:36 +08:00
scrawl
69ce9f32bc Activate/OnActivate fix (Bug #3712) 2017-01-14 00:10:43 +01:00
David Cernat
2e3f508a56 Fix broken default keys and enable master server in configs 2017-01-13 10:33:21 +02:00
David Cernat
253ded1ee3 Use new getFilenameStamp() method to generate timestamps for filenames 2017-01-13 08:49:21 +02:00
David Cernat
3932654d5d Use log filenames w/ timestamps instead of adding numbers to their ends 2017-01-13 07:58:40 +02:00
David Cernat
213bc1e733 Print correct variable for Terra's library 2017-01-12 13:46:17 +02:00
David Cernat
10a0f165dd Print paths used for server dependencies in CMake, change tabs to spaces 2017-01-12 13:45:04 +02:00
Koncord
3c9eaad5ce Rename Main class to MainWindow 2017-01-12 10:46:48 +08:00
David Cernat
610ba1d867 Merge pull request #125 from OpenMW/master
Add OpenMW commits up to 12 Jan
2017-01-12 04:33:25 +02:00
Koncord
f7dc30387c Run tes3mp-netlauncher instead openmw in the OpenMW Launcher 2017-01-12 08:55:21 +08:00
Koncord
90908ed113 rename openmw-netlauncher to tes3mp-netlauncher 2017-01-12 08:54:11 +08:00
scrawl
73aa07b81b Merge pull request #1189 from Allofich/attack
Match best attack selection to vanilla behavior
2017-01-11 18:36:10 +01:00
scrawl
4307c7dd89 Merge pull request #1190 from Allofich/command
Don't make Command spells cancel AI packages
2017-01-11 18:35:24 +01:00
Allofich
2322ab3125 Don't make Command spells cancel AI packages
(Fixes #3649)
2017-01-12 00:07:22 +09:00
Koncord
4604ee49bf Fix waiting answer when browser not connected to the master server 2017-01-11 23:00:46 +08:00
Koncord
968546b20c Use master server address from config file 2017-01-11 22:58:50 +08:00
Koncord
cb799ee446 Server browser 2017-01-11 22:05:40 +08:00
Allofich
c10585fb07 Match best attack selection to original MW
(Fixes #3721)
2017-01-11 22:22:46 +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
David Cernat
56cd18d967 Rename "tes3mp Team" into "tes3mp Credits" and add Special Thanks 2017-01-11 10:19:14 +02:00
Koncord
b6f9a21d7f Do not allow 0 update rate 2017-01-10 20:38:33 +08:00
Koncord
03a92b3a91 Use LOG_VERBOSE instead LOG_INFO 2017-01-10 20:37:40 +08:00
Koncord
01900c2be8 Use modname in Send function 2017-01-10 20:36:39 +08:00
Koncord
2b0ae7b9ca Fix variable name in JSON 2017-01-10 20:35:30 +08:00
Koncord
e92df0c465 Implement SetModname, SetHostname functions 2017-01-10 19:22:02 +08:00
Koncord
f510a5583f Move MasterClient to Networking class
Rename MOTD to hostname
2017-01-10 19:21:31 +08:00
Koncord
b5c586d5b7 Add and implement ID_MASTER_QUERY 2017-01-10 18:33:02 +08:00
Koncord
32615d05cf Prevent allocate memory if player doesn't exists 2017-01-10 18:31:51 +08:00
scrawl
dc1f6cdada Merge pull request #1186 from MiroslavR/autoequip-crea
Creatures now auto-equip shields (Fixes #3704)
2017-01-09 19:05:11 +01:00