Commit graph

946 commits

Author SHA1 Message Date
depyraken
8251713821 merge aquatic to lirria 2016-03-31 02:19:44 +02:00
depyraken
21d93bc1d7 fix a compil error on linux (compils with visual studio 2010) 2016-03-31 02:15:38 +02:00
depyraken
d6ef802487 merge aquatic to lirria 2016-03-30 23:13:00 +02:00
depyraken
42aeac0243 handle separately water and ground
The forbidden zones must be set in the primitives, in the fauna name = "Ybers:Ground|NoGo"
2016-03-30 02:56:09 +02:00
SIELA1915
52702f64f1 merged from compatibility-develop 2016-03-28 02:12:19 +02:00
kervala
55de2f0bd2 Fixed: Compilation (missing NLMISC namespaces for nlfopen)
--HG--
branch : develop
2016-03-20 17:08:44 +01:00
kervala
d11053aa03 Fixed: Compilation (missing NLMISC namespaces for nlfopen) 2016-03-20 17:08:44 +01:00
kervala
0d773e3e79 Fixed: Use nlfopen in tools and servers
--HG--
branch : develop
2016-03-19 16:21:06 +01:00
kervala
82985016cf Fixed: Use nlfopen in tools and servers 2016-03-19 16:21:06 +01:00
kervala
db92fc81f1 Changed: Minor changes
--HG--
branch : develop
2016-02-20 19:26:43 +01:00
kervala
319fad1555 Changed: Minor changes 2016-02-20 19:26:43 +01:00
kervala
3f0e6f3757 Fixed: Compilation under Linux (thanks Kishan for the patch!), fixes #260
--HG--
branch : develop
2016-02-20 19:26:34 +01:00
kervala
7ecc271b58 Fixed: Compilation under Linux (thanks Kishan for the patch!), fixes #260 2016-02-20 19:26:34 +01:00
Yann
8159627ed0 mering to lirria 2016-02-12 21:39:15 +01:00
deed
3cd8969cd7 Changement du volume du sac 2016-02-11 09:48:19 +01:00
Yann
c76fdbf7db Deleting tries to delete unused continents - doesn't suffice, weather_everywhere.cpp ask for a different number of continents
q
2016-02-09 23:36:10 +01:00
Yann
5d9508ccf6 COmmenting calls to deleted continents in Respawn counts for RIng access 2016-02-09 22:59:01 +01:00
Yann
3fa275e64d merging to lirria 2016-02-09 21:32:08 +01:00
Yann
0dd802f677 Deleting unused continents from code 2016-02-09 21:31:30 +01:00
SIELA1915
74e420958b fixed nf_grp.cpp still for date 2016-01-31 21:04:41 +01:00
SIELA1915
1d60b878f9 final fix for displayTime() (i hope) 2016-01-31 20:48:52 +01:00
SIELA1915
aebed43da0 bugfixes 2016-01-31 20:45:41 +01:00
SIELA1915
6d3cc305de trying fixes 2016-01-31 20:42:07 +01:00
SIELA1915
5a5768c5c4 try to fix time display 2016-01-31 20:37:40 +01:00
SIELA1915
677e4b5e75 fixed CI18N (again lol) 2016-01-31 20:31:11 +01:00
SIELA1915
cd45b8731d bugfixes for CI18N 2016-01-31 20:24:54 +01:00
SIELA1915
095bc1b04c merged with compatibility-develop 2016-01-31 15:42:41 +01:00
SIELA1915
db771f1d2b fixed missing include for server when trying to get the date 2016-01-31 15:39:32 +01:00
SIELA1915
223139d53c merged 2016-01-30 20:51:30 +01:00
kervala
475864dac0 Fixed: Typo
--HG--
branch : develop
2016-01-30 20:44:33 +01:00
kervala
23c017c4f3 Fixed: Typo 2016-01-30 20:44:33 +01:00
kervala
5bf17060c0 Fixed: Crash if spawnBot is NULL
--HG--
branch : develop
2016-01-30 20:44:25 +01:00
kervala
a9f05efe06 Fixed: Crash if spawnBot is NULL 2016-01-30 20:44:25 +01:00
SIELA1915
5c77c15107 Changed date to match Khanat 2016-01-30 20:43:01 +01:00
kervala
fc96bdf46d Fixed: AIS crash if variable not initialized (forgot to commit)
--HG--
branch : develop
2016-01-30 18:15:48 +01:00
kervala
bebae652cc Fixed: AIS crash if variable not initialized (forgot to commit) 2016-01-30 18:15:48 +01:00
kervala
e60b630d09 Changed: Minor changes
--HG--
branch : develop
2016-01-30 18:01:55 +01:00
kervala
bbc7692aff Changed: Minor changes 2016-01-30 18:01:55 +01:00
kervala
b6f8fe80e9 Fixed: AIS crash if variable not initialized (a big thanks to depyraken to finding it)
--HG--
branch : develop
2016-01-30 18:01:27 +01:00
kervala
7ab17400e7 Fixed: AIS crash if variable not initialized (a big thanks to depyraken to finding it) 2016-01-30 18:01:27 +01:00
kervala
63a36fc2f8 Changed: Removed libxml2 dependencies from other targets
--HG--
branch : develop
2016-01-27 12:56:16 +01:00
kervala
ba3b4a977b Changed: Removed libxml2 dependencies from other targets 2016-01-27 12:56:16 +01:00
kervala
b6dae7002e Changed: Minor change
--HG--
branch : develop
2016-01-26 23:29:58 +01:00
kervala
8b817eea07 Changed: Minor change 2016-01-26 23:29:58 +01:00
kervala
93d89700bc Fixed: Useless dependencies
--HG--
branch : develop
2016-01-26 23:29:45 +01:00
kervala
f118b85dc6 Fixed: Useless dependencies 2016-01-26 23:29:45 +01:00
kervala
c1125199ca Changed: Minor changes
--HG--
branch : develop
2016-01-26 23:26:50 +01:00
kervala
a1bf53ca89 Changed: Minor changes 2016-01-26 23:26:50 +01:00
kervala
093ee91656 Fixed: libxml2 dependencies
--HG--
branch : develop
2016-01-26 23:26:38 +01:00
kervala
1c694c3216 Fixed: libxml2 dependencies 2016-01-26 23:26:38 +01:00
kervala
36f886f5f1 Changed: Removed more useless dependencies
--HG--
branch : develop
2016-01-26 22:43:35 +01:00
kervala
3faeb82290 Changed: Removed more useless dependencies 2016-01-26 22:43:35 +01:00
kervala
c5d8c9965e Changed: Minor changes (EOL, spaces, etc...)
--HG--
branch : develop
2016-01-26 22:32:45 +01:00
kervala
d05c011033 Changed: Minor changes (EOL, spaces, etc...) 2016-01-26 22:32:45 +01:00
kervala
af2f38612a Fixed: Remove inherited dependency on libxml2 for all projects
--HG--
branch : develop
2016-01-26 22:30:13 +01:00
kervala
237b6767b0 Fixed: Remove inherited dependency on libxml2 for all projects 2016-01-26 22:30:13 +01:00
kervala
963892913f Fixed: Crash in backup service
--HG--
branch : develop
2016-01-21 15:06:40 +01:00
kervala
7f054799b4 Fixed: Crash in backup service 2016-01-21 15:06:40 +01:00
kervala
f5a60e3a60 Fixed: Don't install static libraries if not defining WITH_INSTALL_LIBRARIES
--HG--
branch : develop
2016-01-21 15:06:01 +01:00
kervala
8a1b7d7836 Fixed: Don't install static libraries if not defining WITH_INSTALL_LIBRARIES 2016-01-21 15:06:01 +01:00
kervala
02f6248bd4 Changed: Expand environment variables in paths read from cfg files 2016-01-13 19:59:09 +01:00
kervala
57f216dc3e Changed: Expand environment variables in paths read from cfg files
--HG--
branch : develop
2016-01-13 19:59:09 +01:00
kervala
078a4b1895 Changed: Minor change 2016-01-07 17:40:19 +01:00
kervala
54ee3d79e9 Changed: Minor change
--HG--
branch : develop
2016-01-07 17:40:19 +01:00
kervala
e67096fb60 Changed: Minor changes 2016-01-06 23:21:38 +01:00
kervala
76dece0ec2 Changed: Minor changes
--HG--
branch : develop
2016-01-06 23:21:38 +01:00
kervala
cb5ffb1d05 Fixed: Servers compilation 2016-01-06 23:19:34 +01:00
kervala
c09476ec03 Fixed: Servers compilation
--HG--
branch : develop
2016-01-06 23:19:34 +01:00
kervala
98041d381a Changed: Minor changes 2016-01-06 16:03:39 +01:00
kervala
834fcbe8c8 Changed: Minor changes
--HG--
branch : develop
2016-01-06 16:03:39 +01:00
kervala
bfc9381a6b Fixed: Compilation 2016-01-06 16:03:20 +01:00
kervala
0e74c167cd Fixed: Compilation
--HG--
branch : develop
2016-01-06 16:03:20 +01:00
kervala
6ac293c848 Fixed: Warnings with GCC 2016-01-06 16:03:04 +01:00
kervala
592bb16c11 Fixed: Warnings with GCC
--HG--
branch : develop
2016-01-06 16:03:04 +01:00
kervala
23e55fe475 Fixed: Compilation 2016-01-06 13:14:29 +01:00
kervala
92fe9a6554 Fixed: Compilation
--HG--
branch : develop
2016-01-06 13:14:29 +01:00
kervala
ef7337b511 Changed: Replace strlwr by toLower 2016-01-06 13:05:49 +01:00
kervala
a53ff71469 Changed: Replace strlwr by toLower
--HG--
branch : develop
2016-01-06 13:05:49 +01:00
kervala
73f173dfc6 Fixed: Compilation with clang 2016-01-03 20:13:21 +01:00
kervala
23e4517baa Fixed: Compilation with clang
--HG--
branch : develop
2016-01-03 20:13:21 +01:00
kervala
61457e575e Fixed: Typos 2016-01-02 17:04:45 +01:00
kervala
20711e24e3 Fixed: Typos
--HG--
branch : develop
2016-01-02 17:04:45 +01:00
kervala
8490d64622 Fixed: Use SaveShardRoot from game_share 2016-01-02 17:02:07 +01:00
kervala
25a7caf341 Fixed: Use SaveShardRoot from game_share
--HG--
branch : develop
2016-01-02 17:02:07 +01:00
kervala
ac7f5ffa28 Changed: Replaced substr == by compare, because more optimized (thanks to Kaetemi for the hint!) 2016-01-01 16:26:12 +01:00
kervala
860a4d99ba Changed: Replaced substr == by compare, because more optimized (thanks to Kaetemi for the hint!)
--HG--
branch : develop
2016-01-01 16:26:12 +01:00
kervala
f15f3e70c0 Changed: Minor changes 2016-01-01 16:08:11 +01:00
kervala
03eaa9181a Changed: Minor changes
--HG--
branch : develop
2016-01-01 16:08:11 +01:00
kervala
ca48f22ba6 Fixed: Compilation 2015-12-30 00:46:22 +01:00
kervala
ef6b8fb501 Fixed: Compilation
--HG--
branch : develop
2015-12-30 00:46:22 +01:00
kervala
301c3b2b8a Changed: Minor change 2015-12-29 22:07:10 +01:00
kervala
130ca08bc7 Changed: Minor change
--HG--
branch : develop
2015-12-29 22:07:10 +01:00
kervala
a5e23cb0f9 Changed: Merge code from private repository 2015-12-29 22:06:49 +01:00
kervala
ab4dc8ec01 Changed: Merge code from private repository
--HG--
branch : develop
2015-12-29 22:06:49 +01:00
kervala
cf3dec5af6 Fixed: Wrong check (if c is NULL, nothing is happening) 2015-12-29 17:59:18 +01:00
kervala
d5e74ca5c8 Fixed: Wrong check (if c is NULL, nothing is happening)
--HG--
branch : develop
2015-12-29 17:59:18 +01:00
kervala
64145a8a70 Changed: Minor changes 2015-12-29 16:39:37 +01:00
kervala
c6927af7c0 Changed: Minor changes
--HG--
branch : develop
2015-12-29 16:39:37 +01:00
kervala
4275af8038 Changed: Merge code from private repository 2015-12-29 16:35:47 +01:00
kervala
ef16bab62e Changed: Merge code from private repository
--HG--
branch : develop
2015-12-29 16:35:47 +01:00
kervala
0e71d30714 Changed: Minor changes 2015-12-29 16:19:46 +01:00
kervala
88042cc28d Changed: Minor changes
--HG--
branch : develop
2015-12-29 16:19:46 +01:00
kervala
590dfeebc1 Changed: Replace ~0u by std::numeric_limits<uint>::max() 2015-12-23 15:30:12 +01:00
kervala
cfd905b4a9 Changed: Replace ~0u by std::numeric_limits<uint>::max()
--HG--
branch : develop
2015-12-23 15:30:12 +01:00
kervala
20dac0bdf9 Fixed: Colors are on 3 bits (colors goes from 0 to 7) so 254 was converted to 6 (white) 2015-12-23 15:28:33 +01:00
kervala
4694ca2580 Fixed: Colors are on 3 bits (colors goes from 0 to 7) so 254 was converted to 6 (white)
--HG--
branch : develop
2015-12-23 15:28:33 +01:00
kervala
2eb90a71f7 Changed: Synchronization with private repository 2015-12-18 13:05:11 +01:00
kervala
2a86e317be Changed: Synchronization with private repository
--HG--
branch : develop
2015-12-18 13:05:11 +01:00
kervala
4fcf286b44 Changed: Minor changes 2015-12-17 14:36:51 +01:00
kervala
b2927175c3 Changed: Minor changes
--HG--
branch : develop
2015-12-17 14:36:51 +01:00
kervala
e7fb9df922 Changed: Replace NLMISC::strupr by NLMISC::toUpper 2015-12-17 14:36:33 +01:00
kervala
80581347a4 Changed: Replace NLMISC::strupr by NLMISC::toUpper
--HG--
branch : develop
2015-12-17 14:36:33 +01:00
kervala
7af56ceb40 Changed: Replace more ~0 by std::numeric_limits<*>::max() some changes from private repository 2015-12-17 14:35:48 +01:00
kervala
613150e5bc Changed: Replace more ~0 by std::numeric_limits<*>::max() some changes from private repository
--HG--
branch : develop
2015-12-17 14:35:48 +01:00
kervala
3f561ac3f8 Changed: Replace more ~0 by std::numeric_limits<*>::max() 2015-12-17 13:03:21 +01:00
kervala
d187138099 Changed: Replace more ~0 by std::numeric_limits<*>::max()
--HG--
branch : develop
2015-12-17 13:03:21 +01:00
kervala
ad3e425e3e Changed: Minor changes 2015-12-17 12:48:57 +01:00
kervala
5efaa8360f Changed: Minor changes
--HG--
branch : develop
2015-12-17 12:48:57 +01:00
kervala
5b21d864a7 Fixed: Don't install libraries if WITH_INSTALL_LIBRARIES off 2015-12-16 08:00:27 +01:00
kervala
175af88d67 Fixed: Don't install libraries if WITH_INSTALL_LIBRARIES off
--HG--
branch : develop
2015-12-16 08:00:27 +01:00
kervala
5971858a5d Fixed: Compilation under Linux 2015-12-16 00:07:20 +01:00
kervala
394884ffd9 Fixed: Compilation under Linux
--HG--
branch : develop
2015-12-16 00:07:20 +01:00
kervala
a9af6c7830 Fixed: Clang warning 2015-12-15 15:08:54 +01:00
kervala
4e8ba88046 Fixed: Clang warning
--HG--
branch : develop
2015-12-15 15:08:54 +01:00
kervala
dc2c80d25c Fixed: Use NELID16 macros 2015-12-15 15:05:31 +01:00
kervala
b170168295 Fixed: Use NELID16 macros
--HG--
branch : develop
2015-12-15 15:05:31 +01:00
kervala
e382e2c781 Changed: Replace (uint16)~0 by std::numeric_limits<uint16>::max() 2015-12-15 14:33:59 +01:00
kervala
3a3a8752d1 Changed: Replace (uint16)~0 by std::numeric_limits<uint16>::max()
--HG--
branch : develop
2015-12-15 14:33:59 +01:00
kervala
3b07ad440d Changed: Minor changes 2015-12-15 14:07:32 +01:00
kervala
a550f2c760 Changed: Minor changes
--HG--
branch : develop
2015-12-15 14:07:32 +01:00
kervala
7b9050d439 Changed: Replace atoi by fromString 2015-12-15 14:05:56 +01:00
kervala
bc12a142c8 Changed: Replace atoi by fromString
--HG--
branch : develop
2015-12-15 14:05:56 +01:00
kervala
a09a5be6d1 Changed: Use std::string insteaf of const char* for filenames in CPersistentDataRecord 2015-12-15 13:39:40 +01:00
kervala
a680c7d83b Changed: Use std::string insteaf of const char* for filenames in CPersistentDataRecord
--HG--
branch : develop
2015-12-15 13:39:40 +01:00
kervala
076af98123 Changed: Minor changes 2015-12-15 13:39:02 +01:00
kervala
189fc7a2d9 Changed: Minor changes
--HG--
branch : develop
2015-12-15 13:39:02 +01:00
kervala
68f5cb447f Changed: Use std::string insteaf of const char* for filenames in CPersistentDataRecord 2015-12-15 13:35:04 +01:00
kervala
84831a4b34 Changed: Use std::string insteaf of const char* for filenames in CPersistentDataRecord
--HG--
branch : develop
2015-12-15 13:35:04 +01:00
kervala
36f6fedd4f Changed: Minor changes 2015-12-13 20:23:58 +01:00
kervala
7977ef5903 Changed: Minor changes
--HG--
branch : develop
2015-12-13 20:23:58 +01:00
kervala
bf73907da1 Fixed: Homogenize CFile::moveFile with other methods (use std::string instead of const char*) 2015-12-13 13:03:16 +01:00
kervala
fc951a24ce Fixed: Homogenize CFile::moveFile with other methods (use std::string instead of const char*)
--HG--
branch : develop
2015-12-13 13:03:16 +01:00
kervala
9aa47b4836 Changed: Minor changes 2015-11-15 13:29:34 +01:00
kaetemi
d411833ee0 Fix VS2013 64bit compiler error
C1128: number of sections exceeded object file format limit : compile with /bigobj
2015-07-10 02:31:04 +02:00
kervala
817486538c Changed: Minor changes
--HG--
branch : develop
2015-11-15 13:29:34 +01:00
kaetemi
0cd51d59c7 Fix VS2013 64bit compiler error
C1128: number of sections exceeded object file format limit : compile with /bigobj

--HG--
branch : develop
2015-07-10 02:31:04 +02:00
kaetemi
769d5190c5 Fixes for VS2013, ref #236
--HG--
branch : develop
2015-03-29 16:58:07 +02:00
kaetemi
84f9d64872 Fixes for VS2013, ref #236 2015-03-29 16:58:07 +02:00
kervala
f999cc892c Fixed: Compilation with GCC
--HG--
branch : develop
2015-03-02 23:51:23 +01:00
kervala
4a1e0b58e5 Fixed: Compilation with GCC 2015-03-02 23:51:23 +01:00