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

update commit history, finished missing TODO's, restructured project #88

Open
wants to merge 95 commits into
base: master
Choose a base branch
from
Open

update commit history, finished missing TODO's, restructured project #88

wants to merge 95 commits into from

Commits on Jul 13, 2016

  1. Creep's transfer method is not deprecated 

    Only structure's method is so.
    @nmaggioni
    nmaggioni committed Jul 13, 2016
    Configuration menu
    Copy the full SHA
    abbd4ad View commit details
    Browse the repository at this point in the history

  2. Structure's transfer method are deprecated

    @nmaggioni
    nmaggioni committed Jul 13, 2016
    Configuration menu
    Copy the full SHA
    70bcbfb View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2016

  1. Merge pull request #34 from nmaggioni/master 

    Wrong deprecated methods
    @Garethp
    Garethp authored Jul 14, 2016
    Configuration menu
    Copy the full SHA
    a59b761 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2016

  1. StructureLink.transferEnergy() is not deprecated, as it is not replac… 

    …ed with Creep.withdraw().
    @ArSn
    ArSn committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    c23fa33 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2016

  1. Merge pull request #35 from ArSn/structurelink_transferenergy_not_dep… 

    …recated

StructureLink.transferEnergy() is not deprecated, as it is not replac…
    @Garethp
    Garethp authored Jul 17, 2016
    Configuration menu
    Copy the full SHA
    437c575 View commit details
    Browse the repository at this point in the history

  2. Added Atom install instructions

    @Garethp
    Garethp committed Jul 17, 2016
    Configuration menu
    Copy the full SHA
    3bcac0b View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2016

  1. Creep.say() does now have a public param. Creep does now have a sayin… 

    …g property.
    @ArSn
    ArSn committed Jul 22, 2016
    Configuration menu
    Copy the full SHA
    e625d74 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2016

  1. Merge pull request #37 from ArSn/creep_say_public_param 

    Creep.say() does now have a public param. Creep does now have a saying property.
    @Garethp
    Garethp authored Jul 23, 2016
    Configuration menu
    Copy the full SHA
    7c0d286 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2016

  1. Added missing constants

    @kaiheilos
    kaiheilos authored Jul 31, 2016
    Configuration menu
    Copy the full SHA
    b5a9748 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #38 from kaiheilos/master 

    Added missing constants
    @Garethp
    Garethp authored Jul 31, 2016
    Configuration menu
    Copy the full SHA
    d09b5a3 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2016

  1. Updated StructureTerminal description as the calculation for the cost… 

    … changed.
    @ArSn
    ArSn committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    06c996d View commit details
    Browse the repository at this point in the history

  2. Added new method Game.market.calcTransactionCost().

    @ArSn
    ArSn committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    5299468 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2016

  1. Merge pull request #39 from ArSn/changelog-8th-august 

    Changelog 8th august
    @Garethp
    Garethp authored Aug 10, 2016
    Configuration menu
    Copy the full SHA
    a081583 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2016

  1. Fixed typo for getActiveBodyparts, resolves #41

    @zsw007
    zsw007 authored Aug 24, 2016
    Configuration menu
    Copy the full SHA
    df048dc View commit details
    Browse the repository at this point in the history

  2. Merge pull request #42 from Zsw007/patch-1 

    Fixed typo for getActiveBodyparts, resolves #41
    @Garethp
    Garethp authored Aug 24, 2016
    Configuration menu
    Copy the full SHA
    bd84f6c View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2016

  1. Updating nuker and observer constants 

    Updating nuker and observer constants + introducing new constant CONTROLLER_NUKE_BLOCKED_UPGRADE from recent patch.
    Tymoteusz Paul authored Sep 27, 2016
    Configuration menu
    Copy the full SHA
    8014589 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2016

  1. Merge pull request #46 from Puciek/patch-1 

    Updating nuker and observer constants
    @Garethp
    Garethp authored Sep 29, 2016
    Configuration menu
    Copy the full SHA
    9c7c5c1 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2016

  1. Create package.json 

    to install via npm
    @thomaskneisel
    thomaskneisel authored Oct 12, 2016
    Configuration menu
    Copy the full SHA
    4d1d738 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2016

  1. Added missing Game.market methods

    @rbryson74
    rbryson74 committed Oct 13, 2016
    Configuration menu
    Copy the full SHA
    b3cc744 View commit details
    Browse the repository at this point in the history

  2. Moved serialize path and deserialize path out of the prototype.

    @rbryson74
    rbryson74 committed Oct 13, 2016
    Configuration menu
    Copy the full SHA
    140f9e3 View commit details
    Browse the repository at this point in the history

  3. added isRoomAvailable to Game.map

    @rbryson74
    rbryson74 committed Oct 13, 2016
    Configuration menu
    Copy the full SHA
    c5df4ca View commit details
    Browse the repository at this point in the history

  4. removed object descriptors for getOrderById

    @rbryson74
    rbryson74 committed Oct 13, 2016
    Configuration menu
    Copy the full SHA
    803058b View commit details
    Browse the repository at this point in the history

  5. Merge pull request #51 from rbryson74/master 

    changes or additions for several methods
    @Garethp
    Garethp authored Oct 13, 2016
    Configuration menu
    Copy the full SHA
    0b097b0 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #50 from thomaskneisel/nodeify 

    Create package.json
    @Garethp
    Garethp authored Oct 13, 2016
    Configuration menu
    Copy the full SHA
    b656764 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2016

  1. Update StructureController.js

    @Proximitron
    Proximitron authored Oct 21, 2016
    Configuration menu
    Copy the full SHA
    ac47a5e View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2016

  1. Merge pull request #52 from Proximitron/patch-1 

    Update StructureController.js
    @Garethp
    Garethp authored Nov 7, 2016
    Configuration menu
    Copy the full SHA
    45cf6dc View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2016

  1. updated PathFinder.js to reference the static methods correctly.

    @rbryson74
    rbryson74 committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    5745770 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #54 from rbryson74/master 

    updated PathFinder.js to reference the static methods correctly.
    @Garethp
    Garethp authored Nov 10, 2016
    Configuration menu
    Copy the full SHA
    5bffc61 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2016

  1. Add Links to Screeps documentation

    @RiftLurker
    RiftLurker committed Nov 23, 2016
    Configuration menu
    Copy the full SHA
    0f20b02 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #57 from PostCrafter/master 

    Add Links to Screeps documentation
    @Garethp
    Garethp authored Nov 23, 2016
    Configuration menu
    Copy the full SHA
    9d00759 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2016

  1. Visual Studio Instructions More Indepth 

    Made the visual studio instructions less confusing and added a link to a video
    @greenfrogs
    greenfrogs authored Dec 29, 2016
    Configuration menu
    Copy the full SHA
    515e330 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2017

  1. Added Modules.js with definitions for module and require

    Jay French committed Mar 22, 2017
    Configuration menu
    Copy the full SHA
    78225ee View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2017

  1. Don't need after all

    Jay French committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    45e0a4c View commit details
    Browse the repository at this point in the history

  2. Added new constants from 2017-03-09 release

    Jay French committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    0464522 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #61 from jfren484/master 

    Added constants
    @Garethp
    Garethp authored Mar 23, 2017
    Configuration menu
    Copy the full SHA
    7d70d68 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2017

  1. Fixed Flag Colors 

    Type of flag Color and secondary Color is number not string

http://support.screeps.com/hc/en-us/articles/203079181-Flag#color
    @sebbi08
    sebbi08 authored Apr 16, 2017
    Configuration menu
    Copy the full SHA
    2c36a6a View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2017

  1. Merge pull request #62 from sebbi08/patch-1 

    Fixed Flag Colors
    @Garethp
    Garethp authored Apr 18, 2017
    Configuration menu
    Copy the full SHA
    92f9da1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #59 from greenfrogs/patch-1 

    Updated Visual Studio Instructions
    @Garethp
    Garethp authored Apr 18, 2017
    Configuration menu
    Copy the full SHA
    759bd73 View commit details
    Browse the repository at this point in the history

  3. Updating

    @Garethp
    Garethp committed Apr 18, 2017
    Configuration menu
    Copy the full SHA
    7e8dd19 View commit details
    Browse the repository at this point in the history

  4. Updating

    @Garethp
    Garethp committed Apr 18, 2017
    Configuration menu
    Copy the full SHA
    a1dd6df View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2017

  1. Added Storage Cooldown to Structure Terminal 

    Added the storage cooldown feature from the 2017-05-11 changelog.
    @greenfrogs
    greenfrogs authored Jun 4, 2017
    Configuration menu
    Copy the full SHA
    ba88d36 View commit details
    Browse the repository at this point in the history

  2. Terminal Cooldown Constant Added to Constants 

    From the 2017-05-11 changelog
    @greenfrogs
    greenfrogs authored Jun 4, 2017
    Configuration menu
    Copy the full SHA
    d74fd54 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1 from greenfrogs/patch-3 

    Terminal Cooldown Constant Added to Constants
    @greenfrogs
    greenfrogs authored Jun 4, 2017
    Configuration menu
    Copy the full SHA
    6c81fe7 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2017

  1. Merge pull request #64 from greenfrogs/patch-2 

    Updated to 2017-05-11 Changelog
    @Garethp
    Garethp authored Jun 5, 2017
    Configuration menu
    Copy the full SHA
    636a7eb View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2017

  1. Add line and poly of RoomVisual

    @nickgarvey
    nickgarvey committed Jun 23, 2017
    Configuration menu
    Copy the full SHA
    14e4676 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #65 from nickgarvey/master 

    Add line and poly of RoomVisual
    @Garethp
    Garethp authored Jun 23, 2017
    Configuration menu
    Copy the full SHA
    da8dedc View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2017

  1. add signController

    @shibdib
    shibdib authored Jun 25, 2017
    Configuration menu
    Copy the full SHA
    ba0e747 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2017

  1. Merge pull request #67 from shibdib/patch-1 

    add signController
    @Garethp
    Garethp authored Jun 26, 2017
    Configuration menu
    Copy the full SHA
    46f0657 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2018

  1. Add spawnCreep 

    createCreep is deprecated and has been replaced with spawnCreep
    @MrCeeJ
    MrCeeJ authored Feb 13, 2018
    Configuration menu
    Copy the full SHA
    9a5414e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #72 from MrCeeJ/patch-1 

    Add spawnCreep
    @Garethp
    Garethp authored Feb 13, 2018
    Configuration menu
    Copy the full SHA
    8d54da2 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2018

  1. Added StructureSpawn.Spawning docs 

    Info was taken from http://docs.screeps.com/api/
    @laxadeR
    laxadeR committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    a674089 View commit details
    Browse the repository at this point in the history

  2. Typo Fix

    @laxadeR
    laxadeR committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    635ded1 View commit details
    Browse the repository at this point in the history

  3. More typos

    @laxadeR
    laxadeR committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    209bf66 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2018

  1. Merge pull request #73 from alexlarex/master 

    Added StructureSpawn.Spawning docs
    @Garethp
    Garethp authored Mar 19, 2018
    Configuration menu
    Copy the full SHA
    7e5e24d View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2018

  1. Fix StructureSpawn.spawnCreep

    @RiftLurker
    RiftLurker authored Mar 28, 2018
    Configuration menu
    Copy the full SHA
    df4f0c6 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2018

  1. Merge pull request #75 from PostCrafter/patch-1 

    Fix StructureSpawn.spawnCreep
    @Garethp
    Garethp authored Apr 6, 2018
    Configuration menu
    Copy the full SHA
    8daf3d9 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2018

  1. Tombstones

    @poma
    poma committed Jun 17, 2018
    Configuration menu
    Copy the full SHA
    aff6afb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #76 from poma/master 

    Added tombstones
    @Garethp
    Garethp authored Jun 17, 2018
    Configuration menu
    Copy the full SHA
    0899e84 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2018

  1. Updated ScreepsAutocomplete to inclode the recent changes specified h… 

    …ere: https://blog.screeps.com/2018/09/changelog-2018-09-22/
    @Jacudibu
    Jacudibu committed Sep 22, 2018
    Configuration menu
    Copy the full SHA
    75e993b View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2018

  1. Added Missing return values to PathFinder.search

    @Jacudibu
    Jacudibu committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    a85e811 View commit details
    Browse the repository at this point in the history

  2. Added missing values to Game.cpu

    @Jacudibu
    Jacudibu committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    bee0ec7 View commit details
    Browse the repository at this point in the history

  3. Added Game.shard

    @Jacudibu
    Jacudibu committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    99a284d View commit details
    Browse the repository at this point in the history

  4. Added REACTION_TIME constant

    @Jacudibu
    Jacudibu committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    becf4d8 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2018

  1. Merge pull request #78 from Jacudibu/master 

    Added missing stuff from recent updates
    @Garethp
    Garethp authored Oct 16, 2018
    Configuration menu
    Copy the full SHA
    1e51f5d View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2018

  1. Fixed values for CONTROLLER_DOWNGRADE

    @Jacudibu
    Jacudibu committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    5ada011 View commit details
    Browse the repository at this point in the history

  2. Added missing Controller constants

    @Jacudibu
    Jacudibu committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    cbd21a3 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2018

  1. Added the newly added Creep.pull

    @Jacudibu
    Jacudibu committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    7dac6d5 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2018

  1. Merge pull request #79 from Jacudibu/master 

    Added Creep.pull & some missing Controller constants
    @Garethp
    Garethp authored Nov 14, 2018
    Configuration menu
    Copy the full SHA
    b73899c View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2018

  1. Added latest changes from ptr (2018-12-10)

    @Jacudibu
    Jacudibu committed Dec 10, 2018
    Configuration menu
    Copy the full SHA
    0eb20b3 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2018

  1. Merge pull request #80 from Jacudibu/master 

    Added latest changes from ptr (2018-12-10)
    @Garethp
    Garethp authored Dec 11, 2018
    Configuration menu
    Copy the full SHA
    a451559 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2019

  1. Fix Mineral#mineralType type

    Kevin Yen committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    75d0193 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2019

  1. Merge pull request #82 from kevin-yen/fix-mineralType 

    Fix Mineral#mineralType type
    @Garethp
    Garethp authored Feb 6, 2019
    Configuration menu
    Copy the full SHA
    4f9c5fb View commit details
    Browse the repository at this point in the history

Commits on May 6, 2019

  1. Bring it up to date (power creeps, etc...)

    @shibdib
    shibdib committed May 6, 2019
    Configuration menu
    Copy the full SHA
    d451901 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/Garethp/master' 

    # Conflicts:
#	Global/Constants.js
    @shibdib
    shibdib committed May 6, 2019
    Configuration menu
    Copy the full SHA
    a888181 View commit details
    Browse the repository at this point in the history

  3. remove github markup

    @shibdib
    shibdib committed May 6, 2019
    Configuration menu
    Copy the full SHA
    5da6b4a View commit details
    Browse the repository at this point in the history

  4. Update StructureController.js

    @shibdib
    shibdib authored May 6, 2019
    Configuration menu
    Copy the full SHA
    62bbe2c View commit details
    Browse the repository at this point in the history

  5. Update Constants.js

    @shibdib
    shibdib authored May 6, 2019
    Configuration menu
    Copy the full SHA
    80b78c7 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2019

  1. Merge pull request #83 from shibdib/master 

    Power creeps/ops/etc...
    @Garethp
    Garethp authored May 7, 2019
    Configuration menu
    Copy the full SHA
    2e869e5 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2019

  1. Added missing functions from WebVisual.

    @threenplusone
    threenplusone committed May 21, 2019
    Configuration menu
    Copy the full SHA
    2455cdb View commit details
    Browse the repository at this point in the history

  2. Added missing functions from RawMemory.

    @threenplusone
    threenplusone committed May 21, 2019
    Configuration menu
    Copy the full SHA
    f8a5b6c View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2019

  1. Merge pull request #84 from threenplusone/master 

    Added functions missing from WebVisual & RawMemory.
    @Garethp
    Garethp authored Jun 20, 2019
    Configuration menu
    Copy the full SHA
    3744fd1 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2019

  1. Fix jsdocs related to objects in Game.js

    @EldoranDev
    EldoranDev committed Oct 13, 2019
    Configuration menu
    Copy the full SHA
    88fe010 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2019

  1. Merge pull request #86 from EldoranDev/master 

    Fix jsdocs related to objects in Game.js
    @Garethp
    Garethp authored Oct 15, 2019
    Configuration menu
    Copy the full SHA
    fae6c91 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2019

  1. Screeps Update 4.x: FIND_DROPPED_ENERGY got removed

    @CrystallDEV
    CrystallDEV committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    9f026e5 View commit details
    Browse the repository at this point in the history

  2. Screeps Update 4.x: Structure*.transfer got removed, was replaced lon… 

    …g ago by creep.withdraw
    @CrystallDEV
    CrystallDEV committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    ed05521 View commit details
    Browse the repository at this point in the history

  3. Screeps Update 4.x.x: Updated TODO list

    @CrystallDEV
    CrystallDEV committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    df15050 View commit details
    Browse the repository at this point in the history

  4. Screeps Update 4.x.x: Added new Structure: StructureFactory

    @CrystallDEV
    CrystallDEV committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    c0d3a75 View commit details
    Browse the repository at this point in the history

  5. Screeps Update 4.x.x: Added new Structure: StructureInvaderCore

    @CrystallDEV
    CrystallDEV committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    bf4c65c View commit details
    Browse the repository at this point in the history

  6. Screeps Update 4.x.x: Added new Prototype: Deposit, Updated TODO

    @CrystallDEV
    CrystallDEV committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    f3a8833 View commit details
    Browse the repository at this point in the history

  7. Screeps Update 4.x.x: Added new Prototype: Ruin

    @CrystallDEV
    CrystallDEV committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    6210891 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2019

  1. Screeps Update 4.x.x: Updated Game.market with missing function and n… 

    …ew parameters, updated TODO list
    @CrystallDEV
    CrystallDEV committed Oct 19, 2019
    Configuration menu
    Copy the full SHA
    5039afe View commit details
    Browse the repository at this point in the history

  2. Screeps Update 4.x.x: Removed minimum amount for StructureTerminal::send

    @CrystallDEV
    CrystallDEV committed Oct 19, 2019
    Configuration menu
    Copy the full SHA
    a6afd17 View commit details
    Browse the repository at this point in the history

  3. Structured project properly and removed IDE dependant cfg

    @CrystallDEV
    CrystallDEV committed Oct 19, 2019
    Configuration menu
    Copy the full SHA
    0674d01 View commit details
    Browse the repository at this point in the history

  4. Added npm script to auto generate constants, generated new Constants.… 

    …js, removed TODO file (all done)
    @CrystallDEV
    CrystallDEV committed Oct 19, 2019
    Configuration menu
    Copy the full SHA
    85ecc0e View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2019

  1. Merge remote-tracking branch 'origin/master' 

    # Conflicts:
#	Game.js
#	Global/Constants.js
#	RawMemory.js
#	Structures/StructureController.js
#	Structures/StructureSpawn.js
#	package.json
    Marek Hasselder committed Oct 23, 2019
    Configuration menu
    Copy the full SHA
    b452635 View commit details
    Browse the repository at this point in the history