1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 06:19:55 +00:00
Commit graph

17592 commits

Author SHA1 Message Date
David Cernat
8d2793401e Merge pull request #103 from OpenMW/master
Add OpenMW commits up to 13 Nov
2016-11-14 14:08:16 +02:00
Phillip Andrews
c18fc113e5 Changed missing library dependencies to simple fix 2016-11-14 00:01:22 -06:00
Phillip Andrews
aeaedbc57a Moved install commands to target-specific cmakelists so that all configurations work. 2016-11-13 22:49:01 -06:00
Phillip Andrews
7383cc9de4 Forgot to undo my test edits because I am a big dum-dum 2016-11-13 17:06:00 -06:00
Phillip Andrews
59eba1dede Changed tabs to spaces, oops 2016-11-13 16:59:36 -06:00
Phillip Andrews
86b4673539 Removed math constants in openmw-cs, which are apparently not going to be used 2016-11-13 16:43:07 -06:00
Phillip Andrews
a1225ff4ec Additional MSVC library dependencies 2016-11-13 14:34:12 -06:00
Phillip Andrews
1861302dbd Include various libraries for Visual Studio environment 2016-11-13 14:27:59 -06:00
scrawl
02b9e81f89 Merge pull request #1127 from Allofich/warnings
Fix shadowing warnings
2016-11-13 20:49:26 +01:00
scrawl
233c9e37b0 Merge pull request #1128 from MiroslavR/Woverloaded-virtual
Fix overloaded virtual function warning
2016-11-13 20:49:14 +01:00
Phillip Andrews
2efd38b1ab Fix install procedure so it works with all MSVC build configurations, not just Release 2016-11-13 13:32:42 -06:00
MiroslavR
175cfd4dff Fix overloaded virtual function warning 2016-11-13 17:22:50 +01:00
Allofich
3420121c3f Fix shadowing warnings 2016-11-13 23:20:51 +09:00
scrawl
5658817581 Merge pull request #1126 from Allofich/waterwalking
Don't allow resting on water with water walking
2016-11-13 13:58:26 +01:00
Allofich
fee39afe38 Don't allow resting on water with water walking 2016-11-13 19:50:33 +09:00
David Cernat
f7b5e5e638 Ignore packets from server that try to move LocalPlayer to invalid cells 2016-11-12 22:21:02 +02:00
David Cernat
dc9b814ff6 Fix typo in server script translocations 2016-11-12 21:36:03 +02:00
David Cernat
841e93d5e0 Use new SendCell() method in server scripts to send cell packets 2016-11-12 21:27:09 +02:00
David Cernat
5b39916894 Use new SendPos() method in server scripts to send position packets 2016-11-12 21:16:05 +02:00
David Cernat
e0c88150c3 Reorder functions for server script translocations 2016-11-12 21:01:38 +02:00
Koncord
c85e6a5f91 Fix sucess chance 2016-11-12 20:43:18 +08:00
Koncord
799842b5da Reduce using of the CPU 2016-11-12 20:11:27 +08:00
Koncord
56959ebfda Implement magic 2016-11-12 19:39:16 +08:00
Joakim Berg
12dd60fe20 Update convert_bump_mapped_mods.rst
Forgot to fix one link.
2016-11-11 22:53:25 +01:00
Joakim Berg
2feddcbcc5 Updated the bump mapping tutorial
Fixed some linking errors, edited a few backslashes to become forwardslashes (the backslashes couldn't even be viewed), made all the paths a bit more correctly formatted by writing them with a ./ first (please tell me if that is a bad idea) and added a link to the On The Rocks! mod, since it is a very common mod with this problem (it is featured in MGSO and Morrowind Rebirth).
2016-11-11 22:52:14 +01:00
David Cernat
729da2c0ba Improve logic and clarity of LocalPlayer's charGenThread()
Until now, the fact that charGenThread() returned false whenever the player had a menu open was preventing Main::UpdateWorld() from running at all with a menu open.

The result was that no player packets from LocalPlayer::Update() were being sent by a player in a menu.
2016-11-11 23:46:17 +02:00
Joakim Berg
2e391782ba Merge pull request #1 from OpenMW/master
Updating my own fork
2016-11-11 22:28:03 +01:00
David Cernat
dc5bb32f2a Merge pull request #100 from OpenMW/master
Add OpenMW commits up to 11 Nov
2016-11-11 10:24:53 +02:00
scrawl
f0d5cf7afb Merge pull request #1112 from Assumeru/waterwalking
Move actors out of the water if there's room for them. Fixes #1138
2016-11-10 19:02:51 +01:00
Assumeru
05cc258ed3 Start trace from collision object origin 2016-11-10 15:38:14 +01:00
Bret Curtis
02d859e298 minor fix to remove Index:, it isn't necessary 2016-11-10 10:50:43 +01:00
Bret Curtis
1ffdd2dd0f Merge pull request #1125 from lysol90/master
Further updating of normal map conversion documentation
2016-11-10 10:44:40 +01:00
Joakim Berg
303fe013ea Update convert_bump_mapped_mods.rst 2016-11-09 22:51:27 +01:00
Joakim Berg
e957e2b3cc Update convert_bump_mapped_mods.rst
Ok, so another update then. Sorry for another one so soon after the first PR, but I think (or hope) that this will be the last edit for some time. It looks good to me now. ´

Mainly, I changed changed some "=" headers to "-", and while at it, I fixed some typing errors and just edited some text to read better.
2016-11-09 22:47:39 +01:00
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