Commit Graph

3 Commits

Author SHA1 Message Date
Charlie Nolan 3179d70820 Hooks should be executable. (#25045)
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
2024-04-12 18:41:37 +00:00
S34N be9a8c8c14 Fix TGUI deconflict hooks, makes them work on windows (#24686)
* Lets us install tgui merge drivers on windows

* test this

* gamer mode

* debug

* do it like this

* test

* test this

* stop it being weirdly relative

* more relative fixes

* try cat

* indentation

* update CI stuff to cache

* correct this

* yarn

* yarn consistency

* do we even need to do this? (no we don't)

* properly cache yarn deps in ci

* Why do we even have that step

---------

Co-authored-by: github-actions <github-actions@github.com>
2024-03-20 20:10:29 +00:00
S34N 4f5c3376e3 Updates tools to include mapmerge hooks and merge drivers, plus more (#18034)
* bumps tools to modern versions, adds DMM merge driver hooks for automatic map merging

* mapping guidelines update

* Update .github/CONTRIBUTING.md

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* aa review

* these somehow got ignored? force adding

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-06-21 23:53:19 +01:00