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
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