34 commits

Author	SHA1	Message	Date
kervala	e95f8ac5a3	Merge with develop	2015-12-11 20:21:56 +01:00
Nimetu	4fee61660a	Merge with develop	2015-12-08 21:54:21 +02:00
kervala	708faee866	Merge with develop	2015-12-08 14:33:49 +01:00
Nimetu	29e5b70825	Merge with develop	2015-12-06 16:38:52 +02:00
Nimetu	f7ca1d3d14	Merge with develop	2015-12-03 18:33:27 +02:00
Nimetu	07ba14eddb	Merge with develop	2015-12-02 20:38:11 +02:00
kervala	97c90bb567	Merge with develop	2015-12-02 19:28:44 +01:00
kervala	b19701dd78	Merge with develop	2015-11-30 12:26:23 +01:00
kervala	fc3643bee0	Merge with develop	2015-11-30 10:30:14 +01:00
kervala	7079162492	Changed: Temporary disable NL_USES_DEFAULT_ARENA_OBJECT_ALLOCATOR for ITexture	2015-11-26 10:23:27 +01:00
kervala	b453d7d48a	Merge with develop	2015-11-21 18:09:38 +01:00
kervala	093728dcf9	Merge with develop	2015-11-14 19:29:43 +01:00
kervala	5acd91b8fc	Merge with develop	2015-11-14 12:13:12 +01:00
kervala	88a5da82b7	Merge with develop	2015-11-13 19:52:35 +01:00
Nimetu	b0823a2bf3	Merge with develop	2015-11-12 20:15:28 +02:00
kervala	6dd1b67767	Merge with develop	2015-11-08 14:14:53 +01:00
Nimetu	151930e8cc	Merge with develop	2015-11-08 03:07:14 +02:00
kervala	10fe9697e1	Merge with develop	2015-11-07 14:55:30 +01:00
kervala	4d3aa59507	Merge with develop	2015-11-06 15:49:55 +01:00
kervala	c95e136ef7	Merge with develop	2015-11-05 09:30:56 +01:00
Nimetu	c3ee3168a0	Merge with develop	2015-11-03 01:13:18 +02:00
Nimetu	2aaa4df784	Merge with develop	2015-06-17 00:43:48 +03:00
kervala	fea41e56d0	Fixed uint to bool conversion warning	2015-04-25 18:28:03 +02:00
Nimetu	6a2a6ba6ea	Fix compiling under windows	2015-04-20 01:04:52 +03:00
Nimetu	c047d7a581	Replace url parser with one less strict	2015-04-19 22:12:05 +03:00
Nimetu	bf89af5460	Make sure image src attribute matches local file or is absolute url	2015-04-19 22:01:46 +03:00
Nimetu	ce65cf7b1f	Use cURL as http transport	2015-04-17 17:41:01 +03:00
Nimetu	e069f7d6c9	Remove libwww, only keep html entitites list	2015-04-17 15:10:00 +03:00
Nimetu	e5480e213a	Parse local files (ingame help) with new html parser	2015-04-13 20:53:10 +03:00
Nimetu	9ec3679780	Implement html parser using libxml2	2015-04-13 20:52:34 +03:00
Nimetu	388110a441	Remove libwww dependency from CGroupHTML::addLink() signature	2015-04-13 20:51:39 +03:00
Nimetu	2b74943a5b	Add span tag and bold, italic, underline, strikethrough styles to CGroupHTML	2015-03-29 18:24:19 +03:00
Nimetu	be3c6610b8	Add embolden, oblique, underline, strikethrough styles to CViewText	2015-03-29 18:24:16 +03:00
Nimetu	1c22925e63	Add embolden, oblique font styles (NL3D)	2015-03-29 17:28:33 +03:00