Commit graph

1717 commits

Author SHA1 Message Date
kervala
10e5fb77ed Fixed: NL_OS_WIN32 is never defined 2016-10-08 18:28:54 +02:00
yannk
a2dced68c5 Adding Khanat Full Character selection 2016-10-06 17:37:14 +02:00
yannk
7bbeae5dca Integrating Khanat former changes 2016-10-06 17:34:56 +02:00
yannk
5cd464003a Modification écran de sélection du personnage 2016-10-04 21:05:32 +02:00
kervala
6744ded402 Merge with develop 2016-09-28 23:55:21 +02:00
kervala
fde0edc21a Changed: Minor changes 2016-09-28 23:42:33 +02:00
kervala
6abf3cbdaa Fixed: Connexion -> Connection typo 2016-09-28 23:42:01 +02:00
kervala
4a7b86721a Changed: Also check icon in same directory as executable 2016-09-28 23:30:24 +02:00
kervala
4c692ba040 Added: Ryzhome files 2016-09-25 14:21:42 +02:00
kervala
4c51c4e68c Merge with develop 2016-09-24 14:22:22 +02:00
kervala
a1ac8dfe97 Changed: Minor change 2016-09-24 14:00:01 +02:00
kervala
04dbab90e4 Changed: Moved Syphox mod to ryzom/data/mods to not conflict when creating gamedev.bnp 2016-09-24 13:59:09 +02:00
kervala
fc903ff30c Removed: Textures shouldn't go in gamedev 2016-09-22 21:56:28 +02:00
kervala
e80aac9953 Merge with develop 2016-09-21 18:04:29 +02:00
kervala
5b5c82823b Fixed: Don't ask confirmation 2016-09-21 18:04:07 +02:00
kervala
203490b838 Merge with develop 2016-09-21 17:38:33 +02:00
kervala
7eaed43bf3 Fixed: Missing ENDIF() 2016-09-21 17:38:10 +02:00
kervala
420bf07057 Merge with develop 2016-09-21 17:34:34 +02:00
kervala
6defb32387 Changed: Install Upgrade scripts 2016-09-21 17:34:13 +02:00
kervala
35f8ba80b3 Added: upgd_nl.bat for Windows 2016-09-21 17:27:29 +02:00
kervala
faff5ad04d Changed: Moved SSL certificate to gamedev 2016-09-21 12:46:04 +02:00
kervala
e20e3b4866 Merge with develop 2016-09-20 21:59:11 +02:00
kervala
51aac8b5e9 Changed: Removed extraneous spaces 2016-09-20 21:40:17 +02:00
kervala
58a8da6590 Merge with develop 2016-09-10 19:40:40 +02:00
kervala
26985f0fea Fixed: Don't put downloaded files in quarantine under OS X 2016-09-10 19:39:36 +02:00
kervala
833ba9baf8 Changed: Minor change 2016-09-10 19:38:40 +02:00
kervala
b78d33d1e2 Fixed: Bug where exedll.bnp wasn't downloaded 2016-09-10 19:38:27 +02:00
kervala
34df094f24 Changed: Added getGroundZ to develop branch too 2016-09-03 10:05:56 +02:00
Nimetu
3610c6c8cb Merge with develop 2016-08-30 21:27:56 +03:00
Nimetu
2c38ac8e2e Changed: Implement mp3 player playlist 2016-08-30 21:25:58 +03:00
Nimetu
5e712f3e02 Merge with develop 2016-08-30 18:39:58 +03:00
Nimetu
6487bc4dd9 Fixed: Adding songs from wrong list 2016-08-30 18:38:30 +03:00
kervala
d16ab852f3 Merge with develop 2016-08-26 13:55:25 +02:00
kervala
d71751293b Changed: Use %~X instead of %X because it removes double quotes 2016-08-26 13:30:30 +02:00
kervala
8f8ded0f12 Merge with develop 2016-08-26 13:01:32 +02:00
kervala
77c9be8d5b Changed: Remove unneeded double quotes in batch file 2016-08-26 13:00:51 +02:00
Nimetu
dee80dc90e Merge with develop 2016-08-25 22:18:35 +03:00
Nimetu
136d07bf4f Fixed: Save mp3 player volume to icfg 2016-08-25 22:14:58 +03:00
Nimetu
cc1a749f90 Changed: Make media player to play songs from music directory (issue #59) 2016-08-25 22:08:05 +03:00
ulukyn
e9f3fa6ba4 Added: New getGroundZ lua function 2016-08-25 18:54:35 +02:00
Erwan GEORGET
11ca113401 Quelques corrections de merge 2016-08-09 22:32:01 +02:00
Erwan GEORGET
edf0b19c75 Merge ryzomcore into feature/merge-ryzomcore-to-develop+CI 2016-08-09 22:12:11 +02:00
966badbd20 mise a jour du client_default.cfg 2016-08-06 01:15:02 +02:00
kervala
dabd3b2fdb Merge with develop 2016-07-25 10:46:09 +02:00
kervala
bdd66f019d Changed: Fix text align in patch windows, see #280 2016-07-25 10:45:07 +02:00
kervala
99aa166911 Added: New version of "DejaVu Sans" fonts (and monospace version) 2016-07-25 09:35:23 +02:00
Nimetu
85838aec19 Merge with develop 2016-07-24 16:09:25 +03:00
Nimetu
74a4e107b6 Added: Monospace font options 2016-07-24 16:07:18 +03:00
Nimetu
0be0a1e9e7 Merge with develop 2016-07-23 11:28:22 +03:00
Nimetu
eb877f41ad Fixed: Wrong align on info window on character creation screen. 2016-07-23 11:04:45 +03:00
kervala
6a6aa0eec3 Changed: Fix right text align by Info Window (patch by Riasan) 2016-07-20 14:07:10 +02:00
Riasan
8aefb645e1 Fix: right text align by Info Window 2016-07-19 20:54:54 +02:00
kervala
ca0346645b Merge with develop 2016-07-19 09:42:54 +02:00
kervala
d2dece0aaa Fixed: Typos 2016-07-19 09:41:27 +02:00
kervala
69e68f8d3c Changed: Fox right text align by map and respawn window (patch by Riasan) 2016-07-19 09:41:12 +02:00
Nimetu
0d571e617e Backed out changeset: 61529eb4c24f 2016-07-18 23:44:47 +03:00
Riasan
8f15a04d2d Fix: Right Text Align by Map and Rewspwan Windows 2016-07-18 20:14:20 +02:00
Nimetu
25f6f1980f Merge with develop 2016-07-09 14:59:22 +03:00
Nimetu
5290549a48 Fixed: Re-add handsbar horizontal mode 2016-07-09 14:54:11 +03:00
kervala
a3b8a2749e Merge with develop 2016-07-09 13:48:03 +02:00
kervala
fc0ec87fc9 Changed: Apply changes from default interface to Syphox one 2016-07-09 13:47:30 +02:00
kervala
d0e2b9441e Changed: Bad Position of Text after fix the Text High (by Riasan) 2016-07-09 08:55:24 +02:00
Nimetu
2ce1a63026 Merge with develop 2016-07-07 01:01:00 +03:00
Nimetu
0d4bbaf373 Changed: Allow windowed mode to span over multiple desktops 2016-07-07 00:47:00 +03:00
Riasan
391706c1d8 Fix: Bad Position of Text after fix the Text High 2016-07-02 23:07:47 +02:00
Nimetu
62e5552859 Merge with develop 2016-07-01 23:38:32 +03:00
Nimetu
16c0314701 Changed: If char keys/icfg file does not exist, use shared keys/icfg file 2016-07-01 21:37:26 +03:00
kervala
7df642535b Merge with develop 2016-07-01 10:42:21 +02:00
kervala
7332a26dc6 Changed: Apply changes from default interface to Syphox one 2016-07-01 10:41:48 +02:00
kervala
120d2d7dba Merge with develop 2016-06-26 19:43:53 +02:00
kervala
13ec474eff Changed: Use std::numeric_limits instead of ~0 2016-06-26 19:43:08 +02:00
kervala
61c5cf3126 Fixed: Better alignment of text 2016-06-26 19:39:00 +02:00
kervala
6eacd63fd1 Fixed: Wrong alignment of text in edit boxes 2016-06-26 19:13:34 +02:00
kervala
60cf3bfeb2 Fixed: Wrong alignment of text on character selection screen 2016-06-26 19:01:49 +02:00
kervala
2530930a16 Fixed: Wrong alignment of text on login screen 2016-06-26 18:49:27 +02:00
kervala
99f5dd2443 Changed: Use toString instead of std::stringstream 2016-06-26 14:54:28 +02:00
kervala
ad98793560 Merge with develop 2016-06-19 21:10:23 +02:00
kervala
ababfe0553 Changed: Init CSystemUtils in INelContext 2016-06-19 20:48:30 +02:00
Nimetu
1bff654c7b Merge with develop 2016-06-16 23:32:47 +03:00
Nimetu
583c540995 Changed: Add scrollbar to macro commands list 2016-06-16 23:32:31 +03:00
kervala
3ae8a19af1 Merge with develop 2016-06-12 15:44:48 +02:00
kervala
eccbb211e4 Changed: Allow to compile Ryzom Installer alone 2016-06-12 14:13:42 +02:00
Nimetu
8f9d7078bd Merge with develop 2016-06-12 12:49:14 +03:00
Nimetu
76c8a8a055 Changed: Set <textarea>, <input> font style 2016-06-12 10:30:16 +03:00
Nimetu
0e3a6b8a3e Added: Rows attribute to <textarea> element 2016-06-12 10:22:22 +03:00
kervala
2275e55db9 Merge with develop 2016-06-07 13:32:06 +02:00
kervala
06981b5483 Changed: LZMA updated to 16.02 2016-06-07 13:22:34 +02:00
kervala
abdffe85bc Changed: More details on OS and machine in client.log 2016-06-07 13:21:45 +02:00
kervala
c4f5512b24 Merge with develop 2016-05-29 20:38:55 +02:00
kervala
ac448eac18 Merge with develop 2016-05-27 22:24:20 +02:00
kervala
6fbf8c5326 Merge with develop 2016-05-26 19:36:25 +02:00
kervala
ca585f73c0 Fixed: Create Ryzom profile folder if not already created and return 1 if unable to create it 2016-05-29 20:36:53 +02:00
kervala
4db953aa8a Changed: Remove useless comments/commented code 2016-05-29 20:35:56 +02:00
kervala
c83d7dd33e Fixed: Set VSync value after 3D driver initialized 2016-05-27 22:17:25 +02:00
kervala
a4881c2af5 Changed: Unix EOL 2016-05-25 23:20:02 +02:00
kervala
7b901a8888 Changed: Replace string empty assign by clear() 2016-05-25 23:19:26 +02:00
kervala
d94941a20b Changed: Replace size() comparisons by empty() 2016-05-25 23:18:11 +02:00
kervala
ed03eb0a02 Merge with develop 2016-05-24 11:25:04 +02:00
kervala
5a699abe0a Fixed: Inconsistent EOL 2016-05-24 11:24:36 +02:00
kervala
ac66527715 Fixed: Append _dev suffix to ryzom_client under Linux too 2016-05-24 11:19:41 +02:00
Cédric OCHS
17f094c671 Merged in Llapp/ryzomcore/dev-syui (pull request #139)
UI modification:
2016-05-23 14:35:20 +02:00
SIELA1915
7e3b9d56bb changed all HP, Sap, Stamina and Focus occurences 2016-05-23 11:45:43 +02:00
Llapp
4db7f2c959 UI modification:
*added some new textures
*added code
*changed guild window
*added team invite buttons to tell window, friendlist and guildlist
*added percent view for target HP
*added target sap and stam in target window with percent view
*added pvp icon for target window
*added fps view into radar
*added openable option for guild and friendlist
*added guild invite button
2016-05-22 23:04:30 +02:00
kervala
1656e82303 Merge with develop 2016-05-18 14:31:14 +02:00
kervala
ee8a70287a Changed: New command /version to display Ryzom client version 2016-05-18 14:29:23 +02:00
kervala
0c2cdd108e Merge with develop 2016-05-17 20:50:14 +02:00
kervala
44c6dab045 Changed: Removed extraneous spaces at the end of lines 2016-05-17 20:48:15 +02:00
kervala
0766c4766f Merge with develop 2016-05-17 11:02:02 +02:00
kervala
049e35d930 Changed: Delete SoundMngr to avoid memory leaks 2016-05-17 10:59:28 +02:00
kervala
ece22ab9f3 Merge with develop 2016-05-15 12:05:19 +02:00
kervala
c57c1526a4 Changed: LZMA updated to 16.00 2016-05-15 12:04:31 +02:00
kervala
248c7e14a7 Changed: Replace other cp=1 by cp=2 2016-05-12 20:02:40 +02:00
kervala
5bbd69cbe0 Merge with develop 2016-05-12 19:57:37 +02:00
kervala
2523706447 Changed: Append cp=2 parameter to query when requesting salt to know that we support SHA512 crypt 2016-05-12 19:53:16 +02:00
kervala
9e1b9d8050 Changed: Minor changes 2016-05-12 19:52:20 +02:00
kervala
04407be1cc Changed: Added new command /playedTime that displays time played with this character 2016-05-12 19:51:52 +02:00
kervala
bf79b16b5b Merge with develop 2016-05-08 13:42:53 +02:00
kervala
9571f5f235 Changed: Check for NULL X509_INFO 2016-05-08 13:33:38 +02:00
kervala
435ddae54f Changed: Useless to put a space after method name (if needed, we'll add ourself later) 2016-05-08 13:33:21 +02:00
kervala
27fcfd823a Changed: Minor changes 2016-05-08 13:31:54 +02:00
kervala
3e658f1a1f Changed: Specify host too for login HTTP requests 2016-05-08 13:31:08 +02:00
kervala
43db9313f8 Merge with develop 2016-05-05 17:57:47 +02:00
kervala
84585af4c3 Backed out changeset: d758db202adf 2016-05-05 17:57:05 +02:00
Nimetu
3530beb7fe Merge with develop 2016-05-05 15:01:10 +03:00
Nimetu
f3b13af5e8 Changed: Increase default request timeout for web browsers 2016-05-05 15:00:28 +03:00
kervala
aa59952038 Merge with develop 2016-05-04 10:09:49 +02:00
kervala
e1f8ac7d1b Changed: Update interfaces files with patchlet version 2016-05-04 10:07:03 +02:00
Dremor
159898b081 Merge branch 'ryzomcore' into 'develop'
Merge Ryzomcore into Develop



See merge request !2
2016-05-02 08:01:47 +00:00
Nimetu
d3235c9a20 Merge with develop 2016-04-29 12:26:41 +03:00
Nimetu
8b767cabcd Changed: When writing to icfg or keys files, write to temp file and then rename 2016-04-29 12:16:43 +03:00
kervala
9b837748aa Merge with develop 2016-04-18 13:40:46 +02:00
kervala
58347b9353 Changed: Display certificate path 2016-04-18 13:40:13 +02:00
kervala
8aabb4fec7 Fixed: Warnings with clang 2016-04-18 13:40:02 +02:00
kervala
a9685f71b2 Fixed: Ignore "certificate already in hash table" errors 2016-04-18 13:39:48 +02:00
kervala
ec25d0f62a Backed out changeset: 10cdacbad9a1 2016-04-15 16:12:12 +02:00
kervala
d86fc2ac29 Changed: Temporary log for a OS X 10.7 bug... 2016-04-14 18:58:54 +02:00
kervala
9c3dc650e7 Backed out changeset: 44cd3beacab6 2016-04-14 18:56:48 +02:00
kervala
45565e2bb8 Changed: Temporary checks for a OS X 10.7 bug... 2016-04-14 18:19:19 +02:00
kervala
7292d41acf Merge with develop 2016-04-12 19:55:05 +02:00
kervala
f36c73a9b1 Changed: Display parameters passed to batch in log 2016-04-12 19:54:38 +02:00
kervala
910c6dc7b9 Merge with develop 2016-04-12 15:43:47 +02:00
kervala
a545a8b091 Changed: Removed extraneous spaces at the end of lines 2016-04-12 15:42:53 +02:00
kervala
e77815256f Fixed: CURLE_NOT_BUILT_IN undefined with some CURL versions 2016-04-12 15:42:43 +02:00
kervala
a98e6b1fee Merge with develop 2016-04-09 13:02:40 +02:00
kervala
8c04ffe056 Fixed: Wrong display of max resist levels 2016-04-09 13:02:12 +02:00
kervala
0d49004311 Merge with develop 2016-04-06 09:36:35 +02:00
kervala
130229cbb7 Changed: Give priority to login specified as argument 2016-04-06 09:36:06 +02:00
kervala
18cd57a1d1 Merge with develop 2016-04-02 19:34:20 +02:00
kervala
81ca1a9a04 Changed: Reverted change, not sure it fixes anything 2016-04-02 19:33:53 +02:00
kervala
c93a8e4e69 Changed: Pass LoginCustomParameters to different login URLs if defined 2016-04-02 19:09:21 +02:00
kervala
a355fb9b2a Changed: If only login is passed as parameter, neither use auto login nor alt login 2016-04-02 19:08:13 +02:00
SIELA1915
52702f64f1 merged from compatibility-develop 2016-03-28 02:12:19 +02:00
Nimetu
6a258886fe Merge with develop 2016-03-22 12:23:04 +02:00
Nimetu
2be2717ee7 Merge with develop 2016-03-22 12:23:04 +02:00
Nimetu
5f53c6caa6 Added: AppZone and WebBrowser components 2016-03-22 11:11:47 +02:00
kervala
5109ae5443 Merge with develop 2016-03-19 19:30:06 +01:00
kervala
54ceef6c99 Merge with develop 2016-03-19 19:30:06 +01:00
kervala
17b390e589 Fixed: Clang warnings 2016-03-19 19:29:03 +01:00
kervala
5670c0cd2b Changed: Try to load Steam DLL without path if fails 2016-03-19 18:29:14 +01:00
kervala
66d9a0eea7 Changed: Try to load Steam DLL without path if fails 2016-03-19 18:29:14 +01:00
kervala
f627729e05 Changed: Load Steam DLL just after initializing logs and before loading config 2016-03-18 22:21:01 +01:00
kervala
ba71497344 Changed: Load Steam DLL just after initializing logs and before loading config 2016-03-18 22:21:01 +01:00
kervala
eb92bf7b00 Fixed: Use language defined in Ryzom properties from Steam 2016-03-18 22:20:28 +01:00
kervala
45f2100a03 Fixed: Use language defined in Ryzom properties from Steam 2016-03-18 22:20:28 +01:00
kervala
63b2843232 Merge with develop 2016-03-18 22:16:28 +01:00
kervala
29c946b73a Merge with develop 2016-03-18 22:16:28 +01:00
kervala
2a53238ba3 Changed: Use named arguments in uiFilterMenuDynamic translation 2016-03-18 22:11:03 +01:00
kervala
f728a518a1 Fixed: Move setrlimit after initializing logs 2016-03-18 22:10:19 +01:00
kervala
baa490ca9c Changed: Fix clang warnings 2016-03-18 22:06:20 +01:00
kervala
f5e60a4fea Changed: Init log before calling prelogInit() 2016-03-18 18:10:01 +01:00
kervala
f192068bc4 Merge with develop 2016-03-16 19:15:11 +01:00
kervala
1b724c56fc Merge with develop 2016-03-16 19:15:11 +01:00
kervala
23e93ad89e Fixed: Renamed ryzom_configuration to ryzom_configuration_qt under Linux 2016-03-16 19:14:23 +01:00
kervala
624b2bbdd8 Fixed: We need to restart client from the same startup directory as parent one 2016-03-16 19:13:57 +01:00
kervala
7d23cd6f52 Changed: Removed some semicolons in Lua when useless 2016-03-16 19:13:07 +01:00
kervala
85e9f7eadc Changed: Use # in Lua to get the size of an array 2016-03-15 17:55:58 +01:00
kervala
01c2dd9f33 Merge with develop 2016-03-15 17:45:55 +01:00
kervala
6494a85c5a Merge with develop 2016-03-15 17:45:55 +01:00
kervala
d4af134189 Changed: Search client_default.cfg also in ETC_RYZOM_PREFIX 2016-03-15 17:44:21 +01:00
kervala
0e1cbe909c Merge with develop 2016-03-15 12:37:11 +01:00
kervala
a4be9e2479 Merge with develop 2016-03-15 12:37:11 +01:00
kervala
445ba78816 Fixed: Fyros and Matis are using first name first while Trykers and Zoraïs are using last name first 2016-03-15 12:35:47 +01:00
kervala
966500e1a1 Changed: Remived useless semicolons 2016-03-15 12:34:45 +01:00
kervala
df7917c012 Merge with develop 2016-03-15 00:08:40 +01:00
kervala
b05d1352f8 Merge with develop 2016-03-15 00:08:40 +01:00
kervala
72bc7a8fd0 Fixed: Wrong first and last names orders and some minor bugs 2016-03-15 00:03:06 +01:00
kervala
7ee9833bf3 Changed: Use more explicit variable names 2016-03-15 00:01:29 +01:00
kervala
d2bc560ca8 Changed: Minor changes (spaces replaced by tabs) 2016-03-14 23:58:58 +01:00
kaetemi
4eb9d884d0 Merge with develop 2016-03-10 12:09:18 +01:00
kaetemi
4a581d89fa Merge with develop 2016-03-10 12:09:18 +01:00
kaetemi
2177ed554a Fix thunder update 2016-03-10 12:08:48 +01:00
kaetemi
af0568e131 Fix rounding error in _RyzomDay and _RyzomTime calculation 2016-03-10 12:08:48 +01:00
kervala
68814a1d94 Changed: Random names generator updated by Osquallo 2016-03-09 11:21:53 +01:00
kaetemi
eb8835c36c Merge with develop 2016-03-08 12:46:47 +01:00
kaetemi
130901402d Merge with develop 2016-03-08 12:46:47 +01:00
kaetemi
7a5a8093c4 Fix curl crash 2016-03-08 12:46:15 +01:00
kervala
79556d7204 Merge with develop 2016-03-05 12:46:17 +01:00
kervala
b00bd2c9fc Merge with develop 2016-03-05 12:46:17 +01:00
kervala
6f0febcf92 Changed: Better warning 2016-03-05 12:42:32 +01:00
kervala
794b91022e Merge with develop 2016-03-05 11:51:08 +01:00