Commit graph

277 commits

Author SHA1 Message Date
Nimetu
554dc94906 Merge with develop 2015-12-10 10:56:53 +02: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
kervala
78edb55cef Merge with develop 2015-12-07 21:49:21 +01:00
kervala
079ab7b757 Merge with develop 2015-12-06 19:46:40 +01:00
kervala
e6aa5562d6 Merge with develop 2015-12-06 16:56:53 +01:00
Nimetu
29e5b70825 Merge with develop 2015-12-06 16:38:52 +02:00
kervala
c120568423 Merge with develop 2015-12-05 18:52:33 +01: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
1a7293c697 Merge with develop 2015-11-30 14:20:16 +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
dc7df29d2b Merge with develop 2015-11-29 17:55:33 +01:00
kervala
7079162492 Changed: Temporary disable NL_USES_DEFAULT_ARENA_OBJECT_ALLOCATOR for ITexture 2015-11-26 10:23:27 +01:00
kervala
b9e0d01c96 Merge with develop 2015-11-24 20:11:52 +01:00
kervala
0f418dddbc Merge with develop 2015-11-24 10:13:18 +01:00
kervala
3a85806b29 Merge with develop 2015-11-22 18:42:36 +01:00
kervala
b453d7d48a Merge with develop 2015-11-21 18:09:38 +01:00
kervala
3ecd12f21f Merge with develop 2015-11-15 18:33:50 +01:00
kervala
ae7767123b Merge with develop 2015-11-15 13:33:37 +01:00
kervala
ea2eeaf167 Merge with develop 2015-11-15 12:59:01 +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
9e3db2029d Merge with develop 2015-11-09 12:47:24 +01:00
kervala
f03ad4b9cd Merge with develop 2015-11-09 10:48:04 +01:00
kervala
898ae96533 Merge with develop 2015-11-09 10:01:24 +01:00
kervala
6dd1b67767 Merge with develop 2015-11-08 14:14:53 +01:00
Nimetu
2c6afe9bcc Merge with develop 2015-11-08 05:16:07 +02:00
Nimetu
151930e8cc Merge with develop 2015-11-08 03:07:14 +02:00
kervala
f78523e5d4 Merge with develop 2015-11-07 18:34:25 +01: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
afaaa36777 Merge with develop 2015-11-05 17:30:12 +01:00
kervala
c95e136ef7 Merge with develop 2015-11-05 09:30:56 +01:00
kervala
924d3f313d Merge with develop 2015-11-03 13:42:07 +01:00
Nimetu
c3ee3168a0 Merge with develop 2015-11-03 01:13:18 +02:00
kervala
771fe024b4 Merge with develop 2015-11-01 20:13:33 +01:00
kervala
fd70ff06fa Merge with develop 2015-10-01 14:54: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
d4ccb454c5 Fix compiling on 32bit linux 2015-04-22 13:44:21 +03:00
Nimetu
68db74603b Fix sending and receiving cookies 2015-04-20 20:51:00 +03:00
Nimetu
61af82194c Fix possible curl handle leak 2015-04-20 20:50:56 +03: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