Commit Graph

  • 48e2021511
    Merge 3a6e666f1f into 48458e6f34 Brandon Brown 2025-10-01 01:33:54 -0400
  • 3a6e666f1f fix: fixes memory leak in builder script Brandon Brown 2025-10-01 01:16:50 -0400
  • 48458e6f34
    Merge pull request #19 from akien-mga/godot4.5 main Kenney 2025-09-18 10:41:30 +0200
  • f254742f85
    Check in Godot 4.5 .import changes, run upgrade tool Rémi Verschelde 2025-09-18 10:20:34 +0200
  • c65d94c454 Merge branch 'main' of https://github.com/KenneyNL/Starter-Kit-City-Builder Kenney 2025-09-17 08:27:01 +0200
  • 1cbec71002 Added sounds Kenney 2025-09-17 08:26:58 +0200
  • fb959d73a4
    Update README.md Kenney 2025-09-16 12:25:56 +0200
  • 455f75facc
    Update README.md Kenney 2025-09-16 12:24:30 +0200
  • 5776f4a805 Merge branch 'main' of https://github.com/KenneyNL/Starter-Kit-City-Builder Kenney 2025-09-16 12:23:19 +0200
  • 1023ab252f Upgrade to Godot 4.5 Kenney 2025-09-16 12:23:04 +0200
  • a5240bd84e
    Merge pull request #16 from paulstansifer/patch-1 Kenney 2025-09-16 11:22:00 +0200
  • 92d1b44231
    Merge pull request #33 from STEMuli-Tx/main mrwadepro 2025-05-10 09:33:50 -0500
  • 18a233fb03 Uncomment generic panel menu Wade 2025-05-10 09:33:11 -0500
  • fb580fce3b
    Merge pull request #32 from STEMuli-Tx/art-branch-2 KC-Warren 2025-05-09 15:39:10 -0600
  • 0a8b1d01c0 asset updates KC-Warren 2025-05-09 15:37:44 -0600
  • db271bf5eb Add additional icons Wade 2025-05-09 13:12:23 -0500
  • 66f45a5450
    Merge pull request #31 from STEMuli-Tx/art-branch-2 KC-Warren 2025-05-09 11:13:08 -0600
  • 3dad0f01e5 godot buildings p4 KC-Warren 2025-05-09 11:12:32 -0600
  • d54419db9e
    Merge pull request #30 from STEMuli-Tx/art-branch-2 KC-Warren 2025-05-08 16:01:46 -0600
  • 33ab4a252f godot assets KC-Warren 2025-05-08 16:00:45 -0600
  • 8eddc5fb32
    Merge pull request #27 from STEMuli-Tx/feature/propogate-starting-structure-and-unlocks jc-stemuli 2025-05-08 16:07:56 -0500
  • 15f1b3b32a
    Merge pull request #29 from STEMuli-Tx/main mrwadepro 2025-05-08 16:05:30 -0500
  • d251afb86e Fix issue where structures weren't being selected because of separators being counted as indices and also changed how we compare structures when being selecting from the build menu since Godot doesn't do a deep object match. Wade 2025-05-08 15:59:50 -0500
  • d189092989 Fix up menu more and updated icons. TODO need to see why when I select some structures they don't change in the builder. Wade 2025-05-08 15:04:32 -0500
  • fa3c937475
    Merge pull request #28 from STEMuli-Tx/preetArbelos/fix-always-on-build jc-stemuli 2025-05-08 14:03:44 -0500
  • a6243010fe Clear Selection Instruction UI Preetb71 2025-05-08 14:24:48 -0400
  • eb40dfb7ca Clear Selection Input definition and key press logic Preetb71 2025-05-08 14:22:28 -0400
  • 6f566c8938 Introduce selection enabled variable to switch selection states Preetb71 2025-05-08 14:10:59 -0400
  • 1fb3576f88 Update Tooltip names! Wade 2025-05-08 13:01:13 -0500
  • 6b10f662c2 Created Global function to unlock structures and then setup listener on the sticky menu (pop-up-menu-generator.gd) so that it can regenerate the menu with the unlocks. Wade 2025-05-08 12:48:37 -0500
  • a54e32ba5e Fix - Check for popup menu overlaps and block builds through them. Preetb71 2025-05-08 13:22:21 -0400
  • 3b47a9f435 Fix sticky builder anchors and positioning Preetb71 2025-05-08 11:39:33 -0400
  • c015687985 Check sticky builder and it's child elements for mouse overlaps and block placements. Preetb71 2025-05-07 18:26:29 -0400
  • 8cf2d3e14c Fix Sticky Builder Covering the whole HUD on main scene Preetb71 2025-05-07 17:33:26 -0400
  • 7332ae0e81 Sticky Builder Parent Panel UI Overlap Checks Preetb71 2025-05-07 17:15:19 -0400
  • b9516eb80f
    Merge pull request #26 from STEMuli-Tx/feature/sticky-builder mrwadepro 2025-05-07 15:31:00 -0500
  • ae37a02531 change unlocks Wade 2025-05-07 15:30:33 -0500
  • b8b4ad0231 locked structures back Wade 2025-05-07 15:29:08 -0500
  • d9ba6276e6 Merge branch 'main' into preetArbelos/fix-always-on-build Preetb71 2025-05-07 16:27:09 -0400
  • ac9c85f026
    Merge pull request #25 from STEMuli-Tx/feature/sticky-builder mrwadepro 2025-05-07 15:24:22 -0500
  • 5970884367 Merge branch 'feature/sticky-builder' of https://github.com/STEMuli-Tx/stem-city into feature/sticky-builder Wade 2025-05-07 15:23:45 -0500
  • a72688fa1c add additional fields to builder selection menu Wade 2025-05-07 15:22:51 -0500
  • 8a6b512fb6 Increase Mission Panel Scale Preetb71 2025-05-07 15:55:36 -0400
  • e74612741a
    Merge pull request #24 from STEMuli-Tx/main mrwadepro 2025-05-07 13:55:09 -0500
  • 119e0af3fa add more icons for builder Wade 2025-05-07 13:54:19 -0500
  • f78871b8e5 add sticky builder menu. Wade 2025-05-07 13:42:47 -0500
  • e54d5225e1
    Merge pull request #23 from STEMuli-Tx/art-branch-2 KC-Warren 2025-05-07 12:03:34 -0600
  • 2cf0ee0d33 thumbnails KC-Warren 2025-05-07 12:03:01 -0600
  • a71ba93260
    Merge pull request #22 from STEMuli-Tx/art-branch-2 KC-Warren 2025-05-07 11:57:19 -0600
  • 01f442ecaf farm house assets KC-Warren 2025-05-07 11:56:31 -0600
  • a9d5c5a41a building assets p2 KC-Warren 2025-05-07 11:01:11 -0600
  • df736344a2 godot asset list KC-Warren 2025-05-07 10:13:16 -0600
  • 2dd3512998
    Merge pull request #21 from STEMuli-Tx/fix/unlock-items-panel-scaling jc-stemuli 2025-05-07 08:46:09 -0500
  • 0c553c1cb6 Import Roboto Bold font and assign to necessary labels in HUD Preetb71 2025-05-06 21:20:33 -0400
  • 1db13adcc8 Electricity Indicator Color change Preetb71 2025-05-06 21:16:48 -0400
  • 5b23d71816 Fix top bar margin Preetb71 2025-05-06 21:07:17 -0400
  • 9aca74d4ae Add unlocked panel to the top of canvas, to give priority clicks to it. Preetb71 2025-05-06 20:59:41 -0400
  • 567fb6ed77
    Merge pull request #20 from STEMuli-Tx/wa/game-connection jc-stemuli 2025-05-06 17:50:24 -0500
  • 173e701957 Fix cash display reference errors Preetb71 2025-05-06 17:03:54 -0400
  • ef3503f4c7 Update button hover icons Preetb71 2025-05-06 15:44:51 -0400
  • 1facf2e367 Fix separator thickness Preetb71 2025-05-06 15:41:22 -0400
  • 5acfbfcca3 Update textures and main environment color Preetb71 2025-05-06 15:39:34 -0400
  • 4c043c7f92 Import new hud images Preetb71 2025-05-06 14:38:17 -0400
  • 5e42ac9543 Fix scaling issues of unlocked items box Preetb71 2025-05-05 16:57:28 -0400
  • 1f2a5efb51 Merge branch 'main' into wa/game-connection jc-stemuli 2025-05-05 14:31:39 -0500
  • 7a8c82f890 Merge remote-tracking branch 'origin/wa/game-connection' into wa/game-connection Wade 2025-05-04 22:22:02 -0500
  • e403e87dfd add changes to javascript bridge to get charts working Wade 2025-05-04 22:21:54 -0500
  • a2ffeaa16b Removed some print statements jc 2025-05-04 17:58:01 -0500
  • b98bba1511 added consistent image sizes for building menu jc 2025-05-04 16:49:42 -0500
  • d96b4224d8 Add logic for unlock buildings and waiting to show mission start window till after unlock structures jc 2025-05-04 16:04:03 -0500
  • e5cfabfc7b Fix issue where missions being read in with html params weren't being loaded in. Wade 2025-05-03 20:14:36 -0500
  • 3caae58eee Add Mission received from browser to globals. Wade 2025-05-03 19:10:47 -0500
  • dcbafb6bfa Move signal to mission_manager.gd Wade 2025-05-03 16:37:57 -0500
  • f82c182e71 Merge branch 'jclemente/4_4_update' of https://github.com/STEMuli-Tx/stem-city into jclemente/4_4_update Wade 2025-05-03 15:43:14 -0500
  • cf872e8fd8 add URL params read in function to take in missions and set the missions in Godot Wade 2025-05-03 15:40:46 -0500
  • 2fd0828d4c Added building menu back in jc 2025-05-03 15:32:48 -0500
  • 6055d88d5e Work for loading missions. jc-stemuli 2025-05-02 20:27:20 -0500
  • f3658059dc
    Merge pull request #19 from STEMuli-Tx/art-branch-2 jc-stemuli 2025-04-30 13:43:36 -0500
  • 3c497f3a9d extra stufff KC-Warren 2025-04-30 12:42:28 -0600
  • 60b2f04ce3 art updates to scene and models KC-Warren 2025-04-30 12:37:50 -0600
  • 20d631de6f Changes for build time visual jc-stemuli 2025-04-23 10:48:29 -0500
  • ac096592bf Fixes for broken merging jc-stemuli 2025-04-22 16:08:31 -0500
  • 5b35561ce2 resolving merge conflicts jc-stemuli 2025-04-22 13:00:15 -0500
  • 16d9c8e587
    Merge pull request #18 from STEMuli-Tx/feature/hot-fixes mrwadepro 2025-04-22 12:56:57 -0500
  • 36accdff35 Mission updates Wade 2025-04-21 20:21:44 -0500
  • f83026fa25 Fix power plant placement issue Wade 2025-04-21 19:16:02 -0500
  • f3d6b08e68 Add mission select menu and added construction workers for stores. Wade 2025-04-21 18:46:36 -0500
  • e6a0cdfbbb
    Merge pull request #17 from STEMuli-Tx/feature/hot-fixes mrwadepro 2025-04-21 13:14:39 -0500
  • d54883dce5 Track missions and fix lamp post Wade 2025-04-21 13:14:19 -0500
  • b6831b8b4e
    Merge pull request #15 from STEMuli-Tx/art-branch mrwadepro 2025-04-21 12:28:06 -0500
  • b99481f2e6
    Merge branch 'main' into art-branch mrwadepro 2025-04-21 12:28:00 -0500
  • eaf3e5ad83 lighting/mat updates, arcology v1 thrown in KC-Warren 2025-04-21 11:10:27 -0600
  • 70ba9810c5
    Merge pull request #13 from STEMuli-Tx/feature/mission_cleanup mrwadepro 2025-04-21 11:27:32 -0500
  • 3cad744337
    Merge pull request #9 from STEMuli-Tx/jclemente/4_4_update mrwadepro 2025-04-21 11:27:07 -0500
  • 135d2807d6 latest Wade 2025-04-21 11:26:42 -0500
  • 7771ba425a
    Merge pull request #12 from STEMuli-Tx/main mrwadepro 2025-04-21 11:17:23 -0500
  • 0f11145d64
    Merge branch 'feature/mission_cleanup' into main mrwadepro 2025-04-21 11:17:15 -0500
  • 6fc11d3434
    Merge pull request #11 from STEMuli-Tx/art-branch mrwadepro 2025-04-21 11:16:15 -0500
  • c847284718 latest changes Wade 2025-04-21 11:14:25 -0500
  • ee149159c5 Working missions based on adjustments for unit 1.02 Wade 2025-04-18 13:42:44 -0500