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

16541 commits

Author SHA1 Message Date
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
Nimetu
753d9efccb Changed: Add humidity to ingame map 
--HG--
branch : develop
 2017-05-03 20:52:02 +03:00
Nimetu
e06f8b0976 Changed: Add minutes to ingame map 
--HG--
branch : develop
 2017-05-03 20:52:02 +03:00
Nimetu
5f8fc673d1 Merge with develop 
--HG--
branch : compatibility-develop
 2017-05-01 13:18:58 +03:00
kervala
5e27fe01f1 Changed: Updated translations (mostly UTF-16 -> UTF-8 conversion and use of UNIX EOL) 
--HG--
branch : compatibility-develop
 2017-04-28 13:05:25 +02:00
Nimetu
082704210b Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-26 08:55:00 +03:00
Nimetu
a47a481c7a Changed: Force max table width if requested. 
--HG--
branch : develop
 2017-04-26 08:53:02 +03:00
Nimetu
bff8ed488e Changed: CGroupParagraph does not handle text with line-breaks 
--HG--
branch : develop
 2017-04-25 12:18:53 +03:00
Nimetu
eb23a3b61c Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-25 00:23:09 +03:00
kervala
f739ed9e62 Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-22 18:19:33 +02:00
kervala
532a81f5cb Changed: Don't use CSString 
--HG--
branch : develop
 2017-04-22 18:16:27 +02:00
kervala
e94b06066f Fixed: LibXml must be initialized only once and xmlSetGenericErrorFunc set a global function (calling it for each instance of CIXml is a mistake) 
--HG--
branch : develop
 2017-04-22 18:15:43 +02:00
kervala
d0a199d22d Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-21 11:06:24 +02:00
kervala
21ca659c70 Changed: More information for osxcross 
--HG--
branch : develop
 2017-04-21 11:05:57 +02:00
kervala
4a848b0771 Changed: Centralize Foundation framework search 
--HG--
branch : develop
 2017-04-21 11:04:09 +02:00
kervala
8dca705f73 Fixed: Misc depends on Carbon under OS X 
--HG--
branch : develop
 2017-04-21 11:03:39 +02:00
Nimetu
108759952e Changed: Use http cache headers for image cache 
--HG--
branch : develop
 2017-04-20 21:19:51 +03:00
Nimetu
3d09dd2094 Changed: Save cookies from image request 
--HG--
branch : develop
 2017-04-20 21:19:01 +03:00
Nimetu
3d48368de6 Changed: Workaround for dancing trees under direct3d (issue #160) 
--HG--
branch : develop
 2017-04-23 20:01:35 +03:00
Nimetu
b78e8541ef Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-20 15:39:29 +03:00
Nimetu
72b37450b4 Changed: Use basic cache expire for web images 
--HG--
branch : develop
 2017-04-20 15:37:47 +03:00
kervala
90c1a21ba6 Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-20 13:53:59 +02:00
kervala
f23600cd30 Fixed: Compilation in 32 bits with GCC (patch provided by Alistair Leslie-Hughes, thanks a lot) 
--HG--
branch : develop
 2017-04-20 13:53:36 +02:00
kervala
0845ebb5bd Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-20 09:11:30 +02:00
Guillaume Dupuy
9586e39ca4 Use stdpch.h instead for include 
--HG--
branch : fix_compilation_windows
 2017-04-19 09:53:27 +02:00
Guillaume Dupuy
5b3eed58ec Fix server compilation under windows 
--HG--
branch : fix_compilation_windows
 2017-04-18 20:15:14 +02:00
Nimetu
8f5588e0ec Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-16 22:45:39 +03:00
Nimetu
20c216ecda Added: Basic queue for curl downloads 
--HG--
branch : develop
 2017-04-16 22:01:44 +03:00
Nimetu
9e7258d96e Fixed: Crash on webig debug log 
--HG--
branch : develop
 2017-04-16 21:56:12 +03:00
Guillaume Dupuy
4952eeb585 Add default constructor for CDepositState 
--HG--
branch : save_deposit_state_v2
 2017-04-12 22:15:23 +02:00
Guillaume Dupuy
bd3a27778e Save deposit state 
--HG--
branch : save_deposit_state_v2
 2017-04-12 20:02:11 +02:00
kervala
685bb9fb14 Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-11 17:29:56 +02:00
kervala
e5e2ccf45c Changed: Minor changes 
--HG--
branch : develop
 2017-04-11 17:29:09 +02:00
kervala
a829c31021 Added: Toolchain to compile OS X client under Linux using osxcross 
--HG--
branch : develop
 2017-04-11 17:28:32 +02:00
Guillaume Dupuy
a1fbc963a9 Avoid rollover in _RyzomDay for low values 
--HG--
branch : save_deposit_state_v2
 2017-04-10 01:56:44 +02:00
Nimetu
aa4f7ff697 Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-09 17:38:29 +03:00
Nimetu
dda809d345 Changed: Remove map landmark limit 
--HG--
branch : develop
 2017-04-07 12:43:33 +03:00
Guillaume Dupuy
55add3ad47 Fix 2 * 1 hands equip when you have a 2 hands equipped 
--HG--
branch : item_group
 2017-04-07 19:07:26 +02:00
Guillaume Dupuy
91932668c6 Use item create time / serial to identify them (migration code included) 
--HG--
branch : item_group
 2017-04-07 19:00:36 +02:00
Guillaume Dupuy
ccd8454d60 Add getter/setter for CREATE_TIME/SERIAL 
--HG--
branch : item_group
 2017-04-07 12:34:19 +02:00
Nuno Gonçalves
79e916f61d Changed: CREATE_TIME and SERIAL properties to items in EGS code 
--HG--
branch : compatibility-develop
 2017-04-07 02:49:12 +02:00
Nuno Gonçalves
ae6b3e38a0 Changed: rollback fixes of Strict aliasing warnings 
--HG--
branch : item_group
 2017-04-07 02:46:08 +02:00
Nuno Gonçalves
d33d0ffdc5 Changed: rollback fixes of Strict aliasing warnings 
--HG--
branch : compatibility-develop
 2017-04-07 02:46:08 +02:00
Nuno Gonçalves
de949a60a9 Added: CREATE_TIME and SERIAL properties to items in database.xml 
--HG--
branch : item_group
 2017-04-06 15:01:10 +02:00
Nuno Gonçalves
bc8ae1ed07 Added: CREATE_TIME and SERIAL properties to items in database.xml 
--HG--
branch : items_id
 2017-04-06 15:01:10 +02:00
Guillaume Dupuy
cf3cf69c39 Don't fake invalid action if there is nothing to fake (no item equiped) 
--HG--
branch : develop
 2017-04-03 01:43:26 +02:00
Guillaume Dupuy
ea7119bead Don't fake invalid action if there is nothing to fake (no item equiped) 
--HG--
branch : compatibility-develop
 2017-04-03 01:43:26 +02:00
Guillaume Dupuy
87b0a85fe6 Minor item group fixes : 
* Slot properly saved for right/left hand (couldn't equip 1H sword + dagger before)
* Ingame macro edition for item group
* Use the correct index (db index and not item list index) to autoEquip an item
* non ascii characters (accentued characters and stuff like that) are now correctly displayed in interface / commands output

--HG--
branch : develop
 2017-04-03 01:34:29 +02:00
Guillaume Dupuy
79636f393d Minor item group fixes : 
* Slot properly saved for right/left hand (couldn't equip 1H sword + dagger before)
* Ingame macro edition for item group
* Use the correct index (db index and not item list index) to autoEquip an item
* non ascii characters (accentued characters and stuff like that) are now correctly displayed in interface / commands output

--HG--
branch : compatibility-develop
 2017-04-03 01:34:29 +02:00
deed
90d9f6da6c Merge branch 'feature/merge_ryzomcore170417' into 'develop' 
Feature/merge ryzomcore170417

Closes #16, #18, #5, #3, #2, and #1

See merge request !30
 2017-04-01 18:43:34 +02:00
deed
cbf6e33067 Update ring_domain_00001.sql (error 4000) : crash SU 2017-04-01 16:29:10 +02:00
deed
bf0e7f65ec correction du merge sur la partie server 2017-03-31 21:04:36 +02:00
Nimetu
624a0c867b Merge with develop 
--HG--
branch : compatibility-develop
 2017-03-31 20:48:03 +03:00
Nimetu
b446df86f0 Changed: Remove dead code 
--HG--
branch : develop
 2017-03-31 20:43:43 +03:00
Nuno Gonçalves
37990da5f5 Changed: Fix crash on Scenographic Editor 
--HG--
branch : compatibility-develop
 2017-03-29 13:38:22 +02:00
Nimetu
2939beddba Merge with develop 
--HG--
branch : compatibility-develop
 2017-03-27 18:09:05 +03:00
Nimetu
0236b3e4a4 Fixed: compiling server (fixes #303) 
--HG--
branch : develop
 2017-03-27 18:08:43 +03:00
Nimetu
b54155f690 Merge with develop 
--HG--
branch : compatibility-develop
 2017-03-27 17:37:39 +03:00