Skip to content

Commit 3ce7bb7

Browse files
committed
Merge git://github.com/raduprv/Eternal-Lands
2 parents 7c171b0 + 89324a0 commit 3ce7bb7

22 files changed

+438
-1312
lines changed

CHANGES

+39
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,42 @@
1+
2022-Mar-12: Release 1.9.6.1
2+
Client:
3+
Re-enable "~" as a valid URL character.
4+
Fix trade issue where items would not be sent to storage as expected.
5+
Reset number of enabled local lights on map change.
6+
Fixes for water effects on newer drivers that no longer support the older effects. To use the new effects you need to install the new shader files that included in the data patch. There is a new option on the video tab that is used to enabled the new shaders. Grum has done a lot of work on the to fix the water effect in this and the 2022-01-21 update. This updated should fixed all the reported issues.
7+
Less strict pathfinding" option (Controls tab): Allow the pathfinder to walk to a nearby location when clicking an unwalkable tile, discussed in part in this topic.
8+
Fixes for water effects for some Intel, AMD and GPU graphics driver issues. Setting "water shader quality" to 2 will now enable the nice ripple effect for more users. It also fixes the non-working water and corrupt reflections some users were experiencing.
9+
Provide an option (Controls tab) to turn off the click through action when focusing the main window.
10+
Add additional logging when saving user files. The explicit file close needed for the logging may possibly fix "problem with ..." issues.
11+
Detect if loading a zero length user file, log to user but don't disable saving. Zero length files have been reported but required user action to resolve.
12+
Fix showing #glow command output when indicator disabled.
13+
Add date to timestamp in chat log.
14+
Provide and option (Video tab) to enable the desktop screen saver / monitor power management.
15+
Set lower bound of chat lines from 5 to 1.
16+
Issue #165: Re-validate ground bag window status on reconnect.
17+
Issue #163: Fix storage access inconstancy, Store-All and ALT-click access for closed window.
18+
Fix mouse over issues for spells windows on Android.
19+
Fix only initial spells window mode using default position.
20+
Fix possible crash with #calc using L.
21+
Fix possible crash in character creation window.
22+
Fixed display of action point > 999 in the stats window.
23+
Correct colour for login window version text when there is an error.
24+
Ensure main window fits the available space and is on-screen.
25+
Use the new (JSON) personal files format by default.
26+
Enable the item use counter by default.
27+
Channel colours window can be scaled and its position managed.
28+
Change ground bag window default position to bottom centre.
29+
Fix blank lines in console when wrapping text to fit width.
30+
Add basic screen orientation options for Android (video tab).
31+
Limit "You cannot access the storage from here" messages.
32+
Add date to timestamps in log messages.
33+
Fix trade bug where storage could not be used if the window was hidden then shown.
34+
Data:
35+
An updated version of item_extra_info.txt that fixes issues with equipment swap for the "Mod Cloak", "White Wizard Hat of Life and Mana" and "Tunic of the Ninja" as detailed elsewhere. A server restart is needed for other, similar issues.
36+
An updated version of sound/snds_client.xml that fixed some positional sounds.
37+
An update version of the lion guild map maps/guildmap_lion.elm.gz.
38+
The new shader files shaders/new_water.vert and shaders/new_water.frag that fix the water effects for some newer drivers.
39+
140
2021-Dec-16: Release 1.9.6.0
241
Server updates
342
* Haidir cockatrice daily was not counting one of the cockatrices. Fixed.

debian/changelog

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
eternallands (1.9.6.0-0ubuntu1) bionic; urgency=low
1+
eternallands (1.9.6.1-0ubuntu1) bionic; urgency=low
22

3-
* 1.9.6 release
3+
* 1.9.6.1 release
44

5-
-- Paul Broadhead <[email protected]> Wed, 15 Dec 2021 22:10:43 +0000
5+
-- Paul Broadhead <[email protected]> Sat, 12 Mar 2022 11:18:07 +0000

debian/copyright

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Upstream Author:
77
Radu Privantu
88

99
Copyright:
10-
Copyright (C) 2003-2021, Radu Privantu and Maura Privantu.
10+
Copyright (C) 2003-2022, Radu Privantu and Maura Privantu.
1111

1212
Packaging:
13-
Copyright (C) 2008-2021, Paul Broadhead <[email protected]>
13+
Copyright (C) 2008-2022, Paul Broadhead <[email protected]>
1414
released under the GPL, see `/usr/share/common-licenses/GPL-2'.
1515

1616
Licence:

debian/readme

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
git clone https://github.com/raduprv/Eternal-Lands.git Eternal-Lands
1818

1919
# Set the version number
20-
elver="1.9.6.0"
20+
elver="1.9.6.1"
2121
packagename="eternallands"
2222

2323
# Make an original source tar ball:

elc_private.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define VER_MAJOR 1
1010
#define VER_MINOR 9
1111
#define VER_RELEASE 6
12-
#define VER_BUILD 0
12+
#define VER_BUILD 1
1313
#define COMPANY_NAME ""
1414
#define FILE_VERSION "1.9.6"
1515
#ifdef OTHER_LIFE

elc_private.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "elc.ico"
1313
// TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS...
1414
//
1515
1 VERSIONINFO
16-
FILEVERSION 1,9,5,4
17-
PRODUCTVERSION 1,9,5,4
16+
FILEVERSION 1,9,6,1
17+
PRODUCTVERSION 1,9,6,1
1818
FILETYPE VFT_APP
1919
{
2020
BLOCK "StringFileInfo"
2121
{
2222
BLOCK "040904E4"
2323
{
2424
VALUE "CompanyName", ""
25-
VALUE "FileVersion", "1.9.5"
25+
VALUE "FileVersion", "1.9.6"
2626
#ifdef OTHER_LIFE
2727
VALUE "FileDescription", "Other-Life Client"
2828
#else
@@ -37,7 +37,7 @@ FILETYPE VFT_APP
3737
#else
3838
VALUE "ProductName", "Eternal-Lands Client"
3939
#endif
40-
VALUE "ProductVersion", "1.9.5"
40+
VALUE "ProductVersion", "1.9.6"
4141
}
4242
}
4343
BLOCK "VarFileInfo"

macosx/Eternal Lands.xcodeproj/project.pbxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@
297297
1F22CC3E0DBAD57400411752 /* makeargv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = makeargv.h; path = ../makeargv.h; sourceTree = SOURCE_ROOT; };
298298
1F22CC3F0DBAD57400411752 /* text_aliases.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = text_aliases.c; path = ../text_aliases.c; sourceTree = SOURCE_ROOT; };
299299
1F22CC400DBAD57400411752 /* text_aliases.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = text_aliases.h; path = ../text_aliases.h; sourceTree = SOURCE_ROOT; };
300-
1F3DDB130E92F8450036BD6A /* elglext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = elglext.h; sourceTree = "<group>"; };
301300
1F52AA170D6BCC0800CA2E5F /* calc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = calc.c; path = ../calc.c; sourceTree = SOURCE_ROOT; };
302301
1F52AA180D6BCC0800CA2E5F /* calc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = calc.h; path = ../calc.h; sourceTree = SOURCE_ROOT; };
303302
1F52AA190D6BCC0800CA2E5F /* eye_candy_debugwin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = eye_candy_debugwin.c; path = ../eye_candy_debugwin.c; sourceTree = SOURCE_ROOT; };
@@ -892,7 +891,6 @@
892891
1F81297D0D033551008792A7 /* elc_private.h */,
893892
1F8129800D033551008792A7 /* elconfig.c */,
894893
1F8129810D033551008792A7 /* elconfig.h */,
895-
1F3DDB130E92F8450036BD6A /* elglext.h */,
896894
1FB7E409143560CB002C4FEA /* elloggingwrapper.cpp */,
897895
1FB7E40A143560CB002C4FEA /* elloggingwrapper.h */,
898896
1F8129820D033551008792A7 /* elmemory.c */,
@@ -1800,6 +1798,7 @@
18001798
"$(USER_LIBRARY_DIR)/Frameworks/SDL2_ttf.framework/Headers",
18011799
"$(USER_LIBRARY_DIR)/Frameworks/SDL2_image.framework/Headers",
18021800
"$(SRCROOT)/../nlohmann_json/single_include/",
1801+
"$(SRCROOT)/include/",
18031802
);
18041803
MARKETING_VERSION = 1.9.6p1;
18051804
OTHER_CFLAGS = (
@@ -1860,6 +1859,7 @@
18601859
"$(USER_LIBRARY_DIR)/Frameworks/SDL2_ttf.framework/Headers",
18611860
"$(USER_LIBRARY_DIR)/Frameworks/SDL2_image.framework/Headers",
18621861
"$(SRCROOT)/../nlohmann_json/single_include/",
1862+
"$(SRCROOT)/include/",
18631863
);
18641864
MARKETING_VERSION = 1.9.6p1;
18651865
OTHER_CFLAGS = (

0 commit comments

Comments
 (0)