Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
04f6d13
Commit initial - Projet territoire
laissy-dev Mar 5, 2025
e87b846
Test_Godot
HuguesLa Mar 10, 2025
b2d4e21
add 2Dscene
HuguesLa Mar 11, 2025
77f130a
Create teri_test1.cpp
Mathieu-Da-Costa Mar 11, 2025
680e363
début propagation
HuguesLa Mar 11, 2025
efdde4a
Commit initial - Territoire envahir
laissy-dev Mar 11, 2025
829bdf4
11/03 fin de cours
HuguesLa Mar 11, 2025
2404680
Bonbon.cpp une extension gourmande de envahir
laissy-dev Mar 13, 2025
7c2bab4
Update teri_test1.cpp
Mathieu-Da-Costa Mar 13, 2025
73de3bc
Update teri_test1.cpp
Mathieu-Da-Costa Mar 13, 2025
294192b
Update teri_test1.cpp
Mathieu-Da-Costa Mar 13, 2025
c779ada
Update teri_test1.cpp
Mathieu-Da-Costa Mar 13, 2025
e098c91
Start button
HuguesLa Mar 13, 2025
6b40590
Update teri_test1.cpp
Mathieu-Da-Costa Mar 13, 2025
dd9d9e9
Update test.tscn
HuguesLa Mar 13, 2025
ccf3373
Mes modifications au fichier project.godot
laissy-dev Mar 13, 2025
c4a555f
Merge branch 'exemple/latreille_laissy_da_costa' of https://github.co…
Mathieu-Da-Costa Mar 13, 2025
bdef8c1
fusion
laissy-dev Mar 13, 2025
8b7e8f4
Résolution des conflits de fusion
laissy-dev Mar 13, 2025
6e55543
Résolution du conflit dans examples/territoire/test.tscn
laissy-dev Mar 13, 2025
3529954
Suppression de bonjour.cpp
laissy-dev Mar 13, 2025
e053eff
idk
HuguesLa Mar 13, 2025
d6ef823
Fix scene
HuguesLa Mar 13, 2025
7b2e599
Bonbon explosif sucré expensif
laissy-dev Mar 13, 2025
a7f2015
modif Bonbon
HuguesLa Mar 13, 2025
1351682
modif Bonbon
HuguesLa Mar 13, 2025
6fdf3eb
modif bonbon
HuguesLa Mar 13, 2025
d480232
enlver gestion souris non nécessaire
HuguesLa Mar 17, 2025
8101b68
last version
HuguesLa Mar 17, 2025
4576914
Ajout du score avec zone demilitarisee
laissy-dev Mar 17, 2025
49016b6
Reduction /10 des scores globaux pour fix affichage
laissy-dev Mar 17, 2025
44dce67
update parameters
HuguesLa Mar 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"workbench.view.alwaysShowHeaderActions": true,
"workbench.tree.renderIndentGuides": "none",
"[pvs]": {
"editor.wordSeparators": "`~!@#$%^&*()-=+[{]}|;:'\",.<>/"
},
"files.exclude": {
"**/.git": true,
"**/.svn": true,
"**/.hg": true,
"**/CVS": true,
"**/.DS_Store": true,
"**/Thumbs.db": true,
"**/*.???~": true,
"**/.pvscontext": true,
"**/pvsbin": true,
"**/*.jprf": true,
"**/*.prf": true,
"**/orphaned-proofs.prf": true,
"**/*_adt.pvs": false,
"**/*.log": false,
"**/.vscode": true
},
"files.readonlyInclude": {
"**/*.tccs": true,
"**/*.summary": true
}
}
2 changes: 1 addition & 1 deletion examples/example_1.tscn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[gd_scene load_steps=5 format=3 uid="uid://ddr6qtwy1pesd"]

[ext_resource type="Script" uid="uid://c8esqdv0y26yp" path="res://addons/compute_shader_studio/compute_shader_studio_2d.gd" id="1_6846p"]
[ext_resource type="Script" path="res://addons/compute_shader_studio/compute_shader_studio_2d.gd" id="1_6846p"]
[ext_resource type="Texture2D" uid="uid://demftcowdd5c6" path="res://examples/icon.svg" id="2_s3fct"]

[sub_resource type="FastNoiseLite" id="FastNoiseLite_dmk8h"]
Expand Down
4 changes: 2 additions & 2 deletions examples/example_3.tscn
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=3 uid="uid://cmucgsppcoo5e"]

[ext_resource type="Script" uid="uid://c8esqdv0y26yp" path="res://addons/compute_shader_studio/compute_shader_studio_2d.gd" id="1_eimw3"]
[ext_resource type="Script" uid="uid://jw3o2qu3a0pl" path="res://examples/LabelStepPass.gd" id="2_4aq4t"]
[ext_resource type="Script" path="res://addons/compute_shader_studio/compute_shader_studio_2d.gd" id="1_eimw3"]
[ext_resource type="Script" path="res://examples/LabelStepPass.gd" id="2_4aq4t"]
[ext_resource type="Texture2D" uid="uid://demftcowdd5c6" path="res://examples/icon.svg" id="2_4upxj"]

[node name="CompShadStudioEx3" type="Node2D"]
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_circle/simple_circle.tscn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[gd_scene load_steps=3 format=3 uid="uid://c63rtjh0eurgm"]

[ext_resource type="Script" uid="uid://c8esqdv0y26yp" path="res://addons/compute_shader_studio/compute_shader_studio_2d.gd" id="1_rlapi"]
[ext_resource type="Script" path="res://addons/compute_shader_studio/compute_shader_studio_2d.gd" id="1_rlapi"]
[ext_resource type="Texture2D" uid="uid://demftcowdd5c6" path="res://examples/icon.svg" id="2_y7slp"]

[node name="SimpleCircle" type="Node2D"]
Expand Down
27 changes: 27 additions & 0 deletions examples/territoire/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"workbench.view.alwaysShowHeaderActions": true,
"workbench.tree.renderIndentGuides": "none",
"[pvs]": {
"editor.wordSeparators": "`~!@#$%^&*()-=+[{]}|;:'\",.<>/"
},
"files.exclude": {
"**/.git": true,
"**/.svn": true,
"**/.hg": true,
"**/.DS_Store": true,
"**/Thumbs.db": true,
"**/*.???~": true,
"**/.pvscontext": true,
"**/pvsbin": true,
"**/*.jprf": true,
"**/*.prf": true,
"**/orphaned-proofs.prf": true,
"**/*_adt.pvs": false,
"**/*.log": false,
"**/.vscode": true
},
"files.readonlyInclude": {
"**/*.tccs": true,
"**/*.summary": true
}
}
Loading