Khaganat-games/khanat-client
Khaganat-games/khanat-client
2
0
Fork 0
Code Issues 23 Pull requests 2 Projects Releases Packages Wiki Activity

Draft: Resolve "Créer une zone de paysage extérieur" #45

Open
yannk wants to merge 24 commits from 10-creer-une-zone-de-paysage-exterieur into develop
pull from: 10-creer-une-zone-de-paysage-exterieur
merge into: Khaganat-games:develop
Conversation 28 Commits 24 Files changed 348 +28090 -111
yannk commented 2021-10-15 14:21:05 +00:00 (Migrated from port.numenaute.org)
Copy link

Closes #10
Warning : This branch adds submodule to git :

  • when updating the repository after merging, you will have to pass these commands to be sure you will get the submodules downloaded and updated. From your repository folder, pass :
    • git submodule init
    • git submodule update
  • you can pass the two in one : git submodule update --init
Closes #10 Warning : This branch adds [submodule to git](https://git-scm.com/book/fr/v2/Utilitaires-Git-Sous-modules) : - when updating the repository after merging, you will have to pass these commands to be sure you will get the submodules downloaded and updated. From your repository folder, pass : - `git submodule init` - `git submodule update` - you can pass the two in one : `git submodule update --init`
yannk commented 2021-10-15 14:21:12 +00:00 (Migrated from port.numenaute.org)
Copy link

assigned to @yannk

assigned to @yannk
yannk commented 2021-10-15 14:35:27 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • 466e1c10 - Download et installation of Height Terrain addon by Zylann

Compare with previous version

added 1 commit <ul><li>466e1c10 - Download et installation of Height Terrain addon by Zylann</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=170&start_sha=4f0d91132f2397d02f4dc649dec728174a326e05)
yannk commented 2021-10-15 14:36:17 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • ab87ea16 - Activating Height Terrain addon by Zylann

Compare with previous version

added 1 commit <ul><li>ab87ea16 - Activating Height Terrain addon by Zylann</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=171&start_sha=466e1c105861cc3ffa39f265f4c5e298831bf060)
yannk commented 2021-10-15 14:39:14 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • 4f4b3b10 - Activating Height Terrain addon by Zylann

Compare with previous version

added 1 commit <ul><li>4f4b3b10 - Activating Height Terrain addon by Zylann</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=172&start_sha=ab87ea164458097f0fe9a7201c7c963a44ccc09e)
yannk commented 2021-10-15 14:47:35 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • 8bb63e67 - Creating basic first zone landscape node

Compare with previous version

added 1 commit <ul><li>8bb63e67 - Creating basic first zone landscape node</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=173&start_sha=4f4b3b101fa7dcf109c83ab330b05052204992be)
yannk commented 2021-10-17 19:27:29 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • 45c0759b - Adding submodule for generic textures files repository

Compare with previous version

added 1 commit <ul><li>45c0759b - Adding submodule for generic textures files repository</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=175&start_sha=8bb63e670316a1ea17ec56a3ce58e1978438d027)
yannk commented 2021-10-17 19:53:12 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • 99e928c5 - Adding submodules usage indications

Compare with previous version

added 1 commit <ul><li>99e928c5 - Adding submodules usage indications</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=177&start_sha=45c0759b3bc665dcf7f59c5e36338868cdcc6020)
yannk commented 2021-10-17 19:53:57 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>9da4527f - Latest version of textures</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=178&start_sha=99e928c510c0e30cc4463d907f5c51cb27855343)
yannk commented 2021-10-17 19:54:27 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • 6e6e9eba - Adding a forgotten .import file

Compare with previous version

added 1 commit <ul><li>6e6e9eba - Adding a forgotten .import file</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=179&start_sha=9da4527f20ee6b4bd334b9d0f1629e1ebc937baf)
yannk commented 2021-10-17 19:57:06 +00:00 (Migrated from port.numenaute.org)
Copy link

changed the description

changed the description
yannk commented 2021-10-17 19:59:00 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • d623bf9d - Commands to init and update submodules in one line

Compare with previous version

added 1 commit <ul><li>d623bf9d - Commands to init and update submodules in one line</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=181&start_sha=6e6e9eba80616e231c5f25386cf6a289a99a7dd4)
yannk commented 2021-10-17 20:16:56 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • 3b71ca22 - Precision about the branch to be in for enabling git submodules

Compare with previous version

added 1 commit <ul><li>3b71ca22 - Precision about the branch to be in for enabling git submodules</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=183&start_sha=d623bf9d8155c685a31094f609ad0f2c1a7066c6)
yannk commented 2021-10-17 20:22:56 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • addd2c80 - Enabling 'Khanat client 3D textures library’ addon in the corresponding submodule

Compare with previous version

added 1 commit <ul><li>addd2c80 - Enabling &#39;Khanat client 3D textures library’ addon in the corresponding submodule</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=184&start_sha=3b71ca222958aee2599c85e276385740b0c62fc2)
yannk commented 2021-10-17 20:39:54 +00:00 (Migrated from port.numenaute.org)
Copy link

Important :

Il est possible lors du premeir pull de cett branche que le plugin de Zylann soit indiqué comme non correctement installé et soit donc désactivé :
Capture_d_écran_2021-10-17_22-34-35

Un git diff indiquera d’ailleurs que le fichier project.godot a été modifié. Il suffit pour tout remettre en ordre d’aller dans les Pojects Settings > Plugins et de réactiver le plugin Heigthmap terrain de Marc Gilleron.

# Important : Il est possible lors du premeir pull de cett branche que le plugin de Zylann soit indiqué comme non correctement installé et soit donc désactivé : ![Capture_d_écran_2021-10-17_22-34-35](/uploads/a07c15fc6a3cdd66afbb055b04e77b27/Capture_d_écran_2021-10-17_22-34-35.png) Un `git diff` indiquera d’ailleurs que le fichier `project.godot` a été modifié. Il suffit pour tout remettre en ordre d’aller dans les `Pojects Settings > Plugins` et de réactiver le plugin `Heigthmap terrain` de Marc Gilleron.
deed commented 2021-10-18 16:05:17 +00:00 (Migrated from port.numenaute.org)
Copy link

Voici, ce que j'ai fait il y a 2 ans.

C'est long à explorer 4 zones (dispensaire, montagne, lac, bosses), écran bleu au début qui s’enlève quand on bouge .

On se déplace avec les flèches.

Linux64
https://kloud.khaganat.net/index.php/s/5XtecCS9Ygpo2PF

Voici, ce que j'ai fait il y a 2 ans. C'est long à explorer 4 zones (dispensaire, montagne, lac, bosses), écran bleu au début qui s’enlève quand on bouge . On se déplace avec les flèches. Linux64 https://kloud.khaganat.net/index.php/s/5XtecCS9Ygpo2PF
yannk commented 2021-10-19 18:46:42 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • 3bbb9f3d - Validating new texturesets in submodule

Compare with previous version

added 1 commit <ul><li>3bbb9f3d - Validating new texturesets in submodule</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=186&start_sha=addd2c80ccfc1a5249afa477ce65b05df10b5807)
yannk commented 2021-10-31 08:51:01 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • cc095da4 - Adding a .gdignore file to prevent the content of this folder to be included in the exported game

Compare with previous version

added 1 commit <ul><li>cc095da4 - Adding a .gdignore file to prevent the content of this folder to be included in the exported game</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=190&start_sha=3bbb9f3da6bc46795bb99911d88c7c7b7d5288fa)
yannk commented 2021-12-02 18:26:00 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • 236388d1 - Intégration des mises à jour

Compare with previous version

added 1 commit <ul><li>236388d1 - Intégration des mises à jour</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=195&start_sha=cc095da49b57acfba6de6eaed4602fd8db5f9a72)
yannk commented 2021-12-02 18:29:08 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • b3cd8a34 - Integrating new import files for textures

Compare with previous version

added 1 commit <ul><li>b3cd8a34 - Integrating new import files for textures</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=196&start_sha=236388d1b68869872f61b002f9e8ecb7f01144b1)
yannk commented 2021-12-29 22:14:27 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • ee6c68af - Adding new textures files in the addon

Compare with previous version

added 1 commit <ul><li>ee6c68af - Adding new textures files in the addon</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=240&start_sha=b3cd8a34be768d501d53e005d708b304e0501c7f)
yannk commented 2021-12-29 22:17:09 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • e1164899 - Taking in account the new .import files in textures library addon

Compare with previous version

added 1 commit <ul><li>e1164899 - Taking in account the new .import files in textures library addon</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=241&start_sha=ee6c68af398b80414b5b94fd3106b0ba90e1bf0a)
yannk commented 2022-01-06 20:05:32 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>9d0cee5c - Updating textures files</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=257&start_sha=e11648993e2aabb54d336212fe5fe5af34fd1c80)
yannk commented 2022-01-16 15:41:07 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • 0527866f - Updating Zylann plugin with latest stable version

Compare with previous version

added 1 commit <ul><li>0527866f - Updating Zylann plugin with latest stable version</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=278&start_sha=9d0cee5cb012749d8682b4bb016d84ef88690aea)
yannk commented 2022-01-16 20:01:16 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • c93130ca - Adding basic setup for a textured zone with Zylann addon

Compare with previous version

added 1 commit <ul><li>c93130ca - Adding basic setup for a textured zone with Zylann addon</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=279&start_sha=0527866fc62fc403caa14b9f3f57c5a10c99b479)
yannk commented 2022-01-16 20:03:20 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • 44a4844f - Ajusting starting position of first zone

Compare with previous version

added 1 commit <ul><li>44a4844f - Ajusting starting position of first zone</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=280&start_sha=c93130ca497d75f40bf7db552cc43264ed3b9963)
yannk commented 2022-01-16 20:15:20 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • e83c1ce1 - Adding a bit or height using only sculpting tools

Compare with previous version

added 1 commit <ul><li>e83c1ce1 - Adding a bit or height using only sculpting tools</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=281&start_sha=44a4844f36bc90bfdc6c0c2086cbb26a858416f8)
yannk commented 2022-01-16 20:30:07 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • 80e9869e - Integrating new versions of texture files

Compare with previous version

added 1 commit <ul><li>80e9869e - Integrating new versions of texture files</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=282&start_sha=e83c1ce1b165132b07303c7e5b73fdcf66afdf0f)
yannk commented 2022-01-17 20:38:26 +00:00 (Migrated from port.numenaute.org)
Copy link

added 1 commit

  • 66590d74 - Adding explanations about the use and cloning with submodules, mandatory from now on

Compare with previous version

added 1 commit <ul><li>66590d74 - Adding explanations about the use and cloning with submodules, mandatory from now on</li></ul> [Compare with previous version](/khaganat/mmorpg_khanat/khanat-client/-/merge_requests/8/diffs?diff_id=284&start_sha=80e9869ec489ea630e2ea7303817290a0d89b405)
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 10-creer-une-zone-de-paysage-exterieur:10-creer-une-zone-de-paysage-exterieur
git checkout 10-creer-une-zone-de-paysage-exterieur

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout develop
git merge --no-ff 10-creer-une-zone-de-paysage-exterieur
git checkout 10-creer-une-zone-de-paysage-exterieur
git rebase develop
git checkout develop
git merge --ff-only 10-creer-une-zone-de-paysage-exterieur
git checkout 10-creer-une-zone-de-paysage-exterieur
git rebase develop
git checkout develop
git merge --no-ff 10-creer-une-zone-de-paysage-exterieur
git checkout develop
git merge --squash 10-creer-une-zone-de-paysage-exterieur
git checkout develop
git merge --ff-only 10-creer-une-zone-de-paysage-exterieur
git checkout develop
git merge 10-creer-une-zone-de-paysage-exterieur
git push origin develop
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Bug

Dysfonctionnement

  
CI/CD

Déploiement Continu / Intégration Continue à mettre en place

  
Client

Création du client Khanat

  
Documentation

Tout ce qui a trait aux explications pour comprendre l’utilisation du système

  
Fonctionnalité

Ajout de fonctionnalité

  
Graphisme

Travail graphique

  
Interface

Tout ce qui a trait aux éléments d’interface des logiciels : menus, fenêtres, UX/UI

  
Leveldesign

Tout ce qui a trait aux mécanismes et à la conception des zones de jeu

  
Organisation

Tout ce qui a trait à l’aspect organisationnel des dépôts et de la collaboration

  
Sound design

Tout ce qui a trait au son

  
SysAdmin

Tâches nécessitant de l’administration système

No labels
Bug
CI/CD
Client
Documentation
Fonctionnalité
Graphisme
Interface
Leveldesign
Organisation
Sound design
SysAdmin
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Khaganat-games/khanat-client#45
No description provided.
Delete branch "10-creer-une-zone-de-paysage-exterieur"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?