Xeon0X
|
8093c0ede4
|
Merge pull request #11 from NichiHachi/main
I MADE A HUGE MISTAKE
|
2024-06-15 22:33:02 +02:00 |
|
Kévin Angelier-Leplan
|
57a9e6e6ff
|
Merge branch 'Xeon0X:main' into main
|
2024-06-15 22:32:32 +02:00 |
|
NichiHachi
|
919b245974
|
OOPSI
|
2024-06-15 22:32:15 +02:00 |
|
Xeon0X
|
34dfe8cdad
|
Merge pull request #10 from NichiHachi/main
Put everything inside of main
|
2024-06-15 22:28:41 +02:00 |
|
NichiHachi
|
f2e59e49d7
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# main.py
|
2024-06-15 22:26:28 +02:00 |
|
NichiHachi
|
f5201bc146
|
Put everything inside of main
|
2024-06-15 22:25:39 +02:00 |
|
Xeon0X
|
39224a56e9
|
Merge pull request #9 from NichiHachi/main
Building generation and District "smart" spawn
|
2024-06-15 21:57:43 +02:00 |
|
Kévin Angelier-Leplan
|
39f3bc0e1f
|
Merge branch 'Xeon0X:main' into main
|
2024-06-15 21:50:49 +02:00 |
|
NichiHachi
|
f53d0d7402
|
Fix arg from building
|
2024-06-15 21:50:28 +02:00 |
|
NichiHachi
|
388a5c778c
|
Merge remote-tracking branch 'origin/main'
|
2024-06-15 21:40:31 +02:00 |
|
NichiHachi
|
fb00b927cb
|
Change root file path and added rectangle 2D to 3D
|
2024-06-15 21:40:19 +02:00 |
|
Xeon0X
|
627c1faec7
|
Merge pull request #8 from Eclairsombre/main
Adding utiliation of negative co
|
2024-06-15 17:27:38 +02:00 |
|
Eclairsombre
|
2dfec77792
|
Merge branch 'main' of https://github.com/Eclairsombre/GDMC-2024
|
2024-06-15 17:20:33 +02:00 |
|
Eclairsombre
|
4cc747d9b0
|
adding negative co utilisation
|
2024-06-15 17:20:28 +02:00 |
|
NichiHachi
|
8195396a04
|
Added Mountain building
|
2024-06-15 17:13:46 +02:00 |
|
Xeon0X
|
dca39cb4dd
|
Merge pull request #7 from Eclairsombre/main
House
|
2024-06-15 15:05:58 +02:00 |
|
Xeon0X
|
37405d4936
|
Merge branch 'main' into main
|
2024-06-15 15:05:47 +02:00 |
|
Eclairsombre
|
01059a53be
|
clean
|
2024-06-15 15:02:26 +02:00 |
|
Eclairsombre
|
4056807caa
|
build function
|
2024-06-15 14:59:33 +02:00 |
|
Eclairsombre
|
cf64620bb5
|
Stairs
|
2024-06-15 14:57:34 +02:00 |
|
Eclairsombre
|
59339a46db
|
Entrance
|
2024-06-15 14:31:48 +02:00 |
|
Xeon0X
|
a67a1758b9
|
Merge pull request #6 from NichiHachi/main
Road and Building
|
2024-06-15 14:07:52 +02:00 |
|
Kévin Angelier-Leplan
|
8bb241df02
|
Merge branch 'Xeon0X:main' into main
|
2024-06-15 13:10:29 +02:00 |
|
NichiHachi
|
a78558a988
|
Added Building zone
|
2024-06-15 13:07:51 +02:00 |
|
NichiHachi
|
88632f9c8e
|
Added Road map and Buildable map
|
2024-06-15 04:55:01 +02:00 |
|
Eclairsombre
|
b90a0128b2
|
window
|
2024-06-15 00:31:00 +02:00 |
|
Xeon0X
|
30b646fb54
|
Merge pull request #5 from KAymeric/main
Buildings v1
|
2024-06-14 14:10:38 +02:00 |
|
AKreuzer
|
990b66051c
|
Merge remote-tracking branch 'upstream/main' into main
|
2024-06-14 03:32:23 +02:00 |
|
AKreuzer
|
fdc93e0cb6
|
some comments
|
2024-06-14 03:28:48 +02:00 |
|
KAymeric
|
0e88be750a
|
Merge pull request #2 from KAymeric/Entrance
Entrance
|
2024-06-14 03:22:54 +02:00 |
|
AKreuzer
|
d95ae00fde
|
no style but entrance and roof added
|
2024-06-14 03:22:16 +02:00 |
|
KAymeric
|
e3dc4ba79a
|
list index out of range lmao
|
2024-06-13 22:47:50 +02:00 |
|
Xeon0X
|
60db33571c
|
Merge pull request #4 from NichiHachi/main
Highway map and skeleton
|
2024-06-13 16:42:43 +02:00 |
|
NichiHachi
|
18ce4872dd
|
Refactor: Added print for the console
|
2024-06-13 16:38:51 +02:00 |
|
AKreuzer
|
22f6362e06
|
place entrance (not fied)
|
2024-06-13 12:43:33 +02:00 |
|
NichiHachi
|
528c0a2a30
|
Refactor: More accurate highway map
|
2024-06-13 03:51:25 +02:00 |
|
NichiHachi
|
192c1a9c63
|
Oopsi, I forgor
|
2024-06-13 00:41:25 +02:00 |
|
NichiHachi
|
1557bcb4ef
|
Merge remote-tracking branch 'origin/main'
|
2024-06-13 00:36:35 +02:00 |
|
NichiHachi
|
03e1e441e5
|
Skeleton highway
|
2024-06-13 00:36:19 +02:00 |
|
KAymeric
|
919b8f8aab
|
start door placement
|
2024-06-12 22:59:24 +02:00 |
|
Eclairsombre
|
6cd1bab14f
|
adding entrance
|
2024-06-12 13:10:59 +02:00 |
|
Kévin Angelier-Leplan
|
4bdd5a9909
|
Merge branch 'Xeon0X:main' into main
|
2024-06-12 00:57:23 +02:00 |
|
NichiHachi
|
2b2d5ba869
|
Added data analysis (WORK IN PROGRESS)
|
2024-06-12 00:56:55 +02:00 |
|
Xeon0X
|
f42019fc74
|
Merge pull request #2 from NichiHachi/main
Custom district generator and non-functional Metro (sadge)
|
2024-06-11 14:18:20 +02:00 |
|
NichiHachi
|
c8abb90a84
|
Added custom district generator and old GDMC functions and classes (to get the height, water and tree map)
|
2024-06-11 04:56:54 +02:00 |
|
KAymeric
|
8911a090f8
|
Merge pull request #1 from KAymeric/balcony
Balcony
|
2024-06-11 03:09:09 +02:00 |
|
AKreuzer
|
de3950d376
|
corrections corners bugs, clean tree structure and start entrance
|
2024-06-11 03:06:06 +02:00 |
|
Kévin Angelier-Leplan
|
6e5359c8af
|
Merge branch 'Xeon0X:main' into main
|
2024-06-10 23:28:40 +02:00 |
|
AKreuzer
|
536c71d372
|
balcony details and start facade details
|
2024-06-06 12:40:35 +02:00 |
|
AKreuzer
|
a4561c4ccb
|
balcony fixed
|
2024-06-05 02:10:01 +02:00 |
|