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
Riasan
1760d16dd2
Fix: Typo by forceCameraFirstPerson
...
--HG--
branch : compatibility-develop
2017-05-23 21:59:28 +02:00
Riasan
8b4d189c31
Changed: edit force_camera_fp command
...
--HG--
branch : develop
2017-05-23 19:38:26 +02:00
Riasan
2dbcb978a4
Changed: edit force_camera_fp command
...
--HG--
branch : compatibility-develop
2017-05-23 19:38:26 +02:00
Riasan
6fb823a9be
Merge with develop
...
--HG--
branch : compatibility-develop
2017-05-23 18:27:52 +02:00
Riasan
319cab93cd
Fixed: force_camera_fp command
...
--HG--
branch : develop
2017-05-23 18:24:49 +02:00
Riasan
18823c28fa
Changed: Add new lua command force_camera_fp to force camarea to first person view
...
--HG--
branch : develop
2017-05-22 19:50:47 +02:00
Guillaume Dupuy
7e1556520f
Fix an issue where item in groups could not be moved
...
Multiple group move would result in some item beeing incorrectly marked as equipped
--HG--
branch : fix_item_group
2017-05-21 19:32:08 +02:00
Riasan
9d01b4dfd8
Merge: with develop
...
--HG--
branch : compatibility-develop
2017-05-14 19:07:54 +02:00
Riasan
28b4474ae4
Changed: Add a new gui window web_lua_action
...
--HG--
branch : develop
2017-05-12 19:29:10 +02:00
Nimetu
b8a3405ad7
Merge with develop
...
--HG--
branch : compatibility-develop
2017-05-03 20:53:28 +03:00
Nimetu
3752884a91
Changed: Add next weather tooltip to ingame map
...
--HG--
branch : develop
2017-05-03 20:52:02 +03:00
Nimetu
753d9efccb
Changed: Add humidity to ingame map
...
--HG--
branch : develop
2017-05-03 20:52:02 +03:00