Commit graph

7597 commits

Author SHA1 Message Date
c7be58f514 replace LF for bug shard 2018-04-21 15:43:22 +02: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
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
cecfbb9df9 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:13:07 +01: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
9e9b005b3b Changed: Centralize hexadecimal conversions
--HG--
branch : develop
2017-12-02 16:44:38 +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
kervala
4995760334 Fixed: Don't compile ryzom_servershare and ryzom_aishare if not using Ryzom server or tools
--HG--
branch : develop
2017-10-14 18:31:19 +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
Nimetu
655dee03b4 Merge with develop
--HG--
branch : compatibility-develop
2017-07-23 22:54:14 +03:00
Cédric OCHS
36f5ee7f83 Merged in Glorf/ryzomcore/fix_freespace_check (pull request #156)
Fix ignoreFreeDiskSpaceChecks() usage

Approved-by: Cédric OCHS <kervala@gmail.com>

--HG--
branch : develop
2017-07-15 10:26:50 +00:00
Guillaume Dupuy
d163cde51e Fix ignoreFreeDiskSpaceChecks() usage
Now actually ignore free space, instead of creating an error and refusing to go further everytime

--HG--
branch : fix_freespace_check
2017-07-15 12:14:33 +02:00
kervala
b349fe3c77 Merge with develop
--HG--
branch : compatibility-develop
2017-07-13 22:53:42 +02:00
kervala
524a3d6645 Fixed: Description of "delete profile" action (all files are really deleted)
--HG--
branch : develop
2017-07-13 22:53:20 +02: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