cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-28 10:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,518 Commits 61 Branches 14 Tags
6c7534ff20ac4abcdc70a3b8ccdcdc26c2b80098
Commit Graph

315 Commits

Author SHA1 Message Date
Jordan Brown
c037731e5f Disables max errors on travis compile (#35550) 2018-02-12 13:48:01 -05:00
Jordan Brown
8d88b6a825 Tests give 3 GBP (#35551) 2018-02-12 13:47:42 -05:00
Jordan Brown
8cbbe65f13 Split up Revert/Removal 2018-02-12 09:21:19 -06:00
Jordan Brown
85c5a20e75 Removes Map Merge 1 (#35511) 
* Removes Map Merge 1

* Add Prepare Maps.bat to mapmerge2
 2018-02-11 14:03:29 -05:00
vuonojenmustaturska
79ca572d01 Merge pull request #35133 from AutomaticFrenzy/patch/key-overflow-fix 
Fix map keys overflowing earlier than expected
 2018-02-02 19:33:06 +02:00
Tad Hardesty
b4c330c24c Fix hook installation on Linux 
Marks the shell scripts executable and sets nullglob so that the lack of
merge drivers doesn't cause shenanigans.
 2018-01-30 16:55:37 -08:00
Tad Hardesty
0822afc05a Fix map keys overflowing earlier than expected 2018-01-29 23:26:25 -08:00
vuonojenmustaturska
0f556ce894 Merge pull request #35080 from MrStonedOne/rc-the-unix-way 
Recompile runtime condenser with compile time optimizations
 2018-01-29 20:56:38 +02:00
MrStonedOne
94e322cc02 Recompile runtime condenser with compile time optimizations 2018-01-28 14:49:33 -08:00
JJRcop
f6dc5a82f7 $remove is optional in set_labels 2018-01-27 11:25:03 -05:00
Jordan Brown
a13d517821 Disable ruins for test run mode (#34653) 
* Disable ruins for test run mode

* Fix

* Actually, let's enable them all

* That never happened
 2018-01-20 12:27:55 +01:00
Jordan Brown
bf7938cfdf Adds test run mode. Fails travis if it fails (#34198) 
* Adds test run

* Add OVERRIDE_LOG_DIRECTORY_PARAMETER

* Fails travis if a test run fails

* Fix travis looping

* Move the unit tests behind a define

* Fix various test run things

* Remove the DEBUG check because that's just you shooting yourself in the foot

* Adds readability spacing. Makes RunUnitTests a generic proc

* Remove unit tests
 2018-01-19 11:53:26 -05:00
Tad Hardesty
60b39f9e39 Add READMEs to hooks and mapmerge2 directories (#34511) 2018-01-18 22:26:36 -05:00
oranges
387e09c08f Merge pull request #34319 from ShizCalev/travis-maps 
Fails travis on common mapping mistakes
 2018-01-17 09:36:15 +13:00
ShizCalev
93709057ac Removed exit from pixel offset 2018-01-16 09:54:08 -05:00
Jordan Brown
1a6bf6b69c Merge pull request #34323 from JJRcop/webhook_mistakes 
Fixes webhook diff selecting partial match
 2018-01-16 08:41:56 -05:00
AnturK
89db4e9d26 Enforces utf-8 encoding on all changelog files. (#34434) 
* Enforces utf-8 encoding on all changelog files.

* Lets python3 use pip

* py2.7 begone
 2018-01-14 13:39:27 -05:00
Tad Hardesty
28436f36b5 Fix the batch file method of mapmerge2 and save a .before (#34361) 2018-01-12 10:43:06 -05:00
JJRcop
7b3d27c695 Fixes webhook diff selecting partial match 
By disabling multiline mode, $ becomes the end of the string, so we can match either \Rdiff or $, so that the lazy modifier must match the rest of the string if it can't find \Rdiff
 2018-01-11 14:41:54 -05:00
ShizCalev
cdb53fcbe9 Fails travis on common mapping mistakes 2018-01-11 13:36:06 -05:00
Jordan Brown
3bc88ec88e Fails the build if CENTCOM is misspelled (#34256) 
* Fails the build if CENTCOM is misspelled

* Make centcomm guard saner

* No need for the extra greps
 2018-01-11 05:00:51 -05:00
Jordan Brown
04ebd0eb82 Revert "another test for the hook (#34277)" (#34278) 
This reverts commit cd1722af8c.
 2018-01-10 12:14:51 -08:00
JJRcop
cd1722af8c another test for the hook (#34277) 
i could install php and do this myself i guess?
 2018-01-10 12:14:12 -08:00
Jonathan (JJRcop)
07d1f7cf19 Fixes webhook diff generator 2018-01-10 14:39:27 -05:00
Jordan Brown
e35696f6ab Fixes BUILD_TESTING logic being inverted (#34201) 2018-01-10 01:48:46 -05:00
Jordan Brown
2d34f37a6b Removes standard resources from config tree (#34067) 
* Move default.dmi to /icons

* Delete config folder before travis build

* Rename default.dmi to default_title.dmi

Add sanity check

* Remove redundant checks
 2018-01-07 21:31:30 -05:00
Jordan Brown
b911805942 Autotag .github => GitHub (#33965) 2017-12-31 15:25:56 -05: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
MrStonedOne
e9ed75ec00 Actually, I was right, but for the wrong reasons. 2017-12-19 19:37:23 -08:00
MrStonedOne
a1f45a3c90 Byond I fucking hate you for doing this to me. 2017-12-19 19:29:47 -08:00
MrStonedOne
b54ed44ee5 The runtime condenser now supports taking input from stdin and outputting on stdout 
Just use -s

All messages were moved to stderr so they can be differncated from output
 2017-12-19 19:22:16 -08:00
Leo
e9b3d422d0 Adds a python script to load jsons to prevent any syntax error on them (#33001) 
* Adds a python script to load jsons to prevent any syntax error on them

* Corrects identation on hallucination.json
 2017-11-24 06:00:16 -05:00
Jordan Brown
d740691463 Webhook processor will comment negative PR balances on unlabelled PRs (#32771) 2017-11-16 17:07:45 -05:00
Kyle Spier-Swenson
afc266c3ac Fix webhook 
again
 2017-11-04 17:18:20 -07:00
JJRcop
63370eff30 Fixes Sounds detection in webhook (#32319) 2017-11-02 14:26:30 -04:00
oranges
a5b4d3011a Huge atmos nerf, tweak buff (#32285) 
It's not that different from other subsystems to justify the huge extra point cost, and the people who make atmos related changes have attained a great number of points.

Tweak is for small things that shouldn't affect the point balance either way
 2017-11-02 03:15:40 -06:00
JJRcop
204330a32e Contributors can add the ready tag to their own prs (#32062) 
* Contributors can add the ready tag

* Webhook synchronize case pushes update at the end

* Fixes pr not getting tagged when opened
 2017-11-02 10:01:26 +13:00
Kyle Spier-Swenson
3d6e9a72c1 Fixes the other thing 2017-10-31 13:50:50 -07:00
Kyle Spier-Swenson
7ce48884f2 Fix the error. 2017-10-31 13:44:56 -07:00
Kyle Spier-Swenson
da7d046f98 Improves php logging 2017-10-31 13:31:22 -07:00
JJRcop
f7ed9b5f7e Webhook now comments its diff (#32151) 
* Webhook now comments its diff instead of its dump

* Fixes variable access in webhook

* Fixes webhook regex flaw

* Missing semicolon in webhook

well... I don't have much to say to you
this is... i mean... 😀😀😁😁😁😁😂😂😂😂😂😂😂😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭

* Fixes anoher webhook regex issue

* Re-adds content to webhook update

* Encapsulates webhook diff in <details>
 2017-11-01 09:20:28 +13:00
JJRcop
fd26a28843 Fixes webhook tagging when tree is found anywhere 2017-10-27 13:53:31 -04:00
oranges
9b71dcb8b9 Merge pull request #32050 from optimumtact/ripandtearthehugeguts 
Use phpenv for the php build in travis instead of a PPA
 2017-10-26 23:08:36 +13:00
Kyle Spier-Swenson
b5fde72459 Webhook processor no longer removes [tags] from titles (#32053) 
* Webhook processor no longer removes [tags] from titles

This was shit

* Does the oranges
 2017-10-26 23:07:26 +13:00
oranges
f3e392fb5f Use phpenv for the php build, instead of a PPA 2017-10-24 00:14:04 +00:00
Jordan Brown
82b893953b Renames 'Ready for Review' to 'Review Again' (#31995) 2017-10-23 01:09:58 -04:00
Cyberboss
628a6ca261 Changes starting PR balance to 5 2017-10-16 15:10:50 -05:00
Jordan Brown
76fee91aae Fix TGUI compiler git updates (#31572) 2017-10-12 11:33:51 -06:00
Jordan Brown
dab12866f3 Move code below function definitions 2017-10-10 11:58:37 -04:00
Jordan Brown
f6cf0dfe2a Clairify documentation 2017-10-10 11:57:21 -04:00