Commit graph

7399 commits

Author SHA1 Message Date
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
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
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