Commit graph

3556 commits

Author SHA1 Message Date
0d1f1067bc Merge remote-tracking branch 'upstream/develop' into ryzomcore 2018-10-14 20:05:30 +02:00
Nimetu
f4ef386ec9 Changed: Limit fullscreen resolutions to 1024x768 or higher
--HG--
branch : develop
2018-10-11 23:30:37 +03:00
Nimetu
94861ac709 Changed: Make sure char select window resolution is at least 1024x768
--HG--
branch : develop
2018-10-11 21:54:02 +03:00
Nimetu
ace1684f5c Fixed: Ingame UI restored wrongly if window resized in char select mode
--HG--
branch : develop
2018-10-11 21:51:00 +03:00
Nimetu
3157984c21 Merge with develop
--HG--
branch : experimental-ui-scaling
2018-09-15 21:40:00 +03:00
Jan Boon
0f44a7da27
Fix pointer accessed after delete 2018-08-24 09:30:56 +08:00
kervala
1380a94f5d Changed: Use LIST(APPEND instead of SET
--HG--
branch : develop
2018-08-18 11:12:26 +02:00
kervala
58efd082c1 Changed: Don't include curl.h in headers to avoid dependencies on CURL for more files that required
--HG--
branch : develop
2018-08-18 10:57:33 +02:00
kervala
b86bf43090 Fixed: Simplify certificates management
--HG--
branch : develop
2018-08-11 21:47:50 +02:00
Nimetu
15355e3815 Changed: shadow attributes for CViewText and editbox templates
--HG--
branch : develop
2018-08-11 15:33:01 +03:00
kervala
78670dfdda Fixed: Compilation with VC++ 2010
--HG--
branch : develop
2018-08-09 14:31:17 +02:00
kervala
f39c6ed3c6 Fixed: Warnings
--HG--
branch : develop
2018-08-09 14:30:13 +02:00
kervala
675f85c288 Fixed: Warnings, throw(type) deprecated in C++11 and removed in C++17
--HG--
branch : develop
2018-08-08 20:37:51 +02:00
kervala
d9e6d34fcc Changed: Make sslCtxFunction private and don't include curl.h in header
--HG--
branch : develop
2018-08-07 18:40:48 +02:00
kervala
f04fd9809c Fixed: Allow to use custom CA Certificates under all platforms if libcurl compiled with OpenSSL for WebIG and login
--HG--
branch : develop
2018-08-05 14:31:53 +02:00
Nimetu
a2707f93f1 Fixed: Wrong resolution saved to config when window receives wm_destroy signal
--HG--
branch : develop
2018-07-26 20:24:17 +03:00
Nimetu
1c142ef968 Fixed: Font size calculations for scaled text.
--HG--
branch : experimental-ui-scaling
2018-06-22 19:44:12 +03:00
Nimetu
375cedb09e Merge with develop
--HG--
branch : experimental-ui-scaling
2018-06-21 22:21:14 +03:00
Nimetu
f80e36ebd6 Changed: Workaround for huge target reticle when max polygon is set to low
--HG--
branch : develop
2018-06-07 12:59:58 +03:00
ulukyn
6499b1b053 Added: getDbProp64 to get 64b values from db with lua
--HG--
branch : develop
2018-06-06 14:15:42 +02:00
Nimetu
a62c8eefd4 Fixed: Filtered user landmarks became visible when landmark was edited/removed.
--HG--
branch : develop
2018-05-13 17:00:45 +03:00
Nimetu
4cca062177 Changed: Move leave team menu option
--HG--
branch : develop
2018-05-11 14:51:54 +03:00
Nimetu
5823e98356 Added: Duplicating macro or macro commands
--HG--
branch : develop
2018-05-11 14:42:49 +03:00
Riasan
b5a0fbe266 Changed: rework "creat guild" UI Window
--HG--
branch : develop
2018-05-09 21:33:02 +02:00
Nimetu
5b4759df72 Changed: Show map search results in a list
--HG--
branch : develop
2018-05-10 15:30:01 +03:00
Nimetu
98ae75fe57 Added: curl ca bundle option to client cfg
--HG--
branch : develop
2018-05-07 21:37:40 +03:00
Nimetu
6389fe3048 Fixed: Bad value in client_default.cfg
--HG--
branch : develop
2018-05-07 16:53:54 +03:00
Nimetu
923084a818 Added: Command to search and target closest user landmark.
--HG--
branch : develop
2018-05-04 15:12:00 +03:00
Nimetu
11150e6b79 Changed: Switch compass to target mode after successful /tar command.
--HG--
branch : develop
2019-07-31 20:58:32 +03:00
Inky
3da8dcbdac Changed: copy of changeset #ba5a7ec85045 (dead branch)
--HG--
branch : develop
2019-06-25 23:35:52 +03:00
Inky
f17aeff6f2 Changed: cli character selection
--HG--
branch : develop
2019-06-19 00:10:01 +03:00
Nimetu
c439a10cfe Fixed: WebIG notif thread did not have curl certificates loaded.
--HG--
branch : develop
2019-06-03 20:55:39 +03:00
Nimetu
7ed7491f04 Fixed: Invalid duplicate landmark check.
--HG--
branch : develop
2019-05-14 20:54:38 +03:00
kaetemi
08908452d5 Merge remote-tracking branch 'origin/hg/develop' into kaetemi-develop 2019-05-13 03:59:12 +08:00
Nimetu
d10e7157ef Added: Music player directory/autoplay options to client.cfg
--HG--
branch : develop
2019-05-12 17:13:39 +03:00
kaetemi
a7504e657e Removed: Deprecated bot chat news manager 2019-05-09 06:57:04 +08:00
Nimetu
f5424aac3e Added: html progress element
--HG--
branch : develop
2019-05-07 20:13:05 +03:00
Nimetu
cb0d6c74f3 Added: html meter element
--HG--
branch : develop
2019-05-07 20:12:10 +03:00
Nimetu
742092fd6b Changed: Use button lookup index in html_submit_form instead button name/value
--HG--
branch : develop
2019-05-07 19:40:06 +03:00
root
cf1db62ab8 correction pour la compilation sous windows à cause des merges RC mal fait 2018-03-25 12:04:43 +02:00
1c898ea0b2 Merge branch 'ryzomcore' into ryzomcore+develop
# Conflicts:
#	.hgtags
#	.travis.yml
#	code/CMakeModules/FindMSVC.cmake
#	code/ryzom/client/src/steam_client.cpp
2018-03-24 18:18:50 +01:00
Nimetu
2e7d025109 Changed: Use user requested resolution for both char select and ingame
--HG--
branch : develop
2018-03-17 13:59:42 +02:00
Nimetu
1dc3d51ce2 Added: save_ui action handler to save keys and icfg files
--HG--
branch : develop
2018-10-11 15:24:03 +03:00
Nimetu
d7ee450215 Changed: Use user requested resolution for both char select and ingame
--HG--
branch : experimental-ui-scaling
2018-03-17 13:59:42 +02:00
nimetu@gmail.com
0af4ea6687 Added: Allow to set UI scale with /setuiscale command
--HG--
branch : experimental-ui-scaling
2018-03-16 15:01:22 +02:00
nimetu@gmail.com
4ba3973295 Changed: Remove ui scale option from ingame config
--HG--
branch : experimental-ui-scaling
2018-03-16 15:00:30 +02:00
Nimetu
4851d1602d Changed: Make number of virtual desktops dynamic
--HG--
branch : develop
2018-03-15 21:58:49 +02:00
Nimetu
23fa3d7460 Fixed: Possible crash from null pointer
--HG--
branch : develop
2018-03-13 20:41:49 +02:00
kervala
613d4ddc34 Fixed: Warnings, throw(NLMISC::EStream) deprecated in C++11 and removed in C++17, and class keyword is useless
--HG--
branch : develop
2018-02-02 21:04:30 +01:00
Nimetu
b039f3cd61 Added: /loot command and keyboard shortcut
--HG--
branch : develop
2017-12-04 18:45:21 +02:00
kervala
e2dda1585d Changed: Minor changes
--HG--
branch : develop
2017-12-02 16:46:44 +01:00
kervala
7b2b0c9310 Fixed: Encode password in hexadecimal on command-line when patching to avoid invalid characters
--HG--
branch : develop
2017-12-02 16:46:17 +01:00
kervala
d799dde5ad Added: Steam client support
--HG--
branch : develop
2017-12-02 16:45:12 +01:00
kervala
c4b9b0eb58 Changed: shape command syntax
--HG--
branch : develop
2017-11-20 15:43:13 +01:00
kervala
ea84023e48 Fixed: Missing quote in .bat
--HG--
branch : develop
2017-11-20 15:41:48 +01:00
kervala
106f18a8c8 Changed: More memory leaks detection
--HG--
branch : develop
2017-11-05 19:24:50 +01:00
kervala
bea0240cbb Fixed: Escape password and login to prevent errors with special characters (such as | or &)
--HG--
branch : develop
2017-11-05 19:11:27 +01:00
kervala
8c4cf11534 Changed: Write a message in log to tell that we're creating the patch script
--HG--
branch : develop
2017-11-05 19:09:29 +01:00
kervala
ed884644af Changed: Merged changes from compatibility-develop
--HG--
branch : develop
2017-11-05 19:08:47 +01:00
kervala
93c2f55290 Changed: Minor changes
--HG--
branch : develop
2017-11-05 19:07:19 +01:00
kervala
7f1168293a Fixed: Compilation
--HG--
branch : develop
2017-11-05 19:05:14 +01:00
kervala
f1cdcd1654 Changed: More memory leaks detection
--HG--
branch : develop
2017-11-05 18:30:30 +01:00
compil
e4cb143038 correction du merge 2017-11-03 23:07:35 +01:00
compil
675bcee591 enleve les fichier en trop 2017-10-20 21:43:50 +02:00
compil
98942e57b3 Merge branch 'ryzomcore' into feature/merge_ryzomcore171003 2017-10-14 19:23:02 +02:00
Nimetu
201fc3eb12 Merge with develop
--HG--
branch : compatibility-develop
2017-10-02 15:54:16 +03:00
Nimetu
d89005af4a Fixed: Dynamic linking client
--HG--
branch : develop
2017-10-02 15:53:44 +03:00
kervala
ac7474c7ba Merge with develop
--HG--
branch : compatibility-develop
2017-10-01 15:37:51 +02:00
kervala
575f58d749 Changed: Synchonized some changes from compatibility-develop branch
--HG--
branch : develop
2017-10-01 15:27:31 +02:00
kervala
90359122d7 Changed: Other changes in CMake files
--HG--
branch : develop
2017-10-01 15:25:00 +02:00
kervala
8acaa65e04 Fixed: Compilation with OpenSSL 1.1.0
--HG--
branch : develop
2017-10-01 15:17:10 +02:00
kervala
630ae259ad Changed: Add Steam support in develop branch too
--HG--
branch : develop
2017-10-01 15:10:51 +02:00
kervala
2fad59f296 Changed: Added more memory leaks checks
--HG--
branch : develop
2017-10-01 15:08:31 +02:00
ulukyn@gmail.com
4b22f4bf11 Fixed: Add on/off params to action handler ark_pacs_border
shape highlight is "really" False by default

--HG--
branch : compatibility-develop
2017-09-14 12:36:10 +02:00
ulukyn@gmail.com
27364b29d2 Added: loadBackground(string) lua function to change the texture of next teleport
--HG--
branch : compatibility-develop
2017-08-22 23:23:00 +02:00
ulukyn@gmail.com
3c6dc5ea92 Added: loadBackground(string) lua function to change the texture of next teleport
--HG--
branch : develop
2017-08-22 23:23:00 +02:00
ulukyn@gmail.com
b640c0ce97 Fixed: Resize collision when scale object/npc (using vpb)
--HG--
branch : compatibility-develop
2017-08-22 23:22:06 +02:00
ulukyn@gmail.com
5797b2d64e Fixed: Resize collision when scale object/npc (using vpb)
--HG--
branch : develop
2017-08-22 23:22:06 +02:00
Nimetu
37d6dc50f0 Merge with develop
--HG--
branch : compatibility-develop
2017-08-15 12:39:25 +03:00
Nimetu
9390f9cca5 Changed: Sort tribe fame list
--HG--
branch : develop
2017-08-15 11:54:24 +03:00
kervala
bee1a57ab9 Merge with develop
--HG--
branch : compatibility-develop
2017-07-13 21:00:17 +02:00
kervala
dac136d430 Fixed: Error 60 when creating an account under OS X
--HG--
branch : develop
2017-07-13 20:54:06 +02:00
Nimetu
527d257b93 Merge with develop
--HG--
branch : compatibility-develop
2017-07-12 23:46:23 +03:00
Nimetu
c435f77201 Added: Quality range filter to inventory
--HG--
branch : develop
2017-07-12 23:45:56 +03:00
Nimetu
30512804d5 Merge with develop
--HG--
branch : compatibility-develop
2017-07-12 21:23:08 +03:00
Nimetu
7350291a56 Added: Text search to inventory
--HG--
branch : develop
2017-07-12 21:19:40 +03:00
Nimetu
455a923031 Added: clear_on_escape property to edit box
--HG--
branch : develop
2017-07-12 20:32:42 +03:00
Nimetu
71d969c40b Changed: Keep track of HSTS header and rewrite http to https as needed
--HG--
branch : develop
2017-07-11 22:23:38 +03:00
Guillaume Dupuy
63138ba784 Use correct comparison between enum
Was previously (badly) relying on int as boolean behaviour
Solves a bug where remove slot was not working with headdress (value 0 in enum TSlotEquipment)

--HG--
branch : develop
2017-07-11 00:27:04 +02:00
Meelis Mägi
cdf648fd4f Merged in Glorf/ryzomcore/fix_item_group_08072017 (pull request #154)
Minor item group fixes :

--HG--
branch : develop
2017-07-08 19:20:02 +00:00
Guillaume Dupuy
bc17b5eb1a Don't add multiples identical items to a group
Solves the issue where 2 hand weapon were not properly equipped

--HG--
branch : fix_item_group_08072017
2017-07-08 14:55:18 +02:00
Guillaume Dupuy
59ce9437c8 Swap item serial and create time properties when swapping items
--HG--
branch : fix_item_group_08072017
2017-07-08 13:43:51 +02:00
Nimetu
cb65c89d19 Fixed: Clean up dyn bubbles from chat/webig to prevent crash after character change.
--HG--
branch : compatibility-develop
2017-07-03 21:54:35 +03:00
Nimetu
368e1389f2 Fixed: Clean up dyn bubbles from chat/webig to prevent crash after character change.
--HG--
branch : develop
2017-07-03 21:54:35 +03:00
Nuno Gonçalves
648e3ba184 Fixed: update color instead status
--HG--
branch : compatibility-develop
2017-06-27 14:38:08 +02:00
Nuno Gonçalves
c9c0cbe88f Added: New icon for new lock-loot system (in test on yubo)
--HG--
branch : compatibility-develop
2017-06-23 20:13:38 +02:00
kervala
cb55615659 Merge with develop
--HG--
branch : compatibility-develop
2017-06-20 12:31:31 +02:00
kervala
de8a6ba1b5 Fixed: Warnings with clang
--HG--
branch : develop
2017-06-20 12:28:46 +02:00
Nimetu
2b7dac4450 Merge with develop
--HG--
branch : compatibility-develop
2017-06-08 22:38:03 +03:00
Nimetu
e956f69691 Changed: Enable fps view on game config window
--HG--
branch : develop
2017-06-08 22:37:19 +03:00