staging #12

Merged

alxndr merged 40 commits from staging into main 2026-07-26 10:54:51 +01:00

Conversation 0 Commits 40 Files changed 118 +2317 -137

alxndr commented 2026-07-26 10:54:44 +01:00

Owner

Copy link

we actually have a game kinda?

we actually have a game kinda?

alxndr added 40 commits 2026-07-26 10:54:44 +01:00

added countdown to a group 5798acedd4

changed subtract time to no longer automatically account for time mult since I don't think we want everything to be affected by it 76b4362b68

basic functionality for locked and unlocked doors f826eddde3

defined crowbar and relevant game actions 8fc248d083

added generic equipment functionality and some of crowbar functionality 2412782388

Merge pull request 'crowbar' (#8) from crowbar into equipment-generic ... 728c347ec7

Reviewed-on: #8

added equipment sprites b276a927bb

Merge pull request 'added equipment sprites' (#9) from sprite-import into equipment-generic ... 6be4466b51

Reviewed-on: #9

minor locked door fix 06197a4c7b

really cool push with laser fix and base of trap loading 58daf7210a

erm push 2? 0db27fa98f

rewrote laser trap 2a1d6153a7

Merge pull request 'rewrote laser trap' (#10) from laser-rewrite into equipment-generic ... d56c2f8ac5

Reviewed-on: #10

ok so NOW laser trap should work? 669f02e84b

ok so NOW laser trap should work? 42a6dfb7c9

Added equipment interactions to camera and laser 217775f249

added all interaction based equipment and game actions (minus functionality for doors and vents, and exoskeleton kicking down doors since Renee has taken that) 7d9a50d8cd

Made traps spawn in generation and moved center of camera to allign with walls 7022e9f15f

un-fucked up the camera code (cause it was causing problems) a34aa2c273

added existing sprites to their respective equipment 5577839a21

alarm doors basic functionality 45cd69df11

added time loss animation and stopped cameras from turning once disabled df17e49c20

Traps actually delete and started adding vents (kinda hard to test without other parts implemented tho) 139d056f79

ihhjiojhklhjlhj 7e5e77301e

Added a couple more mission descriptions 99d5a82482

prepared some functionality for goggles and box 5588645b42

Worked on inventory a4e4a364cd

Worked on inventory b6aec5a4db

Base for exoskeleton prepared, and some changes to equipment_definition 60f70ea8f8

merged in inventory branch 752241e282

Merge remote-tracking branch 'origin/camera_placement' into staging f73e0712de

fixes 3e4e9bf735

many tweaks for integration e0db9dadc2

Merge remote-tracking branch 'origin/doors' into staging dc11661fa0

added a couple of small uncommited changes f634e84387

camera fix 9c201c003e

Merge branch 'staging' of https://git.alxndr.online/alxndr/GMTK-Game-Jam-2026 into staging c8b089705d

Exoskeleton stuff plus equip def adjustments 035be91058

idr tbh 9b02ed1172

Merge remote-tracking branch 'origin/exoskeleton' into staging 4f86514efe

alxndr merged commit 6df56b2dfb into main 2026-07-26 10:54:51 +01:00

alxndr referenced this pull request from a commit 2026-07-26 10:54:52 +01:00

Merge pull request 'staging' (#12) from staging into main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

alxndr/GMTK-Game-Jam-2026!12

No description provided.