Sit Melai
510b5672d3
Fixed build_sound tool crashing because of not initialized CSheetId
2016-10-31 22:52:25 +01:00
Sit Melai
f75a3cdd2d
Merge branch 'develop' of ssh://git.khaganat.net:1022/khaganat/khanat-code into develop
...
Merging local changes
2016-10-31 22:50:39 +01:00
Sit Melai
5231e8de28
various improvements to clients
2016-10-31 22:46:39 +01:00
853a0aca10
Merge branch 'feature/character_screens' into 'develop'
...
Feature/character screens
Il faut aussi merger la même branche sur :
- [ ] https://git.khaganat.net/khaganat/khanat-ressources/
- [ ] https://git.khaganat.net/khaganat/khanat-data-client
See merge request !24
2016-10-10 19:31:00 +00:00
yannk
e85b805ccd
Refining character selection screen with new textures Fix#14
2016-10-09 21:03:53 +02:00
yannk
a2dced68c5
Adding Khanat Full Character selection
2016-10-06 17:37:14 +02:00
yannk
7bbeae5dca
Integrating Khanat former changes
2016-10-06 17:34:56 +02:00
yannk
5cd464003a
Modification écran de sélection du personnage
2016-10-04 21:05:32 +02:00
0ff7b7f01e
ajout chascore
2016-09-20 12:39:13 +02:00
2dfcf5f7b6
ajout chascore
2016-09-13 23:24:07 +02:00
Sit Melai
5c4f5bcb50
Merge branch 'develop' of ssh://git.khaganat.net:1022/khaganat/khanat-code into develop
2016-09-07 15:39:02 +02:00
9a3aa0f468
faute de frappe de "
2016-09-06 10:03:59 +02:00
67529e6147
correction du AMS par Depyraken
2016-09-05 18:14:21 +02:00
10c24349c8
mise a jour database
2016-09-05 16:15:24 +02:00
Sit Melai
0d0bf4c7d0
Merge branch 'develop' of ssh://git.khaganat.net:1022/khaganat/khanat-code into develop
2016-09-05 07:16:50 +02:00
261a1fc57d
valid test"
2016-09-03 21:04:12 +02:00
e2e79f722e
test
2016-09-03 21:02:19 +02:00
Sit Melai
fa2bd028a3
regenerated database_plr.h/.cpp files
2016-09-02 22:29:22 +02:00
Sit Melai
598eadfa62
Various build folders added to .gitignore and fixed an error in opengl driver on mac
2016-09-02 21:33:20 +02:00
7e1800a9fe
Merge branch 'feature/merge-ryzomcore-to-develop+CI' into 'develop'
...
Feature/merge ryzomcore to develop+ci
See merge request !22
2016-08-14 20:47:52 +00:00
Erwan Georget
306061a1c0
Merged branch ryzomcore into feature/merge-ryzomcore-to-develop+CI
2016-08-14 16:08:25 +02:00
786df4ff8e
Merge branch 'feature/ci-static-packaging+test+CI' into 'develop'
...
Feature/ci static packaging+test+ci
Nouveautés :
- ~Feature Nouvel installeur pour le client statique
- ~Feature Test dudit installeur
See merge request !21
2016-08-14 12:46:48 +00:00
kervala
97b82ac58f
Changed: Rerun installer from TEMP under Windows, see #279
2016-08-14 13:35:46 +02:00
kervala
6ad79f707e
Changed: Check modification time of Installer to determine if it must be copied again, see #279
2016-08-14 13:29:27 +02:00
kervala
372d06c342
Changed: Try to load config file everytime, see #279
2016-08-14 13:28:50 +02:00
kervala
43e8593735
Added: CProfile and CServer classes have their own sources, see #279
2016-08-14 13:26:45 +02:00
kervala
0fc7d54c8c
Fixed: Save config after choosing if we should uninstall previous version, see #279
2016-08-14 12:52:22 +02:00
kervala
52eeb2a0b2
Fixed: Missing Q_OBJECT, see #279
2016-08-14 12:50:29 +02:00
kervala
1c75bcde46
Changed: Computes size of downloaded files, see #279
2016-08-14 12:50:11 +02:00
kervala
0cb718f37b
Changed: Always copy installer if different, see #279
2016-08-14 12:49:39 +02:00
kervala
51cff76ce2
Fixed: Wrong name of packed sheets BNP, see #279
2016-08-14 12:48:33 +02:00
kervala
c34414b71e
Changed: Allow to get size of a directory recursively or not, see #279
2016-08-14 12:47:56 +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
Cédric OCHS
a281290174
Merged in viniciusarroyo/ryzomcore/viniciusarroyo/fixes-wrong-initialization-of-max-number-1470835250351 (pull request #140 )
...
fixes wrong initialization of max number of objects and npc spaws in egs
2016-08-10 15:42:27 +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
11ca113401
Quelques corrections de merge
2016-08-09 22:32:01 +02:00
Erwan GEORGET
edf0b19c75
Merge ryzomcore into feature/merge-ryzomcore-to-develop+CI
2016-08-09 22:12:11 +02:00
Erwan Georget
7f8163e747
ajout du script d'extraction
2016-08-09 19:20:58 +02:00
Erwan Georget
ca1549b5ad
Ajout de test et du packaging du client statique
2016-08-09 18:29:20 +02:00
kervala
16d6357cb6
Changed: Create a backup if version of default config is incremented, see #279
2016-08-06 20:11:48 +02:00
kervala
c74c8984b9
Changed: Minor changes, see #279
2016-08-06 20:11:15 +02:00
kervala
a12b47c446
Changed: Display directories in Settings, see #279
2016-08-06 20:10:31 +02:00
kervala
8260641eae
Fixed: Include initguid.h to avoid linking against dxguid.lib
2016-08-06 20:09:40 +02:00
kervala
3781f38994
Added: Translations for Ryzom Installer, see #279
2016-08-06 20:05:02 +02:00
966badbd20
mise a jour du client_default.cfg
2016-08-06 01:15:02 +02:00
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
kervala
0ffd7bda5c
Changed: Winch Gate instead of Winchgate
2016-07-27 12:48:16 +02:00
