Commit Graph

9 Commits

Author SHA1 Message Date
Jamie D
d6210b9495 Fixes Mapmerge 2023-01-14 01:54:15 +00:00
TheGamerdk
ca57f72a78 jamie stinks (#16349)
* Modernizes TGUI (#4219)

* Ports the first two PRs. CBT works local

* tchussi oops

* linttobuild

* Update Dockerfile for CBT (#56175)

Follow-up to fix the failing Docker CI on master.

- Reorganize the entire Dockerfile to be more readable
- Inline the tgstation/byond Dockerfile into our own, so we can change the base distro at will
- Also allows us to trash the dependencies.sh<->Dockerfile hack
- Use 32-bit libs on a 64-bit distro so that we can download and run recent 64-bit Node binaries
- Call tools/build/build rather than DreamMaker directly

* TGUI 43 plus hotfix 1

* https://github.com/tgstation/tgstation/pull/58701

* https://github.com/tgstation/tgstation/pull/56223

* https://github.com/tgstation/tgstation/pull/56229

* https://github.com/tgstation/tgstation/pull/56713

* https://github.com/tgstation/tgstation/pull/56797

* https://github.com/tgstation/tgstation/pull/57081/

* https://github.com/tgstation/tgstation/pull/57154

* https://github.com/tgstation/tgstation/pull/57251

* https://github.com/tgstation/tgstation/pull/56269

* https://github.com/tgstation/tgstation/pull/57277

* https://github.com/tgstation/tgstation/pull/57287

* https://github.com/tgstation/tgstation/pull/57326

* QF

* GimmeHopeUpdateExtra_Pr_Labels

* Flush queue in preloading part of tgui_panel (#57432)

* Flush queue in preloading part of tgui_panel

* Update tgui_panel.dm

* Compiles

* https://github.com/tgstation/tgstation/pull/57461

* tgui: Upgrade to Yarn 2.4.1 and TypeScript 4.2 (#57465)

* Fix tgui reloading (#57499)

* Add note about rust-g for building on Linux (#57622)

This PR adds a minor note about needing to compile rust-g to Linux building instructions. I'm not sure if this is the appropriate place for it, but I don't see a better place to put it.

* Fixes build script failing properly on windows. (#57623)

* Adds easy to extend custom svg font. (#57717)

Just throw in svgs into tgui/packages/tgfont/icons directory and you can use them in tgui with tg- prefix.

Co-authored-by: Style Mistake <stylemistake@gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>

* Typescript fixups. (#57746)

* Improve tgui routing to allow interface subdirectories (#57825)

* Improve tgui routing to allow interface subdirectories

* Reverse order of interface file resolution, to be consistent with common expectation (top-level .tsx, top-level .js, directory .tsx, directory.js) and the way Webpack checks

* Fixes TGS compiles on windows. (#57834)

Batch quotes strike again.

* tgui: ESLint and VSCode settings improvements (#57905)

    Added column 80 rulers to all javascript and scss files.
    Added a "prettier" config to have sensible defaults for those who prefer to use it.
    Added RadarJS (fork of SonarQube's SonarJS). Launchable only via bin/tgui --lint-harder for now.
    Disabled ESLint rule for parens around arrow function arguments, because in TypeScript they're pretty much always required, and I don't want to replace it throughout the codebase.
    Removed unused javascript extensions from tooling (jsx, mjs).

* https://github.com/tgstation/tgstation/pull/57931

* https://github.com/tgstation/tgstation/pull/58061

* https://github.com/tgstation/tgstation/pull/58081

* https://github.com/tgstation/tgstation/pull/58212

* https://github.com/tgstation/tgstation/pull/58215

* https://github.com/tgstation/tgstation/pull/58219

* Add "Except DM" build mode to build.js (#58245)

* https://github.com/tgstation/tgstation/pull/58484

* FixBaconFabandPodLauncher

* haharunlintmanuallyfirstkids

* One last fab change then its perf

* f5willwork

* This May Do it

* prune

* Fix Docker build failing on a clean checkout (#56190)

Follow-up to #56175 which turned out to be accidentally relying on Node already being downloaded.

* Huh? Rebuild you better be a fluke

* getinthere

* Syncretize

* Revert "Syncretize"

This reverts commit 41749b68868d2af1b82de9ba6de39cf8052dd1ee.

* zzzz

* quick path change

* another quick

* Correct Dockerfile, bloats it with GCC lol.

* small

* back2oldfile I HATE DOCKER I HATE EXTOOLS

* firstthingnotdonelol

* yuabzn

* v

* reverttoclassic

* Difffffffffff

* prec1s

* ccc

* ok

* bitte

* jesus im dum

* z

* Nuke Window resizable and improve drag code (#56727)

* comp

Co-authored-by: Tad Hardesty <tad@platymuus.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: Cyprex <35031555+Cyprex@users.noreply.github.com>
Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Mordent <62817778+mordent-goonstation@users.noreply.github.com>
Co-authored-by: Jonathan Rubenstein <jrubcop@gmail.com>

* thanks yarn!

* Update Panel.js

* compiles

* restores exosuit

* chmod

* Update travis_config.txt

* honk

* honk2

* Update turdis.yml

* Update ExosuitFabricator.js

* Revert "Update turdis.yml"

This reverts commit 7517df56e5.

* Revert "Update ExosuitFabricator.js"

This reverts commit ac31fa4543.

* wtf is this

* lol

* Update tgui.dm

Co-authored-by: Sinestia <40812746+Sinestia@users.noreply.github.com>
Co-authored-by: Tad Hardesty <tad@platymuus.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: Cyprex <35031555+Cyprex@users.noreply.github.com>
Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Mordent <62817778+mordent-goonstation@users.noreply.github.com>
Co-authored-by: Jonathan Rubenstein <jrubcop@gmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2023-01-02 14:03:15 +00:00
yogstation13-bot
b1003c65a0 [MIRROR] Fix mapmerge misreading maps with two columns per block (#5253)
* Merge pull request #43628 from AutomaticFrenzy/patch/minskystation
2019-04-27 07:58:32 -05:00
monster860
a3d0a6b6c8 Modify TGM so that Dream Maker can handle a map with more than 65536 (2^15) tiles in it (#4521) 2019-02-21 17:42:15 -06:00
oranges
0f0078362a Merge pull request #40721 from AutomaticFrenzy/patch/carriage-return
Ignore carriage returns in map files when mapmerging
2018-10-05 07:07:04 +01:00
Tad Hardesty
b6387ef264 Re-add script for updating map paths (#39907)
* Re-add script for updating map paths

* Handle duplicate values
2018-09-02 21:45:26 +01:00
Tad Hardesty
9e91d3816e Fix atom ordering problem in map files (#39889)
Fixes a major mapping error introduced in #39816 and adds handling to the map merger to prevent it from happening again.

Keys need to be ordered movables, then turf(s), then area, otherwise our map reader acts weird. In-game this manifests as floor being placed in the dirt's underlays, such that after floor is crowbarred to plating the floor is still visually present (this is how I noticed the problem).

Fixes #39888.

Some map files still have stacked turfs. Our map reader supports this but it tends to cause other problems (e.g. atmos) so I'll try to look at those in the future.

X=$(find _maps -name '*.dmm'); tools/hooks/python.sh -m convert $X
2018-08-25 06:47:37 +01:00
Tad Hardesty
0822afc05a Fix map keys overflowing earlier than expected 2018-01-29 23:26:25 -08:00
Tad Hardesty
9639061433 Add a new and improved mapmerge (#33869)
Key benefits of the new mapmerge include: multi-Z support, effective
reuse of deleted keys, automatic handling of key overflow, and utilizing
a git pre-commit hook to eliminate the need to run batch files manually.
2017-12-28 16:01:34 -05:00