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

7638 commits

Author SHA1 Message Date
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
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
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
Nimetu
655dee03b4 Merge with develop 
--HG--
branch : compatibility-develop
 2017-07-23 22:54:14 +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
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
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
Nimetu
087958eb6c Merge with develop 
--HG--
branch : compatibility-develop
 2017-06-01 14:06:04 +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
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
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
eb23a3b61c Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-25 00:23:09 +03:00
kervala
d0a199d22d Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-21 11:06:24 +02:00
kervala
4a848b0771 Changed: Centralize Foundation framework search 
--HG--
branch : develop
 2017-04-21 11:04:09 +02:00
Nimetu
108759952e Changed: Use http cache headers for image cache 
--HG--
branch : develop
 2017-04-20 21:19:51 +03: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
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
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
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