jc-stemuli
|
6055d88d5e
|
Work for loading missions.
|
2025-05-02 20:27:20 +07:00 |
|
jc-stemuli
|
20d631de6f
|
Changes for build time visual
|
2025-04-23 10:48:29 +07:00 |
|
jc-stemuli
|
ac096592bf
|
Fixes for broken merging
|
2025-04-22 16:08:31 +07:00 |
|
jc-stemuli
|
5b35561ce2
|
resolving merge conflicts
|
2025-04-22 13:00:15 +07:00 |
mrwadepro
|
16d9c8e587
|
Merge pull request #18 from STEMuli-Tx/feature/hot-fixes
Feature/hot fixes
|
2025-04-22 12:56:57 +07:00 |
Wade
|
36accdff35
|
Mission updates
|
2025-04-21 20:21:44 +07:00 |
|
Wade
|
f83026fa25
|
Fix power plant placement issue
|
2025-04-21 19:16:02 +07:00 |
|
Wade
|
f3d6b08e68
|
Add mission select menu and added construction workers for stores.
|
2025-04-21 18:46:36 +07:00 |
|
mrwadepro
|
e6a0cdfbbb
|
Merge pull request #17 from STEMuli-Tx/feature/hot-fixes
Track missions and fix lamp post
|
2025-04-21 13:14:39 +07:00 |
|
Wade
|
d54883dce5
|
Track missions and fix lamp post
|
2025-04-21 13:14:19 +07:00 |
|
mrwadepro
|
b6831b8b4e
|
Merge pull request #15 from STEMuli-Tx/art-branch
lighting/mat updates, arcology v1 thrown in
|
2025-04-21 12:28:06 +07:00 |
|
mrwadepro
|
b99481f2e6
|
Merge branch 'main' into art-branch
|
2025-04-21 12:28:00 +07:00 |
KC-Warren
|
eaf3e5ad83
|
lighting/mat updates, arcology v1 thrown in
|
2025-04-21 11:10:27 +07:00 |
|
mrwadepro
|
70ba9810c5
|
Merge pull request #13 from STEMuli-Tx/feature/mission_cleanup
Merge pull request #12 from STEMuli-Tx/main
|
2025-04-21 11:27:32 +07:00 |
|
mrwadepro
|
3cad744337
|
Merge pull request #9 from STEMuli-Tx/jclemente/4_4_update
Changes to make it work with Godot 4.4.
|
2025-04-21 11:27:07 +07:00 |
|
Wade
|
135d2807d6
|
latest
|
2025-04-21 11:26:42 +07:00 |
|
mrwadepro
|
7771ba425a
|
Merge pull request #12 from STEMuli-Tx/main
Latest changes
|
2025-04-21 11:17:23 +07:00 |
|
mrwadepro
|
0f11145d64
|
Merge branch 'feature/mission_cleanup' into main
|
2025-04-21 11:17:15 +07:00 |
|
mrwadepro
|
6fc11d3434
|
Merge pull request #11 from STEMuli-Tx/art-branch
Art branch
|
2025-04-21 11:16:15 +07:00 |
|
Wade
|
c847284718
|
latest changes
|
2025-04-21 11:14:25 +07:00 |
|
Wade
|
ee149159c5
|
Working missions based on adjustments for unit 1.02
|
2025-04-18 13:42:44 +07:00 |
|
Wade
|
234337a0e4
|
Update Mission workflow and add event bus
|
2025-04-17 20:19:01 +07:00 |
|
Wade
|
a36338ef93
|
Add Mission Debrief Message when starting missions.
|
2025-04-17 12:23:32 +07:00 |
|
KC-Warren
|
8d6f95e367
|
art updates
|
2025-04-15 11:39:48 +07:00 |
|
KC-Warren
|
85a2fe5c4e
|
rainbow texture add
|
2025-04-15 09:19:23 +07:00 |
|
jc-stemuli
|
1fb0c69d6c
|
Changes to make it work with godot 4.4.
|
2025-04-15 10:19:18 +07:00 |
|
KC-Warren
|
357fcc4ba1
|
Merge branch 'main' into art-branch
|
2025-04-15 09:16:18 +07:00 |
|
KC-Warren
|
dcc19da7fc
|
orb addition
|
2025-04-15 09:13:09 +07:00 |
|
mrwadepro
|
285781d312
|
Merge pull request #8 from STEMuli-Tx/hot-fix
Hot fix
|
2025-04-12 10:12:34 +07:00 |
|
Wade
|
0906d588d7
|
Latest Changes for League Testing
|
2025-04-12 10:11:55 +07:00 |
|
Wade
|
a2cc9bedf4
|
Latest workable. TODO: Add intro panel and outro panel
|
2025-04-11 23:11:26 +07:00 |
|
mrwadepro
|
8025b1f3ef
|
Merge pull request #7 from STEMuli-Tx/bug/fix-fifth-mission
Add Missions into main scene's Mission Manager Script
|
2025-04-11 18:36:09 +07:00 |
|
Wade
|
73fa297ead
|
Add Missions into main scene's Mission Manager Script
|
2025-04-11 18:35:36 +07:00 |
|
KC-Warren
|
1429b2fa22
|
more asset updates
|
2025-04-11 14:31:42 +07:00 |
|
mrwadepro
|
5cd1196108
|
Merge pull request #6 from STEMuli-Tx/jclemente/music_sfx_init
Jclemente/music sfx init
|
2025-04-11 13:11:53 +07:00 |
|
mrwadepro
|
c44c789ab1
|
Merge pull request #5 from STEMuli-Tx/feature/unlock-screen
Fix population deletion
|
2025-04-11 13:04:39 +07:00 |
|
Wade
|
e16fb23ee5
|
Fix population deletion
|
2025-04-11 13:04:01 +07:00 |
|
jc-stemuli
|
5d0e8ff752
|
Merge branch 'main' into jclemente/music_sfx_init
|
2025-04-11 12:41:56 +07:00 |
|
jc-stemuli
|
37c792e6f7
|
Fix for sound / music volume on init
|
2025-04-11 12:40:19 +07:00 |
|
mrwadepro
|
30886c0c70
|
Merge pull request #4 from STEMuli-Tx/feature/unlock-screen
Feature/unlock screen
|
2025-04-11 12:39:45 +07:00 |
|
Wade
|
be58acd335
|
Fix population count and Unlocked panel along with sprites.
|
2025-04-11 12:33:42 +07:00 |
|
Wade
|
725a4b9579
|
Unlock screen responding as expected
|
2025-04-10 16:38:11 +07:00 |
|
KC-Warren
|
e2986cc0fe
|
road mesh update
|
2025-04-10 12:37:36 +07:00 |
|
KC-Warren
|
9dbd049a8e
|
Merge branch 'main' into art-branch
|
2025-04-10 12:35:11 +07:00 |
|
KC-Warren
|
59283c55e5
|
model, texture, shader updates
|
2025-04-10 12:35:05 +07:00 |
|
Wade
|
6f60ac7e0d
|
Unlock Screen polish. Icons and descriptions show. Now I need to make it appear at the right time and break apart the missions
|
2025-04-09 16:56:42 +07:00 |
|
Wade
|
626685b3df
|
Unlock panel viewing/closing working
|
2025-04-09 14:32:28 +07:00 |
|
mrwadepro
|
faa3dfef1e
|
Merge pull request #3 from STEMuli-Tx/art-branch
art model updates
|
2025-04-09 11:56:26 +07:00 |
|
Wade
|
9ed1121e7c
|
Merge remote-tracking branch 'origin/art-branch' into art-branch
# Conflicts:
# models/colormap.png.import
|
2025-04-09 11:55:51 +07:00 |
|
Wade
|
ad8efec298
|
latest
|
2025-04-09 11:54:04 +07:00 |