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 7517df56e5ac31fa454340812746+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
Redmoogle
eaa04daafa
Conversion ( #9688 )
2020-09-14 19:58:51 +01:00
alexkar598
27eace3338
Enforces line endings
...
Updates the contributing file
Fucking i hate you
2019-08-12 07:44:44 -04:00
Jordan Brown
a7fa4ee38e
Merge pull request #37976 from AutomaticFrenzy/patch/dmi-merger
...
Add a Python script to fix DMI conflicts
2018-05-25 16:55:13 +01:00
Francis Devine
1cc7f13e5f
Merge remote-tracking branch 'upstream/master' into ihateuall
...
Conflicts:
.gitattributes
2015-12-17 15:41:08 +13:00
Francis Devine
fde15613d4
attributes revert
2015-12-17 15:33:33 +13:00
Francis Devine
386ff29636
Slight modification to git attributes
2015-12-17 15:19:34 +13:00
oranges
3e46ad2d2d
Adjust attributes file slightly
2015-12-17 14:12:37 +13:00
oranges
2d2d00462e
Binary dmi and dmm
2015-12-16 10:41:28 +13:00
oranges
8d282b7fea
Added git attributes
2015-12-16 10:40:48 +13:00
Tkdrg
553ce69257
Adds the dmitool icon merger from baystation12
...
Credits to GinjaNinja32@bay12 for developing dmitool and
PsiOmegaDelta@bay12 for some of these scripts. Thanks also to
neersighted for reminding me that we need this.
Basically this is like the map merger, except for icons. You can install
a hook using the instructions in the dmitool folder, and it should
automatically merge your DMIs for you. This means you can solve icon
conflicts effortlessly most of the time.
2015-11-28 03:47:26 -03:00
Mloc-Argent
002cd976d6
repo: make changelog easier to merge
...
The changelog now uses union merges to reduce conflicts.
Changed the EOL in changelog.html to CRLF to help even more.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-06-12 18:30:08 +01:00
Mloc-Hibernia
28973b79e2
removes the crlf bits from .gitattributes
...
that shouldn't have been merged.
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
2014-03-25 09:11:47 +00:00
Mloc-Hibernia
70524cb214
Re-adds the crlf-forcing .gitattributes settings
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
2014-03-24 08:53:40 +00:00
Razharas
3ea1e4cf39
Trying to fix EOFs
...
Jesus lord please let it work
2014-02-05 19:01:21 +04:00
Mloc-Argent
a677ae8377
Adds crlf default to .gitattributes for most text file types we use.
...
Massive green/red is to the best of my knowledge caused by files being nearly entirely LF.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-02-04 15:14:39 +00:00
cib
4b4a607ee8
Added the .gitattributes
...
Likely won't make a difference though, even with that you need to manually edit its contents into your .git directory.
2013-04-02 07:46:49 +02:00
