krageon
/
openmw-tes3coop
forked from teamnwah/openmw-tes3coop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
21,258 Commits
35 Branches
0 Tags
65 MiB
fix/skillcap
0.7.0
0.7.0-alpha
0.7.0-beta
master
0.8.0-dev
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
openmw-0.39.0
openmw-0.38.0
openmw-0.37.0
openmw-0.36.1
openmw-0.36.0
openmw-0.35.1
openmw-0.35.0
openmw-0.34.0
openmw-0.33.1
openmw-0.33.0
openmw-0.32.0
openmw-0.31.0
openmw-0.30.0
openmw-0.29.0
openmw-0.28.0
openmw-0.27.0
openmw-0.26.0
openmw-0.25.0
openmw-0.24.0
openmw-0.23.0
openmw-0.22.0
openmw-0.21.0
openmw-0.20.0
openmw-0.19.0
openmw-0.18.0
openmw-0.17.0
openmw-0.16.0
openmw-0.15.0
openmw-0.14.0
openmw-0.13.0
openmw-0.12.0
openmw-0.11.1
openmw-0.11.0
openmw-0.10.0
openmw-0.9.0
0.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'ad4214d3e2'
${ noResults }
Commit Graph

4006 Commits (ad4214d3e2faf29f6483cdecb14ca852c58eed8f)

Author SHA1 Message Date
David Cernat bdafa8e9ab
Merge pull request #380 from TES3MP/0.6.3 
Add 0.6.3 commits up to 30 Jan 2018
 7 years ago
David Cernat 3d80e2db62 [General] Add placeholders for new packet types, part 2 7 years ago
David Cernat 5858e05362 Merge pull request #378 from TES3MP/0.6.3 while resolving conflicts 
Conflicts:
	apps/openmw-mp/CMakeLists.txt
	apps/openmw-mp/Script/ScriptFunctions.hpp
	components/CMakeLists.txt
 7 years ago
David Cernat 273a1f50af
Merge pull request #377 from OpenMW/master 
Add OpenMW commits up to 29 Jan 2018
 7 years ago
David Cernat 02af7f6ba1 [General] Add placeholders for new packet types 7 years ago
scrawl 25a6a67508
Fix the optimizer messing up LOD node's children (Fixes #4301) 7 years ago
David Cernat 1a8a518897 Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts 
Conflicts:
	README.md
	apps/openmw-mp/Script/Functions/World.cpp
	apps/openmw/mwmp/LocalPlayer.cpp
	apps/openmw/mwmp/LocalPlayer.hpp
	apps/openmw/mwworld/scene.cpp
	components/openmw-mp/Version.hpp
 7 years ago
David Cernat 78df8c5ebe
Merge pull request #375 from OpenMW/master 
Add OpenMW commits up to 29 Jan 2018
 7 years ago
scrawl 89c6b59c30
Merge pull request #1602 7 years ago
David Cernat 420dab10e1 [General] Track objects directly placed by players in ObjectPlace 
This allows the OnPCDrop variable to get set correctly even when object placements have to go through the server first in order to gain a unique multiplayer index (mpNum).

Among other things, this makes it possible to roll marijuana joints in the popular mod "Tribunal Code Patch".
 7 years ago
David Cernat 613adf6b30 [General] Update version to 0.6.3 7 years ago
David Cernat 5d4b97645d Merge pull request #374 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/CMakeLists.txt
 7 years ago
Ilya Zhuravlev 9e9f6f3132 loadtes3: don't pack() non-POD structs 7 years ago
Koncord 6197636fac [General] Fix "using after move" warning 7 years ago
Koncord 0e97b769f9 [General] Change type of Object::enchantmentCharge 7 years ago
Koncord 7e5b929ea2 [General] Rework PacketPlayerFaction 7 years ago
Koncord 29ba07fe8c [General] Rework PacketPlayerInventory 
Save the Action for each item. Now you can add or remove multiple items
 7 years ago
Koncord de0bb3cdab [General] Change type of Item::enchantmentCharge to float 7 years ago
Koncord 0780329a59 [General] Fix typo 7 years ago
Koncord f1e2bc01f6 [General] Use floats instead of doubles for enchantmentCharge 7 years ago
Koncord 1e25a122c9 [General] Use RELIABLE_ORDERED only when jumping 7 years ago
Ilya Zhuravlev 359910762d GraphicsWindowSDL2: support setting up GLESv2 context for android 7 years ago
David Cernat a037193e79 Merge pull request #372 from TES3MP/0.6.2 while resolving conflicts 
Conflicts:
	apps/openmw-mp/Script/Functions/Actors.cpp
	apps/openmw-mp/Script/Functions/Actors.hpp
	apps/openmw-mp/Script/Functions/Items.cpp
	apps/openmw-mp/Script/Functions/Items.hpp
	apps/openmw-mp/Script/Functions/World.cpp
	apps/openmw-mp/Script/Functions/World.hpp
	apps/openmw/mwmp/WorldEvent.cpp
	components/openmw-mp/Packets/Player/PacketPlayerEquipment.cpp
	components/openmw-mp/Version.hpp
 7 years ago
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
 7 years ago
David Cernat 28f47c4f81 [General] Update version to 0.6.2-hotfixed 7 years ago
David Cernat 9935f56d46 [General] Use doubles instead of ints for enchantmentCharge 
Additionally, include enchantmentCharges for items  in PlayerEquipment packets.
 7 years ago
Bret Curtis 588c1df0f0
Merge pull request #1599 from xyzz/android 
Update android port.
 7 years ago
Ilya Zhuravlev d2121ccd62 Update android port. 7 years ago
scrawl 047c44f265
Ignore duplicate data directories to work around the fallout of (Fixes #3557) 7 years ago
scrawl 259919d125
Print a warning when an ambiguous file on a case-sensitive file system is found 7 years ago
Marc Zinnschlag 2dff3aab22 allow . and - in the name part of a begin script statement, but not at the beginning of a name. Fixes #4061 7 years ago
scrawl bba9a8dd91
Don't update off-screen animations 
Make flying creatures animate in-place when out of processing range
 7 years ago
Kyle Cooley 7248a5d037 Remove some duplication, standardize sol2 header inclusion 7 years ago
Kyle Cooley ba4d2bd5fe Merge remote-tracking branch 'origin/master' into LibIssues 7 years ago
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
 7 years ago
Kyle Cooley fcd4d8b842 Fix build for gcc-5.4.0 7 years ago
Koncord 35922e4898 [General] Change "enum ACTOR_ACTION" to "enum class Action" 7 years ago
Koncord ef0384b296 [General] Simplify ProxyMasterPacket 7 years ago
Koncord 647661daf9 [General] Minor fixes in Master packets 7 years ago
David Cernat a818140c14
Merge pull request #365 from OpenMW/master 
Add OpenMW commits up to 2 Jan 2017
 7 years ago
David Cernat 65d978a3cb
Merge pull request #364 from OpenMW/master 
Add OpenMW commits up to 1 Jan 2017
 7 years ago
Koncord c4949ac5d9 [General] Change regular enums to enum class 7 years ago
Koncord 5777759aae [General] Change enum QuickKey::QUICKKEY_TYPE to enum class 7 years ago
Bret Curtis 93f14c219c camelCase 7 years ago
Bret Curtis 7a7b040216 fix building on mips machines 7 years ago
David Cernat 09958681cd Merge pull request #363 from TES3MP/0.6.2 while resolving conflicts, 2nd try 7 years ago
scrawl c920f95d1e
Don't incorrectly discard root node transformation (Fixes #4272) 7 years ago
David Cernat cac2c6c1e8 Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts 7 years ago
David Cernat 993081ba1e [General] Add enchantmentCharge to worldObjects and items 7 years ago
Koncord 077a3d06b3 [General] Change type of BasePlayer::resurrectType to ResurrectType 7 years ago
Koncord 1ef6ad6215 [General] Add weather struct and packet 7 years ago
Koncord 122a30c183 [General] Change type of refNumIndex & mpNum to unsigned 7 years ago
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
 7 years ago
Koncord 2cb0ea20f0 [General] Modernize packets 
Use explicit for constructors
Use override instead virtual for inherited methods
Mark final derived classes as "final"
 7 years ago
Koncord aa183e6844 [General] Introduce chat channels 7 years ago
David Cernat fc5e883160 [General] Rework PlayerStatsDynamic packets so they are of minimal size 7 years ago
David Cernat d1ad0c91f8 [General] Rework PlayerEquipment packets so they are of minimal size 
Moreover, rename BaseNetCreature's equipedItems into equipmentItems.
 7 years ago
David Cernat c9c363ebef [General] Allow GameSettings to set bed & wilderness resting separately 7 years ago
David Cernat 7e322f1f8b Merge pull request #352 from TES3MP/master while resolving conflicts 
# Conflicts:
#	README.md
 7 years ago
David Cernat e7f20e7daf Merge pull request #351 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
#	README.md
 7 years ago
scrawl a4d8aef40d
Merge branch openmw-43 into master 
Conflicts:
	CMakeLists.txt
	README.md
	files/mygui/openmw_trade_window.layout
 7 years ago
David Cernat bd9e8bd10f [General] Simplify storing of attribute and skill index changes 7 years ago
David Cernat 711bdf187a [General] Add BaseNetCreature to CMakeLists in components 7 years ago
David Cernat 720ef5f6c5 [General] Use consistent code style 7 years ago
Koncord b55bb445dd [General] Change underlying type of the WidgetType to uint8_t 7 years ago
Koncord a546d99000 [General] Fix type 7 years ago
Koncord 1841562553 [General] Minor cleanup of the World Packets 7 years ago
Koncord 744b8cf168 [General] Minor cleanup of the Actor Packets 7 years ago
Koncord e44fcdc0b3 [General] Cleanup Player packets 7 years ago
David Cernat 3508a16836 [General] Use GameSettings packet to set ability to rest and wait 7 years ago
David Cernat a796f81444 [General] Add and use utility function for int value checks in vectors 7 years ago
Koncord fef3764eb1 [General] Add forgotten files to build 7 years ago
Koncord c276ff4bd9 [General] Add packet GUIWindow 7 years ago
David Cernat 0a35b897be
Merge pull request #348 from TES3MP/master 
Add master commits up to 25 Nov 2017
 7 years ago
David Cernat d06817a356
Merge pull request #347 from OpenMW/master 
Add OpenMW commits up to 25 Nov 2017
 7 years ago
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.
 7 years ago
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.
 7 years ago
Andrei Kortunov 94c0e3ed10 Move toUpper() from StringUtils to the JournalViewModel 7 years ago
David Cernat 1ee460bba8
Merge pull request #344 from TES3MP/master 
Add master commits up to 23 Nov 2017
 7 years ago
David Cernat 656453725b
Merge pull request #343 from OpenMW/master 
Add OpenMW commits up to 23 Nov 2017
 7 years ago
David Cernat 6668b9ab42 [General] Implement ConsoleCommand packet 7 years ago
Andrei Kortunov 67acb83b62 Add missing include 7 years ago
Andrei Kortunov 5f41f7c48d Clean code up a bit 7 years ago
Andrei Kortunov ba91cd658b Convert topic name to Unicode 7 years ago
Andrei Kortunov f0ca3eabd3 Merge from upstream master 7 years ago
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.
 7 years ago
Andrei Kortunov a391990f2a Provide multibyte toLower() and single chars comparator 7 years ago
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.
 7 years ago
Alexander Stillich 93e9df15c9 Fixed parameter naming 7 years ago
Alexander Stillich 52b3507a2b Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all 7 years ago
Alexander Stillich 09aac22782 Added StringUtil::replaceAll() 7 years ago
Alexander Stillich 92aaff3b78 Fixed escaping @ in boost program options filter 7 years ago
David Cernat 700e4d032e
Merge pull request #334 from TES3MP/master 
Add master commits up to 11 Nov 2017
 7 years ago
David Cernat 01db219de4
Merge pull request #333 from OpenMW/master 
Add OpenMW commits up to 11 Nov 2017
 7 years ago
scrawl a5ba1caed1
Merge pull request #1541 from astillich/4189 
Fixed escaping @ in boost program options filter
 7 years ago
scrawl a5adc5b018 Add NPC base skeleton files to the optimizer blacklist (Fixes #4159) 7 years ago
David Cernat 4dbada69bf Merge pull request #332 from TES3MP/master while resolving conflicts 7 years ago
David Cernat f2a6957e16 Merge pull request #331 from OpenMW/master while resolving conflicts 7 years ago
scrawl 244cc5b861 Reduce error spam 7 years ago
scrawl 7b4add2ae4 Fall back to non-shader material if creating the shader fails 
Also fixes an uncaught exception that will break the whole game.
 7 years ago
Alexander Stillich 43b5c2e36b Fixed parameter naming 7 years ago
Alexander Stillich 70d578d050 Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all 7 years ago
Alexander Stillich af3e1f92ec Added StringUtil::replaceAll() 7 years ago
Koncord 7ab01b66e4 [General] Rewrite Log class 7 years ago
Koncord d15c674584 [General] Move getFilenameTimestamp() to Utils 7 years ago
Alexander Stillich 7d39c5450c Fixed escaping @ in boost program options filter 7 years ago
David Cernat 2ca4017371 [Client] Force position updates for players in animations 7 years ago
David Cernat be25decee2 [General] Implement PlayerSpeech packet 7 years ago
David Cernat 605b06c303 [General] Find actor speech captions instead of sending them in packets 7 years ago
David Walley 41dc82abad Update Links to Documentation in settings.cfg files (#1523) 
* Update settings-default.cfg

* Update settings.cpp
 7 years ago
David Cernat 413893aa51 [General] Implement PlayerAnimPlay packet 7 years ago
David Cernat b801cf2c9e Merge pull request #327 from TES3MP/master 
Add master commits up to 26 Oct 2017
 7 years ago
David Cernat 37304655da Merge pull request #326 from OpenMW/master 
Add OpenMW commits up to 25 Oct 2017
 7 years ago
Koncord 916ada108f [General] Modernize Log utility 
* Reverse Log levels
* Add LOG_TRACE
* Spawn instance of Log in Get() function
 7 years ago
David Cernat 50d5fffb7f [General] Add and implement PlayerQuickKeys packet 7 years ago
AnyOldName3 c1a871ff1f Make indentation consistent. 7 years ago
AnyOldName3 daf7d8451c Switch to a more reliable method of passing the git-version targt the data it needs 7 years ago
AnyOldName3 e3142b9643 Add missing variables to those forwarded to the git-version target 7 years ago
David Cernat 76a4abd7c0 Merge pull request #325 from TES3MP/master while resolving conflicts 
# Conflicts:
#	apps/openmw-mp/processors/player/ProcessorPlayerTopic.hpp
 7 years ago
David Cernat dd25c7db4e Merge pull request #324 from OpenMW/master 
Add OpenMW commits up to 24 Oct 2017
 7 years ago
scrawl 0c6ef17fb5 Add explicit variant of 'OnActivate' 7 years ago
David Cernat 8c47d63b08 [General] Update version to 0.6.2 7 years ago
David Cernat 3a9e5e3a7b Merge pull request #319 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwworld/worldimp.hpp
 7 years ago
Marcin Baszczewski 46b015d3d9 Fix assert with empty setting value 
Local value could be empty, so it's important to check it size before read first char.
 7 years ago
Marc Zinnschlag bdabace7e2 Merge remote-tracking branch 'aesylwinn/LLmerge' 7 years ago
Koncord d702845026 [General] Fix Clang warnings in Log.hpp 7 years ago
David Cernat b20df4b7cd Merge pull request #316 from TES3MP/master 
Add master commits up to 17 Oct 2017
 7 years ago
David Cernat 184c5f2b29 Merge pull request #315 from OpenMW/master 
Add OpenMW commits up to 17 Oct 2017
 7 years ago
scrawl 7f8d996eff Merge pull request #1502 from AnyOldName3/launcher-and-wizard-ampersand-escape-support 
Launcher and wizard ampersand escape support
 7 years ago
David Cernat 17a8e32782 Merge pull request #314 from TES3MP/master 
Add master commits up to 16 Oct 2017
 7 years ago
David Cernat e164e6305e Merge pull request #313 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
 7 years ago
scrawl 136ef1f738 Fix incomplete settings in recreateShaders() 7 years ago
scrawl 03554b2f4b Fix some style issues flagged by cppcheck 7 years ago
scrawl 50d7eb8e54 Fix crash when adding a NULL object to the cache 7 years ago
scrawl 97ec38affb Merge pull request #1492 from drummyfish/master 
fix rain/snow moving with player (issue #2698)
 7 years ago
AnyOldName3 49dbb4a9ca Add a third copy of a comment where I felt clarification was missing 7 years ago
AnyOldName3 7329e6a9ef Load 'data=...' lines correctly when starting the wizard or launcher, and save them correctly when exiting the launcher. 7 years ago
AnyOldName3 28ff677337 Save 'data=...' lines correctly when exiting the wizard 7 years ago
Miloslav Číž 65977b910e wrap weather around in all directions 7 years ago
Miloslav Číž 380a5799dd use bbox as wrap range & apply to all particle systems 7 years ago
Miloslav Číž 33a1459b11 search for particle system by class name 7 years ago
Kyle Cooley 11eae16645 Get rid of duplicate function, fix flag checking 7 years ago
scrawl 5fbdb64bb9 Add OPENMW_DECOMPRESS_TEXTURES environment variable to decompress textures in software if not supported by graphics hardware 
Disabled by default due to requiring new functionality that was just added to OSG 3.6 or OpenMW/OSG.
 7 years ago
scrawl f3ca9832b0 Merge pull request #1500 from akortunov/extraspell 
Implement ExtraSpell magic effect
 7 years ago
Andrei Kortunov 30b05b557b ExtraSpell magic effect: a basic implementation 7 years ago
AnyOldName3 c9e86a8ebc Remove superfluous argument 7 years ago
AnyOldName3 f9a3562ccd Remove duplicate macro definition and fix warning 7 years ago
AnyOldName3 2652a89df4 Fix mismatched indentation that apparently the .editorconfig file doesn't handle automatically 7 years ago
AnyOldName3 f8fe992dc0 Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files 7 years ago
Koncord 6cb9c3c713 [General] Remove explicit specifier 7 years ago