d44dc182eb
Merge branch 'feature/ci-multi-stages+CI' into 'develop'
...
Change : refonte du script d'intégration continue.
Nouveau script CI, avec les squelettes des futures Job de test des clients, outils et serveur, ainsi que du déploiements de ceux-ci
See merge request !19
2016-08-03 18:45:44 +00:00
Erwan Georget
24026cae8f
Change : refonte du script d'intégration continue.
2016-08-03 19:22:54 +02:00
Erwan Georget
945b9e8847
Supression d'un #endif orphelin. fix #10 .
2016-07-30 12:00:54 +02:00
Dremor
c58e1a3506
Merge branch 'feature/chascore-donner-des-noms-standards-aux-barres-de-ressource+CI-LIN64' into 'develop'
...
Changed all HP, Sap, Stamina and Focus occurences to ChaScoreX
Issue #5 :
Changed all HP (or similar) occurences to ChaScore1 (or cha_score1).
Changed all Stamina (or similar) occurences to ChaScore2 (or cha_score2).
Changed all Sap occurences to ChaScore3 (or cha_score3).
Changed all Focus (or similar) occurences to ChaScore4 (or cha_score4).
See merge request !17
2016-05-23 18:22:24 +00:00
SIELA1915
7e3b9d56bb
changed all HP, Sap, Stamina and Focus occurences
2016-05-23 11:45:43 +02:00
Erwan Georget
750200b703
Remove cache, as it tend to make compilation errors
2016-05-18 12:15:27 +02:00
Erwan Georget
27da46d812
New CI file
2016-05-17 15:04:33 +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
8b767cabcd
Changed: When writing to icfg or keys files, write to temp file and then rename
2016-04-29 12:16:43 +03:00
Nimetu
6b75bdb0e1
Fixed: Tooltip position related to parent window
2016-04-23 18:49:36 +03:00
Nimetu
f023fa769a
Fixed: bad commit (issue #143 )
2016-04-19 22:55:34 +03:00
kervala
58347b9353
Changed: Display certificate path
2016-04-18 13:40:13 +02:00
kervala
8aabb4fec7
Fixed: Warnings with clang
2016-04-18 13:40:02 +02:00
kervala
a9685f71b2
Fixed: Ignore "certificate already in hash table" errors
2016-04-18 13:39:48 +02:00
kervala
b0934cabe4
Changed: Signed/unsigned comparison
2016-04-15 16:11:37 +02:00
kervala
c1983fba05
Fixed: Creation of sn_0_* folders under OS X 10.7
2016-04-15 16:11:14 +02:00
kervala
b1368c6e53
Fixed: Link to freetype when using Qt
2016-04-13 20:36:43 +02:00
kervala
f36c73a9b1
Changed: Display parameters passed to batch in log
2016-04-12 19:54:38 +02:00
kervala
58d787fa19
Fixed: Compilation with Qt 5.6
2016-04-12 19:54:05 +02:00
kervala
3d50a01f83
Changed: Q_COMPILER_RVALUE_REFS hack useless with Qt 5.6
2016-04-12 15:43:13 +02:00
kervala
a545a8b091
Changed: Removed extraneous spaces at the end of lines
2016-04-12 15:42:53 +02:00
kervala
e77815256f
Fixed: CURLE_NOT_BUILT_IN undefined with some CURL versions
2016-04-12 15:42:43 +02:00
kervala
8c04ffe056
Fixed: Wrong display of max resist levels
2016-04-09 13:02:12 +02:00
deed
a857cc8bce
petite modif :)
2016-04-08 23:53:16 +02:00
kervala
130229cbb7
Changed: Give priority to login specified as argument
2016-04-06 09:36:06 +02:00
kervala
f93dfcfefe
Changed: Minor changes
2016-04-06 09:29:37 +02:00
kervala
81ca1a9a04
Changed: Reverted change, not sure it fixes anything
2016-04-02 19:33:53 +02:00
kervala
4cccd74b25
Changed: Use booleans to know if we already added a loopback address
2016-04-02 13:31:59 +02:00
kervala
62a7ed13fe
Fixed: Empty const char* because std::string destructor called
2016-04-02 13:31:04 +02:00
kervala
4e62ef6921
Changed: Use toString for formatting
2016-04-02 13:30:08 +02:00
kervala
e2073f31d7
Changed: Minor changes
2016-04-02 13:29:42 +02:00
kervala
a445afef3c
Changed: Better camel case syntax
2016-04-02 13:28:42 +02: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
3bbc975654
merge compatibility-develop to aquatic
2016-03-30 23:10:24 +02:00
Nimetu
9fb698f8af
Fixed: Typo in translation key
2016-03-30 10:44:52 +03: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
kervala
7517200cc7
Merge with develop
2016-03-29 14:00:04 +02:00
kervala
8b5c38392a
Fixed: Typo
2016-03-29 13:59:34 +02:00
kervala
1b0280b96f
Fixed: Wrong locale under Linux
2016-03-29 13:58:57 +02:00
kervala
740b7a252d
Changed: Updated translations
2016-03-29 13:58:29 +02:00
depyraken
d3c21bdd08
add isloopbackIPAddress prototype to code/nel/include/nel/net/inet_address.h
...
add isloopbackIPAddress to code/nel/src/net/inet_address.cpp
add IPv4&IPv6 loopback IP addresses to localAddresses
In code/nel/src/net/unified_network.cpp:
replace is127001 calls by isloopbackIPAddress
change wrong comments about default network id (nid = 0xFF)
When the selected connectionId is not valid
warnings are not triggered anymore when using default network (nid = 0xFF): the logs were full of warnings and the server was lagging
When nid = 0xFF, the new connectionId is stored into DefaultNetwork
When nid <> 0xFF, the new connectionId is stored into NetworkConnectionAssociations[nid]
2016-03-29 02:29:35 +02:00
SIELA1915
52702f64f1
merged from compatibility-develop
2016-03-28 02:12:19 +02:00
Nimetu
df0d249834
Added: AppZone translations
2016-03-22 12:17:57 +02:00
Nimetu
2be2717ee7
Merge with develop
2016-03-22 12:23:04 +02:00
Nimetu
5f53c6caa6
Added: AppZone and WebBrowser components
2016-03-22 11:11:47 +02:00
kervala
9aae3598aa
Merge with develop
2016-03-20 17:28:00 +01:00
kervala
e6729fb0e5
Fixed: Compilation (missing NLMISC namespaces for nlfopen)
2016-03-20 17:27:25 +01:00
kervala
323d981318
Merge with develop
2016-03-20 17:09:13 +01:00
