krageon
/
openmw-tes3coop
forked from teamnwah/openmw-tes3coop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
20,917 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 '4aff1f1833'
${ noResults }
Commit Graph

1314 Commits (4aff1f1833dc4fa2be763ce0574953a3bd862c8d)

Author SHA1 Message Date
David Cernat ac374a8ef9 Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 
Conflicts:
 	apps/openmw-mp/Player.cpp
	apps/openmw-mp/Script/Functions/Mechanics.cpp
	apps/openmw-mp/Script/Functions/Mechanics.hpp
	apps/openmw-mp/Script/Functions/Quests.cpp
	apps/openmw-mp/Script/Functions/Quests.hpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
	apps/openmw-mp/processors/player/ProcessorRecordDynamic.hpp
	apps/openmw/mwmp/LocalPlayer.hpp
	apps/openmw/mwmp/WorldEvent.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/openmw-mp/Base/BasePlayer.hpp
 7 years ago
David Cernat a7e3261b0b
Merge pull request #383 from OpenMW/master 
Add OpenMW commits up to 11 Feb 2018
 7 years ago
Thunderforge a78acbac85 Changing page description to address Zini's concerns 7 years ago
Thunderforge cc0f7d19dc
Removing "Use these settings at your own risk" 7 years ago
Thunderforge 04f79c34a2 Fixing typo "Tooltip" -> "Tool Tip" 7 years ago
Thunderforge 8837046d9c Adding panel for advanced settings.cfg options 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 5d4b97645d Merge pull request #374 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/CMakeLists.txt
 7 years ago
Koncord 05fac2f67d [Browser] Disable connect button by default 7 years ago
scrawl dd5ebe225b
Merge pull request #1580 7 years ago
David Cernat 92060bd6b6
Merge pull request #370 from TES3MP/0.6.2 
Add 0.6.2 commits up to 10 Jan 2018
 7 years ago
David Cernat 14ef2fa791
Merge pull request #369 from OpenMW/master 
Add OpenMW commits up to 9 Jan 2018
 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
Thunderforge bd072b131b Moving controller file out of the controllers subdirectory 7 years ago
David Cernat 65d978a3cb
Merge pull request #364 from OpenMW/master 
Add OpenMW commits up to 1 Jan 2017
 7 years ago
Thunderforge 096e734df6 Adding gamecontrollerdb.txt file that got left behind due to being on .gitignore 7 years ago
Thunderforge 3f7143556a Providing different mappings depending on the version of SDL installed 7 years ago
Thunderforge a5e4f95ed4 Updating controller mappings to latest version 7 years ago
Bret Curtis 7367899634 update openmw.appdata.xml to fix https://lintian.debian.org/tags/appstream-metadata-legacy-format.html 7 years ago
Miloslav Číž 3b741dc4b7 Revert "Add slider for refraction size in settings window" 
This reverts commit ee40b41285.
 7 years ago
Miloslav Číž ee40b41285 Add slider for refraction size in settings window 7 years ago
Koncord aa183e6844 [General] Introduce chat channels 7 years ago
Miloslav Číž b69c16e682 Add setting option to scale water refractions 7 years ago
David Cernat 993cc3dfd6 [Server] Rename server "plugins"/"mods" into "modules" for clarity 
The terms "plugins" and "mods" were used interchangeably to refer to collections of server scripts, which was bound to cause confusion later on, especially with client data files frequently being referred to as "plugins" and "mods" as well.

Moreover, the server configuration file now starts its manual ordering with "Module1" for consistency with the pluginlist.json (soon to be dataFileList.json) of the CoreScripts.
 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
Koncord 382f56178c [Client] Add custom windows 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
scrawl 2136003e1c
Reapply commit a3f821cdc which got lost in a merge 7 years ago
Andrei Kortunov ea36956ff1 Reworked trade window 7 years ago
scrawl cc3c27f241 Clean up layout files to use Spacer class 7 years ago
scrawl a3f821cdcd Disable keyboard for trade +/- buttons 
For one, because their RepeatClick handler breaks the keyboard function, and because its redundant anyway (just press Up/Down arrow with the edit box focused to do the same thing)
 7 years ago
David Cernat 068f733d1e
Merge pull request #338 from TES3MP/master 
Add master commits up to 16 Nov 2017
 7 years ago
David Cernat 5aff515d3f
Merge pull request #337 from OpenMW/master 
Add OpenMW commits up to 15 Nov 2017
 7 years ago
scrawl 5a93b6a324 Enable word-wrapping for the console history 7 years ago
David Cernat ac7a588632 [General] Update config files 7 years ago
scrawl b7eda61f7a Fix overlapping widgets in trade window layout (Fixes #4205) 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 b9baee51d5 Fix overlapping widgets in trade window layout (Fixes #4205) 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
Miloslav Číž 282800b5b2 Create LICENSE (#1532) 
* Create LICENSE

Let's add the license file so that GitHub officially registers it and displays it next to the project.

* move license files

* update licenses in cmakelists.txt

* fix link in README
 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
Koncord ba8613a179 [Browser] Add "no password" filter to browser 7 years ago
Koncord fc3f2483ee [Server] Add manual Server Plugins sort 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