Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity
22698 commits 14 branches 1 tag 255 MiB
Commit graph

16598 commits

Author SHA1 Message Date
compil
e4cb143038 correction du merge 2017-11-03 23:07:35 +01:00
kervala
c1188a9e25 Fixed: Use our own defines for Windows editions to not rely on Windows 10 SDKs (not compatible with Windows XP) 
--HG--
branch : develop
 2017-10-25 21:35:12 +02:00
compil
675bcee591 enleve les fichier en trop 2017-10-20 21:43:50 +02:00
Nimetu
e8c5960882 Fixed: Image with tooltip did not expire. 
--HG--
branch : develop
 2017-10-17 14:44:28 +03:00
Nimetu
b98bd57659 Fixed: Comparing HSTS timestamp value 
--HG--
branch : develop
 2017-10-17 13:54:36 +03:00
Nimetu
81adb6c787 Fixed: Reading gif, off-by-one 
--HG--
branch : develop
 2017-10-16 19:38:35 +03: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
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
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
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
9a3a352142 Changed: Refactor curl certificate loading (issue #314) 
--HG--
branch : develop
 2017-07-04 00:34:11 +03: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
karu
0dfd5af8b3 Added: Load Certificates from Windows into OpenSSL for HTTPS (issue #314) 
--HG--
branch : develop
 2017-07-01 21:25:19 +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
627cec783c Merge with develop 
--HG--
branch : compatibility-develop
 2017-06-23 17:20:41 +02:00
kervala
d39f91d5d3 Fixed: Compilation under GCC 4.8.4 
--HG--
branch : develop
 2017-06-23 17:20:21 +02:00
kervala
a728f3b73e Merge with develop 
--HG--
branch : compatibility-develop
 2017-06-23 16:59:21 +02:00
kervala
1aa708c4de Fixed: Compilation under GCC 4.8.4 
--HG--
branch : develop
 2017-06-23 16:58:51 +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
kervala
50cfe0ff7c Changed: No need to use -DWITH_SYMBOLS=ON 
--HG--
branch : develop
 2017-06-20 12:28:22 +02:00
kervala
0d12fe5604 Fixed: Case of CMake Freetype module 
--HG--
branch : develop
 2017-06-20 12:27:05 +02:00
Riasan
abe569ce51 Changed: increased RYZOM_VERSION_MINOR for comming client Patch 
--HG--
branch : compatibility-develop
 2017-06-19 21:46:53 +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
Nimetu
e0ab70ca82 Fixed: Correctly expire object if file is removed from cache. 
--HG--
branch : develop
 2017-06-08 22:37:19 +03:00
Nimetu
f80c8e7d81 Added: Image mouseover effect 
--HG--
branch : develop
 2017-06-08 22:37:19 +03:00
Nimetu
c6a0b3ed9b Added: Show image tooltips even if not inside link 
--HG--
branch : develop
 2017-06-08 22:37:19 +03:00
Nimetu
087958eb6c Merge with develop 
--HG--
branch : compatibility-develop
 2017-06-01 14:06:04 +03:00
Nimetu
9394906182 Added: -ryzom-modulate-color style to enable modulation with global color 
--HG--
branch : develop
 2017-06-01 13:51:32 +03:00
kishan_grimout
5ea48c7599 fix crash in EGS when client asks to create an item with a sheet ID EGS doesn't know 
by avoiding access the null item pointer outside the if(null) scope.

--HG--
branch : develop
 2017-05-29 16:15:02 +02: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
Nimetu
fcbdbd17b7 Merge with develop 
--HG--
branch : compatibility-develop
 2017-05-14 01:27:20 +03:00
Nimetu
6c01ded28d Fixed: Redirect for image requests 
--HG--
branch : develop
 2017-05-14 01:03:49 +03:00
Riasan
28b4474ae4 Changed: Add a new gui window web_lua_action 
--HG--
branch : develop
 2017-05-12 19:29:10 +02:00
Nimetu
bb3b7e8277 Merge with develop 
--HG--
branch : compatibility-develop
 2017-05-04 10:35:43 +03:00
Nimetu
4f0717c58a Fixed: Image cookies 
--HG--
branch : develop
 2017-05-04 10:26:22 +03: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