teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
20298 commits 34 branches 0 tags 66 MiB
Commit graph

15239 commits

Author SHA1 Message Date
Chris Robinson
4b448c74d2 Use range-for loops instead of for_each 2017-09-16 16:25:32 -07:00
Chris Robinson
1e729e8da9 Avoid more explicit loops 2017-09-16 16:25:32 -07:00
Chris Robinson
9dbb713b7c Print a bit more information for sound initialization 2017-09-16 16:25:32 -07:00
Chris Robinson
acd6d9cd72 Try opening the default device fallback in OpenAL_Output 2017-09-16 16:25:32 -07:00
scrawl
f594eda574 Reset attackStrength when starting a new attack (Fixes #3935) 2017-09-16 23:04:54 +00:00
scrawl
5dd2e871c8 Merge pull request #1450 from kcat/master 
Sound improvements
 2017-09-16 15:59:13 +00:00
scrawl
820e0e9195 Merge pull request #1453 from MiroslavR/convertproj 
ESS-Importer: Convert ballistic projectiles
 2017-09-15 20:53:08 +00:00
scrawl
a8c287b692 Merge pull request #1447 from akortunov/stancechangefixes 
Clear player fields upon reload (bug #2639)
 2017-09-15 20:48:28 +00:00
Andrei Kortunov
44738e1141 Clear player fields upon reload (bug #2639) 2017-09-15 22:39:56 +04:00
Chris Robinson
d68e1581ee Use an std::array for the OpenAL stream buffers 2017-09-15 05:40:20 -07: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
Chris Robinson
0c1ad7c74e Replace a few more explicit loops 2017-09-15 02:36:46 -07:00
David Cernat
9838cc680a [Server] Enable Lua debugging for RelWithDebInfo builds 2017-09-15 08:19:15 +03:00
David Cernat
98195b5e3c Merge pull request #289 from TES3MP/master 
Add master commits up to 15 Sep 2017
 2017-09-15 03:32:20 +03:00
David Cernat
c98e6dc833 Merge pull request #288 from OpenMW/master 
Add OpenMW commits up to 14 Sep 2017
 2017-09-15 03:30:20 +03:00
Chris Robinson
1e123a22e1 Avoid some explicit loops 2017-09-14 16:56:46 -07:00
Chris Robinson
3757571d46 Set HRTF when initializing the device 2017-09-14 16:00:43 -07:00
Chris Robinson
c17edfd547 Don't be so throw-happy in the sound manager 2017-09-14 16:00:43 -07:00
Chris Robinson
abe80f5868 Move the soundlist when updating a Ptr instead of copying 2017-09-14 16:00:43 -07:00
Chris Robinson
605c937572 Ensure 3D sources are spatialized 
Standard OpenAL does not spatialize non-mono sounds, although the game has some
stereo sounds meant to play in 3D. The desired behavior can be achieved with
the AL_SOFT_source_spatialize extension.
 2017-09-14 16:00:43 -07:00
Chris Robinson
6f57233ba1 Avoid copying the same Ptr with each iteration 2017-09-14 16:00:42 -07:00
Chris Robinson
edfba68eb5 Apply reverb and a low-pass filter when underwater 
This replaces the pitch-shift effect when available.
 2017-09-14 16:00:42 -07:00
Chris Robinson
27eeaf90d0 Use unordered_map for the music playlist and sound buffer caches 2017-09-14 16:00:42 -07:00
Chris Robinson
033303b911 Properly update the near water sound volume 2017-09-14 16:00:42 -07:00
Chris Robinson
0b720cd90c Set the appropriate meter/unit scale for sound 2017-09-14 16:00:41 -07:00
Chris Robinson
c790fedd3f Load an effect and filter for underwater 2017-09-14 16:00:41 -07:00
Chris Robinson
3d37cb3cf6 Load EFX functions when available 2017-09-14 16:00:41 -07:00
Chris Robinson
c5a3fb7ccd Simplify checking for near water sfx change 
Rather than checking every frame you're near the water, only check when the
current cell changed (the sfx will only change when moving between interior and
exterior). It also doesn't need to look through all playing sounds, as it's a
local one not attached to a Ptr.
 2017-09-14 16:00:41 -07:00
Chris Robinson
617c05f557 Make Sound and Stream sibling types 
To avoid being able to accidentally cast a Stream* to a Sound*, or vice-versa.
 2017-09-14 16:00:40 -07:00
Chris Robinson
9e45f6d05f Make a note that stopTrack needs to be called for a stopping track 2017-09-14 16:00:40 -07:00
Chris Robinson
9e7a49f66e Include alext.h to get OpenAL extension definitions 2017-09-14 16:00:40 -07:00
Chris Robinson
1fe60dd8e2 Replace some shared_ptrs with pointers to deque entries 2017-09-14 16:00:30 -07:00
MiroslavR
a66d310a1d ESS-Importer: Fix uninitialized paid crime ID 2017-09-15 00:21:02 +02:00
MiroslavR
6e869c3123 ESS-Importer: Convert ballistic projectiles (Feature #2320) 2017-09-15 00:07:19 +02:00
Bret Curtis
e517ad3f7b add ktx support for splashscreens 2017-09-14 10:06:36 +02:00
Bret Curtis
dff0a766a8 adding 3 more extensions 2017-09-13 15:30:22 +02:00
Bret Curtis
b26887ef9b add support for png and dds splashscreens to begin with. 2017-09-13 13:52:05 +02:00
Koncord
f814ae795d [Master] Fix return from isServerValid() 
Temporary accept all servers in OnServerAnnnounce
 2017-09-13 19:11:58 +08:00
Koncord
838e05521e [Master] Minor fixes 2017-09-13 17:56:38 +08:00
Koncord
6decd148e5 [Server] Fix build on Windows 2017-09-13 11:06:53 +08:00
Koncord
045dc566ea Merge branch 'master' into new-script-api 2017-09-12 21:41:25 +08:00
Koncord
bb183457a6 [Master] Init BanAddress/UnbanAddress before opening script 2017-09-12 21:30:37 +08:00
Koncord
dc18916f46 [Master] Add isServerValid lambda. Add "OnServerAnnounce" callback 2017-09-12 21:29:42 +08:00
Koncord
d1388cdf84 [Master] Add Admin Rest Server 
Add admin rest callback - "OnAdminRequest". Called on every POST request
 2017-09-12 20:56:21 +08:00
Koncord
b869fe0b76 [Master] Add Lua 
Init master server values by config table in script
Add BanAddress/UnbanAddress to lua
Fix a couple of indents
Pass lua script as first launch parameter of master server
 2017-09-12 20:50:28 +08:00
Koncord
0e2817da88 [Master] Move response stuff to ResponseUtils.hpp 2017-09-12 20:39:27 +08:00
Koncord
fc8232f943 [Master] Add ban/unban functions 2017-09-12 20:24:50 +08:00
Koncord
26324c2578 [Master] Change Ban structure to vector<string> 2017-09-12 20:23:17 +08:00
Koncord
4e93905350 [Master] Backport SimpleWeb 2017-09-12 20:21:32 +08:00
David Cernat
bd541b1e5b Merge pull request #287 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
 2017-09-12 07:38:49 +03:00
scrawl
bd667c3847 Merge pull request #1435 from AnyOldName3/cmake-vs-debugging-dir 
If CMake supports it, sets the debugger working directory for Visual …
 2017-09-11 10:30:50 +00:00
scrawl
00ae9a01a1 Merge pull request #1445 from akortunov/guifixes 
Allow to add levelup a description for levels > 20
 2017-09-11 10:28:09 +00:00
scrawl
407640322d Merge pull request #1439 from akortunov/resistfix 
Take in account elemental shields for GetResist and SetResist script commands
 2017-09-11 10:27:47 +00:00
Marc Zinnschlag
9a8a4c744f Merge remote-tracking branch 'capostrophic/controlplus' 2017-09-11 10:46:34 +02:00
Andrei Kortunov
7760e4514c Allow to add levelup a description for levels > 20 2017-09-10 22:47:34 +04:00
scrawl
7688696765 Merge pull request #1437 from Capostrophic/nodemapfix 
Use constant nodeMap during part updating in creature animation
 2017-09-10 18:15:20 +00:00
Andrei Kortunov
c6fd75bf42 Take in account elemental shields for GetResist and SetResist script commands (bug #4093) 2017-09-10 22:05:58 +04:00
Capostrophic
97ff24b8d6 Change ctl to ctrl in OpenMW-CS shortcut manager 2017-09-10 20:48:09 +03:00
scrawl
618ec6dcdd Merge pull request #1440 from akortunov/guardfix 
Allow guards to attack fighting creatures only in fAlarmRadius range
 2017-09-10 17:06:14 +00:00
Andrei Kortunov
661232222f Allow guards to attack fighting creatures only in fAlarmRadius range 2017-09-10 15:26:48 +04:00
Capostrophic
9503d61866 Use const nodeMap in creature animation 2017-09-09 23:22:16 +03:00
Kyle Cooley
25d4a0370f Changes to land data access in tables, also update Land once per frame in scene view. 2017-09-09 15:37:52 -04:00
Kyle Cooley
d030b595f8 Fix potential segfault, cleanup, get rid of warnings. 2017-09-09 11:48:13 -04:00
Kyle Cooley
72cb405de2 Some bug fixes, changes to land load code. 2017-09-08 21:03:52 -04:00
AnyOldName3
a9b95596bc Add a missed trailing new line. 2017-09-08 22:21:00 +01:00
AnyOldName3
8c74f16247 Restore trailing new lines to shrink PR 2017-09-08 22:20:04 +01:00
AnyOldName3
5ce34f1cbf Move new behaviour into macro to reduce code duplication 2017-09-08 22:17:42 +01:00
MiroslavR
1e585ac71a Log a warning in case of missing bookart instead of showing a pink rectangle (Fixes #3826) 2017-09-08 22:50:07 +02:00
Kyle Cooley
2eacc2f093 Changes to land creation, add ability to specifically clear terrain cache 2017-09-08 14:37:03 -04:00
AnyOldName3
3c0ec0d6d0 If CMake supports it, sets the debugger working directory for Visual Studio 2017-09-08 17:26:46 +01:00
Andrei Kortunov
ac2f20f983 Update a disposition bar when a dialogue widget is disabled, but visible 2017-09-08 19:42:06 +04:00
Kyle Cooley
ab607f3028 Tweaks to land loading, land cloning, terrain signals, placeholder land update handling 2017-09-08 00:51:46 -04:00
scrawl
8f1c8759e4 Merge pull request #1432 from akortunov/alchemyfix 
Update alchemy effects after every created potion (#4079)
 2017-09-07 20:51:42 +00:00
Andrei Kortunov
dc0313a36f Use base skill value when calculating rank requirements 2017-09-07 21:06:10 +04:00
Andrei Kortunov
7559d25317 Update alchemy effects after every created potion (#4079) 2017-09-06 15:11:47 +04:00
Kyle Cooley
99e90ef808 Cleanup. Also modify ltex index generation. 2017-09-05 19:29:07 -04:00
Kyle Cooley
97d0fd756a LTEX importing 2017-09-04 19:31:09 -04:00
Kyle Cooley
5c3e90da88 Fix includes 2017-09-04 15:14:42 -04:00
Kyle Cooley
d3014cf394 Temporary fix for adding new lands, cloned lands will still reference old data though 2017-09-04 15:13:45 -04:00
David Cernat
b94c0a9991 [Client] Don't send Attribute & Skill packets as werewolf, part 2 2017-09-04 20:21:06 +03: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
David Cernat
8c9d6a0160 [Client] Ensure that LocalPlayer's isWerewolf starts out false 2017-09-04 15:44:10 +03:00
David Cernat
ccb15cc09e [Client] When players die, make guards willing to arrest them again 2017-09-04 15:13:05 +03:00
Kyle Cooley
90c485104a Land creator 2017-09-04 01:06:58 -04:00
Kyle Cooley
7cc95a11a4 Add more land table columns 2017-09-03 20:00:19 -04:00
Kyle Cooley
30ba1d4c25 Move touch command to creator, to allow customization and not break abstraction 2017-09-03 17:01:16 -04:00
Thunderforge
e0ffc94f3e Fix OpenMW-CS internal name 2017-09-02 18:07:12 -05:00
Koncord
510e657c93 Merge branch 'master' into new-script-api 2017-09-02 19:48:44 +08:00
Koncord
060ebe3d4a [Server] Init isWerewolf variable 
Comment unused code
 2017-09-02 19:45:19 +08:00
Koncord
74c9a26d16 [Server] Fix "wrong packet with id: 14" 2017-09-02 14:01:11 +08:00
scrawl
4c5992a0d5 Warn if removing a node fails 2017-09-01 21:42:35 +00:00
scrawl
132ac6001b Fix bug of Animation::mSkeleton not being assigned 
This bug resulted in deactivating a Skeleton not working properly for creatures (that are out of processing range), therefore reduced performance.
 2017-09-01 21:42:34 +00:00
scrawl
7a79ebb713 Merge pull request #1428 from akortunov/stancechangefixes 
[Feedback needed] Stance switching changes, part II
 2017-09-01 21:42:08 +00:00
Andrei Kortunov
7f5f5458d4 Reset player attack animation when unequip weapon or tool 2017-09-01 18:03:23 +04:00
Andrei Kortunov
a5b01fefec Allow to interrupt an attack, if attack button is held 2017-09-01 14:28:21 +04:00
Andrei Kortunov
0d7279ea2a Fixes a regression with bound weapons equipping (bug #4050) 2017-09-01 08:59:05 +04:00
Kyle Cooley
1d480015b4 Add ability to touch records, LAND records in particular 2017-08-31 22:09:49 -04:00
Kyle Cooley
9e41f1340a Replace nonconst getId with setId, add template specialization and specialized derived classes for LandTexture 2017-08-31 22:09:49 -04:00
Kyle Cooley
5d14a2afcc Initial LTEX/LAND tables 2017-08-31 22:09:49 -04:00
scrawl
a8005c33d9 Revert unintended change to mOnGround variable that was somehow introduced with 38a2de3c51 2017-08-31 21:58:12 +00:00
David Cernat
2e8718a0e0 Merge pull request #282 from OpenMW/master 
Add OpenMW commits up to 31 Aug 2017, part 2
 2017-08-31 18:42:54 +03:00
David Cernat
3fc1bdecb3 [Client] Shorten player names to 31 characters after they are inputted 2017-08-31 18:41:37 +03:00
David Cernat
ac3254d85f [General] Don't send PlayerAttribute and PlayerSkill packets as werewolf 
This will prevent the server from overwriting a player's human form stats with their werewolf form stats.

Additionally, share PlayerShapeshift packets last when exchanging data with another player.
 2017-08-31 18:21:38 +03:00
David Cernat
93d1aa2e4a [Client] Comment out the broken sending of custom spells until 0.7.0 2017-08-31 17:07:45 +03:00
Koncord
1c0adc47ee [Server] Fix [get/set]MajorSkills and [get/set]MinorSkills 2017-08-31 20:51:05 +08:00
David Cernat
98a7769b91 Merge branch 'master' into 0.6.0 2017-08-31 15:44:27 +03:00
Andrei Kortunov
1aaa8a76c5 Allow to play only one copy of given sound at time (bug #3647) 2017-08-31 16:14:48 +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
Koncord
54f5104345 [General] Escape format for strings 2017-08-31 20:09:05 +08:00
David Cernat
499c7db121 [Server] Initialize interiors correctly if exterior 0, 0 has been loaded 2017-08-31 14:48:23 +03:00
Andrei Kortunov
91dcd5bc6e Do not allow to unequip weapon from inventory during attack 2017-08-31 13:28:09 +04:00
Andrei Kortunov
6f22d819c5 Do not allow to switch weapon to probe or lockpick during attack 2017-08-31 12:36:54 +04:00
Koncord
66fdba957b [Server] Add getDataFolder() to Script API 2017-08-31 16:25:43 +08:00
Koncord
1d16958910 [Server] Fix multiple calls of ON_POST_INIT 2017-08-31 16:20:50 +08:00
David Cernat
cca4991e74 [Utils] Use consistent names for utility functions added by tes3mp 2017-08-31 10:12:22 +03:00
David Cernat
cf4021a7b5 [Client] Only add valid quests to journal 2017-08-31 09:08:29 +03:00
David Cernat
134dd06d48 [Client] Only add valid inventory & equipment items to LocalPlayer 
Also add related debug information.
 2017-08-31 08:35:46 +03:00
David Cernat
c3d1eada89 [Client] Only add spells to players that are ensured to exist 2017-08-31 06:42:11 +03:00
David Cernat
f6d36d5d80 [Client] Ensure that objects searched for have a valid reference number 2017-08-31 03:40:36 +03:00
scrawl
8c6a8ca48d Respect the framelimit in all cases (Fixes #3531) 
Affects loading screen, videos & modal dialogs. Also skips rendering if window is minimized.
 2017-08-30 21:26:30 +00:00
Koncord
b18c6dec9d [Server] Fix sendList() 
Remove return from requestContainers()
Rename "Cells" usertype to "Cell"
 2017-08-30 22:50:47 +08:00
Koncord
60fc0bedb8 [Server] Use lower case for methods 2017-08-30 13:56:53 +08:00
Koncord
7717f9bece [Server] Replace getKillRefId/getKillNumber with getKill 2017-08-30 13:56:22 +08: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
scrawl
43fda6cf07 Merge pull request #1423 from akortunov/spellpriority 
Combat AI: use effective cast cost when rate enchanted weapon
 2017-08-29 22:38:36 +00:00
David Cernat
833d2a5dbe Merge pull request #277 from TES3MP/0.6.0 
Add hotfix commits for 0.6.0 up to 29 Aug 2017, part 1
 2017-08-29 19:32:21 +03:00
David Cernat
92553b8e29 [Server] Log startup errors by not deleting logger too early 2017-08-29 19:30:37 +03:00
Andrei Kortunov
73d5efabee Display negative values on fatigue progress bar 2017-08-29 18:53:21 +04:00
Andrei Kortunov
8003dbee12 Combat AI: use effective cast cost when rate enchanted weapon 2017-08-29 16:40:55 +04: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
Koncord
fe2dd1bad4 [Server] Use correct cells in "send" functions 
Remove unused return type from ON_PLAYER_SENDMESSAGE
 2017-08-29 03:34:36 +08:00
Koncord
2d0840cb3a [General] Modernize Script API 
This commit changes the style of tes3mp serverside scripting mods. Short list of changes:
* Break compatibility with old server mods
* OOP style lua API
* Basic dependency checker, allowing the installation of multiple server mods without changing configs
* Remove support for C++ plugins
* Change outdated LuaBridge to [sol2](https://github.com/ThePhD/sol2);
* Support GCC, Clang and MSVC compilers
* New environment variables: "TES3MP_SERVER_DIR" and "TES3MP_SERVER_USERDIR";
* New entity "Command controller" for registering new chat commands;
* New Event system
* Simplified Timer API
* All Lua mods now run in their own environments
* Add global namespace - Data that can be used for communicating between mods
* Player and Actor inherit base class NetActor
 2017-08-28 00:15:56 +08:00
scrawl
4fba157d3b Implement releaseGLObjects for cached resources 2017-08-26 19:29:12 +00:00
Harry
86ae2ae395 Improved shuffle (#1412) 2017-08-25 20:08:49 +00:00
AnyOldName3
1578fcbec7 Escape content file names before sending them to the GUI 2017-08-25 10:05:56 +00:00
Marc Zinnschlag
91f674bb6f Merge remote-tracking branch 'aesylwinn/master' 2017-08-25 10:24:17 +02:00
Kyle Cooley
a8576d78ad Change default topic info values 2017-08-24 13:51:53 -04:00
Kyle Cooley
42b948dffe Fix pathgrid segfault 2017-08-23 11:35:26 -04:00
Marc Zinnschlag
f4110a72cc Merge remote-tracking branch 'aesylwinn/fixvideotable' 2017-08-23 11:24:51 +02:00
David Cernat
2597f018d2 Merge pull request #272 from TES3MP/0.6.0 
Add hotfix commits for 0.6.0 up to 23 Aug 2017
 2017-08-23 07:22:29 +03:00
David Cernat
a883c8f8aa [Client] Prevent scripts from creating PlayerTopic packet spam 2017-08-23 07:14:45 +03:00
Kyle Cooley
157ecb166c Fix wrong folder name 2017-08-23 00:02:02 -04:00
David Cernat
8f543fb34e [Client] Use less exploitable way of disabling console 
Previously, large framerate drops allowed players to open and use the console for short periods of time.
 2017-08-23 04:58:07 +03:00
David Cernat
056d54e9f7 [Client] Only send ObjectScale packets for objects located in cells 2017-08-23 02:45:38 +03:00
scrawl
30665b743d Merge pull request #1416 from akortunov/guifixes 
Display large  journal entries correctly
 2017-08-22 20:37:46 +00:00
scrawl
aa95cb3d91 Merge pull request #1406 from Aesylwinn/reloadassets 
Editor: Asset Reloading
 2017-08-22 20:17:30 +00:00
Andrei Kortunov
0177fe6602 Display large entries in journal correctly 2017-08-22 23:26:06 +04:00
Kyle Cooley
d3d04171f9 Fix seg fault, undo changes BsaArchive 2017-08-22 15:06:56 -04:00
Andrei Kortunov
e799cbdb51 Combat AI: allow only one summoned creature at time 2017-08-22 09:18:49 +04:00
Kyle Cooley
8c4b12a603 VFS changes, one VFS and resource system per document. 
Added ability to reset a VFS::Manager.
Removed ability to rebuild the index for a VFS::Manager.
Moved VFS creation to CSM::Data.
 2017-08-21 22:31:19 -04:00
Kyle Cooley
979b0d7211 Code cleanup and more cache clearing 2017-08-21 18:58:38 -04:00
Kyle Cooley
3b9326d238 Clear terrain cache and reload terrain 2017-08-20 22:34:41 -04:00
Kyle Cooley
d4a722067d Reload water 2017-08-20 20:55:56 -04:00
Kyle Cooley
d7744e8b16 A bit of cleanup 2017-08-20 19:07:23 -04:00
scrawl
f0dea8b8e6 Revert "Implement a Fisher-Yates shuffle on background music" 2017-08-20 20:20:27 +00:00
David Cernat
ac27ca663b [Client] Don't send ObjectState packets for items in containers 2017-08-20 06:58:39 +03:00
Kyle Cooley
5950b26912 Update scene assets 2017-08-19 19:36:45 -04:00
scrawl
dbb8a5c959 Merge pull request #1401 from h313/master 
Implement a Fisher-Yates shuffle on background music
 2017-08-19 22:48:24 +00:00
Kyle Cooley
742bd00ec6 Clear cached resources 2017-08-19 15:26:46 -04:00
Harry
2a85c5f011 Implement a Fisher-Yates shuffle on background music 
This fixes sometimes getting repetitive background music
 2017-08-19 14:48:00 -04:00
Andrei Kortunov
65d05ee1cd Get only text from clipboard (bug #4025) 2017-08-19 15:32:17 +04:00
Andrei Kortunov
e0bb9c089b Revert commit 67d59bead5 (a better 
implementation found)
 2017-08-19 15:24:06 +04:00
Kyle Cooley
d31ed83b54 Preliminary asset reloading 2017-08-19 03:43:31 -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
scrawl
f277007b49 Merge pull request #1404 from akortunov/ownedcrosshair 
Owned crosshair feature improvements [discussion]
 2017-08-18 20:21:23 +00:00
Andrei Kortunov
7c80ddc9de Owned crosshair improvements (bug #2789) 2017-08-18 17:08:15 +04:00
Andrei Kortunov
641a6cd842 Added a delay before summoned creature corpse despawning 2017-08-18 11:58:28 +04:00
David Cernat
cffd985038 Merge pull request #266 from TES3MP/0.6.0 
Add hotfix commits for 0.6.0 up to 18 Aug 2017
 2017-08-18 07:45:36 +03:00
David Cernat
0820b7e92b [Server] Add GetCaseInsensitiveFilename() script function 
Additionally, make header order consistent in script function files.
 2017-08-18 07:13:08 +03:00
Capostrophic
6c8c883dc0 Making knownEffect aware that there can be more than 4 potion effects 2017-08-18 00:47:28 +03:00
scrawl
b73ed5ccac Merge pull request #1391 from akortunov/aifollow 
AiFollow: add a threshold when turning to target
 2017-08-17 20:17:11 +00:00
Andrei Kortunov
d8d47f081b AiFollow: add a threshold when turning to target 2017-08-17 22:52:34 +04:00
scrawl
c231d20413 Merge pull request #1362 from akortunov/spellpriority 
Combat AI: use WhenUsed enchantments [Feedback needed]
 2017-08-16 21:23:57 +00:00
scrawl
306b58349e Merge pull request #1387 from akortunov/movementfix 
Check actual movement for GetPCRunning and GetPCSneaking [Feedback needed]
 2017-08-16 20:50:49 +00:00
scrawl
d1161819bf Merge pull request #1396 from akortunov/dispelfix 
Dispel only effects from spells
 2017-08-16 20:49:40 +00:00
Andrei Kortunov
bc7353f100 Check animation state for GetPCRunning and GetPCSneaking 2017-08-16 20:30:47 +04:00
Andrei Kortunov
67d59bead5 Get only text from input fields (bug #4025) 2017-08-16 15:03:04 +04:00
Andrei Kortunov
1e983604db Dispel only effects from spells (bug #3995) 2017-08-15 09:35:29 +04:00
scrawl
8acf0ba633 Merge pull request #1394 from akortunov/followerattackfix 
Prevent followers from attacking player if crime was reported
 2017-08-14 22:19:46 +00:00
scrawl
24eaced7d2 Merge pull request #1395 from akortunov/tradeconfiscatefix 
Confiscate an item when you try to sell it to its owner
 2017-08-14 22:18:42 +00:00
Andrei Kortunov
ec64034160 Confiscate stolen item/gem when enchanting 2017-08-14 19:29:34 +04:00
Andrei Kortunov
7a5645b35d Prevent followers from attacking player if crime was reported 2017-08-14 18:42:19 +04:00
Andrei Kortunov
f84eb68b3d Confiscate an item when you try to sell it to its owner (bug #3944) 2017-08-14 11:31:17 +04:00
Kyle Cooley
249c1ae95a Fix orbit camera jumping back to old position 2017-08-13 19:26:32 -04:00
scrawl
1bdcecc32e Merge pull request #1390 from akortunov/referencecheck 
Do not make target reference unavailable on cell change
 2017-08-12 18:48:52 +00:00
Andrei Kortunov
3f159960b7 Restored pickpocket and werewolf check 2017-08-12 21:18:05 +04:00
scrawl
b6aaa2f2be Merge pull request #1389 from akortunov/autosave 
Create autosave when waiting
 2017-08-12 16:50:30 +00:00
Andrei Kortunov
b3b7d6aa9f Do not make target reference unavailable on cell change (bug #3898) 2017-08-12 09:36:09 +04:00
Andrei Kortunov
c542ae6875 Create autosave when waiting (bug #1452) 2017-08-12 09:06:31 +04:00
David Cernat
d51736d68f [Client] Fix crashes caused by inventory items with disabling scripts 2017-08-11 05:49:33 +03:00
scrawl
0f983144a4 Merge pull request #1383 from akortunov/guifixes 
Enable transparency for interactive messageboxes and tooltips in game mode
 2017-08-10 21:55:24 +00:00
Thunderforge
f41a4bb937 Changing "New Installation" to "Retail CD/DVD" for clarity 2017-08-09 00:20:49 -05:00
Andrei Kortunov
56f5a5dee3 Added transparency to 'owned' tooltip 2017-08-08 22:57:39 +04:00
scrawl
af9db74010 Merge pull request #1377 from LennyPenny/master 
Fade out music before change occurs
 2017-08-08 17:34:50 +00:00
Andrei Kortunov
4cc8afd25d Add transparency for tooltips in game mode 2017-08-08 20:38:15 +04:00
Andrei Kortunov
6cb3c83248 Add transparency for interactive messageboxes in game mode 2017-08-08 20:36:50 +04:00
Lennart Bernhardt
546352dbe3 avoid starting sound updates more than necessary 2017-08-08 03:31:01 +02:00
Lennart Bernhardt
7b8278ae45 remove redundant mMusicFader variable 2017-08-08 03:17:40 +02:00
scrawl
551045e4cc Merge pull request #1370 from Siimacore/data_files_loc_fix 
Correcting https://bugs.openmw.org/issues/3906.
 2017-08-07 18:52:54 +00:00
scrawl
cd4525cf25 Merge pull request #1372 from akortunov/guifixes 
Journalbook layout fixes
 2017-08-07 18:49:13 +00:00
Andrei Kortunov
ab391f17db Fixes regression in spell school detection (bug #4007) 2017-08-07 12:12:57 +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
scrawl
ba72eb77f4 Merge pull request #1374 from akortunov/guardfix 
Disable AiPursue package for player's followers
 2017-08-06 21:11:08 +00:00
scrawl
7f5b615295 Merge pull request #1375 from MiroslavR/missing-import 
Add missing include for isatty function
 2017-08-06 21:10:11 +00:00
spycrab
632d39ca76 Allow starting at an (unnamed) exterior cell using --start (Feature #3941) 2017-08-06 22:31:07 +02:00
Lennart Bernhardt
60a7d3d6e0 Fade out music before change occurs 2017-08-06 20:10:56 +02:00
MiroslavR
393f4ab758 Add missing include for isatty function (Fixes #4002) 2017-08-06 13:02:22 +02:00
David Cernat
77ce05b7d6 [Client] Fix spell casting probability synchronization 2017-08-06 00:11:54 +03:00
Andrei Kortunov
72ce118d02 Disable AiPursue package for player's followers 2017-08-05 12:38:26 +04:00
Andrei Kortunov
cf7a6232d0 Combat AI: use WhenUsed enchantments 2017-08-05 12:18:38 +04:00
scrawl
fe8437ae10 Merge pull request #1371 from akortunov/journalfix 
Do not allow to use journal in a main menu
 2017-08-04 21:45:44 +00:00
David Cernat
721b218cc2 Merge pull request #258 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	README.md
 2017-08-05 00:09:34 +03:00
Jake Westrip
63343b6241 Ensure jail does not decrease a skill past zero 2017-08-05 06:15:15 +10:00
David Cernat
0e2038f045 [General] Record and get player positions before their last cell change 2017-08-04 21:45:52 +03:00
David Cernat
fbec0d9443 [Client] Remove inertia from players who are teleported via a packet 2017-08-04 21:43:01 +03:00
Andrei Kortunov
23bda7613b Do not allow to use journal in a main menu (bug #3991) 2017-08-04 07:31:41 +04:00
Siimacore
c920d083e4 Correcting https://bugs.openmw.org/issues/3906. 2017-08-03 23:15:26 +02:00
scrawl
a78f254883 Merge pull request #1368 from akortunov/tradefix 
Trade window improvements
 2017-08-03 21:09:57 +00:00
scrawl
a63b9e33fd Merge pull request #1369 from akortunov/tauntfix 
Take in account a temporary disposition in isAggressive check (bug #3…
 2017-08-03 21:01:03 +00:00
Andrei Kortunov
56a30d7aec Journalbook layout fixes 2017-08-03 20:27:14 +04:00
Andrei Kortunov
d1489f5b42 Take in account a temporary disposition in isAggressive check (bug #3987) 2017-08-03 19:18:31 +04:00
Andrei Kortunov
35beede065 Restock items after trade deal instead of trade window opening 2017-08-03 18:41:13 +04:00
Andrei Kortunov
487e72fd23 Play Up sounds instead of Down ones in trade window (bug #3982) 2017-08-03 18:39:59 +04:00
elsid
748f5225a9 Copy PathFinder::mPath back value when pass to MWMechanics::AiPackage::pathTo as dest 
May become dangling reference because method may remove all elements from mPath.
 2017-08-02 11:35:53 +03:00
scrawl
0d58a77f86 Merge pull request #1291 from MiroslavR/respawn_crash 
Prevent respawned references from being added to the scene twice
 2017-08-01 14:38:46 +00:00
Andrei Kortunov
604f9ee323 Split weapons and spells rating code from combat actions 2017-08-01 09:05:35 +04:00
MiroslavR
d24286273b Prevent respawned references from being added to the scene twice in certain cases (Fixes #3864) 2017-08-01 00:11:14 +02:00
Andrei Kortunov
b7cfb1aaf4 Fixed DamageHealth and AbsorbHealth effects applying 2017-07-31 23:05:19 +04:00
scrawl
eac2e52841 Merge pull request #1329 from akortunov/priorityfix 
Combat AI: make default spell priority calculation formula close to vanilla
 2017-07-31 18:21:47 +00:00
Koncord
d7cbfc98eb [Browser] Fix crashing of browser (I hope) 2017-08-01 02:16:49 +08:00
scrawl
fde6e29628 Merge pull request #1326 from akortunov/spellpriority 
Combat AI improvements [feedback needed]
 2017-07-31 17:51:51 +00:00
scrawl
333648c975 Merge pull request #1324 from akortunov/doorfix 
Improved doors detection
 2017-07-31 17:42:53 +00:00
Andrei Kortunov
10eb6ec75f AI: Check angle between actor and door 2017-07-31 19:28:02 +04:00
Koncord
1f632d8bc9 [Master] Fix REST servers/info 2017-07-31 19:32:27 +08:00
Koncord
bca594150c [Browser] Add debug info to QueryClient 2017-07-31 19:08:04 +08:00
Koncord
918658d383 [Master] Waiting ACK instead of immediately closing connection. 2017-07-31 19:08:04 +08:00
scrawl
9ac409e61c Merge pull request #1287 from akortunov/spellsorting 
Spellbuying menu improvements
 2017-07-31 09:43:47 +00:00
scrawl
43279c49b5 Go back to index when selecting 'cancel' on topics list 2017-07-30 23:51:44 +02:00
scrawl
4b51fd23e0 Merge pull request #1356 from akortunov/guifixes 
Add missing journal sounds (bug #3974)
 2017-07-30 21:36:04 +00:00
Unknown
bfbfbeac43 Added networking and saving for custom spells 2017-07-31 03:45:47 +10:00
Andrei Kortunov
99b5f21a46 Add missing journal sounds (bug #3974) 2017-07-29 19:41:46 +04:00
Allofich
dae19412f2 Fix problem with animations not looping 
Fixes #3804
 2017-07-29 20:54:11 +09:00
scrawl
631d79f1c8 Merge pull request #1346 from akortunov/aibreathe 
AiBreathe AI package (feature #1374)
 2017-07-28 20:50:04 +00:00
scrawl
4c2487d55f Merge pull request #1353 from akortunov/restfix 
Update effects during rest (bug #3679)
 2017-07-28 20:46:14 +00:00
David Cernat
4db64e1721 [Client] Synchronize spellcasting for non-bipedal creatures 2017-07-28 20:49:26 +03:00
Andrei Kortunov
920021c61b Update effects during rest (bug #3679) 2017-07-28 16:50:52 +04:00
David Cernat
c9550fc560 [Server] Use case-insensitive filename comparison for plugins 
Additionally, clarify the comments related to plugin comparison.
 2017-07-28 06:57:15 +03:00
David Cernat
690f7dc7df Merge pull request #251 from OpenMW/master 
Add OpenMW commits up to 27 Jul 2017, part 2
 2017-07-27 20:55:56 +03:00
David Cernat
9d05063af4 [General] Add server script functions for banning & unbanning IPs 
Additionally, use a more informative message for the client when trying to connecting to a server that it is banned from.
 2017-07-27 19:29:17 +03:00
Marc Zinnschlag
6001e04e51 Merge remote-tracking branch 'rcutmore/bug-3148' 2017-07-27 16:29:44 +02:00
Andrei Kortunov
6ab36c0539 Spellbuying menu improvements 2017-07-27 13:20:18 +04:00
David Cernat
500bff9911 Merge pull request #250 from OpenMW/master 
Add OpenMW commits up to 27 Jul 2017
 2017-07-27 04:01:44 +03:00
Rob Cutmore
3f2cd9b669 Editor: Do color to int conversion in ColorEditor 2017-07-26 19:56:54 -04:00
Rob Cutmore
c7241c692f Editor: Do int to color conversion in ColorEditor 2017-07-26 19:43:37 -04:00
scrawl
1792886f1e Merge pull request #1344 from julianko/dialogue_performance 
Fix dialogue window performance
 2017-07-26 22:05:45 +00:00
David Cernat
2f551aba02 [Client] Don't start dialogue via client scripts if already in dialogue 
This prevents infinite greeting spam in scripts such as hlormarScript.
 2017-07-26 22:37:57 +03:00
David Cernat
e6e5d406b8 Merge pull request #248 from OpenMW/master 
Add OpenMW commits up to 26 Jul 2017, part 2
 2017-07-26 20:31:39 +03:00
David Cernat
796118c266 [Client] Send StatsDynamic packets more often 2017-07-26 20:15:35 +03:00
Julian
d7aa2a882d improve dialogue window performance 2017-07-26 18:58:27 +02:00
scrawl
d3be4769ea Merge pull request #1347 from akortunov/encumberancefix 
Fixed encumberance check (bug #3963)
 2017-07-26 16:20:16 +00:00
David Cernat
d543edbd9a [Server] Make sure players are initialized as non-werewolves 2017-07-26 06:01:48 +03:00
David Cernat
84662ed3fe [Client] Add temporary warnings when creating custom spells and items 2017-07-26 05:36:12 +03:00
Rob Cutmore
3fb7c42845 Editor: Use colour field for cell map colour 2017-07-25 19:11:47 -04:00
Rob Cutmore
0082f5a2dc Editor: fix handling of colour columns 
Colours are stored as ints in the backend but the conversion from
QColor to int was broken.
 2017-07-25 19:11:47 -04:00
David Cernat
cd8d064761 [Server] Add PlayerShapeshift to PlayerCellChange's information exchange 2017-07-25 18:44:06 +03:00
David Cernat
8b79cdd4f4 [Server] Document script functions, part 3 
Also reorder functions in Cells and CharClass so they are consistent with the rest.
 2017-07-25 18:07:09 +03:00
Andrei Kortunov
548814bfbc Added AiBreathe package (feature #1374) 2017-07-25 10:58:04 +04:00
Andrei Kortunov
325ea10594 Fixed encumberance check (bug #3963) 2017-07-25 10:28:33 +04:00
David Cernat
3d1458b5a2 Merge pull request #246 from OpenMW/master 
Add OpenMW commits up to 24 Jul 2017
 2017-07-24 20:21:04 +03:00
Andrei Kortunov
3ba0a336b7 Move spell magicka cost calculation to standalone function 2017-07-24 21:11:59 +04:00
Marc Zinnschlag
cfc5cdd309 Merge remote-tracking branch 'plutonicoverkill/highlight-occurence-fix' 2017-07-24 09:18:24 +02:00
David Cernat
2c1ece79fc Merge pull request #245 from OpenMW/master 
Add OpenMW commits up to 22 Jul 2017
 2017-07-23 22:02:16 +03:00
David Cernat
5e5440b697 [Server] Document script functions, part 2 2017-07-23 21:59:33 +03:00
PlutonicOverkill
16be1e1a84 Fix occurrence highlighting preferences panel 2017-07-23 20:29:42 +12:00
Andrei Kortunov
337f0f876d Fade screen in on a new game start 2017-07-23 11:04:58 +04:00
scrawl
9bc24ab629 Fix character preview zNear/zFar not being autocomputed as intended (Bug #3955) 2017-07-22 00:38:27 +02:00
scrawl
5c11266a46 Fix character preview item selection 2017-07-22 00:06:43 +02:00
scrawl
c9f8a220dc Update the tooltip when the focusObject is set 2017-07-20 20:59:36 +02:00
scrawl
0e2e23e9f8 Remove tooltip object as part of WindowManager::clear 2017-07-20 20:59:09 +02:00
David Cernat
cc91b32b2f [Server] Make spell script functions consistent with others 2017-07-20 17:58:00 +03:00
David Cernat
7173a48f4b [Client] Prevent ObjectState packet spam 2017-07-20 17:01:04 +03:00
David Cernat
b8b3856c73 Merge pull request #244 from OpenMW/master 
Add OpenMW commits up to 19 Jul 2017
 2017-07-19 20:49:56 +03:00
David Cernat
8bd33e5fbb [Server] Document script functions, part 1 2017-07-19 20:40:51 +03:00
scrawl
7f634514a8 Fix the viewport of the character preview being set a frame ahead due to a threading issue 2017-07-19 17:43:15 +02:00
scrawl
20606a2aff Add 'prediction time' setting for cell/terrain pre-loading 2017-07-19 16:44:37 +02:00
scrawl
ac78d01b2b Terrain: use the main camera's viewpoint for intersection tests 
Fixes lag spikes caused by intersection tests loading/unloading terrain pages.
 2017-07-19 13:11:44 +02:00
scrawl
a629d48df6 Update the facedObject after the camera is updated 2017-07-19 13:05:51 +02:00
David Cernat
fd046e42ef Merge pull request #242 from OpenMW/master 
Add OpenMW commits up to 16 Jul 2017
 2017-07-17 21:34:44 +03:00
scrawl
2c7ce26fb7 Merge pull request #1336 from akortunov/evadefix 
Combat AI: avoid enemy hits when casting Self-ranged spells
 2017-07-16 20:05:21 +00:00
Andrei Kortunov
98f161c7fd Combat AI: avoid enemy hits when casting Self-ranged spells (fixes #3922) 2017-07-16 22:38:23 +04:00
scrawl
2c95f40640 Merge pull request #1333 from akortunov/guidistortionfix 
Disable sound distortion for GUI actions and PlaySound command [discussion]
 2017-07-16 18:28:03 +00:00
Andrei Kortunov
2b22d10ebc Spellview fixes 2017-07-16 13:14:19 +04:00
Andrei Kortunov
9179a019df Quick keys menu fixes 2017-07-16 13:11:34 +04:00
Andrei Kortunov
5be1c81913 Fixed Close button handler in EditEffectDialog (fixes #3956) 2017-07-15 14:03:36 +04:00
David Cernat
aeb1ec3394 [Client] Delimit and clarify changes made by tes3mp to engine and main 2017-07-15 12:44:00 +03:00
David Cernat
f65f996418 [Server] Add script functions for werewolf states 2017-07-15 11:09:28 +03:00
Andrei Kortunov
dca8317083 Disable sound distortion for player actions in GUI mode 2017-07-15 10:59:08 +04:00
Andrei Kortunov
3b163ce6ce Disable sound distortion for PlaySound script command 2017-07-15 10:58:19 +04:00
David Cernat
e3929df38a Merge pull request #239 from OpenMW/master 
Add OpenMW commits up to 14 Jul 2017
 2017-07-15 09:13:04 +03:00
David Cernat
43a3daf0aa [General] Add & implement PlayerShapeshift packet for werewolf states 2017-07-15 09:02:19 +03:00