Repository navigation

Ver 1 Complete - #299

Open

AlexTregub wants to merge 695 commits into

mainfrom

Dev

This pull request is big! We're only showing the most recent 250 commits

Commits on Nov 6, 2025
Commits on Nov 7, 2025
- walking and atttacking animation
  afabiku
  committed
  20b8b31
Commits on Nov 8, 2025
- bug fixes
  afabiku
  committed
  0a6a8d6
- got final flash aim brush to appear. TIME TO WORK ON LOGIC
  dadoge217
  committed
  6feffca
Commits on Nov 9, 2025
- ...
  EmmanuelUka
  committed
  9d7e261
- resource count
  EmmanuelUka
  committed
  4053020
- added 2x speed functionality. Refactoring powers system. Lightning works when tested. Add PowerBrushManager and other powers
  dadoge217
  committed
  e8c5eb9
- SHOP SPAWNS [W]
  ACruz2004
  committed
  7b3a35d
- Terrain generation finalized
  AlexTregub
  committed
  679b6c1
- Mostly working...
  AlexTregub
  committed
  062f380
- Cached rendering moved.
  AlexTregub
  committed
  10e5b06
- lightning works on the new system. Going to work on final flash
  dadoge217
  committed
  d0711a7
- Shop UI Implimented and Working
  ACruz2004
  committed
  0a8b70a
- Testing with entire game running
  AlexTregub
  committed
  33f1745
- Changed worldToTile, screenToWorldTile to use round instead of floor. Untested. Fixed coordinateDebugOverlay, mouse position (in tile) now displays correctly.
  AlexTregub
  committed
  c0d8d7f
- Readded the default panels
  CrazzyCrisis
  committed
  3f140d9
- Fixed the command line to spawn things again. It still works but the console is no longer overwriting the browser console because that was causing even more debug issues
  CrazzyCrisis
  committed
  44d1a5e
- Commented out the default panels
  CrazzyCrisis
  committed
  4f66a04
- Mostly reasdy for push, be careful with moving camera, need to fix bounds there.
  AlexTregub
  committed
  a800eda
- Building now spawns and upgrades
  ACruz2004
  committed
  90707a1
- PR#220 PARTIAL - Grid Updated. Rendering Updated
  AlexTregub
  authored
  bb9147b
- Merge branch 'Dev' into AC_GameplayLoop
  ACruz2004
  authored
  ab68ea9
- Merge pull request #223 from AlexTregub/AC_GameplayLoop
  ACruz2004
  authored
  104a963
- format
  afabiku
  committed
  6828f69
- false culling
  CrazzyCrisis
  committed
  6bbeb04
- debug
  EmmanuelUka
  committed
  12db691
Commits on Nov 10, 2025
Commits on Nov 11, 2025
- Boss enabled.
  AlexTregub
  committed
  6d57a6d
- Temporarily disabled Build+Test.
  AlexTregub
  committed
  26975a0
- Temporarily disabled Build+Test.
  AlexTregub
  committed
  388ce51
- Quest UI count
  EmmanuelUka
  committed
  43d669e
- Merge pull request #234 from AlexTregub/EU--Resource_Count
  ACruz2004
  authored
  7c00281
- Attempt again...
  AlexTregub
  committed
  a9594d2
Commits on Nov 12, 2025
- Added culling to direct rendering.
  AlexTregub
  committed
  f9770c9
- Added culling to cached rendering.
  AlexTregub
  committed
  ac3e7c0
- Make backing larger (should not affect performance unless fully zoomed out
  AlexTregub
  committed
  e158b66
- PR#235 Dev Hotfix - Allow view off-map edge
  AlexTregub
  authored
  3b9e7be
Commits on Nov 13, 2025
- Merge branch 'Dev' into AF_Building
  AlexTregub
  committed
  d8ae232
- Added back build process
  AlexTregub
  committed
  be0a0b8
- PR#217 Ants Combat Logic + Building Updates
  AlexTregub
  authored
  9a56d69
- Rolled back changes to build.
  AlexTregub
  committed
  9079b59
- Level Editor Fixed
  CrazzyCrisis
  committed
  8b57c26
Commits on Nov 15, 2025
- Raid System
  afabiku
  committed
  827e5e9
- merged animations
  afabiku
  committed
  e1e12b6
Commits on Nov 17, 2025
- wave ants spawn from hives, hives capturable on destroy
  afabiku
  committed
  f57447a
- changed enemy ant base to cones
  afabiku
  committed
  68dc19b
- Initial prep for loading WEB-STORED json
  AlexTregub
  committed
  9cdd82a
- Added old cave types. Converted old tutorialCave json to new material names
  AlexTregub
  committed
  be265d8
- Potentially working import function...
  AlexTregub
  committed
  411f369
- Fixed out of order issues. No longer causes issues.
  AlexTregub
  committed
  6888775
- Working importTerrainLP function...
  AlexTregub
  committed
  01a9536
- Cleaned up outrageous logging
  AlexTregub
  committed
  70a41fe
- Fixed cave tile rendering issue in map.
  AlexTregub
  committed
  979ec0e
- Disabled testing 'feature' of loading map after 3 seconds of game run.
  AlexTregub
  committed
  a105663
- Quick NPC Fix
  ACruz2004
  committed
  89857a0
- Moved g_activeMap overwrite OUT of async function, and into draw()
  AlexTregub
  committed
  c1de45f
- No longer automatically loads current tutorial level
  AlexTregub
  committed
  4fe3a40
- Cleaned up comments
  AlexTregub
  committed
  aea0913
- Callback testing
  AlexTregub
  committed
  2db1eee
- Fixed window resize problems
  AlexTregub
  committed
  fcafafd
- Added button for loading map from json...
  AlexTregub
  committed
  2e3a7dd
- Cleaned up importTerrain() function call...
  AlexTregub
  committed
  c9e9733
- PR#239 Added user-selectable button for loading level
  AlexTregub
  authored
  a5a1f90
- Added Greg DeLozier
  AlexTregub
  committed
  c7d8439
- Added random position sampling for object placement.
  AlexTregub
  committed
  04551fe
- Additional proof of concept
  AlexTregub
  committed
  20c08c7
- Removed example run during setup to reduce load time.
  AlexTregub
  committed
  14435fa
- Added optional 'array-like' object sampling for additional functionality
  AlexTregub
  committed
  f9777a3
- Commented out examples of array-usage
  AlexTregub
  committed
  fbd4b2c
- PR#236 Added JSON loading to g_activeMap.
  AlexTregub
  authored
  17362a8
- Added copy to web directory, potentially wrong folder...
  AlexTregub
  committed
  60e9a8a
- TEMPORARILY delayed spawning of spider to 20sec...
  AlexTregub
  committed
  1ebd12b
- Merge branch 'Dev' into AT_posSampling
  AlexTregub
  authored
  3125234
- PR #241 Added position sampling from terrain
  AlexTregub
  authored
  b5a0366
- Merge branch 'Dev' into AF_Events
  afabiku
  committed
  6fa5db4
- Giant commit and tutorial quests
  ACruz2004
  committed
  baa4afd
Commits on Nov 18, 2025
- done
  afabiku
  committed
  f9b4177
- Merge branch 'Dev' into AC_Events
  ACruz2004
  authored
  c45d2b5
- Merge pull request #242 from AlexTregub/AC_Events
  ACruz2004
  authored
  8b500ab
- Spawning on rand working...
  AlexTregub
  committed
  76b1962
- Spawning within 25ish tiles of center...
  AlexTregub
  committed
  94d3576
- Expanded amount of tiles hills can spawn on...
  AlexTregub
  committed
  df16c22
- PR#248 Last-Min Em merge, buildings spawn on grass
  AlexTregub
  authored
  eb1fb89
- changed keybinds
  dadoge217
  committed
  7ade6bb
- actually fixed keybinds
  dadoge217
  committed
  4a09333
- idk
  afabiku
  committed
  abcfed0
- test
  afabiku
  committed
  6c709e5
- Antony found, spawn order fixed anthill->antony.
  AlexTregub
  committed
  c1d7c71
- Antony spawning TL of anthill
  AlexTregub
  committed
  e56ec37
- Ant cones all over
  AlexTregub
  committed
  098b06d
- Reduced spawning interval and ant count
  AlexTregub
  committed
  c87d23a
- Queen spawns with hive
  AlexTregub
  committed
  9c33ecc
- Boss spawned...
  AlexTregub
  committed
  274e356
- Boss spawn limited
  AlexTregub
  committed
  db200b5
- Broken ant hill text, but now similar to Antony's
  AlexTregub
  committed
  ea067a4
- Fixed E to open placement for anthill and antcone
  AlexTregub
  committed
  e5a2296
- Fixed Antony text rendering
  AlexTregub
  committed
  35f2e6b
- Center rollback
  AlexTregub
  committed
  3ee15f8
- Queen position located
  AlexTregub
  committed
  e1873dd
- Exists bug where Anthill in the water fully...
  AlexTregub
  committed
  151de4e
- PR#249 AT + AF Spawn fixes, bugs exist
  AlexTregub
  authored
  597b2ec
- Entity MVC
  CrazzyCrisis
  committed
  c7202ab
- Added a few things
  CrazzyCrisis
  committed
  d2fc86b
- Tests
  CrazzyCrisis
  committed
  d07d5ce
- Ant MVC
  CrazzyCrisis
  committed
  7ce46e0
- ant MVC, factory, and testing complete. mergeing
  CrazzyCrisis
  committed
  4072c2c
- Merge pull request #251 from AlexTregub/DW_antMVC
  CrazzyCrisis
  authored
  3345b0e
Commits on Nov 19, 2025
- fixed ant attacking their own nests, added swarms at night
  afabiku
  committed
  2c6d2bf
- Merge branch 'Dev' into AF_Events
  afabiku
  committed
  017d946
- change ants spawn amount
  afabiku
  committed
  dfd2329
- removed comments
  afabiku
  committed
  5180661
Commits on Nov 20, 2025
- fixed npcs getting attacked and made only builders and farmers collect resources
  afabiku
  committed
  f1a3680
Commits on Nov 22, 2025
- Eventbus up and tested
  CrazzyCrisis
  committed
  2bf07a4
Commits on Nov 23, 2025
- Look I overcomplicated something again!
  CrazzyCrisis
  committed
  bae6ec8
- Added signals
  CrazzyCrisis
  committed
  83a43ae
- Ant Count Display working
  CrazzyCrisis
  committed
  0559f55
- Frame rate independent
  CrazzyCrisis
  committed
  6f3318e
- Cleaning up errors
  CrazzyCrisis
  committed
  da8377e
- Resource UI
  CrazzyCrisis
  committed
  b139d87
- Fixed menu hover
  CrazzyCrisis
  committed
  da37cf1
- More cleaning up sketch
  CrazzyCrisis
  committed
  d4567f5
- Keybind cleaning
  CrazzyCrisis
  committed
  b3de97c
- UI works. sketch working.
  CrazzyCrisis
  committed
  286726d
Commits on Nov 24, 2025
- Made some changes, made the queen faster
  CrazzyCrisis
  committed
  65377b3
- Removed debug movement lines for ants
  CrazzyCrisis
  committed
  ac79369
- made queen use melee and change stats
  afabiku
  committed
  86db557
- Cleaned up trash code by me
  CrazzyCrisis
  committed
  6f72729
- added new animations and boss
  afabiku
  committed
  65999fa
- Powerbar added
  CrazzyCrisis
  committed
  6c4614b
- made events stackable, spider nerfed and anteater buffed
  afabiku
  committed
  70a0584
- ugggggh
  CrazzyCrisis
  committed
  03e1eaa
- Stuff mostly works!
  CrazzyCrisis
  committed
  33114be
- Day/Night clock!
  CrazzyCrisis
  committed
  deab2db
- Lightning upgrades!
  CrazzyCrisis
  committed
  b059bf5
- Wooooo
  CrazzyCrisis
  committed
  b2c9d86
- FIREBAALL
  CrazzyCrisis
  committed
  85aeb37
- Perfect
  CrazzyCrisis
  committed
  4af1a96
- ITS SO GOOD
  CrazzyCrisis
  committed
  fa91fce
- Fireball sfx
  CrazzyCrisis
  committed
  69f23d2
- Merge pull request #264 from AlexTregub:dw_eventBus
  CrazzyCrisis
  authored
  8cd1d83
- Added keybinds back
  CrazzyCrisis
  committed
  1c32844
- Got rid of some text on the fireBall
  CrazzyCrisis
  committed
  6cddba6
- Fixed the spawning keybinds
  CrazzyCrisis
  committed
  566e793
- removed queen panel vis
  CrazzyCrisis
  committed
  3894dbb
- made enemy ants not attack each other
  afabiku
  committed
  c067b69
- Removed the unused resource node class
  CrazzyCrisis
  committed
  1aff293
- Lightning SFX
  CrazzyCrisis
  committed
  87d5026
- Selection buttons work
  CrazzyCrisis
  committed
  71ccd1a
- Selection button keybinds!
  CrazzyCrisis
  committed
  76fedca
- Merge pull request #265 from AlexTregub:DW_SelectionButtons
  CrazzyCrisis
  authored
  bfb1685
- Merge branch 'Dev' into AF_Events
  CrazzyCrisis
  authored
  c320869
- Merge pull request #252 from AlexTregub/AF_Events
  CrazzyCrisis
  authored
  7063419
- New workflow planned...
  AlexTregub
  committed
  9d3f5e5
- Details...
  AlexTregub
  committed
  7d4af35
- Needs delim...
  AlexTregub
  committed
  6d4818b
- Trying 'proper' deploy...
  AlexTregub
  committed
  a56e5bb
- Added fallback gzip+tar method
  AlexTregub
  committed
  a9a3dfd
- Added notif of which method used for logging/debugging
  AlexTregub
  committed
  65c8f11
- Fixed delims...
  AlexTregub
  committed
  b4a2e42
- Fixed delims...
  AlexTregub
  committed
  1d73d55
- Added on-deploy check
  AlexTregub
  committed
  d1f3995
- Listeners got lost, added them back in
  CrazzyCrisis
  committed
  ae2259d
- fixed weather stuff. need to fix a little more for smooth level transition
  dadoge217
  committed
  8abaaae
- Merge branch 'Dev' of https://github.com/AlexTregub/softwareEngineering_teamDelta into Dev
  dadoge217
  committed
  42c6713
- Ants will no longer try to go to 0,0 to drop stuff off, and wil only goto a valid dropoff location
  CrazzyCrisis
  committed
  e45cfe7
- Made the quest UI and shop ui use normalized screen cords
  CrazzyCrisis
  committed
  f5bd649
- change queen default sprite
  afabiku
  committed
  e32234c
- Merge branch 'Dev' of https://github.com/AlexTregub/softwareEngineering_teamDelta into AF_Events
  afabiku
  committed
  c7e3e1e
- Merge pull request #269 from AlexTregub/AF_Events
  afabiku
  authored
  4dc004e
- Antony updates via Anthony
  AlexTregub
  committed
  04f42cf
- hot fixes, fixed combat issue and hotkey overlapping
  afabiku
  committed
  1720183
- changed time of day length
  dadoge217
  committed
  6bad314
- lightning now spawns randomly on viewable map
  dadoge217
  committed
  b5be68f
- game length 50 seconds
  dadoge217
  committed
  6902b86
- Merge pull request #271 from AlexTregub/AC_Tutorial_Ref
  ACruz2004
  authored
  c07491e
Commits on Nov 25, 2025
- Disabled kill on spawn
  AlexTregub
  committed
  5dbc9eb
- PR#272 hot fixes, fixed combat issue and hotkey overlapping
  AlexTregub
  authored
  63a4097
- new building lvl
  afabiku
  committed
  02f9279
- Merge branch 'Dev' of https://github.com/AlexTregub/softwareEngineering_teamDelta into AF_Events
  afabiku
  committed
  6882bd5
Commits on Dec 2, 2025
- Tutorial opens gregg. Alex F, make changes as needed, we can drop this if needed
  AlexTregub
  committed
  08c419d
- new building lvl
  afabiku
  committed
  6dca301
Commits on Dec 3, 2025
- Extended menu + adjusted sizing
  AlexTregub
  committed
  1fb85ea
- Basic credits, cleanup needed
  AlexTregub
  committed
  141fd35
Commits on Dec 4, 2025
- Menu Icons Added + Credits working.
  AlexTregub
  committed
  b4dd2ae
- PR#275 Menu Fixes
  AlexTregub
  authored
  54fd83f
- PR#274 Buildings/Tutorial Bug Fix
  AlexTregub
  authored
  7214be1
- Minimap gone
  CrazzyCrisis
  committed
  b090bb8
Commits on Dec 8, 2025
- Legacy pathfinding now working on full grid - OOB errors resolved.
  AlexTregub
  committed
  ffd903b
- Kinda... working building spawns... Antony may drown
  AlexTregub
  committed
  9d22946
- Removed broken tutorial - gregg.json has been lost...
  AlexTregub
  committed
  aa5f50d
- Disabled entities on player-loaded maps...
  AlexTregub
  committed
  cf75b39
- Removed 0,0 farmland reference
  AlexTregub
  committed
  391a965
- Powerups balancing: Lightning every 2 sec, Fireball every 5 with charge
  AlexTregub
  committed
  a720a83
- Balancing, More sampling to spawn main hive, More enemy hives in general...
  AlexTregub
  committed
  6d21ed1
- Queen radius added to allow for hive takeovers, should avoid combat unless in proximity
  AlexTregub
  committed
  280ff12
- Hive upgrade past levels. Up to 45 ants commanded...
  AlexTregub
  committed
  0a9eae7
- Enemy hive now shows open hive menu button...
  AlexTregub
  committed
  9e35e6c
- Disable OOB checks...
  AlexTregub
  committed
  06183dd
- Enemy hive menus...
  AlexTregub
  committed
  48de0c6
- Leveling OK, need to reduce spawn rates.....
  AlexTregub
  committed
  0b2d875
Commits on Dec 9, 2025
- somewhat balanced enemy spawn rates
  dadoge217
  committed
  d76a54a
- Hotfixes
  ACruz2004
  committed
  396da4f
- Merge branch 'Dev' into AC_FinalStretch
  ACruz2004
  authored
  f6e9fe3
- trying to fix swarm again
  dadoge217
  committed
  6ab427f
- Merge pull request #295 from AlexTregub/AC_FinalStretch
  ACruz2004
  authored
  e5efa96
- such a small dialogue change
  ACruz2004
  committed
  f185a9c
- Credits good enough
  AlexTregub
  committed
  52fc71a
- Merge remote-tracking branch 'refs/remotes/origin/AT_altBugfixes' into AT_altBugfixes
  AlexTregub
  committed
  9cc8117
- Added good tiles...
  AlexTregub
  committed
  5086e47
- Weights added, not respected in pathfinding, sigh...
  AlexTregub
  committed
  fe1df06
- Merge pull request #296 from AlexTregub/AT_altBugfixes
  AlexTregub
  authored
  54c934c
- Merge pull request #297 from AlexTregub/AT_altBugfixes
  AlexTregub
  authored
  5b6527e
- Added shaping bad reference.
  AlexTregub
  committed
  f7b169e
- Credits full
  AlexTregub
  committed
  6d05b44
- Merge pull request #298 from AlexTregub/AT_altBugfixes
  AlexTregub
  authored
  e6e4564

Commits

Commits on Nov 6, 2025

Commits on Nov 7, 2025

Commits on Nov 8, 2025

Commits on Nov 9, 2025

Commits on Nov 10, 2025

Commits on Nov 11, 2025

Commits on Nov 12, 2025

Commits on Nov 13, 2025

Commits on Nov 15, 2025

Commits on Nov 17, 2025

Commits on Nov 18, 2025