262 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	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	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	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	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	5c36c08b60	Changed: Use std::string instead of const char*	2016-12-19 13:33:24 +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	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	22e236f2fe	Changed: Use %u instead of %d for uint	2016-12-18 14:00:20 +01:00
kervala	33983dec8d	Changed: Make 2 different upgd_nl.bat depending on compiler	2016-12-18 13:58:20 +01:00
kervala	288b13dbfb	Changed: Replace some const char* by std::string	2016-12-18 13:45:07 +01:00
kervala	487a6eacfa	Merge with develop	2016-12-15 21:12:19 +01:00
kervala	77c4520ce3	Changed: Support VC++ 2013 DLLs	2016-12-15 21:11:27 +01:00
ulukyn	ae32111ea2	Fixed: Load Scenographic Editor lua files	2016-12-14 22:24:49 +01:00
ulukyn	fd1f324c5c	Fixed: Load Scenographic Editor lua files	2016-12-14 20:16:42 +01:00
ulukyn	8fc66a4af4	Fixed: Load Scenographic Editor lua files	2016-12-14 16:14:33 +01:00
ulukyn	569793d779	Added: sceneedit.lua and json.lua used by Scenographic Editor	2016-12-14 13:36:59 +01:00
ulukyn	390765d49f	Fixed: updateVector don't need return a boolean	2016-12-13 23:42:02 +01:00
ulukyn	66a34ace54	Fusion	2016-12-13 21:16:30 +01:00
ulukyn	448da5375d	Fixed: Removing some nlinfo and correction getMouseRightDown	2016-12-13 21:08:33 +01:00
kervala	861a9b399a	Merge with develop	2016-12-11 14:25:19 +01:00
kervala	bb3f3370b8	Fixed: Wrong indent	2016-12-11 14:21:28 +01:00
kervala	43a3391a98	Chnged: Sign comparison warning	2016-12-11 14:20:52 +01:00
kervala	b4d5bb9af5	Changed: Removed unused variables	2016-12-11 14:20:31 +01:00
kervala	f3147c7616	Merge with develop	2016-12-11 12:43:05 +01:00
kervala	e8b906c59b	Fixed: Compilation	2016-12-11 12:42:06 +01:00