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

1467 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
8db7d75e7e Fixed: Uninitialized variables 
--HG--
branch : develop
 2016-12-19 15:43:38 +01:00
kervala
6978dc9bee Changed: Use std::string instead of const char* 
--HG--
branch : develop
 2016-12-19 13:33:24 +01:00
kervala
e186c7796b Changed: New DEV command to display a bubble with a long text 
--HG--
branch : develop
 2016-12-19 13:16:27 +01:00
kervala
31a540b35d Changed: Replace size() comparisons by empty() ones 
--HG--
branch : develop
 2016-12-19 13:15:25 +01:00
kervala
1e45f7bd45 Fixed: Truncated bubble texts 
--HG--
branch : develop
 2016-12-19 12:01:55 +01:00
kervala
8da20b30cc Changed: Merged changes from compatibility-develop that should also be in develop 
--HG--
branch : develop
 2016-12-18 20:39:16 +01:00
kervala
1ed5dcdda9 Changed: Use %u instead of %d for uint 
--HG--
branch : develop
 2016-12-18 14:00:20 +01:00
kervala
c4d8565185 Changed: Make 2 different upgd_nl.bat depending on compiler 
--HG--
branch : develop
 2016-12-18 13:58:20 +01:00
kervala
cbf2c744f0 Changed: Replace some const char* by std::string 
--HG--
branch : develop
 2016-12-18 13:45:07 +01:00
Nimetu
bc5bf44c18 Merge with develop 
--HG--
branch : experimental-ui-scaling
 2018-03-16 11:33:16 +02:00
Nimetu
4c605fcfe0 Backed out changeset: da24b99ddf3d 
--HG--
branch : experimental-ui-scaling
 2017-05-11 11:48:05 +03:00
kervala
3142a8d99f Changed: Support VC++ 2013 DLLs 
--HG--
branch : develop
 2016-12-15 21:11:27 +01:00
kervala
bd8cdb46e0 Fixed: Wrong indent 
--HG--
branch : develop
 2016-12-11 14:21:28 +01:00
kervala
e7d1710747 Chnged: Sign comparison warning 
--HG--
branch : develop
 2016-12-11 14:20:52 +01:00
kervala
c240c45514 Changed: Removed unused variables 
--HG--
branch : develop
 2016-12-11 14:20:31 +01:00
kervala
71b5a1734e Fixed: Compilation 
--HG--
branch : develop
 2016-12-11 12:42:06 +01:00
kervala
106c924f49 Fixed: Use std::vector instead of CUniquePtr for arrays 
--HG--
branch : develop
 2016-12-11 12:31:24 +01:00
kervala
faecd5b952 Changed: extern keyword useless there 
--HG--
branch : develop
 2016-12-10 19:02:06 +01:00
kervala
d37a1e032c Fixed: Don't call CCoTask::releaseInstance() because allocated on heap 
--HG--
branch : develop
 2016-12-10 19:01:34 +01:00
kervala
9a6b3c91b7 Changed: Minor changes 
--HG--
branch : develop
 2016-12-10 18:58:13 +01:00
kervala
934df9bd6f Changed: Already a std::string 
--HG--
branch : develop
 2016-12-10 13:09:16 +01:00
kervala
ab44d7e809 Changed: Use a CUniquePtr macro since std::unique_ptr doesn't exist on all (yet) supported platforms 
--HG--
branch : develop
 2016-12-10 12:05:29 +01:00
kervala
0f6ae5e239 Changed: Release all memory when leaving in login screen 
--HG--
branch : develop
 2016-12-09 16:15:18 +01:00
kervala
eabfcbf708 Fixed: Release CCurrentCoTask singleton 
--HG--
branch : develop
 2016-12-09 16:14:16 +01:00
kervala
995ea1e64f Changed: Unimplemented functions 
--HG--
branch : develop
 2016-12-09 16:04:50 +01:00
kervala
e2b74b77c6 Changed: Memory leaks detection 
--HG--
branch : develop
 2016-12-09 13:51:09 +01:00
kervala
e5362bdae7 Changed: Warning 
--HG--
branch : develop
 2016-12-06 20:27:05 +01:00
kervala
9022dfafde Fixed: Compilation with clang 
--HG--
branch : develop
 2016-12-06 20:26:48 +01:00
kervala
9bb46d2ae8 Fixed: Compilation with clang 
--HG--
branch : develop
 2016-12-05 19:39:19 +01:00
kervala
c71f712d11 Fixed: Release libxml2 structures before exit 
--HG--
branch : develop
 2016-12-04 19:17:21 +01:00
kervala
00048f0d6d Changed: Don't use std::auto_ptr anymore (use std::unique_ptr instead) 
--HG--
branch : develop
 2016-12-04 18:38:16 +01:00
kervala
b4de1326d1 Fixed: Fix memory leaks about logs, displayers, etc... 
--HG--
branch : develop
 2016-12-04 17:23:28 +01:00
kervala
b8658f65f1 Changed: Don't need to use const char* 
--HG--
branch : develop
 2016-12-04 17:22:49 +01:00
kervala
35f1fa0609 Changed: Renamed thread to Thread and assign InstallThread and DownloadThread 
--HG--
branch : develop
 2016-12-04 17:19:37 +01:00
kervala
0449bee4a8 Changed: Replace 0 by NULL 
--HG--
branch : develop
 2016-12-04 17:17:25 +01:00
kervala
491b6a2b59 Fixed: Delete CViewRenderer instance (fix a memory leak) 
--HG--
branch : develop
 2016-12-04 17:17:06 +01:00
kervala
17847efa51 Fixed: Delete created thread (fix a memory leak) 
--HG--
branch : develop
 2016-12-04 17:15:43 +01:00
kervala
b6662b9e0b Changed: Memory leaks detection 
--HG--
branch : develop
 2016-12-04 17:00:20 +01:00
kervala
e941cff0ff Fixed: Strict aliasing warnings 
--HG--
branch : develop
 2016-11-29 20:32:33 +01:00
Nimetu
3b0c7e896c Changed: minor change to ui 
--HG--
branch : develop
 2016-11-26 15:24:05 +02:00
Nimetu
cf338681fa Changed: Add free-view mouse tablet mode option 
--HG--
branch : develop
 2016-11-26 14:55:38 +02:00
kervala
88bfa8ec70 Fixed: Warnings 
--HG--
branch : develop
 2016-11-21 13:22:05 +01:00
kervala
f605c5faa5 Changed: Replace all "" by empty(), clear(), Empty(), etc... 
--HG--
branch : develop
 2016-11-20 14:49:13 +01:00
kervala
481bbae8ee Changed: Use wide versions of Win32 API 
--HG--
branch : develop
 2016-11-19 21:12:04 +01:00
kervala
9941fcf82b Fixed: Typos detected by Lintian 
--HG--
branch : develop
 2016-11-19 19:11:12 +01:00
kervala
f05cab8579 Changed: liblzma 16.04 
--HG--
branch : develop
 2016-11-15 11:32:20 +01:00
kervala
23d1d0f458 Fixed: Spaces in paths for patch under Linux and OS X 
--HG--
branch : develop
 2016-10-31 18:58:49 +01:00
kervala
b25298f0f8 Changed: std::string already empty 
--HG--
branch : develop
 2016-10-30 16:00:04 +01:00
kervala
16df8b8c1d Changed: Use empty() instead of comparison with "" 
--HG--
branch : develop
 2016-10-30 15:59:20 +01:00
kervala
482b292a03 Changed: Minor changes 
--HG--
branch : develop
 2016-10-27 16:48:07 +02:00
kervala
6d2c530210 Changed: Typo 
--HG--
branch : develop
 2016-10-27 10:55:20 +02:00
kervala
19e8ee1d05 Changed: Simplified all ENDIF and ELSE 
--HG--
branch : develop
 2016-10-27 10:54:09 +02:00
kervala
f2f2e94e51 Fixed: Crash when calling runAH in Lua scripts too soon 
--HG--
branch : develop
 2016-10-26 14:29:49 +02:00
kervala
a0075414c0 Changed: Use empty() to check if a string is empty 
--HG--
branch : develop
 2016-10-25 15:52:14 +02:00
kervala
7f4fa540e1 Changed: Display a warning when SetWindowTextW fails 
--HG--
branch : develop
 2016-10-25 11:49:46 +02:00
kervala
e957923ed2 Fixed: Default action tooltip text position 
--HG--
branch : develop
 2016-10-23 16:24:18 +02:00
kervala
eedebb6833 Changed: Removed trailing spaces at EOL 
--HG--
branch : develop
 2016-10-23 16:16:48 +02:00
kervala
8db56f5671 Changed: Name edit box better aligned 
--HG--
branch : develop
 2016-10-22 19:38:13 +02:00
kervala
d52cede669 Fixed: Wrong height in action edit 
--HG--
branch : develop
 2016-10-22 19:38:05 +02:00
kervala
c2d0a3690f Changed: Name edit box better aligned 
--HG--
branch : develop
 2016-10-22 19:24:20 +02:00
kervala
de3d3971b7 Changed: Removed trailing spaces at EOL 
--HG--
branch : develop
 2016-10-22 18:50:43 +02:00
kervala
f22fc6cea7 Changed: Support RYZOM_BUILD CMake option to force Bundle version 
--HG--
branch : develop
 2016-10-22 16:48:15 +02:00
kervala
76f036e802 Changed: OS X icon slightly changed 
--HG--
branch : develop
 2016-10-22 16:47:43 +02:00
kervala
39280d10b8 Changed: MACOSX_BUNDLE_BUNDLE_VERSION must a short version 
--HG--
branch : develop
 2016-10-21 20:00:23 +02:00
kervala
6920f0d5ba Fixed: Use real Ryzom version instead of 1.0 
--HG--
branch : develop
 2016-10-21 19:03:40 +02:00
kervala
084bc2bba9 Changed: Allow to enable Sandbox under OS X 
--HG--
branch : develop
 2016-10-20 13:53:23 +02:00
kervala
5539873337 Fixed: Use 3 numbers version (without revision) for MACOSX_BUNDLE_SHORT_VERSION_STRING 
--HG--
branch : develop
 2016-10-19 17:07:31 +02:00
kervala
1cbbd9083f Changed: Use best dictionary size (128MB) to compress files and other parameters auto 
--HG--
branch : develop
 2016-10-19 13:31:45 +02:00
kervala
142155d8c8 Fixed: Use & to not wait until client exits in bash script 
--HG--
branch : develop
 2016-10-19 10:49:20 +02:00
kervala
4f996024d9 Fixed: Catch ESocket exceptions when disconnecting and log it 
--HG--
branch : develop
 2016-10-19 10:48:32 +02:00
kervala
0080dfc44e Changed: Use exec command under OS X to relaunch client 
--HG--
branch : develop
 2016-10-18 10:32:45 +02:00
kervala
f24346486f Fixed: Use parent directories 
--HG--
branch : develop
 2016-10-17 16:51:01 +02:00
kervala
25824bf8bf Fixed: Check exact filename with pgrep 
--HG--
branch : develop
 2016-10-17 13:29:37 +02:00
kervala
3a2488a126 Fixed: Escape path (it can contains spaces) 
--HG--
branch : develop
 2016-10-17 13:08:44 +02:00
kervala
c8891166ff Changed: Disable FXAA checkbox if bloom not supported 
--HG--
branch : develop
 2016-10-16 17:39:07 +02:00
kervala
8e1123b9fb Changed: Upgrade scripts 
--HG--
branch : develop
 2016-10-16 17:38:37 +02:00
kervala
85c2535a1f Fixed: Deadlock while calling CoUninitialize() 
--HG--
branch : develop
 2016-10-15 17:11:53 +02:00
kervala
7a0a35586a Changed: Copy Ryzom Installer in parent directory if present 
--HG--
branch : develop
 2016-10-15 10:27:34 +02:00
kervala
a70b4d2613 Fixed: Also copy DLLs compatible with Ryzom Installer 
--HG--
branch : develop
 2016-10-15 10:22:50 +02:00
kervala
4d6842495d Changed: Use a 128x128 icon for Linux 
--HG--
branch : develop
 2016-10-12 15:12:26 +02:00
kervala
a8d741882b Changed: Also set executable flag for ryzom_installer_qt 
--HG--
branch : develop
 2016-10-12 15:12:09 +02:00
kervala
d3bf97e00f Fixed: NL_OS_WIN32 is never defined 
--HG--
branch : develop
 2016-10-08 18:28:54 +02:00
kervala
bf96615bc4 Changed: Minor changes 
--HG--
branch : develop
 2016-09-28 23:42:33 +02:00
kervala
e7b23c958a Fixed: Connexion -> Connection typo 
--HG--
branch : develop
 2016-09-28 23:42:01 +02:00