Commit graph

22947 commits

Author SHA1 Message Date
kervala
8c22770876 Fixed: Typo
--HG--
branch : develop
2017-10-15 15:01:09 +02:00
compil
33f3f13dac merge de ryzomcore essai 1 2017-10-14 19:30:19 +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
kervala
68ccee6831 Changed: Also disable Ryzom tools for Travis
--HG--
branch : develop
2017-10-14 16:55:13 +02:00
kervala
cade235fe5 Fixed: Disable servers compilation with Travis because it's taking too much time
--HG--
branch : develop
2017-10-14 12:04:01 +02:00
kervala
ef42c45da3 Fixed: Compilation
--HG--
branch : develop
2017-10-03 14:33:33 +02:00
kervala
c9aa7142bc Fixed: New versions of AssImp depend on IrrXML
--HG--
branch : develop
2017-10-03 14:33:25 +02:00
kervala
450181f244 Fixed: Always link to Crypt32.lib for OpenSSL under Windows
--HG--
branch : develop
2017-10-03 14:32:13 +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
Nimetu
ecc7cac376 Merge with develop
--HG--
branch : compatibility-develop
2017-10-02 13:54:08 +03:00
Nimetu
6b7617f8e1 Changed: Expand/collapse all tree node childs with right click
--HG--
branch : develop
2017-10-02 13:52:44 +03:00
kervala
1088b2a493 Added tag ryzom-patch-3.2.1 for changeset 18403bb9485d
--HG--
branch : compatibility-develop
2017-10-01 15:58:52 +02: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
bd901c5a8c Fixed: Commented too verbose messages
--HG--
branch : develop
2017-10-01 15:25:30 +02:00
kervala
90359122d7 Changed: Other changes in CMake files
--HG--
branch : develop
2017-10-01 15:25:00 +02:00
kervala
92bc8661df Fixed: Support for Visual C++ 2017 and latest Windows 10 Kits
--HG--
branch : develop
2017-10-01 15:19:24 +02:00
kervala
aa6d1a7bbb Changed: Updated Android ans iOS toolchains
--HG--
branch : develop
2017-10-01 15:18:15 +02:00
kervala
30c6a7a935 Changed: CMake policy CMP0005 will be removed soon so don't use it
--HG--
branch : develop
2017-10-01 15:17:41 +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
Nimetu
05e1346b5e Merge with develop
--HG--
branch : compatibility-develop
2017-09-03 00:02:32 +03:00
Nimetu
64c90c4fdc Fixed: Null pointer error
--HG--
branch : develop
2017-09-02 23:53:06 +03:00
Nimetu
c7e0b56a40 Merge with develop
--HG--
branch : compatibility-develop
2017-09-02 23:14:34 +03:00
Nimetu
9dce8df546 Fixed: Image tooltip not showing correctly
--HG--
branch : develop
2017-09-02 23:13:47 +03:00
Nimetu
d6dcf7415a Fixed: Multiline text inside lists
--HG--
branch : develop
2017-09-02 23:13:04 +03:00
Nimetu
c22b361dc2 Changed: Remove NeL tests temp files
--HG--
branch : develop
2017-08-31 12:36:06 +03:00
Nimetu
afd4e964e3 Fixed: Path to NeL test files
--HG--
branch : develop
2017-08-31 11:53:44 +03: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
Nimetu
d6faf81c81 Changed: Ignore cache status when local file has been deleted
--HG--
branch : develop
2017-07-23 22:50:14 +03:00
Nimetu
8300821d0e Changed: Minor fix for mouseover image
--HG--
branch : develop
2017-07-23 22:40:07 +03:00
Nimetu
e35195252f Changed: Fix issue with table background images not displaying
--HG--
branch : develop
2017-07-23 21:37:42 +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
Cédric OCHS
1fec1425da Merged in Glorf/ryzomcore/fix_freespace_check (pull request #155)
Fix issue #302 - incorrect freespace on 32 bits system

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

--HG--
branch : develop
2017-07-14 12:53:32 +00:00
Guillaume Dupuy
9172d14dd3 Fix issue #302 - incorrect freespace on 32 bits system
--HG--
branch : fix_freespace_check
2017-07-14 14:49:27 +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
36bd31c809 Changed: Update Ryzom version to 3.2.1
--HG--
branch : compatibility-develop
2017-07-13 20:59:42 +02:00