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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Remove fusion from reactions, add hypertorus fusion machinery #54379

Merged
merged 86 commits into from Nov 18, 2020
Merged

[WIP] Remove fusion from reactions, add hypertorus fusion machinery #54379

merged 86 commits into from Nov 18, 2020

Commits on Oct 13, 2020

  1. hypertorus fusion machine

    @Ghilker
    Ghilker committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    fca258e View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2020

  1. ignore the MAP

    @Ghilker
    Ghilker committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    b2286c5 View commit details
    Browse the repository at this point in the history

  2. quick fix

    @Ghilker
    Ghilker committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    cdb58c2 View commit details
    Browse the repository at this point in the history

  3. more stuff and tgui

    @Ghilker
    Ghilker committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    1ca3001 View commit details
    Browse the repository at this point in the history

  4. moar

    @Ghilker
    Ghilker committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    8ad09ea View commit details
    Browse the repository at this point in the history

  5. merge master + some fixes

    @Ghilker
    Ghilker committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    65e2d40 View commit details
    Browse the repository at this point in the history

  6. tgui thing

    @Ghilker
    Ghilker committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    f87badf View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2020

  1. more

    @Ghilker
    Ghilker committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    ad5fd73 View commit details
    Browse the repository at this point in the history

  2. tgui

    @Ghilker
    Ghilker committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    91a5ae7 View commit details
    Browse the repository at this point in the history

  3. merge master

    @Ghilker
    Ghilker committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    5a387bb View commit details
    Browse the repository at this point in the history

  4. merge master

    @Ghilker
    Ghilker committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    d837d9c View commit details
    Browse the repository at this point in the history

  5. i hope this fixes it

    @Ghilker
    Ghilker committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    7c82550 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2020

  1. GAS

    @Ghilker
    Ghilker committed Oct 16, 2020
    Configuration menu
    Copy the full SHA
    924f414 View commit details
    Browse the repository at this point in the history

  2. undef

    @Ghilker
    Ghilker committed Oct 16, 2020
    Configuration menu
    Copy the full SHA
    7a0a811 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2020

  1. more stuff, some fixes, debug map

    @Ghilker
    Ghilker committed Oct 17, 2020
    Configuration menu
    Copy the full SHA
    77514e4 View commit details
    Browse the repository at this point in the history

  2. merge master

    @Ghilker
    Ghilker committed Oct 17, 2020
    Configuration menu
    Copy the full SHA
    2d848a1 View commit details
    Browse the repository at this point in the history

  3. f

    @Ghilker
    Ghilker committed Oct 17, 2020
    Configuration menu
    Copy the full SHA
    d5f3d9e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into fusing

    @Ghilker
    Ghilker committed Oct 17, 2020
    Configuration menu
    Copy the full SHA
    0cc6f37 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2020

  1. many docs

    @Ghilker
    Ghilker committed Oct 18, 2020
    Configuration menu
    Copy the full SHA
    497f681 View commit details
    Browse the repository at this point in the history

  2. forgot a parentheses

    @Ghilker
    Ghilker committed Oct 18, 2020
    Configuration menu
    Copy the full SHA
    50f6b43 View commit details
    Browse the repository at this point in the history

  3. tgui change request

    @Ghilker
    Ghilker committed Oct 18, 2020
    Configuration menu
    Copy the full SHA
    9d8302a View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2020

  1. code improvements, better ui

    @Ghilker
    Ghilker committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    96ff22f View commit details
    Browse the repository at this point in the history

  2. merge master

    @Ghilker
    Ghilker committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    5ca44df View commit details
    Browse the repository at this point in the history

  3. improvements

    @Ghilker
    Ghilker committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    bf2b531 View commit details
    Browse the repository at this point in the history

  4. merge master

    @Ghilker
    Ghilker committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    b0bd7ec View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2020

  1. better construction

    @Ghilker
    Ghilker committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    bab21ea View commit details
    Browse the repository at this point in the history

  2. oops

    @Ghilker
    Ghilker committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    f5035c8 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2020

  1. less clamping

    @Ghilker
    Ghilker committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    f71b56c View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2020

  1. power consumption, damage, balancing, requested fixes, other stuff

    @Ghilker
    Ghilker committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    4caabc5 View commit details
    Browse the repository at this point in the history

  2. merge master

    @Ghilker
    Ghilker committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    2779fa7 View commit details
    Browse the repository at this point in the history

  3. this is better

    @Ghilker
    Ghilker committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    8f7a875 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2020

  1. bit of logging, sounds (all royalty free), alert, messages, radio

    @Ghilker
    Ghilker committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    e87294a View commit details
    Browse the repository at this point in the history

  2. fixes

    @Ghilker
    Ghilker committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    afc9abe View commit details
    Browse the repository at this point in the history

  3. moving things around

    @Ghilker
    Ghilker committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    1a0bd1e View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2020

  1. weewooo

    @Ghilker
    Ghilker committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    c72a279 View commit details
    Browse the repository at this point in the history

  2. merge master

    @Ghilker
    Ghilker committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    ed9be21 View commit details
    Browse the repository at this point in the history

  3. f

    @Ghilker
    Ghilker committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    5d344e3 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2020

  1. sound, tgui, more vars, more controls, better code(?)

    @Ghilker
    Ghilker committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    dd6df5b View commit details
    Browse the repository at this point in the history

  2. countdown, machine improvements

    @Ghilker
    Ghilker committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    1ae672e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into fusing

    @Ghilker
    Ghilker committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    b5f5680 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2020

  1. better sprites, meltdown, fixes

    @Ghilker
    Ghilker committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    d3bab0e View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2020

  1. improvements

    @Ghilker
    Ghilker committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    c2f431c View commit details
    Browse the repository at this point in the history

  2. move hypertorus.dm to new and proper location

    @Ghilker
    Ghilker committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    b356efe View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2020

  1. better machines

    @Ghilker
    Ghilker committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    3109ae5 View commit details
    Browse the repository at this point in the history

  2. derp

    @Ghilker
    Ghilker committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    ff9d020 View commit details
    Browse the repository at this point in the history

  3. revert map for TM

    @Ghilker
    Ghilker committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    eb5a64e View commit details
    Browse the repository at this point in the history

  4. crawling in my skin

    @Ghilker
    Ghilker committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    eebca46 View commit details
    Browse the repository at this point in the history

  5. AHHHHHHH

    @Ghilker
    Ghilker committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    a4201ba View commit details
    Browse the repository at this point in the history

  6. fixes and less material cost

    @Ghilker
    Ghilker committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    8d2faf0 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into fusing

    @Ghilker
    Ghilker committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    a33f256 View commit details
    Browse the repository at this point in the history

  8. properly revert i hope

    @Ghilker
    Ghilker committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    6180c67 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2020

  1. limiter to 1e9

    @Ghilker
    Ghilker committed Nov 3, 2020
    Configuration menu
    Copy the full SHA
    d9da10d View commit details
    Browse the repository at this point in the history

  2. merge master

    @Ghilker
    Ghilker committed Nov 3, 2020
    Configuration menu
    Copy the full SHA
    373da57 View commit details
    Browse the repository at this point in the history

  3. 1e8 cap

    @Ghilker
    Ghilker committed Nov 3, 2020
    Configuration menu
    Copy the full SHA
    0c3b358 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into fusing

    @Ghilker
    Ghilker committed Nov 3, 2020
    Configuration menu
    Copy the full SHA
    d37d394 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2020

  1. AHHH

    @Ghilker
    Ghilker committed Nov 4, 2020
    Configuration menu
    Copy the full SHA
    283c1a5 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2020

  1. more interactions, balancing

    @Ghilker
    Ghilker committed Nov 5, 2020
    Configuration menu
    Copy the full SHA
    e10435e View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2020

  1. balancing

    @Ghilker
    Ghilker committed Nov 6, 2020
    Configuration menu
    Copy the full SHA
    32249cf View commit details
    Browse the repository at this point in the history

  2. merge master

    @Ghilker
    Ghilker committed Nov 6, 2020
    Configuration menu
    Copy the full SHA
    98024db View commit details
    Browse the repository at this point in the history

  3. should fix runtimes when rotating machines

    @Ghilker
    Ghilker committed Nov 6, 2020
    Configuration menu
    Copy the full SHA
    8a770e5 View commit details
    Browse the repository at this point in the history

  4. fix to current_damper power consumption increase

    @Ghilker
    Ghilker committed Nov 6, 2020
    Configuration menu
    Copy the full SHA
    9b028b6 View commit details
    Browse the repository at this point in the history

  5. revert a change

    @Ghilker
    Ghilker committed Nov 6, 2020
    Configuration menu
    Copy the full SHA
    b3637de View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2020

  1. Merge branch 'master' into fusing

    @Ghilker
    Ghilker committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    4660092 View commit details
    Browse the repository at this point in the history

  2. fix and balancing, a bit of cleanup

    @Ghilker
    Ghilker committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    7f0d87e View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2020

  1. balancing, documentation, fixes

    @Ghilker
    Ghilker committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    4189ab1 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2020

  1. map changes

    @Ghilker
    Ghilker committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    ae0d41c View commit details
    Browse the repository at this point in the history

  2. fixes, Signals and some minor changes

    @Ghilker
    Ghilker committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    aa0aedf View commit details
    Browse the repository at this point in the history

  3. readability

    @Ghilker
    Ghilker committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    3e0f31f View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2020

  1. map work, balancing gasmix, fixes

    @Ghilker
    Ghilker committed Nov 10, 2020
    Configuration menu
    Copy the full SHA
    967b9b8 View commit details
    Browse the repository at this point in the history

  2. moved room in meta outside

    @Ghilker
    Ghilker committed Nov 10, 2020
    Configuration menu
    Copy the full SHA
    1b76932 View commit details
    Browse the repository at this point in the history

  3. map fix

    @Ghilker
    Ghilker committed Nov 10, 2020
    Configuration menu
    Copy the full SHA
    bc5e64e View commit details
    Browse the repository at this point in the history

  4. pop

    @Ghilker
    Ghilker committed Nov 10, 2020
    Configuration menu
    Copy the full SHA
    e98033d View commit details
    Browse the repository at this point in the history

  5. no icebox bad

    @Ghilker
    Ghilker committed Nov 10, 2020
    Configuration menu
    Copy the full SHA
    41632b8 View commit details
    Browse the repository at this point in the history

  6. cleanup, delta_time use on process

    @Ghilker
    Ghilker committed Nov 10, 2020
    Configuration menu
    Copy the full SHA
    1311d59 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2020

  1. fix, balancing, some more work

    @Ghilker
    Ghilker committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    f7a20e3 View commit details
    Browse the repository at this point in the history

  2. fixes

    @Ghilker
    Ghilker committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    7c443fd View commit details
    Browse the repository at this point in the history

  3. hidden space

    @Ghilker
    Ghilker committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    54926d3 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2020

  1. fix, sprites, more gas stuff

    @Ghilker
    Ghilker committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    1c31d65 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2020

  1. stuff

    @Ghilker
    Ghilker committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    57891ac View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2020

  1. merge master

    @Ghilker
    Ghilker committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    0b43d79 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2020

  1. merge master

    @Ghilker
    Ghilker committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    33a67a3 View commit details
    Browse the repository at this point in the history

  2. tgui changes

    @Ghilker
    Ghilker committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    3cda3d0 View commit details
    Browse the repository at this point in the history

  3. merge master

    @Ghilker
    Ghilker committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    240df08 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2020

  1. tgui

    @Ghilker
    Ghilker committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    82d38b1 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2020

  1. runtimes fixes, balancing, tgui, removed reaction

    @Ghilker
    Ghilker committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    e226ca7 View commit details
    Browse the repository at this point in the history

  2. merge master

    @Ghilker
    Ghilker committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    00f980e View commit details
    Browse the repository at this point in the history