Merge pull request #1 from A31Nesta/Dev

Merge Dev with main
A31Nesta · Nov 20, 2023 · 19631c3 · 19631c3
2 parents 2966930 + d7f0076
commit 19631c3
Show file tree

Hide file tree

Showing 256 changed files with 758 additions and 2,581 deletions.
diff --git a/.godot/.gdignore b/.godot/.gdignore
diff --git a/.godot/editor/Augustus2.gd-folding-0f1c27e9dd2d19028e599818e8b4aee9.cfg b/.godot/editor/Augustus2.gd-folding-0f1c27e9dd2d19028e599818e8b4aee9.cfg
diff --git a/...s2.obj-1c300691e0f7e96d91a382baf43da645.mesh-folding-7a29769a33d81071b6d84f61b45644e7.cfg b/...s2.obj-1c300691e0f7e96d91a382baf43da645.mesh-folding-7a29769a33d81071b6d84f61b45644e7.cfg
diff --git a/...10.obj-3f5f2a498000edc5481a746837eed4fb.mesh-folding-d95bfe144a6adb21d65719504ec7661e.cfg b/...10.obj-3f5f2a498000edc5481a746837eed4fb.mesh-folding-d95bfe144a6adb21d65719504ec7661e.cfg
diff --git a/...0n.obj-9207317703a62c8e510d6235ccfdf4ad.mesh-folding-2b4fe0ddc2c91dbe71ee8ccefa7e17cf.cfg b/...0n.obj-9207317703a62c8e510d6235ccfdf4ad.mesh-folding-2b4fe0ddc2c91dbe71ee8ccefa7e17cf.cfg
diff --git a/...0n.obj-d8b3d9fcd8abd2c5a0691dc931ae6698.mesh-folding-e3cb469894e084898e133dee9e5cc0b2.cfg b/...0n.obj-d8b3d9fcd8abd2c5a0691dc931ae6698.mesh-folding-e3cb469894e084898e133dee9e5cc0b2.cfg
diff --git a/...12.obj-f913f2da3637a52dafdd7687d2aa3032.mesh-folding-aa062e8b51d2346525b90f1cce319a88.cfg b/...12.obj-f913f2da3637a52dafdd7687d2aa3032.mesh-folding-aa062e8b51d2346525b90f1cce319a88.cfg
diff --git a/...2n.obj-fbccbf8efdcaaf450a7a03d033f43487.mesh-folding-eaa760a64384147ec5a887b037dbd662.cfg b/...2n.obj-fbccbf8efdcaaf450a7a03d033f43487.mesh-folding-eaa760a64384147ec5a887b037dbd662.cfg
diff --git a/...20.obj-9dbcb19cd6046a4fa9c346bdcbef86b7.mesh-folding-cd710a12bd269e65e5d6de65f81c735b.cfg b/...20.obj-9dbcb19cd6046a4fa9c346bdcbef86b7.mesh-folding-cd710a12bd269e65e5d6de65f81c735b.cfg
diff --git a/...0n.obj-3d5b8888a11c405576668a83417390ab.mesh-folding-aab5c41c122fe63635b3c2d90254ed6e.cfg b/...0n.obj-3d5b8888a11c405576668a83417390ab.mesh-folding-aab5c41c122fe63635b3c2d90254ed6e.cfg
diff --git a/...D4.obj-97d102dc40ce49782577ee9de336167d.mesh-folding-79b8f3619ba81f1e7a14c85007688f3e.cfg b/...D4.obj-97d102dc40ce49782577ee9de336167d.mesh-folding-79b8f3619ba81f1e7a14c85007688f3e.cfg
diff --git a/...4n.obj-b90ee1b317b6ce4eb71cb05def1735c7.mesh-folding-ecedcc25f23fea0e194e69115ce1b66a.cfg b/...4n.obj-b90ee1b317b6ce4eb71cb05def1735c7.mesh-folding-ecedcc25f23fea0e194e69115ce1b66a.cfg
diff --git a/...D6.obj-22eed87d2bb75b2dbc10d852f043f19a.mesh-folding-6641e3505f566ed558f079726465522d.cfg b/...D6.obj-22eed87d2bb75b2dbc10d852f043f19a.mesh-folding-6641e3505f566ed558f079726465522d.cfg
diff --git a/...6n.obj-2c73b80b8388e87fc1d74957ff0e6ae3.mesh-folding-f5271bfd2237e70a661f6dfb60aba36d.cfg b/...6n.obj-2c73b80b8388e87fc1d74957ff0e6ae3.mesh-folding-f5271bfd2237e70a661f6dfb60aba36d.cfg
diff --git a/...D8.obj-6a3f0ee1168026a328d2ea187ebc09ce.mesh-folding-63c7aaf2c977d539592e836ba93af851.cfg b/...D8.obj-6a3f0ee1168026a328d2ea187ebc09ce.mesh-folding-63c7aaf2c977d539592e836ba93af851.cfg
diff --git a/...8n.obj-500922c7e19c4b1da4563223295b22fa.mesh-folding-0f11ef8f1b660d35dcdc7bf7e7bd025f.cfg b/...8n.obj-500922c7e19c4b1da4563223295b22fa.mesh-folding-0f11ef8f1b660d35dcdc7bf7e7bd025f.cfg
diff --git a/.godot/editor/Dice.tscn-editstate-4688de3073ee415a2b7fc1f4376e93e7.cfg b/.godot/editor/Dice.tscn-editstate-4688de3073ee415a2b7fc1f4376e93e7.cfg
diff --git a/.godot/editor/Dice.tscn-folding-4688de3073ee415a2b7fc1f4376e93e7.cfg b/.godot/editor/Dice.tscn-folding-4688de3073ee415a2b7fc1f4376e93e7.cfg
diff --git a/.godot/editor/DiceForceApplierBasic.gd-folding-759e80db53f80dd7ec8dc1e9c363d4b1.cfg b/.godot/editor/DiceForceApplierBasic.gd-folding-759e80db53f80dd7ec8dc1e9c363d4b1.cfg
diff --git a/.godot/editor/OpenMenu.gd-folding-56eb055adeae824321541315feeed508.cfg b/.godot/editor/OpenMenu.gd-folding-56eb055adeae824321541315feeed508.cfg
diff --git a/.godot/editor/RollButton.gd-folding-f912c8c98a01ee2755edeacb23a84b72.cfg b/.godot/editor/RollButton.gd-folding-f912c8c98a01ee2755edeacb23a84b72.cfg
diff --git a/.godot/editor/addDiceButtons.gd-folding-2cc2dcb4f197831d328e81028d349db6.cfg b/.godot/editor/addDiceButtons.gd-folding-2cc2dcb4f197831d328e81028d349db6.cfg
diff --git a/...rd.obj-dc1aaf51973e152dcca37e86a16a7384.mesh-folding-9cbb591021ec3a709ea03c475351a4d4.cfg b/...rd.obj-dc1aaf51973e152dcca37e86a16a7384.mesh-folding-9cbb591021ec3a709ea03c475351a4d4.cfg
diff --git a/.godot/editor/boardCol.tres-folding-bd8a3f2a2f99af7ab89111bc9e3a4931.cfg b/.godot/editor/boardCol.tres-folding-bd8a3f2a2f99af7ab89111bc9e3a4931.cfg