Commit graph

3404 commits

Author SHA1 Message Date
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
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
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
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
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
f921040f80 Fixed: Use a string (default was a bool)
--HG--
branch : develop
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
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
6978dc9bee Changed: Use std::string instead of const char*
--HG--
branch : develop
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
31a540b35d Changed: Replace size() comparisons by empty() ones
--HG--
branch : develop
2016-12-19 13:15:25 +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
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
b52daf9519 Fixed: Unicode MFC use
--HG--
branch : develop
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
cbf2c744f0 Changed: Replace some const char* by std::string
--HG--
branch : develop
2016-12-18 13:45:07 +01:00
ulukyn@gmail.com
68e6dbaf9a Fusion
--HG--
branch : compatibility-develop
2016-12-13 21:16:30 +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
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
b766a01c8a Fixed: Compilation with clang
--HG--
branch : develop
2016-12-11 19:26:23 +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
bd8cdb46e0 Fixed: Wrong indent
--HG--
branch : develop
2016-12-11 14:21:28 +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
34d454c835 Changed: Use %u for uint
--HG--
branch : develop
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
10f7abb26f Fixed: %s needs a const char*
--HG--
branch : develop
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
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@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
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
86c82181ca Changed: Replace Win32 calls by NeL methods
--HG--
branch : develop
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
a1baec9de2 Changed: Use _T macro
--HG--
branch : develop
2016-12-10 19:39:39 +01:00
kervala
083f44ec32 Fixed: Compilation
--HG--
branch : develop
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
8ef8b60ab8 Fixed: Warning on 64 bits
--HG--
branch : develop
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
kervala
dbf443beb7 Fixed: C++11 forbids to throw exception in destructor
--HG--
branch : develop
2016-12-10 19:04:29 +01:00
kervala
9a6b3c91b7 Changed: Minor changes
--HG--
branch : develop
2016-12-10 18:58:13 +01:00
kervala
50b6af6d3d Fixed: Strict aliasing warnings
--HG--
branch : develop
2016-12-10 18:55:31 +01:00
kervala
3c568ce8a3 Changed: New "new" definitions for NEW_DEBUG macro defined by MFC
--HG--
branch : develop
2016-12-10 18:50:01 +01:00
kervala
ba35109fe4 Changed: Destructor for CApplicationContext to display singletons still in memory
--HG--
branch : develop
2016-12-10 18:48:53 +01:00
kervala
27b272f012 Changed: Replace a lot of const char* by std::string parameters
--HG--
branch : develop
2016-12-10 18:40:03 +01:00
Nimetu
5d35bb8717 Fixed: Protocol-less url in windows
--HG--
branch : develop
2016-12-10 18:56:44 +02:00
kervala
94bf8fd54e Changed: Use TCHAR functions
--HG--
branch : develop
2016-12-10 14:21:20 +01:00
kervala
f0c5b7ea40 Changed: Use TCHAR functions
--HG--
branch : develop
2016-12-10 13:43:00 +01:00
kervala
5658cad02e Changed: Convert std::string <> TCHAR
--HG--
branch : develop
2016-12-10 13:01:27 +01:00
kervala
22de830c26 Changed: Check return code of WaitForSingleObject and log error
--HG--
branch : develop
2016-12-10 12:36:04 +01:00
kervala
c716c48fdb Fixed: Compilation
--HG--
branch : develop
2016-12-10 12:33:44 +01:00
kervala
dbba511ee7 Changed: Replace a lot of const char* by std::string parameters
--HG--
branch : develop
2016-12-10 12:30:57 +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
eabfcbf708 Fixed: Release CCurrentCoTask singleton
--HG--
branch : develop
2016-12-09 16:14:16 +01:00
kervala
06cc0ddec8 Changed: Delete filenames before allocating new ones
--HG--
branch : develop
2016-12-09 16:05:13 +01:00
kervala
9e0b38e6e0 Changed: New tga2dds option -g to force grayscale image instead of alpha
--HG--
branch : develop
2016-12-09 13:53:43 +01:00
kervala
0b171001d1 Removed: Empty cpp files
--HG--
branch : develop
2016-12-09 13:51:52 +01:00
kervala
e2b74b77c6 Changed: Memory leaks detection
--HG--
branch : develop
2016-12-09 13:51:09 +01:00
kervala
c767e55344 Backed out changeset: 6b7af3bc4752
--HG--
branch : compatibility-develop
2016-12-08 18:20:34 +01:00
kervala
cf98f1fdbc Merge with develop
--HG--
branch : compatibility-develop
2016-12-08 10:51:07 +01:00
kervala
8e15feaa13 Fixed: Replace Win32 code by multiplatform one using NeL classes
--HG--
branch : develop
2016-12-07 14:22:50 +01:00
kervala
5ce03c278b Merge with develop
--HG--
branch : compatibility-develop
2016-12-06 20:29:22 +01:00
kervala
3992b53683 Changed: Use _M and _T macros
--HG--
branch : develop
2016-12-06 20:26:26 +01:00
kervala
b112b7bc9b Fixed: Truncated pointer
--HG--
branch : develop
2016-12-06 20:25:31 +01:00
kervala
c79e47384d Fixed: Compilation
--HG--
branch : develop
2016-12-06 20:24:48 +01:00
kervala
fff0b5ce5b Changed: Don't close a display already closed
--HG--
branch : develop
2016-12-06 20:24:21 +01:00
kervala
fef7cc88fb Merge with develop
--HG--
branch : compatibility-develop
2016-12-05 20:13:49 +01:00