Commit graph

7590 commits

Author SHA1 Message Date
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
928777516e Added tag ryzom-patch-3.1.0-hotfix for changeset d4060f217f4f
--HG--
branch : compatibility-develop
2017-01-01 09:51:17 +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
6320e1309a Merge with develop
--HG--
branch : compatibility-develop
2016-12-24 11:57:00 +01:00
kervala
d185b8eded Added tag ryzom-patch-3.1.0 for changeset 4300cc14aad0
--HG--
branch : develop
2016-12-24 11:54:53 +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