Commit graph

934 commits

Author SHA1 Message Date
kervala
9a29dbced9 Changed: Merge pull request in develop too 2016-10-21 16:48:42 +02:00
kervala
661975a471 Changed: Simplify toString
--HG--
branch : develop
2016-10-20 12:35:24 +02:00
kervala
02d8b7d400 Changed: Simplify toString 2016-10-20 12:35:24 +02:00
kervala
3ae41bfa58 Changed: Minor changes
--HG--
branch : develop
2016-10-20 12:34:25 +02:00
kervala
f53ecd3687 Changed: Minor changes 2016-10-20 12:34:25 +02:00
kervala
517336923f Changed: Replace sscanf by fromString
--HG--
branch : develop
2016-10-20 12:33:37 +02:00
kervala
fd61399877 Changed: Replace sscanf by fromString 2016-10-20 12:33:37 +02:00
kervala
25faa27ef5 Fixed: Compilation with VC++ 2015 (need spaces around NL_I64)
--HG--
branch : develop
2016-10-20 12:30:24 +02:00
kervala
9ab62c5606 Fixed: Compilation with VC++ 2015 (need spaces around NL_I64) 2016-10-20 12:30:24 +02:00
kervala
daf3edd056 Changed: Typo
--HG--
branch : develop
2016-10-18 17:49:56 +02:00
kervala
34a3f05b98 Changed: Typo 2016-10-18 17:49:56 +02:00
kervala
a62e5ec380 Changed: Minor changes
--HG--
branch : develop
2016-10-18 17:45:55 +02:00
kervala
44c61c03e5 Changed: Minor changes 2016-10-18 17:45:55 +02:00
kervala
a656985518 Fixed: Possible SQL injection, fixes #297
--HG--
branch : develop
2016-10-18 17:44:47 +02:00
kervala
535f5b8bde Fixed: Possible SQL injection, fixes #297 2016-10-18 17:44:47 +02:00
9a3aa0f468 faute de frappe de " 2016-09-06 10:03:59 +02:00
10c24349c8 mise a jour database 2016-09-05 16:15:24 +02:00
Erwan Georget
306061a1c0 Merged branch ryzomcore into feature/merge-ryzomcore-to-develop+CI 2016-08-14 16:08:25 +02:00
kervala
8580daa0a1 Changed: Minor changes
--HG--
branch : develop
2016-08-10 15:45:37 +02:00
kervala
2c8409506f Changed: Minor changes 2016-08-10 15:45:37 +02:00
kervala
2c6bbb7124 Fixed: Wrong variable names
--HG--
branch : develop
2016-08-10 15:45:28 +02:00
kervala
a5a400bd3f Fixed: Wrong variable names 2016-08-10 15:45:28 +02:00
Vinicius Arroyo
b9bc6e91bd fixes wrong initialization of max number of objects and npc spaws in egs
--HG--
branch : viniciusarroyo/fixes-wrong-initialization-of-max-number-1470835250351
2016-08-10 13:23:35 +00:00
Vinicius Arroyo
7cf8de2922 fixes wrong initialization of max number of objects and npc spaws in egs 2016-08-10 13:23:35 +00:00
Erwan GEORGET
edf0b19c75 Merge ryzomcore into feature/merge-ryzomcore-to-develop+CI 2016-08-09 22:12:11 +02:00
Erwan Georget
945b9e8847 Supression d'un #endif orphelin. fix #10. 2016-07-30 12:00:54 +02:00
kervala
b547861532 Changed: Better checks
--HG--
branch : develop
2016-06-11 20:49:28 +02:00
kervala
9960aab6a1 Changed: Better checks 2016-06-11 20:49:28 +02:00
kervala
0c2535c4a0 Fixed: Compilation
--HG--
branch : develop
2016-06-11 20:31:29 +02:00
kervala
8c2dade6c4 Fixed: Compilation 2016-06-11 20:31:29 +02:00
kervala
9609ac7de2 Changed: Replace atof by fromString
--HG--
branch : develop
2016-06-11 16:54:10 +02:00
kervala
615e7c80b9 Changed: Replace atof by fromString 2016-06-11 16:54:10 +02:00
SIELA1915
7e3b9d56bb changed all HP, Sap, Stamina and Focus occurences 2016-05-23 11:45:43 +02:00
kervala
77ae602e6a Changed: Better alignment
--HG--
branch : develop
2016-05-04 10:07:42 +02:00
kervala
35bb966603 Changed: Better alignment 2016-05-04 10:07:42 +02:00
Dremor
159898b081 Merge branch 'ryzomcore' into 'develop'
Merge Ryzomcore into Develop



See merge request !2
2016-05-02 08:01:47 +00:00
Nimetu
a8a697c5dd Fixed: bad commit (issue #143)
--HG--
branch : develop
2016-04-19 22:55:34 +03:00
Nimetu
f023fa769a Fixed: bad commit (issue #143) 2016-04-19 22:55:34 +03:00
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