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

16601 commits

Author SHA1 Message Date
Nimetu
6adae34ad3 Merge with develop 2017-03-14 23:42:52 +02:00
Nimetu
88c81e8895 Merge with develop 
--HG--
branch : compatibility-develop
 2017-03-14 23:42:52 +02:00
Nuno Gon?alves
ad8724fff3 Changed: comment nldebug on driver_openg_texture to prevent Gigabits of logs 2017-03-14 18:11:55 +01: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
kervala
fded57d3a1 Changed: Use modulateFromColorRGBOnly to colorize a bitmap in textures_tool 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
2e5bcdf248 Added: Clickable urls in chat text (issue 282) 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
b9ab826feb Added: copy_to_clipboard action handler 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
b724f9698c Changed: Refactor CViewLink to be able to use custom action handlers 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
3ae1a9f3ac Changed: Ensure that menu resizes from child elements 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
81350033fa Fixed: Wrong size for list element 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
ea95d93fac Fixed: Crash when trying to navigate to non-existing #anchor 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
661473d9cd Changed: Improve cURL error message for failed requests 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
Nimetu
795c91bcc8 Fixed: Windowed resolution resetting when closing from login/outgame views. 2017-01-12 13:29:47 +02:00
ulukyn
3d270b7a1f Fixed: Scenographic Editor lua issues 2017-01-11 16:27:25 +01: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
9db20a28cb Changed: Move dyn channel commands (/0, /1 ..) to commands.xml 2017-01-11 15:12:06 +02:00
Nimetu
169ab7d907 Merge with develop 2017-01-10 15:09:55 +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
9aae361c7b Fixed: Client crash on bad PNG file from webig download. 2017-01-10 14:07:11 +02:00
Nimetu
a7ca4ec3b9 Changed: Minor change 
--HG--
branch : develop
 2017-01-10 14:07:06 +02:00
Nimetu
44db61b463 Changed: Minor change 2017-01-10 14:07:06 +02:00
ulukyn
f8b7db0bfe Fixed: Scenographic Editor crash the client (revert bad commit of actions.h) 2017-01-10 12:35:53 +01: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
57057b7794 Fixed: Scenographic Editor crash the client 2017-01-10 12:32:44 +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
6344d0e5cc Merge with develop 2017-01-04 14:25:23 +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
fd78d7ca74 Changed: Exit if line is truncated 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
bcad6f8910 Fixed: Support for quads and any number of vertices for a face 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
fc7a2b295e Changed: Allow to define output bitmap size 2017-01-04 14:22:38 +01:00
kervala
a5c5726601 Merge with develop 2017-01-03 13:43:52 +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
d9ab071417 Changed: Use NLMISC::drawFullLine instead of NLMISC::drawLine for better render 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
fcee44b388 Fixed: V coordinates are inverted 2017-01-03 13:42:32 +01:00
kervala
7d608488cd Merge with develop 2017-01-03 12:31:25 +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
ede299924f Changed: Generate an UV map from a Wavefront OBJ file 2017-01-03 12:28:31 +01:00
kervala
db2581a789 Merge with develop 2017-01-02 09:58:41 +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
c988710323 Changed: Formatting 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
0cdb27c68b Changed: Use _T and tStrToUtf8/utf8ToTStr macros 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
8ac0537b9b Changed: Allow to parse HTML color format in CRGBA::stringToRGBA 2017-01-02 09:48:40 +01:00
kervala
28561a7e94 Merge with develop 2017-01-01 22:45:29 +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
eb762eaf08 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 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
cf788f098d Changed: Implement CBitmap::setPixelColor 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
753b429950 Fixed: Loading of some JPEG variants 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
d823fe8312 Changed: Minor change 2017-01-01 22:40:22 +01:00
kervala
4f518b4b1d Merge with develop 2016-12-31 15:16:40 +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
e1549eb73c Fixed: Bug with C++11 under Linux with clang (an iterator is invalidated after an erase) 2016-12-31 15:16:09 +01:00
deed
642c47c180 Update entities_game_service_default.cfg (mise à jour du gameplay pour les tests temps de rez 5 minutes , temps pour une action racourcit et bijoux a 10% au lieu de 1%) 2016-12-31 00:12:21 +01:00
deed
1906de7b89 Update sheets_packer.cfg pour faciliter la mise en place du shard 2016-12-31 00:01:13 +01:00
kervala
6f4c2c843f Merge with develop 2016-12-24 14:24:44 +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
30545b8f7c Changed: Temporary comment Lua functions registration (crash when reselect characters) 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
16b5e22864 Changed: Don't need to release twice CEditor 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
7cca6c1443 Changed: Minor change 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
73663e30dc Changed: Use a global C64BitsParts union to avoid strict aliasing warnings 2016-12-24 14:01:21 +01:00
kervala
31cf9a5349 Fixed: Steam latest client API changes 2016-12-23 13:49:49 +01:00
kervala
6927bb5849 Fixed: Steam latest client API changes 
--HG--
branch : compatibility-develop
 2016-12-23 13:49:49 +01:00
kervala
a11e74f18e Merge with develop 2016-12-23 09:59:27 +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
67583eb186 Changed: Define new variables for VC++ 2015 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
kervala
dcfed04005 Changed: Use hg log -r . instead of hg tip to get last revision 2016-12-23 09:58:30 +01:00
Nimetu
485c4721bc Merge with develop 2016-12-21 23:48:28 +02: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
9655669de6 Fixed: Wrong element width when using scaled texture. 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
b6ab159229 Backed out changeset: c1085bbb3dae 2016-12-21 23:46:32 +02:00
Nimetu
d994a29d79 Merge with develop 2016-12-21 23:16:48 +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
Nimetu
b149858441 Fixed: Wrong element width when using scaled texture. 2016-12-21 23:16:27 +02:00
kervala
63b7d0f8fd Merge with develop 2016-12-21 15:18:59 +01: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
9e4f603051 Fixed: Servers compilation under Linux 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
8e3c7cd588 Fixed: cpptest is using std::auto_ptr 2016-12-21 14:51:09 +01:00
kervala
8bf9a665ce Merge with develop 2016-12-19 17:48:07 +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
c9413d7b63 Changed: Warnings 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
65be422fb7 Fixed: Recursive call 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
259552ed0d Changed: Don't change x or y in these cases 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
236522fe11 Fixed: Memory leak 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
67e3108c25 Fixed: Virtual methods with different parameters 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
dcad84bbb9 Fixed: done() is a method of QDialog 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
c3bce8874e Fixed: Virtual method with different parameters warning 2016-12-19 16:37:16 +01:00
kervala
0da48b0abb Merge with develop 2016-12-19 15:58:48 +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
4e9788116f Changed: Check return value of fwrite 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
3f8aa231a5 Fixed: Compilation under Linux 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
e30ba1d186 Fixed: Strict aliasing warnings 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
34520c8f29 Fixed: Use a string (default was a bool) 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
4123e6149e Fixed: Uninitialized variable 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
82d8e04ab2 Fixed: Uninitialized variables 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
d58b347a99 Changed: Display line numbers instead of a pointer 2016-12-19 15:21:59 +01:00
kervala
c7ef9d9773 Merge with develop 2016-12-19 13:58:14 +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
05a91ecd97 Changed: Unicode 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
5c36c08b60 Changed: Use std::string instead of const char* 2016-12-19 13:33:24 +01:00
kervala
0a4ce7e4e1 Changed: Unicode 
--HG--
branch : develop
 2016-12-19 13:17:07 +01:00
kervala
0cf4af4443 Changed: Unicode 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
0e26ff44b6 Changed: Minor changes 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
d0a87e5210 Changed: New DEV command to display a bubble with a long text 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
4b36ad57cb Changed: Replace size() comparisons by empty() ones 2016-12-19 13:15:25 +01:00
kervala
bbf15b7a80 Merge with develop 2016-12-19 12:02:47 +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
5203c18a69 Fixed: Truncated bubble texts 2016-12-19 12:01:55 +01:00
kervala
03aeffdda7 Merge with develop 2016-12-19 09:27:18 +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
76848d6172 Changed: Minor changes 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
93b0557ca1 Fixed: Wrong argument checked 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
1fdd44a673 Fixed: Servers compilation 2016-12-19 09:25:51 +01:00
kervala
1e8d28759a Merge with develop 2016-12-18 20:44:33 +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
5152d83666 Fixed: Compilation 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
3c1ff1f14b Changed: Minor changes 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
44a7872135 Changed: Merged changes from compatibility-develop that should also be in develop 2016-12-18 20:39:16 +01:00
kervala
bb28b25e71 Merge with develop 2016-12-18 14:47: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
8cbdf6917a Fixed: Unicode MFC use 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
9032a98096 Changed: Strings initialization 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
e2f3e5ee89 Changed: Replaced comparisons with string("") by empty() check 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
b87ce2c134 Changed: Use NLMISC::toString instead of sprintf 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
525ec6b487 Fixed: Warning when generating DLU 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
22e236f2fe Changed: Use %u instead of %d for uint 2016-12-18 14:00:20 +01:00
kervala
32fbf8163d Fixed: Compilation 
--HG--
branch : develop
 2016-12-18 13:59:17 +01:00
kervala
c4cd6ccfc2 Fixed: Compilation 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
ff0581a402 Fixed: Unicode MFC use 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
33983dec8d Changed: Make 2 different upgd_nl.bat depending on compiler 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
5756137e9f Changed: Memory leaks detection 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
kervala
288b13dbfb Changed: Replace some const char* by std::string 2016-12-18 13:45:07 +01:00
Guillaume Dupuy
116769bc4e Remove duplicate code 2016-12-17 14:31:27 +01:00
Guillaume Dupuy
73191a2388 Remove duplicate code 
--HG--
branch : fix_freezing
 2016-12-17 14:31:27 +01:00
Guillaume Dupuy
82dcde8aa6 Fix a bug where a monster could be stuck after dropping aggro while rooted 2016-12-17 02:47:05 +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
487a6eacfa Merge with develop 2016-12-15 21:12:19 +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
kervala
77c4520ce3 Changed: Support VC++ 2013 DLLs 2016-12-15 21:11:27 +01:00
ulukyn
ae32111ea2 Fixed: Load Scenographic Editor lua files 2016-12-14 22:24:49 +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
fd1f324c5c Fixed: Load Scenographic Editor lua files 2016-12-14 20:16:42 +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
8fc66a4af4 Fixed: Load Scenographic Editor lua files 2016-12-14 16:14:33 +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
569793d779 Added: sceneedit.lua and json.lua used by Scenographic Editor 2016-12-14 13:36:59 +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
390765d49f Fixed: updateVector don't need return a boolean 2016-12-13 23:42:02 +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
ulukyn
66a34ace54 Fusion 2016-12-13 21:16:30 +01:00
ulukyn@gmail.com
68e6dbaf9a Fusion 
--HG--
branch : compatibility-develop
 2016-12-13 21:16:30 +01:00
ulukyn
448da5375d Fixed: Removing some nlinfo and correction getMouseRightDown 2016-12-13 21:08:33 +01:00
ulukyn@gmail.com
80fc274813 Fixed: Removing some nlinfo and correction getMouseRightDown 
--HG--
branch : compatibility-develop
 2016-12-13 21:08:33 +01:00
deed
a6339b7fd9 Merge branch 'feature/v3+CI' into 'develop' 
Feature/v3+ci

Toujours le merge de la v3...

See merge request !28
 2016-12-13 13:54:26 +00:00
kervala
d3dc21ad46 Merge with develop 2016-12-12 12:03:15 +01:00
kervala
afe3863f0f Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-12 12:03:15 +01:00
kervala
d039598225 Fixed: Compilation 
--HG--
branch : develop
 2016-12-12 12:02:25 +01:00
kervala
e084c2014a Fixed: Compilation 2016-12-12 12:02:25 +01:00
deed
0e55d39f53 Update egs_mirror.cpp (ajout ChaScore1 ) warning dans le shard 2016-12-12 09:34:03 +00:00
kervala
5acd03d77d Merge with develop 2016-12-11 19:27:27 +01:00
kervala
c14d0733c9 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-11 19:27:27 +01:00
kervala
bca1722bdd Changed: Fix warning 
--HG--
branch : develop
 2016-12-11 19:26:38 +01:00
kervala
ea2caaeb55 Changed: Fix warning 2016-12-11 19:26:38 +01:00
kervala
b766a01c8a Fixed: Compilation with clang 
--HG--
branch : develop
 2016-12-11 19:26:23 +01:00
kervala
64bcfd92fa Fixed: Compilation with clang 2016-12-11 19:26:23 +01:00
kervala
861a9b399a Merge with develop 2016-12-11 14:25:19 +01:00
kervala
2b53cc82aa Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-11 14:25:19 +01:00
kervala
c94ce037bb Fixed: Use -Wno-... 
--HG--
branch : develop
 2016-12-11 14:24:43 +01:00
kervala
3e98e267a2 Fixed: Use -Wno-... 2016-12-11 14:24:43 +01:00
kervala
e4109490cd Changed: GCC warnings 
--HG--
branch : develop
 2016-12-11 14:23:58 +01:00
kervala
879cac9d29 Changed: GCC warnings 2016-12-11 14:23:58 +01:00
kervala
bd8cdb46e0 Fixed: Wrong indent 
--HG--
branch : develop
 2016-12-11 14:21:28 +01:00
kervala
bb3f3370b8 Fixed: Wrong indent 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
43a3391a98 Chnged: Sign comparison warning 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
b4d5bb9af5 Changed: Removed unused variables 2016-12-11 14:20:31 +01:00
kervala
f3147c7616 Merge with develop 2016-12-11 12:43:05 +01:00
kervala
035a267e92 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-11 12:43:05 +01:00
kervala
71b5a1734e Fixed: Compilation 
--HG--
branch : develop
 2016-12-11 12:42:06 +01:00
kervala
e8b906c59b Fixed: Compilation 2016-12-11 12:42:06 +01:00
kervala
486a5e4638 Merge with develop 2016-12-11 12:32:05 +01:00
kervala
ac404a2c8f Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-11 12:32:05 +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
3665c79b3a Fixed: Use std::vector instead of CUniquePtr for arrays 2016-12-11 12:31:24 +01:00
kervala
34d454c835 Changed: Use %u for uint 
--HG--
branch : develop
 2016-12-11 11:59:30 +01:00
kervala
ffdbcd1ab8 Changed: Use %u for uint 2016-12-11 11:59:30 +01:00
kervala
62d4d8ccc0 Changed: Display line number instead of a pointer on a string 
--HG--
branch : develop
 2016-12-11 11:59:10 +01:00
kervala
42497fed77 Changed: Display line number instead of a pointer on a string 2016-12-11 11:59:10 +01:00
kervala
10f7abb26f Fixed: %s needs a const char* 
--HG--
branch : develop
 2016-12-11 11:58:30 +01:00
kervala
93fa57d25c Fixed: %s needs a const char* 2016-12-11 11:58:30 +01:00
kervala
1920a81a23 Fixed: Don't crash if a file is not unique in BNPs 
--HG--
branch : develop
 2016-12-11 11:57:02 +01:00
kervala
27d3fd12d9 Fixed: Don't crash if a file is not unique in BNPs 2016-12-11 11:57:02 +01:00
ulukyn
2a7615b2f4 Added: ARKPACSBorders to enable/disable the display of collisions by user 2016-12-10 22:05:38 +01:00
ulukyn@gmail.com
1a4c020e56 Added: ARKPACSBorders to enable/disable the display of collisions by user 
--HG--
branch : compatibility-develop
 2016-12-10 22:05:38 +01:00
ulukyn
512d300741 Added: Export usefull cursor and shape functions in lua: 
getGroundAtMouse
getMousePos
getMouseDown
getMouseMiddleDown
getMouseRightDown
setMouseCursor
setupShape
getShapeIdAt
addShape
moveShape
rotateShape
getShapePos
getShapeScale
getShapeRot
getShapeColPos
getShapeColScale
getShapeColOrient
deleteShape
 2016-12-10 22:04:33 +01:00
ulukyn@gmail.com
9e73cd8d22 Added: Export usefull cursor and shape functions in lua: 
getGroundAtMouse
getMousePos
getMouseDown
getMouseMiddleDown
getMouseRightDown
setMouseCursor
setupShape
getShapeIdAt
addShape
moveShape
rotateShape
getShapePos
getShapeScale
getShapeRot
getShapeColPos
getShapeColScale
getShapeColOrient
deleteShape

--HG--
branch : compatibility-develop
 2016-12-10 22:04:33 +01:00
ulukyn
18b024f0c7 Added: Add lua function to have an icon at left of menu option 2016-12-10 21:58:15 +01:00
ulukyn@gmail.com
bd7b703f3a Added: Add lua function to have an icon at left of menu option 
--HG--
branch : compatibility-develop
 2016-12-10 21:58:15 +01:00
kervala
dab3de7a74 Merge with develop 2016-12-10 19:52:43 +01:00
kervala
f085121937 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-10 19:52:43 +01:00
kervala
9d6f842f05 Merge 
--HG--
branch : develop
 2016-12-10 19:47:19 +01:00
kervala
f2368f2a91 Merge 2016-12-10 19:47:19 +01:00
kervala
86c82181ca Changed: Replace Win32 calls by NeL methods 
--HG--
branch : develop
 2016-12-10 19:46:51 +01:00
kervala
f3fae4fc60 Changed: Replace Win32 calls by NeL methods 2016-12-10 19:46:51 +01:00
kervala
3d36a4bfb5 Changed: Removed unused methods and used TCHARs 
--HG--
branch : develop
 2016-12-10 19:42:02 +01:00
kervala
98544addc3 Changed: Removed unused methods and used TCHARs 2016-12-10 19:42:02 +01:00
kervala
a1baec9de2 Changed: Use _T macro 
--HG--
branch : develop
 2016-12-10 19:39:39 +01:00
kervala
674e240fdd Changed: Use _T macro 2016-12-10 19:39:39 +01:00
kervala
083f44ec32 Fixed: Compilation 
--HG--
branch : develop
 2016-12-10 19:36:41 +01:00
kervala
2fa6b8d316 Fixed: Compilation 2016-12-10 19:36:41 +01:00
kervala
30b40568ed Changed: Use 3dsmax SDK definitions 
--HG--
branch : develop
 2016-12-10 19:07:15 +01:00
kervala
f485c71918 Changed: Use 3dsmax SDK definitions 2016-12-10 19:07:15 +01:00
kervala
8ef8b60ab8 Fixed: Warning on 64 bits 
--HG--
branch : develop
 2016-12-10 19:05:24 +01:00
kervala
e387a1c31f Fixed: Warning on 64 bits 2016-12-10 19:05:24 +01:00
kervala
829092aa8c Fixed: Compilation with 3dsmax 2017 SDK 
--HG--
branch : develop
 2016-12-10 19:05:05 +01:00