1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-21 11:14:04 +00:00
Commit graph

23767 commits

Author SHA1 Message Date
Capostrophic
0ab5314755 Make scripted items not stack (bug #2969) 2018-12-30 18:18:33 +03:00
Capostrophic
a9619dbe03 Update Fonts documentation 2018-12-30 17:23:57 +03:00
Capostrophic
8a266803eb Simplify some world loops 2018-12-30 15:36:42 +03:00
David Cernat
906d2a837d [Client] Send PlayerInventory packets when recharging items w/ soulgems 2018-12-30 11:58:33 +02:00
Bret Curtis
5e541c1ae1
Merge pull request #2106 from Capostrophic/fallback
Revert to lexical cast for string-to-float conversion
2018-12-30 10:26:02 +01:00
David Cernat
71679934a1 [Client] Send PlayerInventory packets when repairing items 2018-12-30 09:39:46 +02:00
David Cernat
5d9893ee92 [Client] Set actor killer correctly for spells that do damage over time
Additionally, clean up comments related to other code that sets actor killers.
2018-12-30 07:40:11 +02:00
David Cernat
6e1504f0a1 [Server] Use clearer variable & function names in TimerAPI 2018-12-30 04:15:53 +02:00
David Cernat
42b5a8054f [Server] Remove unusable position functions for players 2018-12-30 03:17:37 +02:00
Capostrophic
e412e1b41c Revert to lexical_cast<float>, catch out-of-range exceptions 2018-12-29 20:20:27 +03:00
Koncord
4ce0331f1b [Server] Fix GCC build 2018-12-29 15:54:08 +08:00
Bret Curtis
932691d199
Merge pull request #2091 from Capostrophic/fallheight
Avoid falling height reset if on-ground state wasn't actually updated (bug #4411)
2018-12-29 08:26:28 +01:00
Bret Curtis
02c8e328bd
Merge pull request #2104 from Capostrophic/fallback
Improve fallback numerical value handling (bug #4768)
2018-12-29 08:01:18 +01:00
Koncord
9343b8af2f [Server] Remove unused function 2018-12-29 14:02:08 +08:00
Koncord
c2230a8a21 [Server] Add MP flag to the server if enabled 2018-12-29 12:03:01 +08:00
Koncord
a0e89208a0 [General] Fix standalone server build 2018-12-29 11:58:49 +08:00
Koncord
55cea491ca [Server] Introduce MS VC++ 2017 support 2018-12-29 11:57:26 +08:00
Koncord
6af2400752 [Server] Remove usages of get/set env. Add GetModDir function 2018-12-29 11:40:31 +08:00
Koncord
b3456a8841 [Server] Fix invalidation of iterators 2018-12-29 11:10:20 +08:00
Capostrophic
467724d5e8 Improve fallback numerical value handling (bug #4768) 2018-12-28 23:49:06 +03:00
Bret Curtis
d80d056140
Merge pull request #2098 from xyzz/fix-loading-screen-uaf
loadingscreen: Fix UaF in loading screen.
2018-12-28 18:58:04 +01:00
Bret Curtis
91b962c095
Merge pull request #2099 from xyzz/replace-volatile-atomic
Replace volatile bools with std::atomic<bool>
2018-12-28 16:41:07 +01:00
Bret Curtis
0fb056d317
Merge pull request #2103 from Capostrophic/markers
Clean up fallback record creation
2018-12-28 16:39:36 +01:00
Capostrophic
7155e787b4 Clean up fallback record creation 2018-12-28 01:22:24 +03:00
Bret Curtis
807e0311b9
Merge pull request #2102 from nikolaykasyanov/macos-cmake-check
[macOS] Fail CMake when trying to use CMake 3.13 for macOS packaging
2018-12-26 22:14:13 +01:00
Nikolay Kasyanov
2306d904c7 [macOS] Fail CMake when trying to use CMake 3.13 for macOS packaging 2018-12-26 17:00:17 +01:00
David Cernat
343dd8b5ea [Client] Fix addition of items to player inventories
Previously, multiple stacks of the same item ID could overwrite data in each other because of how the logic in ContainerStore::add() works. For example, a stack of 5 grand soul gems with no souls would get added to the player, then the attempt to add a grand soul gem with a particular soul would retrieve the previous stack first before setting all of it to that soul, resulting in 6 grand soul gems with that soul.
2018-12-26 13:41:19 +02:00
David Cernat
76ac905efc [Client] Send PlayerInventory packets when trapping souls in soulgems 2018-12-26 12:25:00 +02:00
David Cernat
f853368641 [Client] Fix loss of player items in ContainerStore::unstack()
Previously, unstacking items for a player led to a PlayerInventory packet being sent about the items' removal.

This change makes it so both a packet about their re-addition and their removal are sent instead, cancelling each other out, which is inelegant, but arguably preferable to complicating the sending of PlayerInventory packets again.
2018-12-26 12:24:26 +02:00
Bret Curtis
f18f2d39e5
Merge pull request #2096 from xyzz/android-relative-mouse
android: Add a method so that we can send relative mouse movements from java.
2018-12-26 10:41:35 +01:00
Nikolay Kasyanov
956934911a [macOS, CI] Use CMake 3.12.4
See https://gitlab.com/OpenMW/openmw/issues/4767 for details.
2018-12-26 10:17:32 +01:00
Ilya Zhuravlev
1bdec2399f Make sure CopyFramebufferToTextureCallback is only called once and not every frame 2018-12-25 11:56:24 -05:00
Ilya Zhuravlev
07e9ce84b3 Replace volatile bools with std::atomic<bool> 2018-12-24 14:19:35 -05:00
Ilya Zhuravlev
8e7c01b561 loadingscreen: Fix UaF in loading screen.
When the CopyFramebufferToTextureCallback callback is called, in its operator() it resets setInitialDrawCallback by providing a NULL pointer.
However, this causes the callback to get deleted. In turn, the "this" pointer is invalidated.
When execution returns to DrawCallback::run, it accesses a _nestedCallback member of deleted "this" which is UB.
2018-12-24 14:18:26 -05:00
Ilya Zhuravlev
98b2c04404 android: Add a method so that we can send relative mouse movements from java. 2018-12-23 15:14:29 -05:00
Bret Curtis
a037e4c954
Merge pull request #2090 from xyzz/nulls-in-c
android_main.c: Replace nullptr back to NULL since there are no nullptr in C
2018-12-23 19:38:12 +01:00
Capostrophic
793c2a19d2 Cherry-pick cc9cii's editor improvements 2018-12-23 20:10:16 +03:00
Capostrophic
0bbcc0e787 Avoid falling height reset if onGround state didn't change (bug #4411) 2018-12-23 13:39:35 +03:00
Ilya Zhuravlev
09585b7208 android_main.c: Replace nullptr back to NULL since there are no nullptr in C 2018-12-22 22:21:26 -05:00
Bret Curtis
8e113a32b2
Merge pull request #2081 from nikolaykasyanov/unneed-macos-files
Remove unnecessary Recastnavigation headers & static libs from macOS package
2018-12-21 17:47:15 +01:00
Andrei Kortunov
b4f3ce2a0a Editor: Implement faction ranks table (feature #4209) 2018-12-21 14:16:40 +04:00
Bret Curtis
d4e56b73ae
Merge pull request #2086 from Capostrophic/aidata
Editor: avoid overflows in certain fields (bug #2987)
2018-12-21 11:05:42 +01:00
Bret Curtis
d3ed3c2b0d
Merge pull request #2087 from nikolaykasyanov/update-macos-deps
Update macOS dependencies, use Xcode 10.1
2018-12-21 11:02:40 +01:00
Nikolay Kasyanov
e0161bb2bf Update macOS dependencies, use Xcode 10.1 2018-12-20 22:36:06 +01:00
Nikolay Kasyanov
c3a2a2d73f Do not package Recastnavigation headers and static libs 2018-12-20 21:18:41 +01:00
Nikolay Kasyanov
f98a454ec1 Add a script to verify macOS package contents 2018-12-20 21:18:41 +01:00
Capostrophic
2681435857 Editor: handle AI settings, regional sound and levelled list "none" chances as shorts (bug #2987) 2018-12-20 19:51:55 +03:00
AnyOldName3
199e6ed82d Revert "Use forward declaration to reduce build times."
This reverts commit 305b9826df.
2018-12-19 23:53:14 +00:00
AnyOldName3
305b9826df Use forward declaration to reduce build times. 2018-12-19 16:23:32 +00:00
Alexander Kolodeev
7c3ef213ce Fix error when create new OpenCS addon 2018-12-19 18:47:02 +03:00