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

24675 commits

Author SHA1 Message Date
Bret Curtis
78d9787212
Merge pull request #1880 from Capostrophic/landing
Play landing sound manually and ignore land soundgen textkeys (bug #2256)
2018-08-23 08:40:55 +02:00
David Cernat
9e58cc82bd [Server] Set minimum updateRate when communicating with master server 2018-08-23 00:10:49 +03:00
David Cernat
be448e5b8e [General] Use more appropriate update rate in server config 2018-08-23 00:06:28 +03:00
Capostrophic
3f76f1d3ed Fix gold count calculation in pickupObject (bug #4604) 2018-08-22 22:35:22 +03:00
Capostrophic
f74ebb64af Correct special case soundgen comparisons 2018-08-22 16:36:15 +03:00
Capostrophic
ae0a6a22b3 Move "land" check earlier 2018-08-22 14:47:06 +03:00
David Cernat
d1fa57ac14 [General] Switch to new official master server port when using old one 2018-08-22 13:49:17 +03:00
David Cernat
0658d39eaa [General] Update ports used for master server in client & server config 2018-08-22 13:47:46 +03:00
Marc Zinnschlag
a7242d9e7a Merged pull request #1879 2018-08-22 11:06:58 +02:00
Marc Zinnschlag
344eae269b Merged pull request #1877 2018-08-22 11:06:37 +02:00
Marc Zinnschlag
918ecfdebc Merged merge request !29 2018-08-22 10:53:36 +02:00
Marc Zinnschlag
6cf34abb9e Merged merge request !38 2018-08-22 10:52:27 +02:00
Thunderforge
5a2e9868c1 Fixes #3681
This changes the way that the popup works to use [`QtColorDialog::getColor()`](http://doc.qt.io/archives/qt-4.8/qcolordialog.html#getColor) instead of the problematic open() function. Also makes the button change to create the modal dialog when pushed, rather than being a checkbox of sorts
2018-08-21 22:13:05 -05:00
Capostrophic
2b45fd84ea Play landing sound manually and ignore land soundgen textkeys (bug #2256) 2018-08-21 19:03:03 +03:00
Capostrophic
910065f38f Make some more optimizations to actor processing loops 2018-08-21 17:02:56 +03:00
Capostrophic
b77d733c3e Fix freeze in getActorsSidingWith 2018-08-21 16:47:29 +03:00
AnyOldName3
25e92481f4 Merge remote-tracking branch 'refs/remotes/upstream/master' 2018-08-21 14:00:58 +01:00
AnyOldName3
15e820825f Fix another convex hull clipping issue and restore z-clipping 2018-08-21 14:00:29 +01:00
Thunderforge
9b10fe0edb Addiong missing "to" word 2018-08-21 07:03:55 -05:00
David Cernat
03832f933b [Client] Send only individual items in PlayerInventory packets
For a long time, whenever a PlayerInventory packet was sent, it contained all the items in the player's inventory, because that's how Koncord originally implemented it and I always had too many other priorities to go back and rework it.

From now on, clients only send PlayerInventory packet with the one item added or removed, with the single exception being trading with merchants, where the entire inventory is still sent for the time being.
2018-08-21 10:10:06 +03:00
David Cernat
75a64a69c7 [Server] Add GetInventoryChangesAction() script function
Additionally, fix a typo in the description of GetSpellBookChangesAction()
2018-08-21 10:06:40 +03:00
Bret Curtis
b748bb11ae
Merge pull request #1878 from Capostrophic/hitchance
Use the correct skill for creature AI weapon hit chance rating
2018-08-21 08:12:06 +02:00
David Cernat
45b011452e [Client] Combine methods for sending spell packets into a single one 2018-08-21 01:20:30 +03:00
Capostrophic
74229490e4 Use the correct skill for creature AI weapon hit chance rating 2018-08-20 21:38:57 +03:00
David Cernat
140e0ed52c [Client] Also clear aiActors when clearing ActorList 2018-08-20 20:54:34 +03:00
Thunderforge
e1afa1c2c3 Adding common problems that were previous on the site FAQ
The [OpenMW FAQ](https://openmw.org/faq/) currently has two problems on it: a black screen and pink textures due to ST3C issues. Given that these are less common now, and that we have a dedicated space for "common problems" anyway, I figure that we should just move this to these questions to there.
2018-08-20 12:49:26 -05:00
David Cernat
aed4ca2fd2 [Client] Allow use of baseId for more record types
Additionally, don't allow new enchantment records to be created if they have no effects, to avoid a crash.
2018-08-20 15:24:20 +03:00
David Cernat
a083439139 Merge pull request #469 from davidcernat/master while resolving conflicts
# Conflicts:
#	apps/openmw/main.cpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
2018-08-20 14:08:44 +03:00
David Cernat
7efee0e968 [Client] Fix GCC build 2018-08-20 10:15:30 +03:00
Capostrophic
a06c9c767d Treat <> and << operators as < and >< and >> as > in scripts
(bug #4597)
2018-08-19 18:40:33 +03:00
Bret Curtis
7f3769d5fc
Merge pull request #1874 from akortunov/combat_anims
Fix some issues with attack animations
2018-08-19 13:57:36 +02:00
Bret Curtis
3c827da702
Merge branch 'master' into combat_anims 2018-08-19 10:03:39 +02:00
Bret Curtis
3b2781bf89
Merge pull request #1720 from akortunov/playvfx
Rework spell VFX management
2018-08-19 10:00:38 +02:00
Marc Zinnschlag
dc9aedca7d Merged merge request !33 2018-08-18 12:08:05 +02:00
Marc Zinnschlag
91be35124c Merged merge request !35 2018-08-18 12:07:37 +02:00
Marc Zinnschlag
20c53594de Merged merge request !36 2018-08-18 12:06:35 +02:00
Marc Zinnschlag
9475df7880 Merged merge request !37 2018-08-18 12:05:01 +02:00
AnyOldName3
3ce96997d1 Remove sneaky tabs. 2018-08-18 00:09:40 +01:00
James Carty
4489838ea3 Fix incorrect function call 2018-08-17 22:35:04 +01:00
James Carty
513e99148e Fix function with no return value 2018-08-17 20:18:20 +01:00
AnyOldName3
80082308f0 Merge upstream (shadermanager log system revamp) 2018-08-17 18:22:13 +01:00
AnyOldName3
dd501f4132 Make ConvexHull::clip more resilient against large values. 2018-08-17 17:47:52 +01:00
James Carty
99b465eede Update authors 2018-08-17 13:54:58 +01:00
James Carty
331016c782 Update Authors 2018-08-17 13:48:02 +01:00
Diego Crespo
76932ebfc5 Updated AUTHORS.md 2018-08-17 08:39:50 -04:00
Andrei Kortunov
d7ca087f59 AiCast: fix aiming 2018-08-17 12:41:13 +04:00
Andrei Kortunov
31f8bea1dd Rework spell effects management 2018-08-17 12:41:13 +04:00
Andrei Kortunov
8516aee6e0 Implement getHalfExtents() for non-actor objects 2018-08-17 12:40:01 +04:00
David Walley
a492978fe6 Update AUTHORS.md - add Loriel (Documentation) 2018-08-17 08:23:47 +00:00
Marc Zinnschlag
088463ebe6 Merged pull request #1868 2018-08-17 09:37:49 +02:00