krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
20672 commits 35 branches 0 tags 65 MiB
Commit graph

15538 commits

Author SHA1 Message Date
scrawl
98b4f9c596
Merge pull request #1549 from akortunov/itemmodels 
Item models reworking
 2017-11-11 22:12:07 +00:00
scrawl
dc016059c3 Disable Activate key when textinput is active (Bug #4151) 2017-11-11 22:00:18 +00:00
scrawl
3b9e1e8c1b Make movement keys not function in text input mode 2017-11-11 22:00:09 +00:00
Andrei Kortunov
8c0dcd8b2b Do not track a nearest actor during combat and pursue (bug #4179) 2017-11-11 19:46:59 +04:00
rexelion
f0649849b8 changed variable name to be more descriptive 2017-11-11 12:00:23 +00:00
Andrei Kortunov
9943bd4d74 AiWander fast forwarding improvements (bug #3638) 2017-11-11 15:31:06 +04:00
Andrei Kortunov
03f129b53c remove redundant allowedToInsertItems() function from ItemModel 2017-11-11 11:58:22 +04:00
Andrei Kortunov
99517d83ea Bound items detection refactoring 2017-11-11 11:58:22 +04:00
Andrei Kortunov
a02124f884 Handle item owners during pickpocketing 2017-11-11 11:58:18 +04: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
f1aeb416ec Disable Activate key when textinput is active (Bug #4151) 2017-11-10 22:54:53 +00:00
scrawl
b06512a60d Fix error message that referred to the wrong file (Bug #4159) 2017-11-10 22:51:32 +00:00
scrawl
1afbf99f74 Make movement keys not function in text input mode 2017-11-10 22:51:31 +00:00
rexelion
69a56eaea3 don't initialise rangeAttackOfTarget 2017-11-10 10:44:53 +00:00
Kyle Cooley
1cd539bad2 Fix render order for markers 2017-11-10 02:06:06 -05:00
Andrei Kortunov
3694b6ec90 Move onClose() check to item models 2017-11-10 10:58:43 +04:00
Andrei Kortunov
ac33ff9482 Move onDropItem() check to item models 2017-11-10 10:58:43 +04:00
Andrei Kortunov
3604b73d60 Move onTakeItem() to item models 2017-11-10 10:58:40 +04:00
Kyle Cooley
556117f6e6 Update marker transparency when changed. 2017-11-10 01:56:06 -05: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
Kyle Cooley
de214db8d4 Use configured transparency. 2017-11-09 13:45:32 -05:00
Kyle Cooley
197ea95646 Prevent arrows for move/scale markers from intersecting. 2017-11-09 13:04:46 -05:00
rexelion
983c33c4c8 don't use a pointer for ActionWeapon 2017-11-09 14:23:26 +00:00
scrawl
41ecbdbe6c Add missing WaitDialog::clear() (Fixes #4196) 2017-11-08 00:56:05 +00:00
scrawl
9ecdcc187f Clarify a warning message refers to inventory objects 2017-11-08 00:26:09 +00:00
scrawl
95b3c1181a Update shader with a non-color tracking material when equipment is changed during chameleon/invisibility effects (Fixes #4190) 2017-11-08 00:24:52 +00:00
scrawl
e42bd71081 Add missing WaitDialog::clear() (Fixes #4196) 2017-11-08 00:24:04 +00:00
rexelion
cab0002461 Backing up distance is now dependent on opponents's weapon range; don't back up from ranged oponents 2017-11-07 17:57:23 +00:00
rexelion
a1d9f11b04 use fProjectileMaxSpeed for ranged weapons distance 2017-11-07 11:43:21 +00:00
Kyle Cooley
492b99b008 Transparent object markers 2017-11-07 00:41:27 -05:00
Koncord
ca7f3f7450 [Client] Disable focus on <tab> for chat window 2017-11-07 11:44:08 +08:00
Koncord
64b531aa3c [Server] Remove redundant argument 2017-11-07 06:37:09 +08:00
Koncord
f377164db9 [Client] Fix build 2017-11-07 05:35:23 +08:00
Koncord
d15c674584 [General] Move getFilenameTimestamp() to Utils 2017-11-07 05:33:10 +08:00
scrawl
801f2d42d5
Merge pull request #1537 from drummyfish/guardfix 
Check the real distance to target in AIPursue (issue #4184)
 2017-11-05 23:24:59 +00:00
Miloslav Číž
f98a821482 fix possible bug in aipursue 2017-11-05 23:46:15 +01:00
scrawl
87c79d7102
Merge pull request #1536 from rexelion/knockoutfix 
Wait a few seconds before getting up (fixes #3884)
 2017-11-05 20:27:54 +00:00
scrawl
45993d3da2
Merge pull request #1529 from drummyfish/animfix 
Stop character landing animation when turning (issue #4177)
 2017-11-05 20:24:24 +00:00
Miloslav Číž
430d01a39a additional animation refactor 2017-11-05 20:19:47 +01:00
rexelion
de7a7d842b mTimeUntilWake is initialised in the constructor 2017-11-05 18:30:34 +00:00
scrawl
e6303c578c
Merge pull request #1530 from rexelion/curseitemfix 
Trigger OnActivate when item is picked up through the inventory (Issue #3726)
 2017-11-05 15:35:39 +00:00
rexelion
48ec680f23 use game time instead of real time 2017-11-04 19:37:20 +00:00
Miloslav Číž
f34223fce9 check the real distance to target in aipursue 2017-11-04 20:02:21 +01:00
rexelion
ab66034ed1 use uniform_int_distribution instead of rand() 2017-11-04 02:15:56 +00:00
rexelion
ee2f3db9a8 fixed randomness 2017-11-04 01:31:15 +00:00
rexelion
8c2cc0f42f break invisibility first 2017-11-04 00:44:16 +00:00
rexelion
bcbfa5fe1e prevent activation, leave the rest to the script 2017-11-04 00:38:33 +00:00
rexelion
de83ad0116 use real time; wait random number of seconds 2017-11-04 00:24:09 +00:00
Koncord
0da44f69ad [Server] Isolate getModFolder() & getDataFolder() 2017-11-03 06:36:35 +08:00
Koncord
062d6a1824 [Server] Add sandboxed import() function 2017-11-03 06:36:35 +08:00
rexelion
5b8610b34b knocked out characters wait some time before getting up 2017-11-01 23:44:50 +00:00
David Cernat
29cb51cdce [Server] Enable SOL_SAFE_USERTYPE for both Debug and RelWithDebInfo 2017-11-01 18:09:25 +02:00
Koncord
bd7082f57e [Server] Use custom Lua error handler not only on Windows 
For some reason sol's default error handler does not wroking properly
 2017-11-01 21:48:42 +08:00
David Cernat
71c921faa7 [Server] Rename property cell into description, initialize Cells type 2017-11-01 13:22:41 +02:00
rexelion
a9e5e19482 OnActivate is triggered when the item is picked up 2017-10-31 22:33:26 +00:00
David Cernat
5653d07c7b [Server] Fix build on Windows 2017-10-31 22:00:03 +02:00
Koncord
948090676a [Server] Impove Lua Error handler for Windows 2017-11-01 01:17:11 +08:00
Miloslav Číž
ff1265c0e7 refactor jump animation 2017-10-31 14:22:24 +01:00
David Cernat
61db22f5ae
Merge pull request #329 from TES3MP/master 
Add master commits up to 31 Oct 2017
 2017-10-31 06:31:49 +02:00
David Cernat
a31d43965f
Merge pull request #328 from OpenMW/master 
Add OpenMW commits up to 31 Oct 2017
 2017-10-31 06:22:57 +02:00
rexelion
e8743f3f79 check the presence of OnActivate using the SuppressActivate flag instead of looking for keywords 2017-10-30 21:16:25 +00:00
Miloslav Číž
3c65bdaf14 weapon cycle fix 2017-10-30 18:05:45 +01:00
Miloslav Číž
7bc512974f use mcurrentjump instead of custom attrib 2017-10-30 15:26:38 +01:00
rexelion
4e6f53d6f1 item added to the player and OnActivate is triggered when the inventory is closed 2017-10-29 11:45:17 +00:00
rexelion
1ee5dcff77 added a function to determine if a script contains OnActivate 2017-10-28 20:56:08 +01:00
Miloslav Číž
5c8f491441 move animation disabling code to a better place 2017-10-28 18:46:52 +02:00
Miloslav Číž
f9c396e0ea stop landing animation when turning 2017-10-28 15:48:07 +02:00
David Cernat
b7e5e77166 [Server] Fix getCaseInsensitiveFilename, simplify Players.size() 2017-10-28 03:58:53 +03:00
David Cernat
378d30834b [Server] Add special error handler for Sol back in, but only for Windows 2017-10-28 01:44:02 +03:00
Koncord
14d47213ef [Server] Add Players.size() to Lua API 2017-10-28 02:34:45 +08:00
Miloslav Číž
03401bb5df remove redundant condition 2017-10-27 20:19:20 +02:00
Koncord
3495fd43f4 [Client] Add network statistics (CTRL+F2) 2017-10-28 00:39:46 +08:00
Koncord
e7a5919477 [Server] Fix path to native libs 2017-10-27 20:58:02 +08:00
Koncord
1aa630e4a9 [Server] Add StackWalker for Windows 2017-10-27 05:27:07 +08:00
Koncord
e8915f8ec5 [Client] Fix build 2017-10-27 01:33:01 +08:00
Koncord
14fdec2478 [Server] Add forgotten stacktrace.cpp 2017-10-26 23:24:35 +08: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
David Cernat
878294e4fe Merge branch 'new-script-api' of https://github.com/TES3MP/openmw-tes3mp into new-script-api 2017-10-26 17:25:53 +03:00
scrawl
f9397ce933 Merge branch 'master' into openmw-43 2017-10-25 14:17:06 +00:00
Koncord
d44848ecbb [Server] Fix build 2017-10-25 16:05:45 +08:00
Koncord
05abb8ace3 [Server] Add Log level constants to lua 2017-10-25 15:22:07 +08:00
Koncord
04a844a9c0 [Server] Use sol's default_handler 2017-10-25 15:21:11 +08:00
Koncord
dad0b38f25 [Server] Add custom terminate handler with stacktrace 2017-10-25 14:45:36 +08:00
Koncord
a3d5fbbdcd [Server] Add stacktrace 2017-10-25 14:45:36 +08: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
Alexander "Ace" Olofsson
3e51c9e6b3 Missed the OpenCS config file 2017-10-24 23:23:55 +02:00
scrawl
4a7be0ffda Don't reset journal index to a lower value (Fixes #4172) 2017-10-24 20:02:35 +00:00
David Cernat
bece095579 [Server] Add getCaseInsensitiveFilename script function back in 2017-10-24 20:25:02 +03: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
David Cernat
a94d4ce6f5 Merge pull request #323 from TES3MP/0.6.1 
Add hotfix commit for 0.6.1 from 23 Oct 2017
 2017-10-24 19:34:34 +03:00
scrawl
4437a72e47 Merge pull request #1519 from drummyfish/rainfix 
fix rain ripple regression (bug #4169)
 2017-10-24 15:31:16 +00:00
Miloslav Číž
3731e20228 fix rain ripple regression 2017-10-24 14:12:41 +02:00
scrawl
0c6ef17fb5 Add explicit variant of 'OnActivate' 2017-10-23 23:33:06 +00:00
scrawl
e564dd842e Refactor dialogue responses to make sure messages from scripts are printer afterwards, not before the dialogue response (Fixes #4166) 
Don't delete Link objects prematurely (Fixes #4171)
 2017-10-23 23:33:06 +00:00
scrawl
2a0b2c4e24 Hide modal window before deleting it (Fixes #4168) 2017-10-23 23:33:05 +00:00
David Cernat
3aedc2e5bc [Server] Don't automatically share PlayerTopic packets between players 2017-10-23 19:39:35 +03:00
David Cernat
360cf2ead7 Merge pull request #321 from OpenMW/master 
Add OpenMW commits up to 22 Oct 2017
 2017-10-23 14:51:29 +03:00
scrawl
8b19a8b7f6 Merge pull request #1513 from lukago/feature4082b 
Feature #4082: use many ingredients/potions instantly
 2017-10-22 20:51:14 +00:00
scrawl
3d0094bd2e Fix behavior of 'journal' command when invoked with already seen entry 2017-10-22 20:50:15 +00:00
scrawl
768da57da2 Fix dialogue topics displayed in lower case 2017-10-22 20:50:15 +00: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
lukago
b6cb3b445c use getIndex to handle other windows, nullsafe fixes 2017-10-21 23:34:57 +02:00
scrawl
bb4ffb7743 Merge pull request #1514 from akortunov/ringfix 
Do not replace an equpped ring of the same value
 2017-10-21 13:35:55 +00:00
scrawl
075a7fee20 Merge pull request #1515 from akortunov/guifixes 
Fix a 'Good Beast' companion window
 2017-10-21 13:35:29 +00:00
scrawl
5b2fe01375 Merge pull request #1508 from AnyOldName3/shut-up-travis 
Mark worldimp functions as override to stop distracting Travis CI war…
 2017-10-21 13:34:48 +00:00
Andrei Kortunov
eaff7e30aa Fix a 'Good Beast' companion window 2017-10-21 16:56:21 +04:00
Koncord
ba8613a179 [Browser] Add "no password" filter to browser 2017-10-21 12:42:38 +08:00
Andrei Kortunov
e64f14b7ce Do not replace an equpped ring of the same value 2017-10-20 23:05:12 +04:00
lukago
a3225364ff refactor, use dragItem method 2017-10-19 17:43:27 +02:00
AnyOldName3
03fc3353b9 Tidy up indentation 2 2017-10-19 16:34:50 +01:00
AnyOldName3
f3e6b26e6b Tidy up indentation 2017-10-19 16:34:11 +01:00
scrawl
9be27193a3 Merge pull request #1512 from Rhiyo/patch-1 
fixed new clothing replacing old clothing of same value
 2017-10-19 14:54:27 +00:00
lukago
43f94a8890 simplify drag and drop on avatar for potions and ingredients 2017-10-19 16:50:04 +02:00
Marc Zinnschlag
0b163f0a50 Merge remote-tracking branch 'aesylwinn/forceNewProject' 2017-10-19 14:44:30 +02:00
Marc Zinnschlag
bdabace7e2 Merge remote-tracking branch 'aesylwinn/LLmerge' 2017-10-19 14:24:58 +02:00
Rhiyo
d9fe3aac99 fixed new clothing replacing old clothing of same value 
Found on the bug http://bugs.openmw.org/issues/4165.

In original Morrowind, new clothing of the same value wouldn't replace old clothing. Tested with common and expensive clothing by selling to merchants and using the AddItem console command in original Morrowind. 

In OpenMW, before this change, new clothing of the same value would replace old clothing, tested with the same methods used above.
 2017-10-19 22:46:08 +10:30
David Cernat
fb67180809 [Server] Fix build in Visual Studio 2017-10-19 13:04:37 +03:00
Koncord
4530370e52 [Server] Use old style of Server Plugins location 2017-10-19 11:55:49 +08:00
Koncord
ce6a4e4032 [Server] Fix indents 2017-10-19 10:26:03 +08:00
Koncord
fc3f2483ee [Server] Add manual Server Plugins sort 2017-10-19 10:24:17 +08:00
Kyle Cooley
6d8666d80d Force new project file when creating new project 2017-10-18 20:21:44 -04:00
Koncord
dffd3bfa7d [Server] Add customData to Player 
example:
counter = 0

Event.register(Events.ON_PLAYER_CONNECT, function(player)
    player.customData.counter = counter
    counter = counter + 1
    return true
end)

CommandController.registerCommand("test", function(player, args)
    player:message(player.customData.counter, false)
    return true
end, "")
 2017-10-18 22:32:03 +08:00
Koncord
7a0b45d456 [Server] Load mods in dependencies order 2017-10-18 21:30:36 +08:00
Koncord
66283943c5 [Browser] Fix Clang warnings 2017-10-18 21:30:36 +08:00
AnyOldName3
2abff22c08 Make MWWorld::World final to enable compiler optimisations 2017-10-18 13:48:31 +01:00
AnyOldName3
7440cf37bc Remove redundant virtual keywords implied by override keywords 2017-10-18 13:37:37 +01:00
David Cernat
6e7c033a5d Merge pull request #318 from TES3MP/master 
Add master commits up to 18 Oct 2017
 2017-10-18 15:14:37 +03:00
David Cernat
260b3411c3 Merge pull request #317 from OpenMW/master 
Add OpenMW commits up to 18 Oct 2017
 2017-10-18 15:13:48 +03:00
AnyOldName3
69da89be39 Mark a method I missed out the first time as override 2017-10-18 13:05:04 +01:00
scrawl
33ceddc58b Merge pull request #1506 from akortunov/swimanimations 
Use SwimTurnLeft/Right animations correctly
 2017-10-18 10:03:30 +00:00
scrawl
21a705fb75 Merge pull request #1507 from AnyOldName3/data-local-fix 
Fix the loading of 'data-local' lines which I broke
 2017-10-18 09:59:43 +00:00
scrawl
7328de6c50 Merge pull request #1505 from drummyfish/master 
Make snow create water ripples (fixes #4156)
 2017-10-18 09:59:21 +00:00
AnyOldName3
2aad5bed7a Mark worldimp functions as override to stop distracting Travis CI warnings and prevent future typos 2017-10-18 05:06:09 +01:00
AnyOldName3
43e9e955c8 Do the same for the CS 2017-10-18 02:04:48 +01:00
AnyOldName3
1f77f9654b Strip quotes from the data-local setting if present (because for whatever reason it's a string, not a boost::filesystem::path) 2017-10-18 01:42:11 +01:00
Andrei Kortunov
4d4d247565 Use SwimTurnLeft/Right animations correctly 2017-10-17 23:26:55 +04:00
Miloslav Číž
a7cad65aab fix water shader switching bug 2017-10-17 10:00:01 +02:00
Miloslav Číž
8a1e0e74fd update uniform from one place 2017-10-17 09:59:53 +02:00
Miloslav Číž
797e407269 make snow create water ripples 2017-10-17 09:59:53 +02:00
Miloslav Číž
da47653625 move rain intensity uniform to water node 2017-10-17 09:59:45 +02:00
David Cernat
bbac26294f [Server] Fix typos and make all files end with newlines 2017-10-17 07:44:10 +03:00
David Cernat
b20df4b7cd Merge pull request #316 from TES3MP/master 
Add master commits up to 17 Oct 2017
 2017-10-17 05:15:02 +03:00
David Cernat
184c5f2b29 Merge pull request #315 from OpenMW/master 
Add OpenMW commits up to 17 Oct 2017
 2017-10-17 04:34:46 +03:00
Kyle Cooley
6d7a24224b Add documentation. 2017-10-16 12:52:13 -04:00
AnyOldName3
654bd401fb Switch openmw-cs to the escape versions of option types 2017-10-16 15:38:17 +01:00
David Cernat
17a8e32782 Merge pull request #314 from TES3MP/master 
Add master commits up to 16 Oct 2017
 2017-10-16 07:47:37 +03:00
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
 2017-10-16 07:37:29 +03:00
scrawl
03554b2f4b Fix some style issues flagged by cppcheck 2017-10-15 17:06:58 +02:00
scrawl
64d02f577e Fix missing null check 2017-10-15 17:06:58 +02:00
scrawl
624046c558 Fix unused event handler 2017-10-15 17:06:58 +02:00
scrawl
bbf9b0c0a7 Merge pull request #1503 from akortunov/regressions 
Handle Trespassing crime differently from Theft
 2017-10-15 09:08:52 +00:00
scrawl
97ec38affb Merge pull request #1492 from drummyfish/master 
fix rain/snow moving with player (issue #2698)
 2017-10-15 09:04:48 +00:00
Andrei Kortunov
8f255a6b72 Handle Trespassing crime differently from Theft (bug #4158) 2017-10-15 11:03:02 +04:00
Miloslav Číž
af6eeddbe5 use operator instead of drawcallback 2017-10-15 00:04:14 +02:00
Miloslav Číž
65977b910e wrap weather around in all directions 2017-10-14 21:42:27 +02:00
Miloslav Číž
380a5799dd use bbox as wrap range & apply to all particle systems 2017-10-14 21:42:19 +02:00
Miloslav Číž
38bfa64100 transform weather particles to world space 2017-10-14 21:42:11 +02:00
Miloslav Číž
8114126a62 make use of renderinfo 2017-10-14 21:41:59 +02:00
Miloslav Číž
33a1459b11 search for particle system by class name 2017-10-14 21:41:47 +02:00
Miloslav Číž
b95c9ba483 rain independent from camera plus wrap-around 2017-10-14 21:40:28 +02:00
Kyle Cooley
11eae16645 Get rid of duplicate function, fix flag checking 2017-10-14 15:09:12 -04:00
Kyle Cooley
d27071f06a Fix LTEX import bug. 2017-10-14 13:18:54 -04:00
Kyle Cooley
98c38ad7d1 Merge cleanup. 2017-10-14 13:18:31 -04:00
Kyle Cooley
6d9d98c02c Merge Land/LandTextures 2017-10-14 11:32:42 -04:00
scrawl
548af6dbfb Fix jail screen fading 2017-10-14 14:03:16 +00:00
scrawl
f3ca9832b0 Merge pull request #1500 from akortunov/extraspell 
Implement ExtraSpell magic effect
 2017-10-14 14:01:49 +00:00
Andrei Kortunov
30b05b557b ExtraSpell magic effect: a basic implementation 2017-10-14 16:55:00 +04:00
scrawl
09d7681254 Merge pull request #1499 from lukago/bug4155 
Bugfix #4155: NPCs don't equip a second ring in some cases
 2017-10-13 19:35:03 +00:00
glbwsk
83a5c7c3d8 removed unnecessary comments, added gitignore for clion cmake 2017-10-13 20:32:52 +02:00
scrawl
548e90a7bc Set cursor active when moving by controller 2017-10-13 16:22:44 +00:00
glbwsk
ff9cb22a58 npc swap cheaper ring during auto equip 2017-10-13 15:16:07 +02:00
glbwsk
e6e482ea98 added some comments for autoEquip 2017-10-13 14:47:26 +02:00
glbwsk
a25903b075 fixed autoequiping rings by npc - now checks if right hand is free 2017-10-13 14:39:44 +02:00
Koncord
1fd16ba69c [Browser] Correctly init parent class 2017-10-11 06:35:22 +08:00
Koncord
62588ce088 [Server] Minor fixes 2017-10-11 06:26:09 +08:00
Koncord
3839a2dcfd [Browser] Remove unused variables 2017-10-11 05:46:39 +08:00
Koncord
ed75563a94 [Browser] Do not show "Unreachable" servers when ping filter is enabled 2017-10-11 05:36:31 +08:00
Koncord
01a5196a92 [Browser] Mark few strings translatable 2017-10-10 13:11:36 +08:00
Koncord
15723adb9a [Browser] Make sort servers case insensitive 2017-10-10 13:11:36 +08:00
Koncord
57353cdfff [Browser] Mark unreachable servers as "Unreachable" instead 999 2017-10-10 13:11:36 +08:00
David Cernat
fe9a3088bd Merge pull request #312 from TES3MP/master 
Add master commits up to 10 Oct 2017
 2017-10-10 06:27:35 +03:00
David Cernat
ec2c964ae1 Merge pull request #311 from TES3MP/0.6.1 
Add hotfix commit for 0.6.1 from 10 Oct 2017
 2017-10-10 06:26:33 +03:00
David Cernat
f532ab241d [Server] Avoid duplicates of the same player in a cell's loaders 2017-10-10 05:48:56 +03:00
David Cernat
c35101cc36 [Client] Don't use message box call boolean for regular message boxes 2017-10-10 04:11:36 +03:00
David Cernat
4f112ba3d7 [Client] Use regular message boxes where expected to do so 
This helps us move towards using the same terminology as OpenMW for GUI elements, leading to less confusion.
 2017-10-10 04:05:36 +03:00
Koncord
5c79e7106f [Browser] Minor improvements 2017-10-10 07:17:41 +08:00
David Cernat
41ff3fee89 Merge pull request #310 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
 2017-10-09 14:41:55 +03:00
scrawl
479f9535b4 Allow training window exit() 2017-10-08 20:38:20 +00:00
scrawl
9cde3e4408 Merge pull request #1495 from akortunov/regressions 
Add showsInInventory() check to the ContainerItemModel
 2017-10-08 14:09:59 +00:00
Andrei Kortunov
ea3729790f Add showsInInventory() check to the ContainerItemModel 2017-10-08 09:20:07 +04:00
David Cernat
4845599bda Merge pull request #308 from TES3MP/master while resolving conflicts 
# Conflicts:
#	apps/openmw-mp/main.cpp
 2017-10-08 06:50:15 +03:00
David Cernat
182f8c1f06 [General] Print client version on startup 2017-10-08 06:17:53 +03:00
David Cernat
3d38da0e85 [Server] Put includes in a specific order 2017-10-08 05:17:14 +03:00
David Cernat
61b1a59814 [General] Move server's version printing method to Utils 2017-10-08 04:16:30 +03:00
David Cernat
08f34e5356 [Client] Fix recent problems with password window 2017-10-08 02:42:41 +03:00
David Cernat
711c4d83da [Client] Fix build after recent OpenMW changes to GUI 2017-10-07 23:33:36 +03:00