Commit graph

7574 commits

Author SHA1 Message Date
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@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
57057b7794 Fixed: Scenographic Editor crash the client 2017-01-10 12:32:44 +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
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
065d1dc84c Changed: Minor change
--HG--
branch : develop
2017-01-01 22:40:22 +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
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
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
642c47c180 Update entities_game_service_default.cfg (mise à jour du gameplay pour les tests temps de rez 5 minutes , temps pour une action racourcit et bijoux a 10% au lieu de 1%) 2016-12-31 00:12:21 +01:00
1906de7b89 Update sheets_packer.cfg pour faciliter la mise en place du shard 2016-12-31 00:01:13 +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
66fcc5081a Changed: Temporary comment Lua functions registration (crash when reselect characters)
--HG--
branch : develop
2016-12-24 14:02:33 +01:00
kervala
30545b8f7c Changed: Temporary comment Lua functions registration (crash when reselect characters) 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
16b5e22864 Changed: Don't need to release twice CEditor 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
7cca6c1443 Changed: Minor change 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
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
6927bb5849 Fixed: Steam latest client API changes
--HG--
branch : compatibility-develop
2016-12-23 13:49:49 +01: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
43195f71a5 Fixed: Servers compilation under Linux
--HG--
branch : develop
2016-12-21 15:18:26 +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
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
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
07606ffd77 Fixed: done() is a method of QDialog
--HG--
branch : develop
2016-12-19 17:43:47 +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
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
7aabc217b0 Fixed: Compilation under Linux
--HG--
branch : develop
2016-12-19 15:50:21 +01:00
kervala
3f8aa231a5 Fixed: Compilation under Linux 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
e30ba1d186 Fixed: Strict aliasing warnings 2016-12-19 15:49:50 +01:00
kervala
408dbb64f6 Fixed: Uninitialized variable
--HG--
branch : develop
2016-12-19 15:44:08 +01:00
kervala
4123e6149e Fixed: Uninitialized variable 2016-12-19 15:44:08 +01:00
kervala
8db7d75e7e Fixed: Uninitialized variables
--HG--
branch : develop
2016-12-19 15:43:38 +01:00