|
80b032e703
|
Revert "mise a jour de RC"
This reverts commit d526953811 .
|
2017-03-15 20:43:10 +01:00 |
|
|
d526953811
|
mise a jour de RC
|
2017-03-15 20:29:34 +01:00 |
|
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 |
|
Nimetu
|
5c56eb400e
|
Changed: Workaround for white/black textures on Intel GPU (issue #310)
--HG--
branch : develop
|
2017-03-01 20:36:25 +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
|
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
|
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 |
|
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
|
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
|
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 |
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |
|
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 |
|
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
|
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 |
|