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

3036 commits

Author SHA1 Message Date
Nimetu
a2707f93f1 Fixed: Wrong resolution saved to config when window receives wm_destroy signal 
--HG--
branch : develop
 2018-07-26 20:24:17 +03:00
Nimetu
1c142ef968 Fixed: Font size calculations for scaled text. 
--HG--
branch : experimental-ui-scaling
 2018-06-22 19:44:12 +03:00
Nimetu
375cedb09e Merge with develop 
--HG--
branch : experimental-ui-scaling
 2018-06-21 22:21:14 +03:00
Nimetu
f80e36ebd6 Changed: Workaround for huge target reticle when max polygon is set to low 
--HG--
branch : develop
 2018-06-07 12:59:58 +03:00
ulukyn
6499b1b053 Added: getDbProp64 to get 64b values from db with lua 
--HG--
branch : develop
 2018-06-06 14:15:42 +02:00
Nimetu
a62c8eefd4 Fixed: Filtered user landmarks became visible when landmark was edited/removed. 
--HG--
branch : develop
 2018-05-13 17:00:45 +03:00
Nimetu
5823e98356 Added: Duplicating macro or macro commands 
--HG--
branch : develop
 2018-05-11 14:42:49 +03:00
Nimetu
5b4759df72 Changed: Show map search results in a list 
--HG--
branch : develop
 2018-05-10 15:30:01 +03:00
Nimetu
98ae75fe57 Added: curl ca bundle option to client cfg 
--HG--
branch : develop
 2018-05-07 21:37:40 +03:00
root
cf1db62ab8 correction pour la compilation sous windows à cause des merges RC mal fait 2018-03-25 12:04:43 +02:00
deed
1c898ea0b2 Merge branch 'ryzomcore' into ryzomcore+develop 
# Conflicts:
#	.hgtags
#	.travis.yml
#	code/CMakeModules/FindMSVC.cmake
#	code/ryzom/client/src/steam_client.cpp
 2018-03-24 18:18:50 +01:00
Nimetu
2e7d025109 Changed: Use user requested resolution for both char select and ingame 
--HG--
branch : develop
 2018-03-17 13:59:42 +02:00
Nimetu
1dc3d51ce2 Added: save_ui action handler to save keys and icfg files 
--HG--
branch : develop
 2018-10-11 15:24:03 +03:00
Nimetu
d7ee450215 Changed: Use user requested resolution for both char select and ingame 
--HG--
branch : experimental-ui-scaling
 2018-03-17 13:59:42 +02:00
nimetu@gmail.com
0af4ea6687 Added: Allow to set UI scale with /setuiscale command 
--HG--
branch : experimental-ui-scaling
 2018-03-16 15:01:22 +02:00
Nimetu
4851d1602d Changed: Make number of virtual desktops dynamic 
--HG--
branch : develop
 2018-03-15 21:58:49 +02:00
Nimetu
23fa3d7460 Fixed: Possible crash from null pointer 
--HG--
branch : develop
 2018-03-13 20:41:49 +02:00
kervala
613d4ddc34 Fixed: Warnings, throw(NLMISC::EStream) deprecated in C++11 and removed in C++17, and class keyword is useless 
--HG--
branch : develop
 2018-02-02 21:04:30 +01:00
Nimetu
b039f3cd61 Added: /loot command and keyboard shortcut 
--HG--
branch : develop
 2017-12-04 18:45:21 +02:00
kervala
e2dda1585d Changed: Minor changes 
--HG--
branch : develop
 2017-12-02 16:46:44 +01:00
kervala
7b2b0c9310 Fixed: Encode password in hexadecimal on command-line when patching to avoid invalid characters 
--HG--
branch : develop
 2017-12-02 16:46:17 +01:00
kervala
d799dde5ad Added: Steam client support 
--HG--
branch : develop
 2017-12-02 16:45:12 +01:00
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
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
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
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
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
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
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
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
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
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
b54155f690 Merge with develop 
--HG--
branch : compatibility-develop
 2017-03-27 17:37:39 +03:00
Nimetu
4c6f79ed22 Fixed: missing stdpch.h (fixes #303) 
--HG--
branch : develop
 2017-03-27 17:35:20 +03:00
Nimetu
946b509700 Merge with develop 
--HG--
branch : compatibility-develop
 2017-03-25 15:01:22 +02:00
Nimetu
2eab033283 Fixed: Music player loading non-existing files into playlist. 
--HG--
branch : develop
 2017-03-25 15:00:43 +02:00
Nimetu
71e4004dd0 Merge with develop 
--HG--
branch : compatibility-develop
 2017-03-23 18:30:08 +02:00
Meelis Mägi
86adf11579 Merged in Glorf/ryzomcore/item_group (pull request #144) 
Item group support

--HG--
branch : develop
 2017-03-23 16:11:15 +00:00
Guillaume Dupuy
850613ac7e Don't use a separate thread to fake invalid actions 
--HG--
branch : item_group
 2017-03-23 16:06:47 +01:00
deed
c9145249ef correction du merge (interface) 2017-03-23 15:08:39 +01:00
deed
6a92d08499 correction du merge 2017-03-21 21:20:08 +01:00