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

17608 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bret Curtis
a1c1db467e Merge pull request #1124 from lysol90/master 
Create convert_bump_mapped_mods.rst
 2016-11-09 21:32:45 +01:00
Assumeru
99bc4f733f Trace up to waterlevel + halfextent 2016-11-09 18:03:10 +01:00
Joakim Berg
d7bf2b9e85 Update index.rst 
Added convert_bump_mapped_mods to the table of contents.
 2016-11-09 15:56:07 +01:00
Joakim Berg
3ee28bfeac Update convert_bump_mapped_mods.rst 
This should be correct according to the style-guide. Well, except for the British/American spelling. I need a Brit and/or an American to confirm that.
 2016-11-09 15:47:50 +01:00
Joakim Berg
1b8cfee5eb Update convert_bump_mapped_mods.rst 2016-11-09 15:38:49 +01:00
lysol90
2d48c38d0d Create convert_bump_mapped_mods.rst 
A tutorial to how normal mapping works with different mods in Morrowind and how they work in OpenMW. It also covers how to convert the mods made for Morrowind to be used with OpenMW.
 2016-11-09 13:14:50 +01:00
David Cernat
48ca4d29bc Merge pull request #99 from OpenMW/master 
Add OpenMW commits up to 7 Nov
 2016-11-08 00:24:39 +02:00
scrawl
92d42ef49b Merge pull request #1123 from Allofich/warnings 
Fix dereference of null pointer warning
 2016-11-07 22:22:32 +01:00
scrawl
4f8bfb7702 Merge pull request #1122 from MiroslavR/slow-repair 
Improve performance of repairing/recharging
 2016-11-07 22:16:11 +01:00
Allofich
c7313606f5 Fix dereference of null pointer warning 2016-11-07 22:39:20 +09:00
David Cernat
8aaf44e5a8 Fix accidental line duplication 2016-11-06 19:07:03 +02:00
David Cernat
ec211e58d0 Merge pull request #98 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/CMakeLists.txt
 2016-11-06 19:03:35 +02:00
MiroslavR
e80636f0ca Improve performance of repairing/recharging (Fixes #2493) 2016-11-06 11:01:46 +01:00
scrawl
7af1e09151 Merge pull request #1120 from nikolaykasyanov/osx-link-libz 
Link OpenMW with libz on macOS explicitly
 2016-11-05 15:43:23 +01:00
Nikolay Kasyanov
3adf4cb97f Link OpenMW with libz on macOS 2016-11-05 12:18:22 +01:00
Nikolay Kasyanov
0115a3a874 Revert "Link OpenMW with libz on macOS" 
This reverts commit 0c4dd05118.
 2016-11-05 12:11:04 +01:00
Nikolay Kasyanov
0c4dd05118 Link OpenMW with libz on macOS 2016-11-05 12:09:47 +01:00
scrawl
d8b506155e Merge pull request #1118 from MiroslavR/resize-perf 
Fix horrible performance when resizing/moving the settings window
 2016-11-04 20:24:27 +01:00
David Cernat
817b63922c Put DedicatedPlayer in ToddTest if his cell doesn't exist on our client 2016-11-04 20:53:19 +02:00
David Cernat
4d053743a0 Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp 2016-11-04 15:52:13 +02:00
David Cernat
25afa47e08 Only declare ptrCellStore for WorldPackets that need it 2016-11-04 15:47:55 +02:00
Koncord
82f202c891 Implement GetAvgPing(pid) function 2016-11-04 20:15:14 +08:00
Koncord
37e9cafbf7 Add new API function: SetConsoleAllow 
example:
tes3mp.SetConsoleAllow(pid, 0) -- disallow console to the player

The console is allowed by default
 2016-11-04 03:01:26 +08:00
Koncord
3759127627 Woops 2016-11-04 00:57:51 +08:00
Koncord
6f6993255a Fix string in breakpad() 2016-11-04 00:24:16 +08:00
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
scrawl
681efdb6ca Merge pull request #1119 from nikolaykasyanov/use-local-config-path-in-launcher 
Use local config path from configuration manager in the launcher
 2016-11-01 21:48:28 +01:00
Nikolay Kasyanov
5d4734c02e Use local path from configuration manager to load openmw.cfg in launcher 2016-11-01 21:27:35 +01:00
Nikolay Kasyanov
224d7f27b0 Revert "Use local path from configuration manager to load openmw.cfg in launcher" 
89e85a6acf
 2016-11-01 21:19:27 +01:00
Nikolay Kasyanov
89e85a6acf Use local path from configuration manager to load openmw.cfg in launcher 2016-11-01 21:14:24 +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
4d72e7ce37 Merge pull request #91 from OpenMW/master 
Add OpenMW commits up to 31 Oct
 2016-10-31 12:22:37 +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
scrawl
d073999340 Merge pull request #1117 from nikolaykasyanov/fix-osx-ci 
Fix & reenable OS X CI
 2016-10-30 23:27:57 +01:00
Nikolay Kasyanov
cf2e59c983 [OS X] Use Qt 5.5 on CI 
Newer Qt versions require C++11.
 2016-10-30 21:36:43 +01:00
Nikolay Kasyanov
c99d9a47e8 [OS X] Reenable CI 2016-10-30 21:36:43 +01: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
scrawl
f514f53f52 Merge pull request #1114 from Allofich/warnings 
Fix shadowing warnings
 2016-10-30 19:26:38 +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