Commit graph

605 commits

Author SHA1 Message Date
Nimetu
6adae34ad3 Merge with develop 2017-03-14 23:42:52 +02:00
Nimetu
2e5bcdf248 Added: Clickable urls in chat text (issue 282) 2017-01-21 13:29:34 +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
Nimetu
9db20a28cb Changed: Move dyn channel commands (/0, /1 ..) to commands.xml 2017-01-11 15:12: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
57057b7794 Fixed: Scenographic Editor crash the client 2017-01-10 12:32:44 +01:00
kervala
28561a7e94 Merge with develop 2017-01-01 22:45:29 +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
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
kervala
6f4c2c843f Merge with develop 2016-12-24 14:24:44 +01:00
kervala
30545b8f7c Changed: Temporary comment Lua functions registration (crash when reselect characters) 2016-12-24 14:02:33 +01:00
kervala
16b5e22864 Changed: Don't need to release twice CEditor 2016-12-24 14:01:51 +01:00
kervala
7cca6c1443 Changed: Minor change 2016-12-24 14:01:35 +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
63b7d0f8fd Merge with develop 2016-12-21 15:18:59 +01:00
kervala
9e4f603051 Fixed: Servers compilation under Linux 2016-12-21 15:18:26 +01:00
kervala
8bf9a665ce Merge with develop 2016-12-19 17:48:07 +01:00
kervala
c9413d7b63 Changed: Warnings 2016-12-19 17:47:15 +01:00
kervala
67e3108c25 Fixed: Virtual methods with different parameters 2016-12-19 17:46:07 +01:00
kervala
dcad84bbb9 Fixed: done() is a method of QDialog 2016-12-19 17:43:47 +01:00
kervala
0da48b0abb Merge with develop 2016-12-19 15:58:48 +01:00
kervala
4e9788116f Changed: Check return value of fwrite 2016-12-19 15:50:54 +01:00
kervala
3f8aa231a5 Fixed: Compilation under Linux 2016-12-19 15:50:21 +01:00
kervala
e30ba1d186 Fixed: Strict aliasing warnings 2016-12-19 15:49:50 +01:00
kervala
4123e6149e Fixed: Uninitialized variable 2016-12-19 15:44:08 +01:00
kervala
82d8e04ab2 Fixed: Uninitialized variables 2016-12-19 15:43:38 +01:00
kervala
c7ef9d9773 Merge with develop 2016-12-19 13:58:14 +01:00
kervala
05a91ecd97 Changed: Unicode 2016-12-19 13:33:44 +01:00
kervala
5c36c08b60 Changed: Use std::string instead of const char* 2016-12-19 13:33:24 +01:00
kervala
0cf4af4443 Changed: Unicode 2016-12-19 13:17:07 +01:00
kervala
0e26ff44b6 Changed: Minor changes 2016-12-19 13:16:48 +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
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
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
76848d6172 Changed: Minor changes 2016-12-19 09:26:46 +01:00
kervala
93b0557ca1 Fixed: Wrong argument checked 2016-12-19 09:26:28 +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
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
9032a98096 Changed: Strings initialization 2016-12-18 14:41:47 +01:00
kervala
e2f3e5ee89 Changed: Replaced comparisons with string("") by empty() check 2016-12-18 14:40:54 +01:00
kervala
22e236f2fe Changed: Use %u instead of %d for uint 2016-12-18 14:00:20 +01:00
kervala
c4cd6ccfc2 Fixed: Compilation 2016-12-18 13:59:17 +01:00
kervala
ff0581a402 Fixed: Unicode MFC use 2016-12-18 13:59:02 +01:00