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.

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

Merging master into XML converter #185

Merged
merged 43 commits into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
7d2dc04
cleaning up the mumble link code
AsherGlick Dec 5, 2021
42b484b
adding a timeout for burrito link to allow it to exit if it is orphaned
AsherGlick Dec 6, 2021
c01f846
adding a method to allow for burrito link to be launched automatically
AsherGlick Dec 6, 2021
49a070c
removing trailing whitespace from some gdscript files
AsherGlick Dec 6, 2021
2be26b5
Adding a new setting that allows for a minimum size to be specified
AsherGlick Dec 6, 2021
c1d7cc0
forcing minimum size value from settings when resizing window
AsherGlick Dec 6, 2021
7211318
making the size settings more intuitive to understand
AsherGlick Dec 6, 2021
fc2513d
Autolaunch Burrito Link (#48)
AsherGlick Dec 10, 2021
becbbcd
Merge branch 'master' into minimum_size_setting
AsherGlick Dec 10, 2021
60927ef
Merge pull request #49 from AsherGlick/minimum_size_setting
AsherGlick Dec 11, 2021
3bb5bd6
updating burrito_link formatting with mostly clang-format
AsherGlick Nov 21, 2022
e247d51
Cleaning up burrito_link Makefile to only reference burrito_link
AsherGlick Nov 21, 2022
365c08c
Adding sanity check for memory mapped sruct sizes
AsherGlick Nov 21, 2022
e6d0e1f
swapping memory map struct types for standard types
AsherGlick Nov 21, 2022
41848b2
splitting out the struct definitions to a seperate file
AsherGlick Nov 21, 2022
7445b09
renaming gw2mumbleudp.c to burrito_link.c
AsherGlick Nov 21, 2022
467d459
replacing make with cmake to get compile_commands.json for clangd mor…
AsherGlick Nov 21, 2022
9b554a2
moving some globals to the top of the file
AsherGlick Nov 22, 2022
b498493
Removing non _WIN32 memory mapping code
AsherGlick Nov 22, 2022
bcb88de
splitting out function to get the x11 window id from the windows proc…
AsherGlick Nov 22, 2022
ca57358
adding a barebones linked library proxy
AsherGlick Nov 27, 2022
89bc9b6
Getting burrito link to work in d3d11.dll
AsherGlick Nov 27, 2022
084aabe
Closing the thread when the dll is unloaded
AsherGlick Feb 24, 2023
fc7bdc1
supporting burrito link dll as an arcdps plugin
AsherGlick Feb 25, 2023
d9bee01
burrito link cmake build
AsherGlick Feb 25, 2023
42d8060
Merge pull request #125 from AsherGlick/burrito_link_updates
AsherGlick Feb 26, 2023
80e80d6
Removing artifact retention 7 day limit
AsherGlick Mar 5, 2023
b084d24
Merge pull request #131 from AsherGlick/extend_artifact_retention
AsherGlick Apr 14, 2023
edbffaa
Shifted the burrito button to the right
klingbolt Aug 25, 2023
31ae872
Change so that the button should work
klingbolt Aug 25, 2023
ad4798d
Changed the pass through coordinates
klingbolt Aug 25, 2023
3479b6a
Changed numbers to be the properties the numbers were coming from
klingbolt Aug 25, 2023
2a2ae5a
Changed some numbers
klingbolt Aug 29, 2023
70a7446
Update Spatial.tscn
klingbolt Sep 19, 2023
c6df8e1
Changed margin for editor bar
klingbolt Sep 20, 2023
b716c61
Merge branch 'master' of https://github.com/klingbolt/Burrito
klingbolt Sep 20, 2023
9f6ae70
Merge pull request #156 from klingbolt/master
AsherGlick Sep 20, 2023
0a691a6
pinning docker build version
AsherGlick Sep 20, 2023
a344bdf
Merge pull request #160 from AsherGlick/pinning_ci_linux_version
AsherGlick Sep 20, 2023
ac0fbb4
Merge branch 'master' into merging_master_into_xml_converter
AsherGlick Oct 25, 2023
cd875c5
fixing burrito link build dir from merge
AsherGlick Oct 25, 2023
78274d4
Update Spatial.gd
AsherGlick Oct 27, 2023
2f60b09
Update Spatial.tscn
AsherGlick Oct 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
burrito link cmake build
  • Loading branch information
AsherGlick committed Feb 25, 2023
commit d9bee0178132054fb4fd470dc4d232249decffbe
8 changes: 6 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,13 @@ jobs:

- name: Build Burrito Link
run: |
cd burrito_link
mkdir output/burrito_link
mkdir burrito_link/build
cd burrito_link/build
cmake ..
make
mv burrito_link.exe ../output
mv burrito_link.exe ../../output/burrito_link
mv d3d11.dll ../../output/burrito_link


- name: Build Burrito
Expand Down
18 changes: 0 additions & 18 deletions burrito_link/Makefile

This file was deleted.