aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-09-19 19:20:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
7781 commits 14 branches 0 tags 258 MiB
Commit graph

7503 commits

Author SHA1 Message Date
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
Guillaume Dupuy
6e62b186d0 Fix style 
--HG--
branch : item_group
 2017-03-21 16:25:50 +01:00
Guillaume Dupuy
67877cb846 Forgot UI translation 
--HG--
branch : compatibility-develop
 2017-03-21 09:15:47 +01:00
Guillaume Dupuy
b0ad916c37 Added translations for item groups 
--HG--
branch : compatibility-develop
 2017-03-20 22:34:00 +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
f52abb2933 Merge with develop 
--HG--
branch : compatibility-develop
 2017-03-18 14:55:33 +02: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
327686c1ce Merge with develop 
--HG--
branch : compatibility-develop
 2017-03-15 17:45:19 +02:00
Nimetu
be591b2107 Changed: replace c++11 code 
--HG--
branch : develop
 2017-03-15 17:43:49 +02:00
Nimetu
34573de13b Added: translations 
--HG--
branch : compatibility-develop
 2017-03-15 00:12:59 +02:00
Nimetu
88c81e8895 Merge with develop 
--HG--
branch : compatibility-develop
 2017-03-14 23:42:52 +02:00
Nuno Gonçalves
70823d15a9 Changed: comment nldebug on driver_openg_texture to prevent Gigabits of logs 
--HG--
branch : compatibility-develop
 2017-03-14 18:11:55 +01: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
5c56eb400e Changed: Workaround for white/black textures on Intel GPU (issue #310) 
--HG--
branch : develop
 2017-03-01 20:36:25 +02:00
Cédric OCHS
9bc910d102 Merged in Glorf/ryzomcore/fix_compilation_mac (pull request #152) 
Fix compilation (tools + server) on OSX

Approved-by: Cédric OCHS <kervala@gmail.com>

--HG--
branch : develop
 2017-04-29 09:09:09 +00: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
kervala
076a50e3fb Changed: Use modulateFromColorRGBOnly to colorize a bitmap in textures_tool 
--HG--
branch : develop
 2017-02-27 10:57:24 +01:00
Nimetu
cea9549cd8 Added: Clickable urls in chat text (issue 282) 
--HG--
branch : develop
 2017-01-21 13:29:34 +02:00
Nimetu
5b0b92710a Added: copy_to_clipboard action handler 
--HG--
branch : develop
 2017-01-21 13:29:24 +02:00
Nimetu
9d0a2556d0 Changed: Refactor CViewLink to be able to use custom action handlers 
--HG--
branch : develop
 2017-01-21 13:29:20 +02:00
Nimetu
d7a797bf4a Changed: Ensure that menu resizes from child elements 
--HG--
branch : develop
 2017-01-21 13:29:15 +02:00
Nimetu
472ccb758a Fixed: Wrong size for list element 
--HG--
branch : develop
 2017-01-21 13:29:12 +02:00
Nimetu
524f80c8a0 Fixed: Crash when trying to navigate to non-existing #anchor 
--HG--
branch : develop
 2017-01-21 13:29:05 +02:00
Nimetu
fa8e1d95db Changed: Improve cURL error message for failed requests 
--HG--
branch : develop
 2017-01-21 13:28:48 +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
ulukyn@gmail.com
c43627159c Fixed: Scenographic Editor lua issues 
--HG--
branch : compatibility-develop
 2017-01-11 16:27:25 +01:00
Nimetu
109725fc9e Changed: Move dyn channel commands (/0, /1 ..) to commands.xml 
--HG--
branch : develop
 2017-01-11 15:12:06 +02:00
Nimetu
ab5aa5b2c4 Merge with develop 
--HG--
branch : compatibility-develop
 2017-01-10 15:09:55 +02:00
Nimetu
3e95a8b89f Fixed: Client crash on bad PNG file from webig download. 
--HG--
branch : develop
 2017-01-10 14:07:11 +02:00
Nimetu
a7ca4ec3b9 Changed: Minor change 
--HG--
branch : develop
 2017-01-10 14:07:06 +02:00
ulukyn@gmail.com
8dce467417 Fixed: Scenographic Editor crash the client (revert bad commit of actions.h) 
--HG--
branch : compatibility-develop
 2017-01-10 12:35:53 +01:00
ulukyn@gmail.com
56c4674d10 Fixed: Scenographic Editor crash the client 
--HG--
branch : compatibility-develop
 2017-01-10 12:32:44 +01:00
kervala
47ac7ddd94 Merge with develop 
--HG--
branch : compatibility-develop
 2017-01-04 14:25:23 +01:00
kervala
9541e78219 Changed: Exit if line is truncated 
--HG--
branch : develop
 2017-01-04 14:24:25 +01:00
kervala
5af01c7e24 Fixed: Support for quads and any number of vertices for a face 
--HG--
branch : develop
 2017-01-04 14:24:02 +01:00
kervala
74558b9517 Changed: Allow to define output bitmap size 
--HG--
branch : develop
 2017-01-04 14:22:38 +01:00
kervala
0a86498c0f Merge with develop 
--HG--
branch : compatibility-develop
 2017-01-03 13:43:52 +01:00
kervala
ca5a4f6788 Changed: Use NLMISC::drawFullLine instead of NLMISC::drawLine for better render 
--HG--
branch : develop
 2017-01-03 13:43:31 +01:00
kervala
7fac9341ee Fixed: V coordinates are inverted 
--HG--
branch : develop
 2017-01-03 13:42:32 +01:00
kervala
eb91466d3b Merge with develop 
--HG--
branch : compatibility-develop
 2017-01-03 12:31:25 +01:00
kervala
b55f659a12 Changed: Generate an UV map from a Wavefront OBJ file 
--HG--
branch : develop
 2017-01-03 12:28:31 +01:00
kervala
2dbbfd6598 Merge with develop 
--HG--
branch : compatibility-develop
 2017-01-02 09:58:41 +01:00
kervala
147053404d Changed: Formatting 
--HG--
branch : develop
 2017-01-02 09:58:05 +01:00
kervala
6ed3213a1a Changed: Use _T and tStrToUtf8/utf8ToTStr macros 
--HG--
branch : develop
 2017-01-02 09:57:48 +01:00
kervala
88d345e857 Changed: Allow to parse HTML color format in CRGBA::stringToRGBA 
--HG--
branch : develop
 2017-01-02 09:48:40 +01:00
kervala
84618b4fbe Merge with develop 
--HG--
branch : compatibility-develop
 2017-01-01 22:45:29 +01:00
kervala
dde8fd723a Added: New tool textures_tool to produce diffuse, normal, specular, etc... textures from an UV template and seamless textures or colorize a texture with a color 
--HG--
branch : develop
 2017-01-01 22:44:27 +01:00
kervala
534630bdcc Changed: Implement CBitmap::setPixelColor 
--HG--
branch : develop
 2017-01-01 22:42:37 +01:00
kervala
1bd7e18ba7 Fixed: Loading of some JPEG variants 
--HG--
branch : develop
 2017-01-01 22:40:52 +01:00
kervala
065d1dc84c Changed: Minor change 
--HG--
branch : develop
 2017-01-01 22:40:22 +01:00
kervala
cdd1250066 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-31 15:16:40 +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
c91cd27a25 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-24 14:24:44 +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
6927bb5849 Fixed: Steam latest client API changes 
--HG--
branch : compatibility-develop
 2016-12-23 13:49:49 +01:00
kervala
4514d1179b Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-23 09:59:27 +01:00
kervala
6c09626fde Changed: Define new variables for VC++ 2015 
--HG--
branch : develop
 2016-12-23 09:58:44 +01:00
kervala
3efe3ab1c1 Changed: Use hg log -r . instead of hg tip to get last revision 
--HG--
branch : develop
 2016-12-23 09:58:30 +01:00
Nimetu
4e4985d647 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-21 23:48:28 +02:00
Nimetu
3fbfa4743b Fixed: Wrong element width when using scaled texture. 
--HG--
branch : develop
 2016-12-21 23:47:50 +02:00
Nimetu
04e774dc37 Backed out changeset: c1085bbb3dae 
--HG--
branch : develop
 2016-12-21 23:46:32 +02:00
Nimetu
b95fed61f2 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-21 23:16:48 +02:00
Nimetu
254c7690f8 Fixed: Wrong element width when using scaled texture. 
--HG--
branch : develop
 2016-12-21 23:16:27 +02:00
kervala
f069df82b3 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-21 15:18:59 +01:00
kervala
43195f71a5 Fixed: Servers compilation under Linux 
--HG--
branch : develop
 2016-12-21 15:18:26 +01:00
kervala
03ad7b63d4 Fixed: cpptest is using std::auto_ptr 
--HG--
branch : develop
 2016-12-21 14:51:09 +01:00
kervala
8884a8fcb1 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-19 17:48:07 +01:00
kervala
1b1e08b7f6 Changed: Warnings 
--HG--
branch : develop
 2016-12-19 17:47:15 +01:00
kervala
798fde40f6 Fixed: Recursive call 
--HG--
branch : develop
 2016-12-19 17:46:48 +01:00
kervala
3defbbbc89 Changed: Don't change x or y in these cases 
--HG--
branch : develop
 2016-12-19 17:46:38 +01:00
kervala
e2f776d21e Fixed: Memory leak 
--HG--
branch : develop
 2016-12-19 17:46:17 +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
c178730b80 Fixed: Virtual method with different parameters warning 
--HG--
branch : develop
 2016-12-19 16:37:16 +01:00
kervala
b04451c473 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-19 15:58:48 +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
f921040f80 Fixed: Use a string (default was a bool) 
--HG--
branch : develop
 2016-12-19 15:46:05 +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
e29fa9a719 Changed: Display line numbers instead of a pointer 
--HG--
branch : develop
 2016-12-19 15:21:59 +01:00
kervala
929cf93b87 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-19 13:58:14 +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
kervala
0a4ce7e4e1 Changed: Unicode 
--HG--
branch : develop
 2016-12-19 13:17:07 +01:00
kervala
cbb1233ce2 Changed: Minor changes 
--HG--
branch : develop
 2016-12-19 13:16:48 +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
89318ea69d Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-19 12:02:47 +01:00
kervala
1e45f7bd45 Fixed: Truncated bubble texts 
--HG--
branch : develop
 2016-12-19 12:01:55 +01:00
kervala
0328f16c6c Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-19 09:27:18 +01:00
kervala
61b76ad106 Changed: Minor changes 
--HG--
branch : develop
 2016-12-19 09:26:46 +01:00
kervala
bd13cabb13 Fixed: Wrong argument checked 
--HG--
branch : develop
 2016-12-19 09:26:28 +01:00
kervala
ede5a5a53b Fixed: Servers compilation 
--HG--
branch : develop
 2016-12-19 09:25:51 +01:00
kervala
c8bc57d0a4 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-18 20:44:33 +01:00
kervala
148c748d31 Fixed: Compilation 
--HG--
branch : develop
 2016-12-18 20:39:47 +01:00
kervala
0668ff8f04 Changed: Minor changes 
--HG--
branch : develop
 2016-12-18 20:39:35 +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
4e99767ae2 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-18 14:47:16 +01:00
kervala
c458084b59 Fixed: Unicode MFC use 
--HG--
branch : develop
 2016-12-18 14:42:04 +01:00
kervala
a0b4bb2397 Changed: Strings initialization 
--HG--
branch : develop
 2016-12-18 14:41:47 +01:00
kervala
cbf407f9a1 Changed: Replaced comparisons with string("") by empty() check 
--HG--
branch : develop
 2016-12-18 14:40:54 +01:00
kervala
4d6e569f98 Changed: Use NLMISC::toString instead of sprintf 
--HG--
branch : develop
 2016-12-18 14:03:29 +01:00
kervala
6ac49adb8b Fixed: Warning when generating DLU 
--HG--
branch : develop
 2016-12-18 14:00:55 +01:00
kervala
1ed5dcdda9 Changed: Use %u instead of %d for uint 
--HG--
branch : develop
 2016-12-18 14:00:20 +01:00
kervala
32fbf8163d Fixed: Compilation 
--HG--
branch : develop
 2016-12-18 13:59:17 +01:00
kervala
b52daf9519 Fixed: Unicode MFC use 
--HG--
branch : develop
 2016-12-18 13:59:02 +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
c3b3db07f1 Changed: Memory leaks detection 
--HG--
branch : develop
 2016-12-18 13:57:26 +01:00
kervala
cbf2c744f0 Changed: Replace some const char* by std::string 
--HG--
branch : develop
 2016-12-18 13:45:07 +01:00
Guillaume Dupuy
73191a2388 Remove duplicate code 
--HG--
branch : fix_freezing
 2016-12-17 14:31:27 +01:00
Guillaume Dupuy
fb280101f1 Fix a bug where a monster could be stuck after dropping aggro while rooted 
--HG--
branch : fix_freezing
 2016-12-17 02:47:05 +01:00
kervala
81008cd9ff Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-15 21:12:19 +01:00
kervala
3142a8d99f Changed: Support VC++ 2013 DLLs 
--HG--
branch : develop
 2016-12-15 21:11:27 +01:00
ulukyn@gmail.com
3f58cbd077 Fixed: Load Scenographic Editor lua files 
--HG--
branch : compatibility-develop
 2016-12-14 22:24:49 +01:00
ulukyn@gmail.com
b0dc979718 Fixed: Load Scenographic Editor lua files 
--HG--
branch : compatibility-develop
 2016-12-14 20:16:42 +01:00
ulukyn@gmail.com
6238139c08 Fixed: Load Scenographic Editor lua files 
--HG--
branch : compatibility-develop
 2016-12-14 16:14:33 +01:00
ulukyn@gmail.com
6ff3cc9d77 Added: sceneedit.lua and json.lua used by Scenographic Editor 
--HG--
branch : compatibility-develop
 2016-12-14 13:36:59 +01:00
ulukyn@gmail.com
c6f10d493d Fixed: updateVector don't need return a boolean 
--HG--
branch : compatibility-develop
 2016-12-13 23:42:02 +01:00