Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dropship weapons console TGUI #4812

Merged
merged 93 commits into from
Dec 25, 2023
Merged

Dropship weapons console TGUI #4812

merged 93 commits into from
Dec 25, 2023

Commits on Apr 23, 2023

  1. managed to refactor out about half of ui data and all topic functiona… 

    …lity
    @mullenpaul
    mullenpaul committed Apr 23, 2023
    Configuration menu
    Copy the full SHA
    7405e53 View commit details
    Browse the repository at this point in the history

  2. done most of the refactoring out

    @mullenpaul
    mullenpaul committed Apr 23, 2023
    Configuration menu
    Copy the full SHA
    6d6266b View commit details
    Browse the repository at this point in the history

Commits on May 1, 2023

  1. started weapon selection screen

    @mullenpaul
    mullenpaul committed May 1, 2023
    Configuration menu
    Copy the full SHA
    957794f View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2023

  1. Merge branch 'master' into dropship-weapons-console

    @mullenpaul
    mullenpaul committed Jun 3, 2023
    Configuration menu
    Copy the full SHA
    85feb88 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. refactoring of cassim to integrate with dropship equipment menu

    @mullenpaul
    mullenpaul committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    e32dd98 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2023

  1. reworked dropship panel into crtpanel

    @mullenpaul
    mullenpaul committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    deb0520 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2023

  1. got mfd styled closer to what is wanted

    @mullenpaul
    mullenpaul committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    0236703 View commit details
    Browse the repository at this point in the history

  2. got embedded maps working

    @mullenpaul
    mullenpaul committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    0c73a43 View commit details
    Browse the repository at this point in the history

  3. got camera working

    @mullenpaul
    mullenpaul committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    d63da39 View commit details
    Browse the repository at this point in the history

  4. got signal buttons working

    @mullenpaul
    mullenpaul committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    c761532 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. starting mfd refactor

    @mullenpaul
    mullenpaul committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    97d0dd0 View commit details
    Browse the repository at this point in the history

  2. refactored mfd into more generic component

    @mullenpaul
    mullenpaul committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    6f29d7d View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. more mfd refactors

    @mullenpaul
    mullenpaul committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    516f61f View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2023

  1. got generic refactor finished

    @mullenpaul
    mullenpaul committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    c0f0ebf View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2023

  1. got medevac stretcher data to front end

    @mullenpaul
    mullenpaul committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    cef2cf9 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2023

  1. mock up of medevac ui

    @mullenpaul
    mullenpaul committed Jul 23, 2023
    Configuration menu
    Copy the full SHA
    aa4d513 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Merge branch 'master' into dropship-weapons-console

    @mullenpaul
    mullenpaul committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    de8ef79 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. commiting current work

    @mullenpaul
    mullenpaul committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    3badd7e View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

  1. Merge branch 'master' into dropship-weapons-console

    @mullenpaul
    mullenpaul committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    a20c762 View commit details
    Browse the repository at this point in the history

  2. equipment panel mockup

    @mullenpaul
    mullenpaul committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    75f8fe0 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. got cas camera working

    @mullenpaul
    mullenpaul committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    7336808 View commit details
    Browse the repository at this point in the history

  2. medevac working

    @mullenpaul
    mullenpaul committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    1472954 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

  1. deployable equipment working

    @mullenpaul
    mullenpaul committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    4e36880 View commit details
    Browse the repository at this point in the history

  2. fix a couple of typing issues

    @mullenpaul
    mullenpaul committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    4a102af View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. pushing current firemission work

    @mullenpaul
    mullenpaul committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    4b3b22c View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

  1. got firemission configuration working needs a lot of work

    @mullenpaul
    mullenpaul committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    5efd5cf View commit details
    Browse the repository at this point in the history

  2. got firemission configuration working in a better way

    @mullenpaul
    mullenpaul committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    b6fd728 View commit details
    Browse the repository at this point in the history

  3. got gun camera working

    @mullenpaul
    mullenpaul committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    724ba52 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into dropship-weapons-console 

    # Conflicts:
#	code/game/machinery/computer/dropship_weapons.dm
    @mullenpaul
    mullenpaul committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    a0ca75e View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. Update code/game/cas_manager/datums/cas_fire_envelope.dm 

    Co-authored-by: fira <[email protected]>
    @mullenpaul @fira
    mullenpaul and fira authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    8b51098 View commit details
    Browse the repository at this point in the history

  2. Update code/game/cas_manager/datums/cas_fire_mission.dm 

    Co-authored-by: fira <[email protected]>
    @mullenpaul @fira
    mullenpaul and fira authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    43af804 View commit details
    Browse the repository at this point in the history

  3. Update code/modules/cm_marines/dropship_equipment.dm 

    Co-authored-by: fira <[email protected]>
    @mullenpaul @fira
    mullenpaul and fira authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    304beaa View commit details
    Browse the repository at this point in the history

  4. Update code/game/machinery/computer/dropship_weapons.dm 

    Co-authored-by: fira <[email protected]>
    @mullenpaul @fira
    mullenpaul and fira authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    3aca4af View commit details
    Browse the repository at this point in the history

  5. Update code/game/machinery/computer/dropship_weapons.dm 

    Co-authored-by: fira <[email protected]>
    @mullenpaul @fira
    mullenpaul and fira authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    606fcc4 View commit details
    Browse the repository at this point in the history

  6. Update code/game/cas_manager/datums/cas_fire_mission.dm 

    Co-authored-by: fira <[email protected]>
    @mullenpaul @fira
    mullenpaul and fira authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    93d2a76 View commit details
    Browse the repository at this point in the history

  7. Update code/game/cas_manager/datums/cas_fire_mission.dm 

    Co-authored-by: fira <[email protected]>
    @mullenpaul @fira
    mullenpaul and fira authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    f020988 View commit details
    Browse the repository at this point in the history

  8. Update code/game/cas_manager/datums/cas_fire_mission.dm 

    Co-authored-by: fira <[email protected]>
    @mullenpaul @fira
    mullenpaul and fira authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    035efa8 View commit details
    Browse the repository at this point in the history

  9. Update code/game/cas_manager/datums/cas_fire_mission.dm 

    Co-authored-by: fira <[email protected]>
    @mullenpaul @fira
    mullenpaul and fira authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    fef997f View commit details
    Browse the repository at this point in the history

  10. Update code/game/cas_manager/datums/cas_fire_mission.dm 

    Co-authored-by: fira <[email protected]>
    @mullenpaul @fira
    mullenpaul and fira authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    9f14171 View commit details
    Browse the repository at this point in the history

  11. Update code/game/machinery/computer/dropship_weapons.dm 

    Co-authored-by: fira <[email protected]>
    @mullenpaul @fira
    mullenpaul and fira authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    4a91097 View commit details
    Browse the repository at this point in the history

  12. Update code/game/machinery/computer/dropship_weapons.dm 

    Co-authored-by: fira <[email protected]>
    @mullenpaul @fira
    mullenpaul and fira authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    e4e7af6 View commit details
    Browse the repository at this point in the history

  13. Update code/game/machinery/computer/dropship_weapons.dm 

    Co-authored-by: fira <[email protected]>
    @mullenpaul @fira
    mullenpaul and fira authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    29ea34b View commit details
    Browse the repository at this point in the history

  14. Update code/game/machinery/computer/dropship_weapons.dm 

    Co-authored-by: fira <[email protected]>
    @mullenpaul @fira
    mullenpaul and fira authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    d6d7399 View commit details
    Browse the repository at this point in the history

  15. Update code/game/machinery/computer/dropship_weapons.dm 

    Co-authored-by: fira <[email protected]>
    @mullenpaul @fira
    mullenpaul and fira authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    82b1224 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. review feedback - backend

    @mullenpaul
    mullenpaul committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    6905a13 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2023

  1. firemissions now update with weapon update

    @mullenpaul
    mullenpaul committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    ec3c620 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into dropship-weapons-console 

    # Conflicts:
#	code/modules/cm_marines/dropship_equipment.dm
    @mullenpaul
    mullenpaul committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    f82e214 View commit details
    Browse the repository at this point in the history

  3. revert minimap changes

    @mullenpaul
    mullenpaul committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    1e8a805 View commit details
    Browse the repository at this point in the history

  4. remove build issue

    @mullenpaul
    mullenpaul committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    fc97fdb View commit details
    Browse the repository at this point in the history

  5. resolve null pointer map

    @mullenpaul
    mullenpaul committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    ab85724 View commit details
    Browse the repository at this point in the history

  6. fixed N-S firemission direction

    @mullenpaul
    mullenpaul committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    f2cdc14 View commit details
    Browse the repository at this point in the history

  7. added warning over using bad weapon in firemission

    @mullenpaul
    mullenpaul committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    0f53dd8 View commit details
    Browse the repository at this point in the history

  8. firemission offsets now working properly

    @mullenpaul
    mullenpaul committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    2502f9e View commit details
    Browse the repository at this point in the history

  9. fixed single weapon target acquisition

    @mullenpaul
    mullenpaul committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    ccde22c View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. Merge branch 'master' into dropship-weapons-console

    @fira
    fira authored Nov 8, 2023
    Configuration menu
    Copy the full SHA
    32c3121 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2023

  1. upgraded cas firemissions to SPAN_WARNING

    @mullenpaul
    mullenpaul committed Nov 11, 2023
    Configuration menu
    Copy the full SHA
    9ed6697 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2023

  1. ui refactor work

    @mullenpaul
    mullenpaul committed Nov 12, 2023
    Configuration menu
    Copy the full SHA
    5da2f6b View commit details
    Browse the repository at this point in the history

  2. ui refactors to improve state management

    @mullenpaul
    mullenpaul committed Nov 12, 2023
    Configuration menu
    Copy the full SHA
    5fc4fd4 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. tracked down bugs which came up during firemission creation and equip… 

    …ment selection
    @mullenpaul
    mullenpaul committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    a7eb555 View commit details
    Browse the repository at this point in the history

  2. resolve linting error

    @mullenpaul
    mullenpaul committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    cf2261c View commit details
    Browse the repository at this point in the history

  3. can now support an arbitrary number of firemissions, minimum name len… 

    …gth is now 1
    @mullenpaul
    mullenpaul committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    37c926b View commit details
    Browse the repository at this point in the history

  4. styling improvements for the MFD

    @mullenpaul
    mullenpaul committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    1596785 View commit details
    Browse the repository at this point in the history

  5. finished styling the panel

    @mullenpaul
    mullenpaul committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    907eee0 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. attempted nvg interface

    @mullenpaul
    mullenpaul committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    ec34779 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. refactored camera manager into datum, not fully working or tested

    @mullenpaul
    mullenpaul committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    1b4e692 View commit details
    Browse the repository at this point in the history

  2. got nvgs working on gun camera

    @mullenpaul
    mullenpaul committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    058a758 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2023

  1. made functional d-pad for offset calibration

    @mullenpaul
    mullenpaul committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    6ffd2ef View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. got gun camera working on firemissions

    @mullenpaul
    mullenpaul committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    6caa210 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2023

  1. got camera moving sorted

    @mullenpaul
    mullenpaul committed Nov 25, 2023
    Configuration menu
    Copy the full SHA
    06a7dc7 View commit details
    Browse the repository at this point in the history

  2. fix linter issue

    @mullenpaul
    mullenpaul committed Nov 25, 2023
    Configuration menu
    Copy the full SHA
    3e9a3f0 View commit details
    Browse the repository at this point in the history

  3. trying to resolve weapon issue

    @mullenpaul
    mullenpaul committed Nov 25, 2023
    Configuration menu
    Copy the full SHA
    2e5feb4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into dropship-weapons-console 

    # Conflicts:
#	code/game/machinery/computer/dropship_weapons.dm
#	code/modules/cm_marines/dropship_equipment.dm
    @mullenpaul
    mullenpaul committed Nov 25, 2023
    Configuration menu
    Copy the full SHA
    4d09a54 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2023

  1. Merge commit '3e0832cbd0b06d6a2266e52401b0269dbc3d0981' into dropship… 

    …-weapons-console
    @mullenpaul
    mullenpaul committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    96c27b4 View commit details
    Browse the repository at this point in the history

  2. ui no longer bricks when no ammo in weapons

    @mullenpaul
    mullenpaul committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    45c2327 View commit details
    Browse the repository at this point in the history

  3. increase rate limit to overcome limiter for cas offsets

    @mullenpaul
    mullenpaul committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    6778063 View commit details
    Browse the repository at this point in the history

  4. basic spotlight page working

    @mullenpaul
    mullenpaul committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    6bf8cd3 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. Merge commit '35f3406f070e32145e2cbb95518310d88e3f2cd2' into dropship… 

    …-weapons-console
    @mullenpaul
    mullenpaul committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    b5019ce View commit details
    Browse the repository at this point in the history

  2. fix spotlight issue

    @mullenpaul
    mullenpaul committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    def4a2b View commit details
    Browse the repository at this point in the history

  3. fix list null

    @mullenpaul
    mullenpaul committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    fe42c06 View commit details
    Browse the repository at this point in the history

  4. nulling out list

    @mullenpaul
    mullenpaul committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    923563b View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. Merge branch 'master' into dropship-weapons-console

    @mullenpaul
    mullenpaul committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    7c13a62 View commit details
    Browse the repository at this point in the history

  2. resolve feedback issues

    @mullenpaul
    mullenpaul committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    d873240 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. fix width error for firemissions

    @mullenpaul
    mullenpaul committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    1cd88eb View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2023

  1. debug flare compatible

    @mullenpaul
    mullenpaul committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    100f736 View commit details
    Browse the repository at this point in the history

  2. rework firemission error messages

    @mullenpaul
    mullenpaul committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    dec1a84 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2023

  1. properly unregister from cameras

    @mullenpaul
    mullenpaul committed Dec 23, 2023
    Configuration menu
    Copy the full SHA
    b3d5d28 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2023

  1. Merge branch 'master' into dropship-weapons-console 

    # Conflicts:
#	code/modules/cm_marines/dropship_equipment.dm
    @mullenpaul
    mullenpaul committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    7f55d8b View commit details
    Browse the repository at this point in the history

  2. changed fm directions

    @mullenpaul
    mullenpaul committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    ca90fd9 View commit details
    Browse the repository at this point in the history

  3. camera signal handler added

    @mullenpaul
    mullenpaul committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    0e26e20 View commit details
    Browse the repository at this point in the history

  4. should have resolved topic lock restriction for offsets

    @mullenpaul
    mullenpaul committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    9fa3770 View commit details
    Browse the repository at this point in the history

  5. resolve medevec camera issue

    @mullenpaul
    mullenpaul committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    9cc8088 View commit details
    Browse the repository at this point in the history

  6. added sanity check to minute count

    @mullenpaul
    mullenpaul committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    dc4c061 View commit details
    Browse the repository at this point in the history

  7. added initialisation for topic limiter when null

    @mullenpaul
    mullenpaul committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    ef3e131 View commit details
    Browse the repository at this point in the history