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

13592 commits

Author SHA1 Message Date
Koncord
adb49b7c7d Add New GUI dialog: ListBox 
Example:

local GUI_LISTBOX = 42

function OnPlayerSendMessage(pid, message)
    if message == "/lb" then
        local items = "consectetur adipiscing elit\nsed do eiusmod tempor incididunt ut labore\net dolore magna aliqua." -- items can be separated through newline
        local label = "Lorem ipsum dolor sit amet"
        tes3mp.ListBox(pid, GUI_LISTBOX, label, items)
    end
end

function OnGUIAction(pid, idGui, data)
    if idGui == GUI_LISTBOX then
        print("ID: " .. idGui .. " data: " .. tostring(data)) -- if value higher than last item id
    end
end
 2016-11-04 00:24:16 +08:00
David Cernat
107dacac6d Add OnPlayerChangeInventory server script callback 2016-11-03 16:39:31 +02:00
David Cernat
6ff47bbde9 Merge pull request #93 from OpenMW/master 
Add OpenMW commits from 1 Nov
 2016-11-02 12:31:20 +02:00
Nikolay Kasyanov
5d4734c02e Use local path from configuration manager to load openmw.cfg in launcher 2016-11-01 21:27:35 +01:00
MiroslavR
5cd04af3fa Fix horrible performance when resizing/moving the settings window 
Resize widgets instead of reconstructing them.
 2016-11-01 16:37:00 +01:00
David Cernat
66e697953c Add missing break statement in Networking to prevent default nighttime 2016-10-31 22:53:32 +02:00
David Cernat
31d02e8bf1 Move Networking code for ID_GAME_INVENTORY next to ID_GAME_EQUIPMENT 2016-10-31 17:16:41 +02:00
David Cernat
06152fde77 Stop player-controlled NPCs from reporting crimes committed by players 2016-10-31 11:00:56 +02:00
David Cernat
4621363b65 Make capitalization reflect name of filename, and remove unused check 2016-10-31 01:23:31 +02:00
David Cernat
373011f883 Only send information to POSTLOADED player about other POSTLOADED ones 2016-10-31 01:14:17 +02: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
scrawl
e0f613661e Fix char -> int, fix shadowing warning 2016-10-30 20:10:33 +01:00
David Cernat
05cfc918f5 Temporarily use a whitelist for scripts instead of a blacklist 2016-10-30 21:00:54 +02:00
scrawl
cac8de0b29 Merge pull request #1116 from Allofich/paused 
Don't update ripple simulation when paused
 2016-10-30 19:26:56 +01:00
scrawl
e5cb7306c3 Merge pull request #1115 from Allofich/conversion 
Fix narrowing conversion warning
 2016-10-30 19:26:51 +01:00
Allofich
19db070fca Don't update ripple simulation when paused 2016-10-31 01:19:38 +09:00
David Cernat
621faf368e Fix server crash caused by invalid player GUIDs, 2nd attempt 2016-10-30 18:07:23 +02:00
Allofich
68ed264f40 Fix narrowing conversion warning 2016-10-31 00:53:17 +09:00
David Cernat
ffb7683a5f Use suicide as death reason when an attacker leaves the server 2016-10-30 17:39:45 +02:00
Allofich
125e94ef0e Fix shadowing warnings 2016-10-31 00:39:31 +09:00
David Cernat
3c4b74cd14 Fix frame listener errors for player markers 2016-10-30 16:39:59 +02:00
David Cernat
eebe1f156a Change logic for death reasons so it makes sense 2016-10-30 13:19:48 +02:00
David Cernat
9c12aa2141 Fix formatting 2016-10-30 12:58:58 +02:00
David Cernat
6929cd6c4c Delete debug about player map that is no longer needed 2016-10-30 02:30:17 +03:00
David Cernat
cee7843576 Send ID_OBJECT_DELETE when taking world items through inventory screen 2016-10-30 02:26:32 +03:00
David Cernat
41504bd02a Use more accurate position for ID_OBJECT_PLACE 2016-10-30 00:51:23 +03:00
David Cernat
a4647de048 Break away from OpenMW by giving RefNum indexes to new created objects 2016-10-30 00:21:55 +03:00
David Cernat
3c88f6f0cd Fix server crash caused by invalid player GUIDs 2016-10-29 16:41:29 +03:00
David Cernat
937bf97883 Send gold values correctly with ID_OBJECT_PLACE 2016-10-29 00:34:46 +03:00
David Cernat
180aa3f2f3 Send item count ID_WORLD_OBJECT_PLACE 2016-10-28 22:35:01 +03:00
David Cernat
1f982e4dc7 Find objects from world packets using both ID and reference number 2016-10-28 21:31:41 +03:00
David Cernat
d93e66207e Update player markers only when getting a position packet 2016-10-27 19:09:05 +03:00
David Cernat
7f98cddfdf Don't send animation packets from blacklisted scripts 2016-10-27 17:41:48 +03:00
David Cernat
e414261121 Send ID_OBJECT_ANIM_PLAY from ingame scripts 2016-10-27 16:46:47 +03:00
David Cernat
46397a7dac Add and implement ID_OBJECT_ANIM_PLAY 2016-10-27 16:09:02 +03:00
David Cernat
344f2b535a Fix setting of index for ID_SCRIPT_MEMBER_SHORT in InterpreterContext 2016-10-27 15:02:40 +03:00
David Cernat
fff6833950 Send ID_SCRIPT_MEMBER_SHORT from MWScript::InterpreterContext 2016-10-27 02:18:27 +03:00
David Cernat
d5fca115f7 Fix variable name for ID_SCRIPT_GLOBAL_SHORT in InterpreterContext 2016-10-27 02:17:06 +03:00
David Cernat
c205e793cb Add and implement ID_SCRIPT_MEMBER_SHORT 2016-10-27 00:41:14 +03:00
David Cernat
c91e240664 Simplify the type of map that player objects are stored in 2016-10-26 21:36:58 +03:00
David Cernat
65363b0dd1 Avoid sending packets for 9 more ingame scripts 2016-10-26 21:33:13 +03:00
David Cernat
2032bf9cad Fix typo in debug 2016-10-26 17:22:53 +03:00
David Cernat
a9f6ea4d8d Use the name "guid" for RakNet IDs so as to not confuse with int IDs 2016-10-26 15:55:34 +03:00
David Cernat
47854d631b Avoid sending packets for 2 more ingame scripts 2016-10-26 15:24:53 +03:00
David Cernat
c99c3b1486 Avoid sending packets for 3 additional spammy ingame scripts 2016-10-26 12:43:26 +03:00
David Cernat
749c6db49e Send WorldPackets with script values from MWScript::InterpreterContext 2016-10-26 12:29:32 +03:00
David Cernat
97468980af Add and implement 3 new WorldPackets for ingame script variable values 2016-10-26 12:25:50 +03:00
Assumeru
25d64989b3 Check if the actor still exists /first/ 2016-10-26 11:04:54 +02:00
David Cernat
e7ebeb8eec Stop sending ID_OBJECT_MOVE and ID_OBJECT_ROTATE from scripts, because it clashes with syncing script variable values across players and makes movements and rotations happen twice 2016-10-26 10:01:55 +03:00
David Cernat
75f6d82f08 Add a way of filtering out ingame scripts for upcoming script packets 2016-10-25 22:44:15 +03:00
Assumeru
a72cd896ca Move actors out of the water if there's room for them. Fixes #1138 2016-10-25 19:26:17 +02:00
David Cernat
aaf4cc0d7e Prevent being in a menu from disabling script execution or actor damage 2016-10-25 17:48:00 +03:00
David Cernat
cc40b85034 Don't send packets for floating objects 2016-10-25 16:30:31 +03:00
David Cernat
b1051255e0 Send ID_OBJECT_ROTATE from ingame scripts 2016-10-25 14:42:54 +03:00
David Cernat
385b5f39e3 Add and implement ID_OBJECT_ROTATE 2016-10-25 14:28:39 +03:00
David Cernat
54ed9a7ab4 Implement ID_OBJECT_MOVE and send it from ingame scripts 2016-10-25 14:07:00 +03:00
David Cernat
0fb9b6eefb On second thought, rename ID_OBJECT_MOVE_WORLD into ID_OBJECT_MOVE 2016-10-25 12:53:18 +03:00
David Cernat
947a677801 Replace ID_ACTIVATOR_ACTIVATE with ID_OBJECT_MOVE_WORLD 2016-10-25 12:42:29 +03:00
David Cernat
c25ebc34b3 Shorten WorldPacket IDs by removing WORLD from them 2016-10-25 12:15:27 +03:00
David Cernat
bdb53e1cb4 Implement ID_WORLD_DOOR_ACTIVATE and send it from MWBase::World 2016-10-25 10:40:55 +03:00
David Cernat
7264f13b8e Implement ID_WORLD_OBJECT_SCALE and send it from ingame scripts 2016-10-25 00:52:42 +03:00
David Cernat
52d156e136 Make server able to receive the 5 new WorldPackets 2016-10-25 00:50:32 +03:00
David Cernat
ef6f20e3f7 In server console, print number of players remaining when one leaves 2016-10-24 22:47:52 +03:00
David Cernat
24bfe40bf7 Add debug about current server crash 2016-10-24 21:17:53 +03:00
David Cernat
b2688777c1 Create marker once a player has been initialized properly and fix debug 2016-10-24 21:08:47 +03:00
David Cernat
be73265848 Send ID_WORLD_VIDEO_PLAY from ingame scripts 2016-10-24 17:55:10 +03:00
David Cernat
b6111d16cc Add and implement ID_WORLD_VIDEO_PLAY 2016-10-24 17:52:19 +03:00
David Cernat
c54af2b02b Make DedicatedPlayer's setMarkerState method actually enable markers 2016-10-24 16:26:51 +03:00
David Cernat
1e4d625c99 Make player markers show up in exterior cells 2016-10-24 15:29:10 +03:00
David Cernat
04eb051df6 Make markers get removed when their players quit, rename marker methods 2016-10-24 15:10:32 +03:00
David Cernat
aed884949c Send ID_WORLD_OBJECT_LOCK from ingame scripts 2016-10-24 13:22:46 +03:00
David Cernat
3fd93896f2 Add and implement ID_WORLD_OBJECT_LOCK 2016-10-24 13:20:04 +03:00
David Cernat
3a5a5e73a1 Send ID_WORLD_OBJECT_UNLOCK from ingame scripts and regular unlocking 2016-10-24 11:43:27 +03:00
David Cernat
08ea5163c4 Add and implement ID_WORLD_OBJECT_UNLOCK 2016-10-24 11:26:31 +03:00
David Cernat
94c5d6d2f9 Don't use autoEquip on player-controlled NPCs 2016-10-24 11:15:09 +03:00
David Cernat
47ebd24b4a Merge pull request #79 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	apps/openmw/mwinput/inputmanagerimp.cpp
 2016-10-24 09:18:21 +03:00
David Cernat
a6fa0073a0 Find items by mRefNum.mIndex instead of mRefNum for WorldPackets 2016-10-23 23:13:42 +03:00
David Cernat
6bfaf3be50 Send an ID_WORLD_OBJECT_PLACE whenever ingame scripts place objects 2016-10-23 20:48:24 +03:00
David Cernat
3380c482c0 Fix errors remaining from merge with tes3mp-packetexpansion, part 2 2016-10-23 19:32:39 +03:00
David Cernat
b06a2f3119 Fix part about Breakpad in server's CMakeLists 2016-10-23 19:28:35 +03:00
David Cernat
e7567020bb Fix debug for ID_WORLD_OBJECT_DELETE in client's Networking 2016-10-23 19:10:21 +03:00
David Cernat
d85a1ee1a9 Fix errors remaining from merge with tes3mp-packetexpansion 2016-10-23 18:32:03 +03:00
David Cernat
c639337842 Merge with tes3mp-packetexpansion by fixing conflicts 
# Conflicts:
#	apps/openmw-mp/Networking.cpp
#	apps/openmw/mwmp/Networking.cpp
#	components/CMakeLists.txt
#	components/openmw-mp/NetworkMessages.hpp
#	components/openmw-mp/PacketsController.cpp
 2016-10-23 17:57:38 +03:00
David Cernat
025a847fd1 Send an ID_WORLD_OBJECT_DELETE whenever ingame scripts delete objects 2016-10-23 17:03:47 +03:00
David Cernat
0a44bea91d Send cell coordinates in tes3mp using mData instead of mCellId.mIndex 2016-10-23 16:55:30 +03:00
David Cernat
cbc132612a Use mRefNum.mIndex instead of just mRefNum and add extra debug 2016-10-23 16:33:53 +03:00
David Cernat
17f66e4e90 Implement ID_WORLD_OBJECT_PLACE 2016-10-23 13:30:32 +03:00
Koncord
a6467c9c47 Add breakpad to server 2016-10-23 17:07:46 +08:00
Koncord
df3886168f Word wrapping in chat 2016-10-23 14:33:43 +08:00
Koncord
c27351c19e Implement inventory functions 
AddItem, RemoveItem, GetItemName, GetItemCount, GetItemHealth, GetInventorySize SendInventory
Example:
```lua
tes3mp.AddItem(pid, "glass dagger", 1, 50)
tes3mp.AddItem(pid, "glass dagger", 1, -1)
tes3mp.SendInventory(pid)
tes3mp.RemoveItem(pid, "glass dagger", 1)
tes3mp.SendInventory(pid)
local invSize = tes3mp.GetInventorySize(pid) - 1
for i = 0, invSize do
    print(("%s %d %d"):format(tes3mp.GetItemName(pid, i), tes3mp.GetItemCount(pid, i), tes3mp.GetItemHealth(pid, i)))
end
```
 2016-10-23 02:57:49 +08:00
David Cernat
6e43baf73e Send Cell instead of CellId because of problems with the latter 2016-10-22 20:09:13 +03:00
David Cernat
103b1e3f72 Send CellId in ID_WORLD_OBJECT_DELETE 2016-10-22 18:44:13 +03:00
David Cernat
2e57e25675 Only delete object from ID_WORLD_OBJECT_DELETE if it actually exists 2016-10-22 18:19:57 +03:00
David Cernat
3c49157ed7 Rename WorldPackets to ID_WORLD_OBJECT_DELETE and ID_WORLD_OBJECT_PLACE 2016-10-22 18:05:32 +03:00
David Cernat
40f1db2d86 Create SearchByRefNumCustomVisitor in CellStore that returns entire Ptr 2016-10-22 17:47:21 +03:00
David Cernat
b3d6dad0c5 Send ID_WORLD_OBJECT_REMOVAL from actiontake.cpp and not worldimp.cpp 2016-10-22 17:10:57 +03:00
David Cernat
cc98a25dcf Add searchByRefNum method to OpenMW's CellStore 2016-10-22 16:47:11 +03:00
David Cernat
92463c4a03 Fix Windows server crash caused by printing event->CellRef()->mRefID 2016-10-22 14:13:16 +03:00
David Cernat
8080cceac6 Add some placeholder code so Stanislav can test it 2016-10-22 12:45:19 +03:00
Stanislav Zhukov
81dfd21d9a Merge pull request #76 from TES3MP/tes3mp-minimap 
Show dedicated players on minimap
 2016-10-22 17:21:02 +08:00
Koncord
b704519078 Show dedicated players on minimap 2016-10-22 17:06:26 +08:00
David Cernat
565e7e4b9f Create and implement placeholder for ID_WORLD_OBJECT_CREATION 2016-10-21 21:57:05 +03:00
David Cernat
32dc8cf63f Read contents of ID_WORLD_OBJECT_REMOVAL on client 2016-10-21 20:44:15 +03:00
David Cernat
36f218876a Add ProcessPlayerPacket and ProcessWorldPacket to client's Networking 2016-10-21 19:23:56 +03:00
David Cernat
ac666edebd Add a CellRef to WorldEvent 2016-10-20 22:15:47 +03:00
MiroslavR
cd9de94c0c Import teleporting and levitation disabled state from vanilla savegames (Fixes #3420) 2016-10-20 14:38:18 +02:00
David Cernat
b2845cd17c Create and start using WorldEvent class 2016-10-20 14:28:19 +03:00
David Cernat
a42d5f2429 Make client send placeholder ID_WORLD_OBJECT_REMOVAL to server 2016-10-20 12:53:48 +03:00
MiroslavR
f3ce0840be Import controls state from vanilla savegames 2016-10-20 02:14:36 +02:00
MiroslavR
301dd77efb Save controls state (Fixes #3598) 2016-10-20 02:12:01 +02:00
MiroslavR
407abc605f Fix auto-equipping of blunt weapons 2016-10-19 22:37:45 +02:00
David Cernat
f218613231 Rename client Networking's GetPacket method into GetPlayerPacket 2016-10-19 22:49:35 +03:00
David Cernat
e27d1857ef Fix formatting in previous changes made by tes3mp to OpenMW's core 2016-10-19 22:06:11 +03:00
scrawl
9c549a85ce Merge pull request #1108 from MiroslavR/autoequip-weap 
Auto-equip weapons
 2016-10-19 20:45:47 +02:00
David Cernat
d0328f2553 Add placeholder ProcessWorldPacket method to server's Networking 2016-10-19 21:44:17 +03:00
David Cernat
2602c1f71a Add ProcessPlayerPacket method to server's Networking 2016-10-19 21:26:42 +03:00
David Cernat
f1ec01cc6b Add WorldPacketController to server's Networking 2016-10-19 20:51:51 +03:00
David Cernat
790d41e278 Move PlayerPackets into their own subfolder 2016-10-19 19:37:10 +03:00
David Cernat
bda1f867fd Rename server's GetController() method into GetPlayerController() 2016-10-19 16:54:39 +03:00
David Cernat
d2212ef80b Rename PacketsController into PlayerPacketController 2016-10-19 16:31:07 +03:00
David Cernat
5e0c0dd5f1 Use logger in server's Networking MainLoop 2016-10-19 13:00:33 +03:00
MiroslavR
76ddd9bebb Add a setting for merchant auto-equipping prevention 2016-10-19 02:22:49 +02:00
scrawl
a7d4928593 Properly handle moved references in respawning code (Fixes #3600) 2016-10-18 23:51:45 +02:00
MiroslavR
1d3008594d Autoequip weapons (Fixes #3562) 2016-10-18 13:57:35 +02:00
David Cernat
b8f4cb94fb Rename BasePacket into PlayerPacket 2016-10-17 15:54:36 +03:00
MiroslavR
14240cf7a2 Fix autoEquip to better match vanilla (Fixes #3590) 2016-10-16 17:27:17 +02:00
scrawl
1d58733880 Merge pull request #1104 from MiroslavR/missing-weather-states 
Import base weather states before loading region modifiers
 2016-10-15 22:17:20 +02:00
Allofich
ccacad51be Fix shadowing warnings 2016-10-16 01:34:54 +09:00
MiroslavR
7b59eda13a Import base weather states before loading region modifiers (Fixes #3594) 2016-10-15 17:34:03 +02:00
scrawl
9e63c3ce63 Merge pull request #1103 from Allofich/warnings 
Fix shadowing warnings
 2016-10-14 21:18:12 +02:00
scrawl
5ccbabc27d Fix build against bullet with profiler disabled (Fixes #3592) 2016-10-14 21:00:35 +02: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
Allofich
1c54f54ab8 Fix shadowing warnings 2016-10-15 00:12:46 +09:00
scrawl
2ed0277839 Merge pull request #1102 from Allofich/spells 
Change several spell effects from instant to non-instant
 2016-10-13 21:36:14 +02:00
scrawl
9d2e0124dc Revert "Fix the cell changed flag no longer being reset after the player dies" 
This reverts commit d7acec74fd.
 2016-10-13 17:44:03 +02:00
Allofich
610f36f47b Set magic effects that don't support variable durations to use duration of 1 2016-10-14 00:13:08 +09:00
Allofich
1c2e04747d Remove stray line 2016-10-13 23:38:21 +09:00
Allofich
675bd09462 Change several instant effects to be non-instant (Fixes #2054) 2016-10-13 23:38:21 +09:00
scrawl
db09858f59 Don't allow the player to activate objects when dead 2016-10-13 14:42:10 +02:00
scrawl
454d1ffaef Make the cell change check during actor update more robust 2016-10-13 14:39:58 +02:00
scrawl
d7acec74fd Fix the cell changed flag no longer being reset after the player dies 2016-10-13 14:38:35 +02:00
scrawl
612c3e995f Add drop shadow to ItemWidget (Fixes #3545) 2016-10-13 01:42:50 +02:00
scrawl
15046c961b Merge pull request #1101 from MiroslavR/ignored-light-sources-fix 
Ignored light sources fix
 2016-10-12 01:11:37 +02:00
MiroslavR
611d02ad43 Remove unused code 2016-10-11 22:16:17 +02:00
MiroslavR
1906d96064 Non-player actors emitting light from a non-portable light item should be illuminated (Fixes #3588) 2016-10-11 22:15:51 +02:00
MiroslavR
53b006eccb OpenMW-CS: Recognize special faction ID "FFFF" (no faction) during topic info verification (Fixes #3564) 2016-10-11 19:36:44 +02:00
scrawl
3dce155d96 Fix uninitialized variable 2016-10-11 14:50:13 +02:00
MiroslavR
8be8c7ca66 OpenMW-CS: Fix verification of "Not Local" info conditions (Bug #3564) 2016-10-11 02:55:17 +02:00
MiroslavR
14468262a7 Fix "Not Local" dialog test to also test variable value instead of just its existence (Fixes #3577) 2016-10-11 02:53:43 +02:00
scrawl
95a67bf0c2 Disable OSG 3.5.5 thread affinity setting in the scenewidget due to the interference with QT threads 
Reference: http://forum.openscenegraph.org/viewtopic.php?t=16158
 2016-10-10 18:23:06 +02:00
scrawl
530fb61ad0 Use OpenThreads instead of boost thread 
This should allow OpenMW to work better with git versions of openscenegraph. OSG dev version 3.5.5 added the setting of thread affinity for the main thread. The problem is that in the boost/standard threading libraries, the affinity of a thread is inherited by any further threads launched from that thread, leading to these threads always running on the same core as the main thread unless you tell them not to.

With OpenThreads, the default affinity of a thread is none, no matter what parent thread it was launched from.

So, when using custom threading with OSG 3.6+, we have these options:
1. explicitely tell OSG to *not* set the thread affinity
or 2. explicitely set the thread affinity of additional threads created (possible with boost, but not possible with std::thread)
or 3. use OpenThreads
or 4. accept the suboptimal performance of non-OSG threads (in OpenMW's case the sound streaming & video threads) running on the same core as the main thread

This patch opts for 3.)

Reference: http://forum.openscenegraph.org/viewtopic.php?t=16158
 2016-10-10 18:23:06 +02:00
scrawl
ae2036fa85 Merge pull request #1097 from Allofich/persuasion 
Don't let intimidate bring disposition below 0 (Fixes #3584)
 2016-10-09 20:20:43 +02:00
Allofich
028db21c8a Don't let disposition at end of dialogue be below 0 (Fixes #3584) 2016-10-10 02:20:24 +09:00
David Cernat
14bac1e533 Make player markers appear on inventory map 2016-10-09 13:41:00 +03:00
David Cernat
07acd7a721 Make player markers work in interiors and make them easier to test 2016-10-09 10:29:30 +03:00
scrawl
1893617ec9 Improvements to ignored light list setting 
The pointer to the LightListCallback is now stored in the Animation, which eliminates the need for dynamic_cast. Also, when the object root is recreated, the previously used LightListCallback will be reused, so we no longer need the objectRootReset() notifier.

Finally, there was a bug when saving and reloading the game, the getIgnoredLightSources() were not being set, as the ActorAnimation constructor completes before the NpcAnimation sets the ObjectRoot. This was solved by creating the LightListCallback in advance in the Animation constructor.
 2016-10-08 23:59:28 +02:00
MiroslavR
11565b5966 Make actors with non-portable lights in inventory glow (Closes #2042, #3338) 2016-10-08 23:17:12 +02:00
scrawl
50bcb65ee0 Move USED_OSG_PLUGINS to the top of the CMakeLists to be used by all platforms 2016-10-08 19:20:24 +02:00
scrawl
6615330430 Fix use of UnrefQueue in removeObject 2016-10-08 16:41:17 +02:00
scrawl
3019d70986 Use 'default icon' for items with no icon specified 2016-10-08 16:05:20 +02:00
Koncord
bd1b1fca64 Woops 2016-10-08 15:36:25 +08:00
Koncord
50d989d767 Fix server crash if player is not fully connected 2016-10-08 15:30:52 +08:00
Koncord
79532cf797 Detecting reason of death 2016-10-08 15:15:43 +08:00
Koncord
2e81034e53 Started work on the map markers 2016-10-07 13:17:44 +08:00
scrawl
37bfa88b2d Merge pull request #1094 from Allofich/alchemy 
Fix reversed use of alembics and retorts
 2016-10-06 19:02:24 +02:00
Allofich
498976775a Fix reversed use of alembics and retorts 2016-10-07 01:38:50 +09:00
scrawl
73b6c34a23 Merge pull request #1092 from Allofich/warnings 
Fix shadowing warnings
 2016-10-06 17:50:26 +02:00
Allofich
53e94b7c3f Fix shadowing warnings 2016-10-06 23:33:52 +09: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
df03b32205 Coverity fixes 2016-10-05 23:32:26 +09:00
scrawl
721062a4bd Merge pull request #1089 from Allofich/bound 
Corrections for bound equipment
 2016-10-04 18:34:27 +02: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
MiroslavR
a05649e1d5 Use loop fallback for movement animations (Fixes #3578) 2016-10-03 22:36:56 +02:00
sandstranger
5230bf6528 disable using shaders for gles1 and Android 2016-10-03 20:31:08 +04:00
scrawl
44dffe55ab Merge pull request #1083 from Allofich/onhit 
Make AI response to spell hits more like original MW
 2016-10-02 14:06:51 +02:00
scrawl
3d76ba5a7c Merge pull request #1086 from Allofich/warnings 
Fix shadowing warnings
 2016-10-02 14:03:02 +02:00
Allofich
6ec37b5cfb Fix shadowing warnings 2016-10-02 17:48:54 +09:00
Allofich
e78f02aaf2 Consider reflected/absorbed hostile spells as assaults 2016-10-02 16:08:24 +09:00
MiroslavR
210c02d98e Fix interactive ID validity checks in TypesetBookImpl 2016-10-01 21:07:17 +02:00
Allofich
a81a04e6d0 Remove unused line 2016-10-02 01:11:01 +09:00
Allofich
fa17784722 Change breaks to continues 2016-10-02 00:54:01 +09:00
scrawl
140be70a90 Merge pull request #1082 from Gladdy/master 
Fix for segmentation fault on entering a cell
 2016-10-01 16:42:47 +02:00
scrawl
b170efb9fa Merge pull request #1084 from Allofich/water 
Don't let water-only creatures prevent resting
 2016-10-01 16:14:19 +02:00
Allofich
a2e174a40f Don't let water-only creatures prevent resting 2016-10-01 22:15:31 +09:00
Allofich
266ec1aadc Make AI response to spell hits more like original MW 2016-10-01 21:38:17 +09:00
Koncord
fa0a55c2a9 Fix use of freed memory 2016-10-01 10:54:42 +08:00
Koncord
94d5efdfd3 Call LOG_QUIT after Networking's dtor call 2016-09-30 18:16:09 +08:00
David Cernat
add1a5e5b2 Merge pull request #72 from OpenMW/master 
Add OpenMW commits up to 30 Sep
 2016-09-30 12:37:29 +03:00
David Cernat
e0361835b0 Allow script-induced setting of equipment 2016-09-30 12:36:20 +03:00
David Cernat
4b96080521 Make GetItemSlot work and add SendEquipment in server item functions 2016-09-30 12:30:05 +03:00
Marc Zinnschlag
e918474a94 Merge remote-tracking branch 'rcutmore/bug-3277' 2016-09-30 09:37:45 +02:00
David Cernat
728a09e423 Reorder functions in LocalPlayer and make their names more consistent 2016-09-30 08:59:58 +03:00
David Cernat
6650b74498 Add handling of skill increases 2016-09-30 07:15:59 +03:00
David Cernat
15a4602482 Add getSkillIncrease, setSkillIncrease functions to OpenMW's NpcStats 2016-09-30 07:15:03 +03:00
David Cernat
f4621d8529 Use setLevelProgress when setting LocalPlayer's skills 2016-09-30 06:27:26 +03:00
David Cernat
8fbc6f31f1 Add setLevelProgress function to OpenMW's NpcStats 2016-09-30 06:26:43 +03:00
David Cernat
977b277cdd Add missing entries for level progress functions 2016-09-30 05:08:11 +03:00
David Cernat
a0e9a672a5 Split updateClassStats in 3 and add handling of level progress 2016-09-30 04:52:21 +03:00
David Cernat
2ab619b0e3 Constantly update skill progress from LocalPlayer 2016-09-30 03:43:49 +03:00
Rob Cutmore
8f47ed17df Show nested tables only when they are editable 2016-09-29 20:42:44 -04:00
Martijn Bakker
45ffdbb284 fixed a segmentation fault when entering a cell which contains someone already attacking you 2016-09-30 00:40:13 +01:00
David Cernat
56a2c70911 Use double instead of int for skill progress functions 2016-09-29 18:13:36 +03:00
David Cernat
ae4950ce49 Add server stat functions for getting and setting skill progress 2016-09-29 17:57:26 +03:00
David Cernat
6ae4cc15e4 Clean up handling of stat packets on client, part 2 2016-09-29 17:48:33 +03:00
David Cernat
25026a9b95 Allow player-controlled NPCs to have attack animations again 2016-09-29 16:57:39 +03:00
David Cernat
5efa5aa912 Fix indentation 2016-09-29 13:17:46 +03:00
David Cernat
afbd3274cc Clean up handling of stat packets on client 2016-09-29 13:10:32 +03:00
David Cernat
bc0aa86bcf Make variable names more consistent and easier to understand 2016-09-29 12:05:44 +03:00
David Cernat
694ce537b6 Allow script-induced dynamic stat changes, part 2 2016-09-29 11:02:57 +03:00
David Cernat
18cd964d21 Allow script-induced dynamic stat changes 2016-09-29 10:19:39 +03:00
David Cernat
ae00f12c87 Merge pull request #68 from OpenMW/master 
Use a shader to render the simple water, ensuring that fog is applied…
 2016-09-29 03:12:57 +03:00
scrawl
85c7d014d3 Use a shader to render the simple water, ensuring that fog is applied per pixel (Fixes #2716) 2016-09-28 21:10:44 +02:00
David Cernat
7a1531c01b Fix script functions for setting dynamic stats, part 2 2016-09-28 19:41:54 +03:00
David Cernat
458bdf4dff Fix script functions for setting dynamic stats 2016-09-28 16:40:19 +03:00
David Cernat
433190d82e Rename OnPlayerUpdateEquiped into OnPlayerChangeEquipment 2016-09-28 15:20:23 +03:00
David Cernat
684caf7791 Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp 2016-09-28 14:29:37 +03:00
David Cernat
16216b30f7 Fix formatting 2016-09-28 14:27:35 +03:00
Koncord
94f6ab30f2 Fix GetProtocolVersion 2016-09-28 19:20:22 +08:00
David Cernat
b6086ab015 Rename ID_GAME_DYNAMICSTATS_CURRENT into ID_GAME_DYNAMICSTATS 2016-09-28 14:13:24 +03:00
David Cernat
57f07813b0 Rename ID_GAME_UPDATE_POS into ID_GAME_POS 2016-09-28 11:45:14 +03:00
David Cernat
26487598a6 Rename ID_GAME_UPDATE_EQUIPED into ID_GAME_EQUIPMENT 2016-09-28 11:36:29 +03:00
David Cernat
0479eb38cc Update protocol version and make version mismatch error less confusing 2016-09-28 08:26:18 +03:00
David Cernat
9fd5ae981e Add missing backslash 2016-09-28 07:59:53 +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
295f486a97 Using less confusing names for server stat functions, part 2 2016-09-28 02:19:39 +03:00
David Cernat
69030579c1 Using less confusing names for server stat functions 2016-09-27 17:04:04 +03:00
David Cernat
7ae9ea7465 Add server stat functions for getting attribute and skill counts 2016-09-27 15:51:10 +03:00
David Cernat
57703482b2 Fetch attribute and skill counts in server stat functions 2016-09-27 15:01:54 +03:00
David Cernat
4d7130b12f Improve logic for script-induced cell changes 2016-09-27 11:28:44 +03:00
David Cernat
01af4f3bbc Update position before sending cell packet 2016-09-26 17:00:09 +03:00
David Cernat
1ee2458f6e Add packet for player levels, part 2 2016-09-26 13:19:01 +03:00
David Cernat
046a1ea899 Add packet for player levels 2016-09-25 14:28:25 +03:00
Rob Cutmore
b59694c4f0 Set tooltip for read-only nested tables 2016-09-25 06:31:28 -04: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
Marc Zinnschlag
eaeaae3243 Merge remote-tracking branch 'aesylwinn/FixRefIdData' 2016-09-25 09:33:28 +02:00
scrawl
4791fadb9a Merge pull request #1078 from MiroslavR/hidden-items 
Do not show uncarriable lights in item views
 2016-09-24 23:27:23 +02:00
Aesylwinn
b899d43a33 Allow base plugins to overwrite referencables made in other base plugins. 2016-09-24 16:45:08 -04:00
scrawl
dc07885d25 Merge pull request #1069 from Allofich/combat 
Add unarmed attack selection to chooseBestAttack()
 2016-09-24 18:38:10 +02:00
MiroslavR
52e00f5fef Do not show uncarriable lights in item views 2016-09-24 18:01:31 +02:00
Rob Cutmore
829345257c Allow disabled nested tables to be scrollable 2016-09-24 10:36:00 -04:00
David Cernat
10d391a1fd Merge pull request #63 from OpenMW/master 
Add OpenMW commits up to 23 Sep
 2016-09-24 00:53:06 +03:00
Allofich
0582f2d918 Adjust touch spell/telekinesis interaction 2016-09-23 21:44:49 +09:00
Allofich
0c603e986d Don't play touch spell explosions on non-activatable statics 2016-09-23 03:25:24 +09:00
Allofich
eecf412b85 Recreate vanilla-like behavior for telekinesis and touch spells 2016-09-23 01:16:03 +09:00
Allofich
04c13ffab3 Add unarmed attack selection to chooseBestAttack() 2016-09-22 00:45:54 +09:00
scrawl
8379291f70 Merge pull request #1072 from Allofich/range 
Give "on touch" spells same range as vanilla MW
 2016-09-21 17:39:44 +02:00
Allofich
37cc4e9efe Don't play area vfx for 0-area touch spells that hit non-actors 2016-09-22 00:14:08 +09:00
Allofich
563ae479e8 Give "on touch" spells same range as vanilla MW 2016-09-21 23:34:32 +09:00
David Cernat
f515111845 Merge pull request #62 from OpenMW/master 
Add OpenMW commits up to 20 Sep
 2016-09-21 06:05:24 +03:00
scrawl
c6ef26ba4b Merge pull request #1070 from mrcheko/pathfinding 
fix using potion as weapon
 2016-09-20 22:58:54 +02:00
mrcheko
229cb4b386 remove dynamic_cast to ActionPotion 2016-09-20 23:00:00 +03:00
mrcheko
48765f2ff2 fix using potion as weapon 2016-09-19 23:43:26 +03:00
David Cernat
1534f835a6 Merge pull request #61 from OpenMW/master 
Add OpenMW commits up to 19 Sep
 2016-09-19 23:38:20 +03:00
scrawl
718178bfe9 Merge pull request #1066 from MiroslavR/setinvisible 
Don't use base invisibility magnitude for setting alpha
 2016-09-19 15:35:12 +02:00
Allofich
7e3cca6d37 Vfx after Divine/Almsivi intervention should be attached to player 2016-09-19 22:20:16 +09:00
Allofich
d1157b3e10 Use correct vfx for teleport spells 2016-09-19 18:12:30 +09:00
David Cernat
9690e007df Don't send unhandled skill and attribute requests to joining players 2016-09-19 11:06:04 +03:00
David Cernat
79c561057c Merge pull request #59 from OpenMW/master 
Add OpenMW commits up to 18 Sep
 2016-09-19 02:47:09 +03:00
MiroslavR
744667e163 Don't use base invisibility magnitude for setting alpha (Fixes #3555) 2016-09-19 00:05:50 +02:00
scrawl
cd4b182091 Merge pull request #1051 from Allofich/textures 
Use spell effect particle textures
 2016-09-18 22:37:14 +02:00
Allofich
a8e9f2df67 Cleanup 2016-09-19 05:20:04 +09:00
scrawl
30d5c7488d savegamedialog: don't reset the character selection scrollbar when a character is deleted 2016-09-18 19:26:41 +02:00
Koncord
24617589e4 Fix packet spam 2016-09-18 15:52:26 +08:00
Koncord
96e2d749c7 New auth protocol 2016-09-18 11:55:51 +08:00
Koncord
61c5456373 Log callbacks 2016-09-18 11:55:51 +08:00
Koncord
e661a35ac2 Fix checking strings in SetName & SetBirthsign 2016-09-18 11:55:51 +08:00
Koncord
1e48555617 Make sensitivity to protocol version 2016-09-18 11:55:51 +08:00
Koncord
fe10821528 Add loaded/isLoaded to server player 2016-09-18 11:55:51 +08:00
Koncord
df13e9c37a Fix verbose log level in server 2016-09-18 11:55:51 +08:00
David Cernat
68f974d999 Merge pull request #57 from OpenMW/master 
Add OpenMW commits up to 17 Sep
 2016-09-17 21:31:51 +03:00
scrawl
8520b97b37 Merge pull request #1062 from stil-t/master 
apps/wizard: (trivial) fix misplaced arguments in installFile for installFiles
 2016-09-17 18:09:51 +02:00
scrawl
7bd445fb83 Don't crash if FontManager::getByName returns NULL (Fixes #3552) 2016-09-17 17:21:35 +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
Mikhail Korolev
7e2fe77836 apps/wizard: (trivial) fix misplaced arguments in installFile for installFiles 2016-09-15 19:03:07 +03:00
scrawl
7bbdeb5f85 Merge pull request #1061 from MiroslavR/nameless-actors 
Allow activating actors without a name
 2016-09-15 17:51:14 +02:00
MiroslavR
f323f231db Allow activating actors without a name (Fixes #3551) 2016-09-15 16:47:50 +02:00
Allofich
5aad1d81f4 Remove no longer used parameter 2016-09-15 23:41:20 +09:00
MiroslavR
55e670c5fe Fix animation state not saving 
References with animation state changed but otherwise identical to their content file counterparts
were previously considered unchanged and thus dropped while saving.
 2016-09-15 16:11:54 +02:00
David Cernat
5b6caa7b2c Fix build by adding missing argument to onHit 2016-09-15 09:34:05 +03: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
322a0ba8bb Initialize speed for magic projectiles 2016-09-14 21:39:44 +02:00
Allofich
7eb62b5d3a Initialize speed for magic projectiles 2016-09-15 01:44:53 +09:00
Allofich
dc8ff5e49b Play all sfx and use particle textures for permanent enchantments 2016-09-15 00:27:08 +09:00
Allofich
527bbd5243 Change size_t to int for consistency 2016-09-15 00:09:40 +09:00
Allofich
01774c656c Fix for blood effect texture overrides 2016-09-14 23:28:57 +09:00
Allofich
a033ba3bd2 Override spell textures by NiTexturingProperty 2016-09-14 23:03:04 +09:00
scrawl
1362264561 Fix warning 2016-09-13 02:49:19 +02:00
scrawl
65dc12cdd6 Remove unused parameter 2016-09-13 02:48:36 +02:00
scrawl
feaf3652a5 Merge pull request #1055 from mrcheko/pathfinding 
prevent running in circles around path points
 2016-09-13 02:47:49 +02:00
scrawl
3cd73d0fc3 Merge pull request #1058 from Allofich/onhit 
Don't play blood effects for completely resisted hits
 2016-09-13 02:47:43 +02: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
Allofich
3bbde312b9 Remove unneeded code 2016-09-12 19:54:06 +09:00
Allofich
3f6543860a Make creatures use fHandToHandReach 2016-09-11 00:01:20 +09:00
Allofich
c98d4e0473 Allow dodging for bipedal creatures 2016-09-10 23:56:31 +09:00
Allofich
7bc4535c0d Make NPCs dodge according to target's weapon reach 2016-09-10 23:30:46 +09:00
Koncord
0f7670dd07 Add some verbose messages for chat 2016-09-10 13:57:15 +08:00
Koncord
babc3230b7 Add new functions: GetServerVersion & GetProtocolVersion 2016-09-10 13:41:23 +08:00
Koncord
a34d46f57e Add chat messages to log in client 
Cleanup redundant code in GUIChat class
 2016-09-10 13:40:06 +08:00
mrcheko
72786fef9d prevent running in circles around path points 
addresses http://bugs.openmw.org/issues/2229
 2016-09-09 23:57:19 +03:00
Allofich
368828b217 Update TODO comments 2016-09-10 01:38:05 +09:00
Allofich
f31342894a Put simpler condition first 2016-09-09 00:03:38 +09:00
Allofich
bca477ca8a Apply particle textures like original engine does 2016-09-08 23:59:23 +09:00
Allofich
85349da26c Add comments 2016-09-08 23:58:00 +09:00
Allofich
502a758eff Use particle texture for "hit" effects 2016-09-08 23:58:00 +09:00
Allofich
fe3a033642 Use particle textures for spell projectiles 2016-09-08 23:56:54 +09:00
Allofich
02610828c1 Don't play area vfx for non-area spells on actors. 2016-09-08 02:07:01 +09:00
Allofich
88d992a020 Create area effect visual for non-area spells 2016-09-08 00:05:45 +09:00
Marc Zinnschlag
03a35c38df add missing item when executing the Equip instruction 2016-09-06 16:33:26 +02:00
Marc Zinnschlag
48c257b939 Merge remote-tracking branch 'aesylwinn/ContentNumberFix' 2016-09-06 15:48:05 +02:00
scrawl
05e4542d33 Merge pull request #1048 from mrcheko/pathfinding 
Pathfinding unification v2
 2016-09-06 13:19:18 +02:00
mrcheko
aa441f2648 AiPackage: fix path recalc on cell change 
AiTravel: remove unneeded code
 2016-09-06 01:11:10 +03:00
mrcheko
a22fc43947 aiwander: reset path on cell change 
remove redundant mIsWanderDestReady var
 2016-09-05 15:18:34 +03:00
Marc Zinnschlag
b8fa555260 Merge remote-tracking branch 'aesylwinn/RandomFixes' 2016-09-05 11:10:34 +02:00
scrawl
fbc9b90ebe Cleanup 2016-09-05 00:04:11 +02:00
scrawl
8677a6f803 Merge pull request #1044 from Allofich/magic 
Changes to multi-effect spells
 2016-09-05 00:03:10 +02:00
Allofich
c617e90755 Fix for loading projectile speed 2016-09-05 05:41:24 +09:00
Allofich
f8270f6bd5 Consolidations and cleanup for multi-effect spells 2016-09-05 05:30:51 +09:00
Allofich
dbd7c038b2 Add loading code for multi-effect projectiles 2016-09-05 03:45:13 +09:00
Allofich
c6cd1f813b Attach projectiles to nodes of multi-effect bolts 2016-09-05 02:59:33 +09:00
Allofich
5a0d3feb98 Use C++ int-to-string conversion 2016-09-05 02:52:44 +09:00
Allofich
a36f7babc1 Double scaling of spell explosions 2016-09-05 02:18:57 +09:00
Allofich
60384399ee Fix errors and warnings 2016-09-05 01:39:18 +09:00
Allofich
f49ebee56a Play sounds for multi-effect projectile 2016-09-04 23:57:06 +09:00
Allofich
37f07f7435 Combine into one multi-effect magic projectile 2016-09-04 22:35:29 +09:00
Koncord
64b5638d40 DIE TABS, DIE!!!!!!!1 2016-09-04 17:39:08 +08:00
Allofich
10842462c7 Send lists of models and sounds to launchMagicBolt 2016-09-04 17:42:27 +09:00
Allofich
96e1726e4d Fix warnings 2016-09-04 17:42:27 +09:00
Allofich
ecec7d8215 Fix spells having explosions for wrong range type 2016-09-04 17:42:27 +09:00
Allofich
c4d77b6a8b Casting animation comes from the first effect 2016-09-04 17:42:27 +09:00
Allofich
3300ef5db7 Don't apply projectile effects multiple times 2016-09-04 17:42:27 +09:00
Allofich
f36e5ef403 Use last effect of spell for hand effect color 2016-09-04 17:42:27 +09:00
Allofich
f6c3a62b3e Use average speed for multiple spell projectiles 2016-09-04 17:42:27 +09:00
Allofich
f1a18027f2 Shoot projectiles of spells with multiple effects 2016-09-04 17:42:27 +09:00
Allofich
446c0a4fa8 Play all of a spell's casting effects 2016-09-04 17:42:27 +09:00
Allofich
b4577fe751 Allow multiple spell hit sounds on single target 2016-09-04 17:42:27 +09:00
Koncord
ab6d6d1cc8 Fix log message in Networking::Connect() 2016-09-04 16:18:53 +08:00
Koncord
d110834ee7 Fix log message in Networking::Update() 2016-09-04 16:03:07 +08:00
scrawl
7859e378df Merge pull request #1045 from Allofich/attack 
Fix AI melee attack
 2016-09-04 00:22:59 +02:00
Aesylwinn
fab7549b42 Fix windows path issue in editor debug run. 
- The problem was caused by spaces in the data directory
 2016-09-03 17:49:49 -04:00
Aesylwinn
ee432690e6 Make it easier to place objects in the scene editor. 
This fix allows objects to be dropped onto the ground, and prevents
objects from being selected through the ground.
 2016-09-03 17:37:13 -04:00
Allofich
5c2bc515fe Remove overridden code in aicombat 2016-09-04 02:13:09 +09:00
mrcheko
0775ed75ea fix zero div in getXAngleToDir 2016-09-03 17:50:06 +03:00
Allofich
0d63d75bb0 Remove no longer used parameter 2016-09-03 22:40:24 +09:00
Allofich
286e4bb98f Remove attacktype movement 2016-09-03 21:16:59 +09:00
David Cernat
81999a8179 Remove outdated ID_GAME_UPDATE_SKILLS packet, part 2 2016-09-02 07:58:20 +03:00
David Cernat
8abef0bebe Remove outdated ID_GAME_UPDATE_SKILLS packet 2016-09-02 07:36:39 +03:00
David Cernat
e36321f448 Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp 2016-09-02 06:57:49 +03:00
David Cernat
dafc6c0843 Save and load birthsigns 2016-09-02 06:57:13 +03:00
David Cernat
9764dbb8d2 Merge pull request #52 from OpenMW/master 
Add OpenMW commits up to 2 Sep
 2016-09-02 06:29:34 +03:00
David Cernat
ff94b5f1ac Fix unsuitable variable name 2016-09-02 06:16:35 +03:00
David Cernat
941d76fce0 Fix setting of default classes and initialize classes safely on server 2016-09-02 04:31:35 +03:00
scrawl
bdf55927e1 Merge pull request #1041 from Allofich/waterwalking 
Don't allow casting Water Walking in deep water
 2016-09-02 02:57:22 +02:00
David Cernat
970e9aff2f Remove old class methods and don't include class in ID_GAME_BASE_INFO 2016-09-02 03:45:43 +03:00
Koncord
534ef527b9 Fix my stupid epic fail 2016-09-02 07:35:53 +08:00
Allofich
154dcc942c Let NPCs use attack type regardless of movement 2016-09-01 22:43:33 +09:00
Marc Zinnschlag
316cf40f12 Merge remote-tracking branch 'aesylwinn/FixInteriorCellRefTeleportation' 2016-09-01 11:51:34 +02:00
Allofich
b99c2c54d8 Allow Water Walking on non-submerged creatures 2016-09-01 03:53:53 +09:00
Aesylwinn
c0d53a2557 Fix CellRefs being teleported from interior to exterior cells. 2016-08-31 11:02:04 -04:00
Allofich
22b11c5947 Move Water Walking check into checkEffectTarget() 2016-08-31 23:56:31 +09:00
Allofich
f25c65260c Limit sMagicinvalidEffect to self-cast spells 2016-08-31 17:22:45 +09:00
Allofich
6c3cad238b Use castByPlayer bool 2016-08-31 17:18:23 +09:00
David Cernat
e9dce26f38 Resolve conflicts in pull request #50 
# Conflicts:
#	CMakeLists.txt
 2016-08-31 07:28:32 +03:00
Aesylwinn
b2ddd3c259 Initialize with correct content file number instead of correcting at save stage. 2016-08-30 16:42:38 -04:00
Allofich
a6216d883f Don't allow casting Water Walking in deep water 2016-08-31 04:37:50 +09:00
David Cernat
263efa9988 Fix formatting, part 2 2016-08-30 12:37:36 +03:00
David Cernat
a20e7890a2 Fix formatting 2016-08-30 10:52:30 +03:00
David Cernat
f562215d9a Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp 2016-08-30 08:55:13 +03:00
David Cernat
1f8595bf3b Save server information in a folder named data instead of files 2016-08-30 08:54:26 +03:00
Koncord
cf1a0113a1 Time API 2016-08-30 13:24:42 +08:00
David Cernat
5e6a374687 Add comment about MesssageBox to prevent future confusion 2016-08-30 08:13:08 +03:00
David Cernat
857defadbc Revert one unnecessary renaming of MessageBox 2016-08-30 08:05:00 +03:00
David Cernat
32ce7e97a8 Fix build for Windows server 2016-08-30 08:01:34 +03:00
Koncord
1186d09ec0 ScriptFunctions.hpp size reduction 2016-08-30 12:20:39 +08:00
Koncord
11eae277a9 Characters Class API 
Added some new functions
 2016-08-30 11:18:19 +08:00
Aesylwinn
3ae2fc17c6 Fix some issues with content file numbers in the editor. 
1. Change content numbers to be relative to the plugin when saving.
2. Initialize the indices in the MasterData part of a plugin header.
 2016-08-29 18:06:56 -04:00
David Cernat
d612cbcc7b Revert "Disable CharGen custom class choice until we can handle custom classes" 
This reverts commit e81bf7318c.
 2016-08-29 21:04:32 +08:00
Koncord
a03c2f5019 Now server & client sensitive to version 2016-08-27 15:36:22 +08:00
Koncord
8a5e32c631 Show the InputBox only if queue is free 2016-08-27 13:58:06 +08:00
Koncord
4c2415e9db Fix focus for InputDialog 
Created a special pipe for future GUI modes.
 2016-08-27 13:40:11 +08:00
David Cernat
e81bf7318c Disable CharGen custom class choice until we can handle custom classes 2016-08-27 04:47:35 +03:00
David Cernat
00e7810428 Add script functions for saving and loading non-custom player classes 2016-08-27 00:14:50 +03:00
Allofich
9e1bfde46f Add comment 2016-08-26 02:42:56 +09:00
Allofich
67bd882bc7 Disable current idle when an action is taken 2016-08-25 23:42:09 +09:00
Allofich
6190ff1f0d Update idle if current idle finishes playing 2016-08-25 21:45:56 +09:00
Allofich
f4cc5d0399 Sometimes play 1st-person weapon idle to Stop key 2016-08-25 21:34:45 +09:00
David Cernat
7bb6020e51 Display message boxes when client is disconnected. 2016-08-25 02:58:03 +03:00
David Cernat
4d2ca20445 Resolve conflicts in pull request #43 
# Conflicts:
#	README.md
 2016-08-24 22:03:35 +03:00
Koncord
1b403719f5 Merged branch master into master 2016-08-24 16:15:56 +08:00
Koncord
997c62cc52 Add --connect option to client 2016-08-24 16:15:34 +08:00
David Cernat
486de67d84 Make handshake log message less confusing 2016-08-24 06:38:38 +03:00
David Cernat
abaa8cac72 Spawn players in Pelagiad on startup 2016-08-24 06:23:32 +03:00
David Cernat
77aff346e9 Fix typo in method name "getGUIConroller", part 2 2016-08-24 05:55:02 +03:00
David Cernat
63eebd3d18 Respawn players in Fort Pelagiad instead of ToddTest for the time being 2016-08-24 05:32:40 +03:00
David Cernat
d830937f4e Fix typo in method name "getGUIConroller" 2016-08-24 04:48:35 +03:00
David Cernat
f93e382b8b Use tes3mp icon for executable, part 2 2016-08-24 04:01:05 +03:00
David Cernat
5385563972 Let players inform others about Lua script-induced cell & pos changes 2016-08-24 02:53:39 +03:00
David Cernat
d24b4d0a2d Disable New, Save and Load buttons in main menu 2016-08-24 00:46:32 +03:00
David Cernat
7b187d0295 Fix visual glitch when jumping without adjusting camera afterwards 2016-08-23 22:27:12 +03:00
Allofich
7db31ab58a Correct telekinesis glow length 2016-08-24 01:21:15 +09:00
scrawl
346f5a19a3 Merge pull request #1029 from Allofich/anim 
Improvements for playgroup and loopgroup
 2016-08-23 14:14:36 +02:00
Allofich
9b0e5d6b59 Loop mid-animation idles when loading a save game 2016-08-23 19:50:56 +09:00
Koncord
fc4d8b82fb Stubs for minimap 2016-08-23 11:11:25 +08:00
David Cernat
7691bcc958 Add server script callbacks for attribute and skill changes 2016-08-23 03:04:22 +03:00
David Cernat
03d6e0cb62 Send attributes and skills to server whenever they change 2016-08-23 02:24:10 +03:00
David Cernat
ce5553cda6 Get hand-to-hand attack victim's stats if there actually is a victim 2016-08-23 01:23:09 +03:00
scrawl
0fd810707e Remove unused stopLooping() 2016-08-22 23:33:26 +02:00
scrawl
b0dc625b18 Run setLoopingEnabled after the anim queue is updated 2016-08-22 23:33:24 +02:00
scrawl
719e884b7c Remove duplicate code 2016-08-22 23:25:00 +02:00
scrawl
0c9882956a Add AnimState::shouldLoop() 2016-08-22 23:25:00 +02:00
scrawl
6450c9be27 Simplify condition 2016-08-22 23:22:58 +02:00
Allofich
bf9dc45b2b Emulate vanilla animation loops more closely 2016-08-23 01:42:36 +09:00
mrcheko
612c7f1a2f Revert "Revert "Merge pull request #993 from mrcheko/pathfinding"" 
This reverts commit 3732979eec.
 2016-08-19 22:15:26 +03:00
David Cernat
c4f49e05e3 Remove manual newlines for logger 2016-08-19 07:54:10 +03:00
Koncord
78210ab8ce rename openmw-mp to tes3mp-server 2016-08-19 09:38:33 +08:00
Koncord
b67789aa6a Rename openmw to tes3mp 2016-08-19 09:38:06 +08:00
Koncord
90215f4e7c Fix log messages for GCC compatibility 2016-08-19 09:37:24 +08:00
Koncord
d3c9864fb0 Fix maximum connections 2016-08-19 08:18:25 +08:00
David Cernat
e1955b440f Fix player initialization on server 2016-08-19 03:11:03 +03:00
David Cernat
cba01af683 Log player initialization on server 2016-08-19 01:32:39 +03:00
David Cernat
2337a0becb Add LOG_APPEND method for writing to log without timestamp and level 2016-08-18 23:17:46 +03:00
David Cernat
f4744f8547 Add additional log info 2016-08-18 22:29:54 +03:00
David Cernat
97f944dde7 Use logger for most console messages 2016-08-18 20:20:17 +03:00
Aesylwinn
91fd966146 Fix some issues detected by coverity for the editor. 2016-08-18 12:42:35 -04:00
Allofich
b332a13b4e Don't restart looped animations on repeated calls 2016-08-18 23:23:38 +09:00
David Cernat
a36c20eaae Reduce server console spam 2016-08-18 16:13:04 +03:00
David Cernat
436548413e Resolve conflicts in pull request #39 
# Conflicts:
#	CMakeLists.txt
 2016-08-18 15:10:52 +03:00
Marc Zinnschlag
2fef8948f1 Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale' 2016-08-18 09:13:43 +02:00
David Cernat
a2dbeb6c95 Share skills and attributes correctly upon logging in, and fix grammar 2016-08-18 05:21:25 +03:00
Koncord
35991fcd15 Add logger to client 2016-08-18 07:58:37 +08:00
Koncord
7f8c0ecbbd Logging in file for server 2016-08-18 07:58:09 +08:00
David Cernat
c94f818478 Add script functions for getting attributes and skills by their names 2016-08-18 00:55:35 +03:00
David Cernat
41868cc9cc Add script functions for getting attributes and skills by their IDs 2016-08-18 00:13:45 +03:00
David Cernat
e5cb58e7c4 Add debug info about ID_GAME_BASE_INFO packets 2016-08-17 21:18:04 +03:00
David Cernat
8eda381016 Make formatting consistent, part 2 2016-08-17 18:20:36 +03:00
David Cernat
1363c4c5b6 Make formatting consistent 2016-08-17 18:04:35 +03:00
David Cernat
1bbd7c271f Add fail-safes to DedicatedPlayer cell updating to narrow down problems 2016-08-17 07:27:40 +03:00
David Cernat
e39b66af4f Move logger to components 2016-08-17 06:15:44 +03:00
David Cernat
38c8d2344b Uncomment sending of stats packets to and from new players 2016-08-17 04:52:15 +03:00
David Cernat
aa69c156c7 Fix race-related graphical glitches when players spawn 2016-08-17 01:06:50 +03:00
Koncord
a840d84b39 Merged branch master into master 2016-08-17 05:53:09 +08:00
Koncord
ee8d9895dc Porting Log.cpp to C++98 2016-08-17 05:52:40 +08:00
scrawl
dda5bfbc9f CharacterPreview no longer depends on osgViewer 2016-08-16 22:47:45 +02:00
scrawl
8bfcf259a3 LocalMap no longer depends on osgViewer 2016-08-16 22:37:44 +02:00
scrawl
b2ae45f0eb Remove unneeded setGraphicsContext() calls 2016-08-16 19:33:09 +02:00
scrawl
0209c70583 Improve performance by skipping update if transform is unchanged 2016-08-16 17:50:59 +02:00
scrawl
4751e0e953 Improve performance of animateCollisionShapes by caching the node path 2016-08-16 17:50:59 +02:00
scrawl
8a4722cb84 Revert "animateCollisionShape checks if the shape is really animated" 
This reverts commit cbf344663f.

Doesn't work correctly because the Animation delays the assignment of the UpdateCallbacks until the animation starts. The commit broke the animation of in_dagoth_bridge00
 2016-08-16 17:50:59 +02:00
scrawl
3ef9b3f44d Merge pull request #1025 from Allofich/anim 
Use loopfallback for idle animation groups
 2016-08-16 16:30:55 +02:00