mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-25 06:39:41 +00:00
Code Issues Releases Wiki Activity
21011 commits 38 branches 54 tags 122 MiB
Commit graph

3933 commits

Author SHA1 Message Date
Ilya Zhuravlev
a038327521 SDLCursorManager: fix possibly invalid read when no cursor present 
On android we have no cursor so I moved the check closer to usage
 2018-01-17 23:03:11 -05:00
David Cernat
28f47c4f81 [General] Update version to 0.6.2-hotfixed 2018-01-17 08:10:49 +02:00
David Cernat
9935f56d46 [General] Use doubles instead of ints for enchantmentCharge 
Additionally, include enchantmentCharges for items  in PlayerEquipment packets.
 2018-01-17 08:10:49 +02:00
Bret Curtis
588c1df0f0
Merge pull request #1599 from xyzz/android 
Update android port.
 2018-01-16 11:12:21 +01:00
Ilya Zhuravlev
d2121ccd62 Update android port. 2018-01-16 00:11:27 -05:00
scrawl
047c44f265
Ignore duplicate data directories to work around the fallout of (Fixes #3557) 2018-01-14 00:25:20 +00:00
scrawl
259919d125
Print a warning when an ambiguous file on a case-sensitive file system is found 2018-01-14 00:23:29 +00:00
Marc Zinnschlag
2dff3aab22 allow . and - in the name part of a begin script statement, but not at the beginning of a name. Fixes #4061 2018-01-12 16:37:06 +01:00
scrawl
bba9a8dd91
Don't update off-screen animations 
Make flying creatures animate in-place when out of processing range
 2018-01-11 01:49:35 +00:00
Kyle Cooley
7248a5d037 Remove some duplication, standardize sol2 header inclusion 2018-01-05 20:25:57 -05:00
Kyle Cooley
ba4d2bd5fe Merge remote-tracking branch 'origin/master' into LibIssues 2018-01-05 17:35:47 -05:00
David Cernat
b6a7377692 Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try 
Conflicts:
	apps/openmw-mp/Networking.cpp
	apps/openmw-mp/Script/Functions/Miscellaneous.cpp
	apps/openmw-mp/Script/Functions/Miscellaneous.hpp
	apps/openmw/mwmp/GUI/GUIChat.cpp
 2018-01-05 21:24:14 +02:00
Kyle Cooley
fcd4d8b842 Fix build for gcc-5.4.0 2018-01-04 21:41:00 -05:00
Koncord
35922e4898 [General] Change "enum ACTOR_ACTION" to "enum class Action" 2018-01-05 09:40:11 +08:00
Koncord
ef0384b296 [General] Simplify ProxyMasterPacket 2018-01-05 09:06:24 +08:00
Koncord
647661daf9 [General] Minor fixes in Master packets 2018-01-05 08:38:40 +08:00
David Cernat
a818140c14
Merge pull request #365 from OpenMW/master 
Add OpenMW commits up to 2 Jan 2017
 2018-01-04 12:12:18 +02:00
David Cernat
65d978a3cb
Merge pull request #364 from OpenMW/master 
Add OpenMW commits up to 1 Jan 2017
 2018-01-02 07:50:37 +02:00
Koncord
c4949ac5d9 [General] Change regular enums to enum class 2018-01-02 12:44:53 +08:00
Koncord
5777759aae [General] Change enum QuickKey::QUICKKEY_TYPE to enum class 2018-01-02 11:52:38 +08:00
Bret Curtis
93f14c219c camelCase 2018-01-01 16:32:20 +01:00
Bret Curtis
7a7b040216 fix building on mips machines 2018-01-01 14:10:23 +01:00
David Cernat
09958681cd Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try 2018-01-01 12:04:25 +02:00
scrawl
c920f95d1e
Don't incorrectly discard root node transformation (Fixes #4272) 2017-12-31 23:49:43 +00:00
David Cernat
cac2c6c1e8 Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts 2017-12-25 02:25:01 +02:00
David Cernat
993081ba1e [General] Add enchantmentCharge to worldObjects and items 2017-12-23 13:16:38 +02:00
Koncord
077a3d06b3 [General] Change type of BasePlayer::resurrectType to ResurrectType 2017-12-10 12:01:04 +08:00
Koncord
1ef6ad6215 [General] Add weather struct and packet 2017-12-10 09:48:29 +08:00
Koncord
122a30c183 [General] Change type of refNumIndex & mpNum to unsigned 2017-12-10 09:20:13 +08:00
Koncord
f35d35741e [General] Remove redundant code 
Remove BaseEvent::worldObjectCount
Remove BaseActor::count
Use foreach loops in packets and processors
Remove redundant "&" in CellController::get().getCell() calls
 2017-12-09 14:59:41 +08:00
Koncord
2cb0ea20f0 [General] Modernize packets 
Use explicit for constructors
Use override instead virtual for inherited methods
Mark final derived classes as "final"
 2017-12-09 10:13:27 +08:00
Koncord
aa183e6844 [General] Introduce chat channels 2017-12-08 07:43:29 +08:00
David Cernat
fc5e883160 [General] Rework PlayerStatsDynamic packets so they are of minimal size 2017-12-02 18:29:30 +02:00
David Cernat
d1ad0c91f8 [General] Rework PlayerEquipment packets so they are of minimal size 
Moreover, rename BaseNetCreature's equipedItems into equipmentItems.
 2017-11-30 12:31:54 +02:00
David Cernat
c9c363ebef [General] Allow GameSettings to set bed & wilderness resting separately 2017-11-30 12:18:15 +02:00
David Cernat
7e322f1f8b Merge pull request #352 from TES3MP/master while resolving conflicts 
# Conflicts:
#	README.md
 2017-11-30 10:10:38 +02:00
David Cernat
e7f20e7daf Merge pull request #351 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
#	README.md
 2017-11-30 10:06:38 +02:00
scrawl
a4d8aef40d
Merge branch openmw-43 into master 
Conflicts:
	CMakeLists.txt
	README.md
	files/mygui/openmw_trade_window.layout
 2017-11-29 22:37:50 +00:00
David Cernat
bd9e8bd10f [General] Simplify storing of attribute and skill index changes 2017-11-29 16:55:51 +02:00
David Cernat
711bdf187a [General] Add BaseNetCreature to CMakeLists in components 2017-11-29 16:11:15 +02:00
David Cernat
720ef5f6c5 [General] Use consistent code style 2017-11-29 13:00:22 +02:00
Koncord
b55bb445dd [General] Change underlying type of the WidgetType to uint8_t 2017-11-28 22:24:04 +08:00
Koncord
a546d99000 [General] Fix type 2017-11-28 22:10:27 +08:00
Koncord
1841562553 [General] Minor cleanup of the World Packets 2017-11-28 22:05:10 +08:00
Koncord
744b8cf168 [General] Minor cleanup of the Actor Packets 2017-11-28 21:51:34 +08:00
Koncord
e44fcdc0b3 [General] Cleanup Player packets 2017-11-28 21:38:45 +08:00
David Cernat
3508a16836 [General] Use GameSettings packet to set ability to rest and wait 2017-11-27 07:39:02 +02:00
David Cernat
a796f81444 [General] Add and use utility function for int value checks in vectors 2017-11-26 13:03:54 +02:00
Koncord
fef3764eb1 [General] Add forgotten files to build 2017-11-25 23:55:05 +08:00
Koncord
c276ff4bd9 [General] Add packet GUIWindow 2017-11-25 23:37:08 +08:00
David Cernat
0a35b897be
Merge pull request #348 from TES3MP/master 
Add master commits up to 25 Nov 2017
 2017-11-25 08:55:18 +02:00
David Cernat
d06817a356
Merge pull request #347 from OpenMW/master 
Add OpenMW commits up to 25 Nov 2017
 2017-11-25 08:54:22 +02:00
David Cernat
b0965f094a [General] Rework PlayerAttribute packets so they are of minimal size 
Previously, whenever a single attribute value changed for a player, that player then sent a PlayerAttribute packet with all values for all 8 attributes.

This did not cause anywhere as much packet spam as PlayerSkill used to, but there was no good reason not to fix it as well.
 2017-11-24 14:28:05 +02:00
David Cernat
ef79a98544 [General] Rework PlayerSkill packets so they are of minimal size 
Previously, whenever a single skill value changed for a player, that player then sent a PlayerSkill packet with all values for all 27 skills, plus the player's progress towards the next level and the bonuses to each attribute on the next level up as the result of sklll increases thus far.

This commit makes PlayerSkill contain only the values of specific skills, moves the player's progress towards the next level to PlayerLevel packets, and moves the bonuses to each attribute on the next level up to PlayerAttribute packets.

Players now also send a PlayerSkill packet whenever their progress towards a new point in a skill changes. This was previously avoided so as to not have massive packet spam.
 2017-11-24 12:38:42 +02:00
Andrei Kortunov
94c0e3ed10 Move toUpper() from StringUtils to the JournalViewModel 2017-11-23 19:37:45 +04:00
David Cernat
1ee460bba8
Merge pull request #344 from TES3MP/master 
Add master commits up to 23 Nov 2017
 2017-11-23 04:53:27 +02:00
David Cernat
656453725b
Merge pull request #343 from OpenMW/master 
Add OpenMW commits up to 23 Nov 2017
 2017-11-23 04:51:13 +02:00
David Cernat
6668b9ab42 [General] Implement ConsoleCommand packet 2017-11-23 00:21:47 +02:00
Andrei Kortunov
67acb83b62 Add missing include 2017-11-21 13:27:33 +04:00
Andrei Kortunov
5f41f7c48d Clean code up a bit 2017-11-21 13:03:38 +04:00
Andrei Kortunov
ba91cd658b Convert topic name to Unicode 2017-11-21 12:31:23 +04:00
Andrei Kortunov
f0ca3eabd3 Merge from upstream master 2017-11-21 09:39:54 +04:00
scrawl
9fda3b6db4 Fix NumericEditBox behavior broken by switch to std::stoi 
For some reason stoi doesn't throw an error for '1foo' while 'foo1' does.

Now the edit box flat out rejects any non-digit key events.
 2017-11-20 23:20:03 +00:00
Andrei Kortunov
a391990f2a Provide multibyte toLower() and single chars comparator 2017-11-20 21:30:46 +04:00
David Cernat
926106cf8c [General] Rework CharGen slightly for clarity purposes 
Previously, charGenStage.end was doing double duty as both the variable indicating the number of CharGen stages and – when set to 0 – the variable indicating that CharGen was over. The latter role is now filled by a new boolean.
 2017-11-13 05:33:27 +02:00
Alexander Stillich
93e9df15c9 Fixed parameter naming 2017-11-11 22:58:02 +00:00
Alexander Stillich
52b3507a2b Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all 2017-11-11 22:58:02 +00:00
Alexander Stillich
09aac22782 Added StringUtil::replaceAll() 2017-11-11 22:58:01 +00:00
Alexander Stillich
92aaff3b78 Fixed escaping @ in boost program options filter 2017-11-11 22:57:59 +00:00
David Cernat
700e4d032e
Merge pull request #334 from TES3MP/master 
Add master commits up to 11 Nov 2017
 2017-11-11 03:47:22 +02:00
David Cernat
01db219de4
Merge pull request #333 from OpenMW/master 
Add OpenMW commits up to 11 Nov 2017
 2017-11-11 03:46:21 +02:00
scrawl
a5ba1caed1
Merge pull request #1541 from astillich/4189 
Fixed escaping @ in boost program options filter
 2017-11-10 23:08:54 +00:00
scrawl
a5adc5b018 Add NPC base skeleton files to the optimizer blacklist (Fixes #4159) 2017-11-10 22:51:32 +00:00
David Cernat
4dbada69bf Merge pull request #332 from TES3MP/master while resolving conflicts 2017-11-10 08:50:28 +02:00
David Cernat
f2a6957e16 Merge pull request #331 from OpenMW/master while resolving conflicts 2017-11-10 08:43:50 +02:00
scrawl
244cc5b861 Reduce error spam 2017-11-08 00:24:03 +00:00
scrawl
7b4add2ae4 Fall back to non-shader material if creating the shader fails 
Also fixes an uncaught exception that will break the whole game.
 2017-11-08 00:24:03 +00:00
Alexander Stillich
43b5c2e36b Fixed parameter naming 2017-11-07 23:20:10 +01:00
Alexander Stillich
70d578d050 Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all 2017-11-07 23:10:58 +01:00
Alexander Stillich
af3e1f92ec Added StringUtil::replaceAll() 2017-11-07 23:06:23 +01:00
Koncord
7ab01b66e4 [General] Rewrite Log class 2017-11-07 05:34:55 +08:00
Koncord
d15c674584 [General] Move getFilenameTimestamp() to Utils 2017-11-07 05:33:10 +08:00
Alexander Stillich
7d39c5450c Fixed escaping @ in boost program options filter 2017-11-05 22:14:16 +01:00
David Cernat
2ca4017371 [Client] Force position updates for players in animations 2017-11-01 22:00:54 +02:00
David Cernat
be25decee2 [General] Implement PlayerSpeech packet 2017-10-31 15:19:14 +02:00
David Cernat
605b06c303 [General] Find actor speech captions instead of sending them in packets 2017-10-30 11:06:09 +02:00
David Walley
41dc82abad Update Links to Documentation in settings.cfg files (#1523) 
* Update settings-default.cfg

* Update settings.cpp
 2017-10-28 16:05:30 +00:00
David Cernat
413893aa51 [General] Implement PlayerAnimPlay packet 2017-10-27 09:10:29 +03:00
David Cernat
b801cf2c9e Merge pull request #327 from TES3MP/master 
Add master commits up to 26 Oct 2017
 2017-10-26 17:34:00 +03:00
David Cernat
37304655da Merge pull request #326 from OpenMW/master 
Add OpenMW commits up to 25 Oct 2017
 2017-10-26 17:28:56 +03:00
Koncord
916ada108f [General] Modernize Log utility 
* Reverse Log levels
* Add LOG_TRACE
* Spawn instance of Log in Get() function
 2017-10-25 14:45:36 +08:00
David Cernat
50d5fffb7f [General] Add and implement PlayerQuickKeys packet 2017-10-25 07:21:00 +03:00
AnyOldName3
c1a871ff1f Make indentation consistent. 2017-10-24 23:31:40 +01:00
AnyOldName3
daf7d8451c Switch to a more reliable method of passing the git-version targt the data it needs 2017-10-24 23:29:18 +01:00
AnyOldName3
e3142b9643 Add missing variables to those forwarded to the git-version target 2017-10-24 23:10:50 +01:00
David Cernat
76a4abd7c0 Merge pull request #325 from TES3MP/master while resolving conflicts 
# Conflicts:
#	apps/openmw-mp/processors/player/ProcessorPlayerTopic.hpp
 2017-10-24 19:45:11 +03:00
David Cernat
dd25c7db4e Merge pull request #324 from OpenMW/master 
Add OpenMW commits up to 24 Oct 2017
 2017-10-24 19:36:14 +03:00
scrawl
0c6ef17fb5 Add explicit variant of 'OnActivate' 2017-10-23 23:33:06 +00:00
David Cernat
8c47d63b08 [General] Update version to 0.6.2 2017-10-23 20:22:29 +03:00
David Cernat
3a9e5e3a7b Merge pull request #319 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwworld/worldimp.hpp
 2017-10-22 20:27:44 +03:00