Commit graph

6413 commits

Author SHA1 Message Date
kervala
a1994702a3 Merge with develop
--HG--
branch : compatibility-develop
2016-05-24 11:25:04 +02:00
kervala
fa7a46205d Fixed: Inconsistent EOL
--HG--
branch : develop
2016-05-24 11:24:36 +02:00
kervala
5ad9a57ada Fixed: Append _dev suffix to ryzom_client under Linux too
--HG--
branch : develop
2016-05-24 11:19:41 +02:00
Cédric OCHS
b2fdf9c936 Merged in Llapp/ryzomcore/dev-syui (pull request #139)
UI modification:

--HG--
branch : develop
2016-05-23 14:35:20 +02:00
Llapp
3c6a7f4daf 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

--HG--
branch : dev-syui
2016-05-22 23:04:30 +02:00
kervala
85948a1f1c Changed: Renamed ring_map_entry_ponts.txt to r2_entry_points.txt in compatibility-develop too (don't forget to update data_common.bnp!)
--HG--
branch : compatibility-develop
2016-05-20 19:18:46 +02:00
kervala
719e6f6e85 Merge with develop
--HG--
branch : compatibility-develop
2016-05-18 14:31:14 +02:00
kervala
1ba31e36d7 Changed: Disable maximize button in window title bar
--HG--
branch : develop
2016-05-18 14:30:33 +02:00
kervala
df1e6aa11b Changed: New command /version to display Ryzom client version
--HG--
branch : develop
2016-05-18 14:29:23 +02:00
kervala
119bbe1f71 Merge with develop
--HG--
branch : compatibility-develop
2016-05-18 09:57:33 +02:00
kervala
cc72b3e2a1 Fixed: Typo in comment
--HG--
branch : develop
2016-05-18 09:56:43 +02:00
kervala
a3f85fa8cd Changed: Save/load configuration filename
--HG--
branch : develop
2016-05-18 09:56:22 +02:00
kervala
8f3f6075bb Changed: Configure button action
--HG--
branch : develop
2016-05-18 09:53:36 +02:00
kervala
87ce45dcb1 Fixed: Delay when logging in
--HG--
branch : develop
2016-05-18 09:52:48 +02:00
kervala
e23c41e477 Merge with develop
--HG--
branch : compatibility-develop
2016-05-17 20:50:14 +02:00
kervala
fc6d3eb075 Changed: Removed extraneous spaces at the end of lines
--HG--
branch : develop
2016-05-17 20:48:15 +02:00
kervala
221a8c471e Changed: Use client filename defined in installer.ini
--HG--
branch : develop
2016-05-17 20:47:38 +02:00
kervala
48d37e5289 Changed: Use same header image as NSIS
--HG--
branch : develop
2016-05-17 20:47:04 +02:00
kervala
2ba19e44c0 Removed: Bitmaps for NSIS
--HG--
branch : develop
2016-05-17 20:46:38 +02:00
kervala
81098186e3 Merge with develop
--HG--
branch : compatibility-develop
2016-05-17 11:02:02 +02:00
kervala
13dfa25a04 Changed: Added commented QT5_CREATE_TRANSLATION
--HG--
branch : develop
2016-05-17 11:01:16 +02:00
kervala
de7031ee06 Changed: Don't need to use QXcbGlxIntegrationPlugin
--HG--
branch : develop
2016-05-17 11:00:48 +02:00
kervala
0c811510d5 Changed: Delete SoundMngr to avoid memory leaks
--HG--
branch : develop
2016-05-17 10:59:28 +02:00
kervala
cf79569bb0 Merge with develop
--HG--
branch : compatibility-develop
2016-05-16 20:33:43 +02:00
kervala
048cd7731f Fixed: Link Installer to OPENGL_gl_LIBRARY
--HG--
branch : develop
2016-05-16 20:33:18 +02:00
kervala
addbfd7553 Merge with develop
--HG--
branch : compatibility-develop
2016-05-16 18:20:14 +02:00
kervala
1fc5934bfa Fixed: Typo
--HG--
branch : develop
2016-05-16 18:19:23 +02:00
kervala
47d1d7a111 Merge with develop
--HG--
branch : compatibility-develop
2016-05-16 18:17:40 +02:00
kervala
da5c53e3c2 Changed: Compilation under Linux
--HG--
branch : develop
2016-05-16 18:16:33 +02:00
kervala
9017d28485 Merge with develop
--HG--
branch : compatibility-develop
2016-05-16 16:50:11 +02:00
kervala
7818e78b33 Fixed: Compilation with GCC
--HG--
branch : develop
2016-05-16 16:49:42 +02:00
kervala
57268e0f43 Merge with develop
--HG--
branch : compatibility-develop
2016-05-16 16:31:30 +02:00
kervala
579e9eecc3 Changed: Add more checks for data
--HG--
branch : develop
2016-05-16 16:30:46 +02:00
kervala
db11469631 Changed: Better English
--HG--
branch : develop
2016-05-16 16:21:47 +02:00
kervala
44d3f75cc9 Changed: Update progress in CFilesCleaner
--HG--
branch : develop
2016-05-16 14:58:50 +02:00
kervala
f042f1850f Changed: Allow to abort when extracting files
--HG--
branch : develop
2016-05-16 14:55:46 +02:00
kervala
9f06af9a87 Changed: Minor change
--HG--
branch : develop
2016-05-16 14:54:24 +02:00
kervala
af248d0a0f Changed: Don't download changelog
--HG--
branch : develop
2016-05-16 14:54:10 +02:00
kervala
4675cdb0d7 Changed: Call accept() or reject() depending on next action
--HG--
branch : develop
2016-05-16 14:53:19 +02:00
kervala
3efc46a681 Changed: Emit done when an operation is finished
--HG--
branch : develop
2016-05-16 14:52:47 +02:00
kervala
3e0aa24703 Changed: Launch upgd_nl.bat/sh script after extracting BNP client files
--HG--
branch : develop
2016-05-16 14:52:16 +02:00
kervala
740e8ef1e2 Changed: Display current operation
--HG--
branch : develop
2016-05-16 14:50:53 +02:00
kervala
32cb08ad72 Changed: Remove Help icon in window title bar
--HG--
branch : develop
2016-05-16 14:50:15 +02:00
kervala
0b2928d349 Changed: Moved createDefaultProfile
--HG--
branch : develop
2016-05-16 14:49:50 +02:00
kervala
591f9c88d5 Changed: downloadData and downloadClient methods
--HG--
branch : develop
2016-05-16 14:49:18 +02:00
kervala
714d899611 Changed: Name of OperationDialog UI
--HG--
branch : develop
2016-05-16 14:48:41 +02:00
kervala
dbf1229aae Changed: operationFinish() not useful
--HG--
branch : develop
2016-05-16 14:48:01 +02:00
kervala
c1485f500a Changed: Use profile default index instead of ID
--HG--
branch : develop
2016-05-16 14:46:35 +02:00
kervala
1fed8f51a0 Changed: Better syntax for profile display
--HG--
branch : develop
2016-05-16 14:46:08 +02:00
kervala
a161968c3c Changed: Profile ID is now a QString
--HG--
branch : develop
2016-05-16 14:45:43 +02:00
kervala
c396eecebf Merge with develop
--HG--
branch : compatibility-develop
2016-05-16 11:13:45 +02:00
kervala
db70d04dce Changed: Include Windows headers only under Windows
--HG--
branch : develop
2016-05-16 11:13:04 +02:00
kervala
079ac81c8d Changed: Index is not the ID
--HG--
branch : develop
2016-05-16 11:12:30 +02:00
kervala
56e220a050 Changed: New COperationDialog that manager progress bar in a dialog
--HG--
branch : develop
2016-05-16 11:11:40 +02:00
kervala
4d983577dc Changed: One class per files operation
--HG--
branch : develop
2016-05-16 11:10:01 +02:00
kervala
a22483e021 Merge with develop
--HG--
branch : compatibility-develop
2016-05-15 12:05:19 +02:00
kervala
00ccc811f6 Changed: LZMA updated to 16.00
--HG--
branch : develop
2016-05-15 12:04:31 +02:00
kervala
d03bbcdf73 Merge with develop
--HG--
branch : compatibility-develop
2016-05-14 18:55:54 +02:00
kervala
9d586221df Merge with develop
--HG--
branch : feature-ryzom-installer
2016-05-14 18:54:43 +02:00
kervala
cf7ecf9857 Changed: Only compile installer if WITH_RYZOM_INSTALLER set
--HG--
branch : feature-ryzom-installer
2016-05-14 18:53:57 +02:00
kervala
9a55bb5783 Changed: Create default profile
--HG--
branch : feature-ryzom-installer
2016-05-14 18:53:35 +02:00
kervala
c09b1dab31 Changed: Check for memory leaks
--HG--
branch : feature-ryzom-installer
2016-05-14 18:53:09 +02:00
kervala
f3feb5ebd9 Changed: Include Windows.h only under Windows
--HG--
branch : feature-ryzom-installer
2016-05-14 18:52:53 +02:00
kervala
4f79e265f8 Changed: Don't redefine FILE_ATTRIBUTE_* if already defined
--HG--
branch : feature-ryzom-installer
2016-05-14 18:52:40 +02:00
kervala
f3a6422626 Changed: New done() signal to go to next step
--HG--
branch : feature-ryzom-installer
2016-05-14 18:52:09 +02:00
kervala
5deb7327e3 Changed: Play button
--HG--
branch : feature-ryzom-installer
2016-05-14 18:51:33 +02:00
kervala
3397d1dc38 Changed: Clean files
--HG--
branch : feature-ryzom-installer
2016-05-14 18:50:27 +02:00
kervala
2bcdc5107b Changed: Display error message when no installer.ini file found
--HG--
branch : feature-ryzom-installer
2016-05-14 18:48:32 +02:00
kervala
d56aa19b1a Changed: Compile shortcuts code only under Windows
--HG--
branch : feature-ryzom-installer
2016-05-14 18:48:06 +02:00
kervala
8e8a0d4ffa Changed: Hide help button
--HG--
branch : feature-ryzom-installer
2016-05-14 18:47:45 +02:00
kervala
01e284af12 Changed: Renamed configurationsComboBox to profilesComboBox
--HG--
branch : feature-ryzom-installer
2016-05-14 18:47:28 +02:00
Nimetu
60a739955b Merge with develop
--HG--
branch : compatibility-develop
2016-05-14 13:47:03 +03:00
kervala
be40cda4c1 Merge with develop
--HG--
branch : feature-ryzom-installer
2016-05-14 12:35:12 +02:00
Nimetu
f15926dd7e Changed: Remove legacy HTTPCurrentDomain variable
--HG--
branch : develop
2016-05-14 12:53:09 +03:00
Nimetu
ae46d76d88 Fixed: Parsing url authority when path is empty
--HG--
branch : develop
2016-05-14 12:53:09 +03:00
Nimetu
8aa2a3ced6 Changed: Rename CUrlParser domain variable
--HG--
branch : develop
2016-05-14 12:53:09 +03:00
kervala
bd69c167d3 Merge with develop
--HG--
branch : compatibility-develop
2016-05-13 20:55:24 +02:00
kervala
9fd00d8505 Fixed: Missing to include PCH
--HG--
branch : develop
2016-05-13 20:55:00 +02:00
Nimetu
f02b388d06 Merge with develop
--HG--
branch : compatibility-develop
2016-05-13 13:58:33 +03:00
Nimetu
131f3814a3 Fixed: Resolve http-equiv refresh url
--HG--
branch : develop
2016-05-13 13:57:28 +03:00
kervala
5b3683bbd3 Changed: Replace other cp=1 by cp=2
--HG--
branch : develop
2016-05-12 20:02:40 +02:00
kervala
49c801c5d8 Changed: Updated translations
--HG--
branch : compatibility-develop
2016-05-12 19:59:08 +02:00
kervala
ff5a82ec4f Merge with develop
--HG--
branch : compatibility-develop
2016-05-12 19:57:37 +02:00
kervala
c1d142b9ee Changed: Append cp=2 parameter to query when requesting salt to know that we support SHA512 crypt
--HG--
branch : develop
2016-05-12 19:53:16 +02:00
kervala
011b545ac8 Changed: Minor changes
--HG--
branch : develop
2016-05-12 19:52:20 +02:00
kervala
a885b9b557 Changed: Added new command /playedTime that displays time played with this character
--HG--
branch : develop
2016-05-12 19:51:52 +02:00
Nimetu
5a2dc969cb Merge with develop
--HG--
branch : compatibility-develop
2016-05-09 20:14:15 +03:00
Nimetu
cdfecc8d69 Fixed: url inheriting for defined empty query component
--HG--
branch : develop
2016-05-09 20:05:06 +03:00
kervala
0296ba8123 Changed: Updated translations
--HG--
branch : compatibility-develop
2016-05-08 19:25:15 +02:00
kervala
9e33df4532 Merge with develop
--HG--
branch : compatibility-develop
2016-05-08 19:24:04 +02:00
kervala
af6b282ec1 Changed: Minor changes
--HG--
branch : develop
2016-05-08 19:23:38 +02:00
kervala
583db43e71 Changed: Disable too verbose message for sound sheets
--HG--
branch : develop
2016-05-08 19:23:27 +02:00
kervala
155902a229 Merge with develop
--HG--
branch : compatibility-develop
2016-05-08 14:00:40 +02:00
kervala
ab2ac66cb5 Fixed: Stack size errors while compiling with VC++ 2015
--HG--
branch : develop
2016-05-08 14:00:15 +02:00
kervala
a9685ac366 Merge with develop
--HG--
branch : compatibility-develop
2016-05-08 13:42:53 +02:00
kervala
b932c31546 Fixed: Use correct formatted HTTP 1.1 query, previous one was blocked by some security software (a big thanks to Vojtech Vobr from AVG Technologies for his investigation to help us to fix this issue)
--HG--
branch : develop
2016-05-08 13:39:17 +02:00
kervala
c95bd7faba Changed: Check for NULL X509_INFO
--HG--
branch : develop
2016-05-08 13:33:38 +02:00
kervala
a0916ca14a Changed: Useless to put a space after method name (if needed, we'll add ourself later)
--HG--
branch : develop
2016-05-08 13:33:21 +02:00
kervala
8099537d02 Changed: Minor changes
--HG--
branch : develop
2016-05-08 13:31:54 +02:00
kervala
8fb8cfb218 Changed: Specify host too for login HTTP requests
--HG--
branch : develop
2016-05-08 13:31:08 +02:00
kervala
1ff64c71d4 Fixed: Some problems with AMS, patches by depyraken (thanks a lot!)
--HG--
branch : develop
2016-05-08 13:28:25 +02:00
kervala
1e0283d38c Fixed: Use %p to display pointer
--HG--
branch : develop
2016-05-08 13:22:32 +02:00
kervala
1168825ee1 Merge with develop
--HG--
branch : compatibility-develop
2016-05-05 17:57:47 +02:00
kervala
0786abd9f6 Backed out changeset: d758db202adf
--HG--
branch : develop
2016-05-05 17:57:05 +02:00
Nimetu
f7f275671f Merge with develop
--HG--
branch : compatibility-develop
2016-05-05 15:01:10 +03:00
Nimetu
6f8a9b8108 Changed: Increase default request timeout for web browsers
--HG--
branch : develop
2016-05-05 15:00:28 +03:00
kervala
4e6058d9e6 Fixed: Typo
--HG--
branch : compatibility-develop
2016-05-04 19:52:31 +02:00
kervala
d44b8adf7e Changed: Missing space
--HG--
branch : compatibility-develop
2016-05-04 19:30:20 +02:00
kervala
4a6eed78e9 Changed: Updated EULAs
--HG--
branch : compatibility-develop
2016-05-04 19:21:43 +02:00
kervala
ed522e4445 Fixed: Remove "Play Ryzom" button if using Steam
--HG--
branch : compatibility-develop
2016-05-04 10:10:42 +02:00
kervala
601cb4347a Merge with develop
--HG--
branch : compatibility-develop
2016-05-04 10:09:49 +02:00
kervala
77ae602e6a Changed: Better alignment
--HG--
branch : develop
2016-05-04 10:07:42 +02:00
kervala
99b87b1128 Changed: Update interfaces files with patchlet version
--HG--
branch : develop
2016-05-04 10:07:03 +02:00
kervala
32e22ab208 Changed: Simplify CMake end tags
--HG--
branch : develop
2016-05-04 10:06:29 +02:00
Nimetu
7a8c8d95d8 Merge with develop
--HG--
branch : compatibility-develop
2016-04-29 12:26:41 +03:00
Nimetu
7cd5204457 Changed: When writing to icfg or keys files, write to temp file and then rename
--HG--
branch : develop
2016-04-29 12:16:43 +03:00
Nimetu
edd16d9a82 Merge with develop
--HG--
branch : compatibility-develop
2016-04-23 18:49:52 +03:00
Nimetu
a1e8408be0 Fixed: Tooltip position related to parent window
--HG--
branch : develop
2016-04-23 18:49:36 +03:00
kervala
b8cec2dff1 Merge with develop
--HG--
branch : compatibility-develop
2016-04-22 10:56:31 +02:00
kervala
8553a9abfb Changed: Updated translations
--HG--
branch : compatibility-develop
2016-04-22 10:56:02 +02:00
Nimetu
a8a697c5dd Fixed: bad commit (issue #143)
--HG--
branch : develop
2016-04-19 22:55:34 +03:00
kervala
366d3a7583 Merge with develop
--HG--
branch : compatibility-develop
2016-04-18 13:40:46 +02:00
kervala
811a39aa1a Changed: Display certificate path
--HG--
branch : develop
2016-04-18 13:40:13 +02:00
kervala
631b7346c2 Fixed: Warnings with clang
--HG--
branch : develop
2016-04-18 13:40:02 +02:00
kervala
5b53bbbe3f Fixed: Ignore "certificate already in hash table" errors
--HG--
branch : develop
2016-04-18 13:39:48 +02:00
kervala
51e4d2a53c Merge with develop
--HG--
branch : compatibility-develop
2016-04-15 16:12:32 +02:00
kervala
7f5219dd16 Backed out changeset: 10cdacbad9a1
--HG--
branch : compatibility-develop
2016-04-15 16:12:12 +02:00
kervala
ccb69f8b27 Changed: Signed/unsigned comparison
--HG--
branch : develop
2016-04-15 16:11:37 +02:00
kervala
d1d6f6da41 Fixed: Creation of sn_0_* folders under OS X 10.7
--HG--
branch : develop
2016-04-15 16:11:14 +02:00
kervala
69e8116333 Changed: Temporary log for a OS X 10.7 bug...
--HG--
branch : compatibility-develop
2016-04-14 18:58:54 +02:00
kervala
7d9ff0ad72 Backed out changeset: 44cd3beacab6
--HG--
branch : compatibility-develop
2016-04-14 18:56:48 +02:00
kervala
c0f51c1c5b Changed: Temporary checks for a OS X 10.7 bug...
--HG--
branch : compatibility-develop
2016-04-14 18:19:19 +02:00
kervala
465609f942 Merge with develop
--HG--
branch : compatibility-develop
2016-04-13 20:37:30 +02:00
kervala
e82ada1026 Fixed: Link to freetype when using Qt
--HG--
branch : develop
2016-04-13 20:36:43 +02:00
kervala
54ac3bd1d5 Merge with develop
--HG--
branch : compatibility-develop
2016-04-12 19:55:05 +02:00
kervala
8090ddd12f Changed: Display parameters passed to batch in log
--HG--
branch : develop
2016-04-12 19:54:38 +02:00
kervala
32ce9a47cb Fixed: Compilation with Qt 5.6
--HG--
branch : develop
2016-04-12 19:54:05 +02:00
kervala
ba1486ea48 Merge with develop
--HG--
branch : feature-ryzom-installer
2016-04-12 16:53:28 +02:00
kervala
346a0297f6 Merge with develop
--HG--
branch : compatibility-develop
2016-04-12 15:43:47 +02:00
kervala
7ff21f975d Changed: Q_COMPILER_RVALUE_REFS hack useless with Qt 5.6
--HG--
branch : develop
2016-04-12 15:43:13 +02:00
kervala
6e05750fa3 Changed: Removed extraneous spaces at the end of lines
--HG--
branch : develop
2016-04-12 15:42:53 +02:00
kervala
28f66549a0 Fixed: CURLE_NOT_BUILT_IN undefined with some CURL versions
--HG--
branch : develop
2016-04-12 15:42:43 +02:00
kervala
6cd73cca03 Merge with develop
--HG--
branch : compatibility-develop
2016-04-09 13:02:40 +02:00
kervala
0a110eff4f Fixed: Wrong display of max resist levels
--HG--
branch : develop
2016-04-09 13:02:12 +02:00
kervala
ef5b22045c Changed: Version 3.0.0
--HG--
branch : compatibility-develop
2016-04-09 12:53:30 +02:00
kervala
5b93785499 Merge with develop
--HG--
branch : compatibility-develop
2016-04-06 09:36:35 +02:00
kervala
c5e57273a9 Changed: Give priority to login specified as argument
--HG--
branch : develop
2016-04-06 09:36:06 +02:00
kervala
2d8407157b Merge with develop
--HG--
branch : compatibility-develop
2016-04-06 09:34:34 +02:00
kervala
a002b20c7f Changed: Minor changes
--HG--
branch : develop
2016-04-06 09:29:37 +02:00
kervala
435573b305 Merge with develop
--HG--
branch : compatibility-develop
2016-04-02 19:34:20 +02:00