Commit graph

13429 commits

Author SHA1 Message Date
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
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
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
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
MiroslavR
f1f9209814 Creatures now auto-equip shields (Fixes #3704) 2017-01-08 20:52:04 +01:00
Koncord
97dd8704a3 Ignore ping packets 2017-01-07 23:05:22 +08:00
Allofich
5e992a0342 Fix attempting to access NPC stats on creatures 2017-01-06 02:58:24 +09:00
Assumeru
1a073ca642 Fix teleportation being unreachable 2017-01-03 22:02:23 +01:00
Koncord
dbbdb1071c Use default FindLua51 instead homebrew 2017-01-03 19:12:34 +08:00
Allofich
eee49b7ea7 Make dispel an instant effect again (Fixes #3695) 2017-01-02 17:35:50 +09:00
scrawl
80c008906b Fix texture coordinates 2017-01-02 04:50:33 +01:00
scrawl
48a23d61b2 Mask out water in global map overlay 2017-01-02 04:01:04 +01:00
scrawl
7b5f3e3cdc Fix crash in ProjectileManager when a sound id fails to play or is not found 2017-01-01 21:34:31 +01:00
scrawl
708009eac4 Merge pull request #1158 from logzero/move3
[RFC] Movement solver experiments
2017-01-01 20:44:41 +01: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
scrawl
da3815f5a6 Merge pull request #1179 from Armada651/fix-audio-cutoff
OpenAL_Output: When a source is finished, rewind it instead of stopping it.
2017-01-01 19:13:32 +01:00
logzero
dbf0fa6766 Skip stepping if movement tracer hits actor. 2016-12-31 10:57:06 +01:00
David Cernat
59c3dbe6af Merge pull request #120 from OpenMW/master while resolving conflicts
# Conflicts:
#	README.md
2016-12-30 23:59:30 +02:00
Koncord
b9c3849cc7 Change keycode to scancode 2016-12-30 02:33:44 +08:00
Koncord
7595b33461 Implement spellbook 2016-12-29 21:19:57 +08:00
Marc Zinnschlag
dedd95f52a Merge remote-tracking branch 'miroslavr/save-cleanup' 2016-12-29 08:37:59 +01:00
Jules Blok
e9d8ff532f OpenAL_Output: When a source is finished, rewind it instead of stopping it.
This works around a bug in the MacOS OpenAL implementation.
2016-12-29 01:03:13 +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
MiroslavR
c9dd63af8d Merge pull request #1171 from NeveHanter/travel-followers-cost
Implemented "paying" for travelling followers
2016-12-26 22:34:39 +01:00
NeveHanter
8568cd049f Removed "less" character from the documentation by the requested opportunity. 2016-12-26 21:46:43 +01: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
e10c4d8814 Stop combat between AI when canFight is false 2016-12-26 22:42:42 +09:00
David Cernat
5bdfb72752 Merge pull request #116 from OpenMW/master
Add OpenMW changes up to 26 Dec
2016-12-26 01:09:20 +02: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