Commit graph

466 commits

Author SHA1 Message Date
642c47c180 Update entities_game_service_default.cfg (mise à jour du gameplay pour les tests temps de rez 5 minutes , temps pour une action racourcit et bijoux a 10% au lieu de 1%) 2016-12-31 00:12:21 +01:00
a6339b7fd9 Merge branch 'feature/v3+CI' into 'develop'
Feature/v3+ci

Toujours le merge de la v3...

See merge request !28
2016-12-13 13:54:26 +00:00
0e55d39f53 Update egs_mirror.cpp (ajout ChaScore1 ) warning dans le shard 2016-12-12 09:34:03 +00:00
d5b6609538 Correction des privileges ChaScore1 et maxChaScore1 pour les GM 2016-12-07 21:40:41 +01:00
5d93d12272 Changement du nom de shard "Open" en "Lirria" 2016-12-07 21:26:43 +01:00
56df66454a Changement du nom du shard à la création du personnage 2016-12-03 17:56:35 +01:00
Sit Melai
ccb943b852 Merge de la v3 de Ryzom Core 2016-11-07 17:11:05 +01:00
kervala
b785a5114b Changed: Use empty() instead of comparison with "" 2016-10-30 15:59:20 +01:00
kervala
a53ec84c73 Changed: Simplified all ENDIF and ELSE 2016-10-27 10:54:09 +02:00
kervala
9a29dbced9 Changed: Merge pull request in develop too 2016-10-21 16:48:42 +02:00
kervala
02d8b7d400 Changed: Simplify toString 2016-10-20 12:35:24 +02:00
kervala
f53ecd3687 Changed: Minor changes 2016-10-20 12:34:25 +02:00
kervala
fd61399877 Changed: Replace sscanf by fromString 2016-10-20 12:33:37 +02:00
kervala
9ab62c5606 Fixed: Compilation with VC++ 2015 (need spaces around NL_I64) 2016-10-20 12:30:24 +02:00
kervala
34a3f05b98 Changed: Typo 2016-10-18 17:49:56 +02:00
kervala
44c61c03e5 Changed: Minor changes 2016-10-18 17:45:55 +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
2c8409506f Changed: Minor changes 2016-08-10 15:45:37 +02:00
kervala
a5a400bd3f Fixed: Wrong variable names 2016-08-10 15:45:28 +02: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
9960aab6a1 Changed: Better checks 2016-06-11 20:49:28 +02:00
kervala
8c2dade6c4 Fixed: Compilation 2016-06-11 20:31:29 +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
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
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
d11053aa03 Fixed: Compilation (missing NLMISC namespaces for nlfopen) 2016-03-20 17:08:44 +01:00
kervala
82985016cf Fixed: Use nlfopen in tools and servers 2016-03-19 16:21:06 +01:00
kervala
319fad1555 Changed: Minor changes 2016-02-20 19:26:43 +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