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

3127 commits

Author SHA1 Message Date
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
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
5797b2d64e Fixed: Resize collision when scale object/npc (using vpb) 
--HG--
branch : develop
 2017-08-22 23:22:06 +02:00
Nimetu
9390f9cca5 Changed: Sort tribe fame list 
--HG--
branch : develop
 2017-08-15 11:54:24 +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
524a3d6645 Fixed: Description of "delete profile" action (all files are really deleted) 
--HG--
branch : develop
 2017-07-13 22:53:20 +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
c435f77201 Added: Quality range filter to inventory 
--HG--
branch : develop
 2017-07-12 23:45:56 +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
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
de8a6ba1b5 Fixed: Warnings with clang 
--HG--
branch : develop
 2017-06-20 12:28:46 +02:00
Nimetu
e956f69691 Changed: Enable fps view on game config window 
--HG--
branch : develop
 2017-06-08 22:37:19 +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
8b4d189c31 Changed: edit force_camera_fp command 
--HG--
branch : develop
 2017-05-23 19:38:26 +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
28b4474ae4 Changed: Add a new gui window web_lua_action 
--HG--
branch : develop
 2017-05-12 19:29:10 +02: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
Guillaume Dupuy
431e2349d5 Fix build with macOS clang 
--HG--
branch : fix_compilation_mac
 2017-04-28 23:58:16 +02:00
Guillaume Dupuy
d5080e07cb Fix compilation on mac (thanks Siela for the fixes !) 
--HG--
branch : fix_compilation_mac
 2017-04-28 23:56:06 +02:00
Nimetu
108759952e Changed: Use http cache headers for image cache 
--HG--
branch : develop
 2017-04-20 21:19:51 +03:00
kervala
4a848b0771 Changed: Centralize Foundation framework search 
--HG--
branch : develop
 2017-04-21 11:04:09 +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
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
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
ae6b3e38a0 Changed: rollback fixes of Strict aliasing warnings 
--HG--
branch : item_group
 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
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
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
Nimetu
b446df86f0 Changed: Remove dead code 
--HG--
branch : develop
 2017-03-31 20:43:43 +03:00
Nimetu
0236b3e4a4 Fixed: compiling server (fixes #303) 
--HG--
branch : develop
 2017-03-27 18:08:43 +03:00
Nimetu
4c6f79ed22 Fixed: missing stdpch.h (fixes #303) 
--HG--
branch : develop
 2017-03-27 17:35:20 +03:00
Nimetu
2eab033283 Fixed: Music player loading non-existing files into playlist. 
--HG--
branch : develop
 2017-03-25 15:00:43 +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
Guillaume Dupuy
6e62b186d0 Fix style 
--HG--
branch : item_group
 2017-03-21 16:25:50 +01:00
Guillaume Dupuy
1122a4e806 Add translations 
--HG--
branch : item_group
 2017-03-20 21:50:02 +01:00
Guillaume Dupuy
3d53789e0f Remember the slot (right/left hand) for item that can we weared in two similar slots 
--HG--
branch : item_group
 2017-03-20 20:38:51 +01:00
Guillaume Dupuy
db3271289d Avoid crashing if interface file is not at the good version 
--HG--
branch : item_group
 2017-03-20 17:43:50 +01:00
Guillaume Dupuy
332a2b5a74 More verbose message, bad command usage now print a synopsis 
--HG--
branch : item_group
 2017-03-20 17:16:19 +01:00
Guillaume Dupuy
65ae5b4ad1 Add an option to remember item to remove when creating a group 
--HG--
branch : item_group
 2017-03-20 16:31:37 +01:00
Nimetu
c247b43a9b Changed: Fix ingame keys list 
--HG--
branch : develop
 2017-03-18 14:55:15 +02:00
Guillaume Dupuy
f222d1736a Fix uninit/release 
--HG--
branch : item_group
 2017-03-18 01:45:40 +01:00
Guillaume Dupuy
6af0fd168c Use SLOT_EQUIPEMENT instead of SLOTTYPE 
--HG--
branch : item_group
 2017-03-16 13:36:56 +01:00
Guillaume Dupuy
08306e6a69 Minor fixes 
--HG--
branch : item_group
 2017-03-16 12:47:36 +01:00
Guillaume Dupuy
1d36ea9acc Minor interface fixes 
--HG--
branch : item_group
 2017-03-16 12:24:20 +01:00
Guillaume Dupuy
83dea32f41 Add support for removing items before equipping an item group 
--HG--
branch : item_group
 2017-03-16 12:19:29 +01:00
Guillaume Dupuy
a6f541aad2 Cleanup 
--HG--
branch : item_group
 2017-03-16 11:36:24 +01:00
Guillaume Dupuy
27b7131e22 Fix compilation under windows 
--HG--
branch : item_group
 2017-03-16 00:59:53 +01:00
Guillaume Dupuy
11eeafc12d Support unlimited number of items group (and in a clean way) 
--HG--
branch : item_group
 2017-03-16 00:58:32 +01:00
Nimetu
be591b2107 Changed: replace c++11 code 
--HG--
branch : develop
 2017-03-15 17:43:49 +02:00
Guillaume Dupuy
c2049935a4 Support for an item beeing in multiple groups 
--HG--
branch : item_group
 2017-03-11 19:25:45 +01:00
Guillaume Dupuy
5dcc7932ff Forgot a return 
--HG--
branch : item_group
 2017-03-11 01:06:39 +01:00
Guillaume Dupuy
d4b2e64c21 Fix compilation 
--HG--
branch : item_group
 2017-03-10 11:51:36 +01:00
Guillaume Dupuy
8880c37fb2 Remove C++11 features 
--HG--
branch : item_group
 2017-03-09 21:31:26 +01:00
Guillaume Dupuy
54ff3a88d5 Fix a crash 
--HG--
branch : item_group
 2017-03-09 20:52:02 +01:00
Guillaume Dupuy
6c9bbb8c0b Allow support for room / guild movement 
--HG--
branch : item_group
 2017-03-09 18:54:12 +01:00
Guillaume Dupuy
ecf2ac530c Remove usePrice from xml, it's now used if minPrice or maxPrice are not default value 
--HG--
branch : item_group
 2017-03-09 17:58:07 +01:00
Guillaume Dupuy
9fffec8ef1 Added interface for item groups 
--HG--
branch : item_group
 2017-03-09 17:47:25 +01:00
Guillaume Dupuy
fdbc261a7e First working prototype of itemgroups 
--HG--
branch : item_group
 2017-03-08 17:30:09 +01:00
Nimetu
cea9549cd8 Added: Clickable urls in chat text (issue 282) 
--HG--
branch : develop
 2017-01-21 13:29:34 +02:00
Nimetu
0f5ec6c0b4 Fixed: Windowed resolution resetting when closing from login/outgame views. 
--HG--
branch : develop
 2017-01-12 13:29:47 +02:00
Nimetu
109725fc9e Changed: Move dyn channel commands (/0, /1 ..) to commands.xml 
--HG--
branch : develop
 2017-01-11 15:12:06 +02:00
kervala
065d1dc84c Changed: Minor change 
--HG--
branch : develop
 2017-01-01 22:40:22 +01:00
kervala
1bb75d8956 Fixed: Bug with C++11 under Linux with clang (an iterator is invalidated after an erase) 
--HG--
branch : develop
 2016-12-31 15:16:09 +01:00
kervala
66fcc5081a Changed: Temporary comment Lua functions registration (crash when reselect characters) 
--HG--
branch : develop
 2016-12-24 14:02:33 +01:00
kervala
3265749bfe Changed: Don't need to release twice CEditor 
--HG--
branch : develop
 2016-12-24 14:01:51 +01:00
kervala
48734b6d2f Changed: Minor change 
--HG--
branch : develop
 2016-12-24 14:01:35 +01:00
kervala
d8ffb10df8 Changed: Use a global C64BitsParts union to avoid strict aliasing warnings 
--HG--
branch : develop
 2016-12-24 14:01:21 +01:00
kervala
43195f71a5 Fixed: Servers compilation under Linux 
--HG--
branch : develop
 2016-12-21 15:18:26 +01:00
kervala
1b1e08b7f6 Changed: Warnings 
--HG--
branch : develop
 2016-12-19 17:47:15 +01:00
kervala
6570b26297 Fixed: Virtual methods with different parameters 
--HG--
branch : develop
 2016-12-19 17:46:07 +01:00
kervala
07606ffd77 Fixed: done() is a method of QDialog 
--HG--
branch : develop
 2016-12-19 17:43:47 +01:00
kervala
4e0a19205c Changed: Check return value of fwrite 
--HG--
branch : develop
 2016-12-19 15:50:54 +01:00
kervala
7aabc217b0 Fixed: Compilation under Linux 
--HG--
branch : develop
 2016-12-19 15:50:21 +01:00
kervala
db9fbd2746 Fixed: Strict aliasing warnings 
--HG--
branch : develop
 2016-12-19 15:49:50 +01:00
kervala
408dbb64f6 Fixed: Uninitialized variable 
--HG--
branch : develop
 2016-12-19 15:44:08 +01:00
kervala
8db7d75e7e Fixed: Uninitialized variables 
--HG--
branch : develop
 2016-12-19 15:43:38 +01:00
kervala
89347cd6a0 Changed: Unicode 
--HG--
branch : develop
 2016-12-19 13:33:44 +01:00
kervala
6978dc9bee Changed: Use std::string instead of const char* 
--HG--
branch : develop
 2016-12-19 13:33:24 +01:00