Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,423 Commits 4 Branches 180 Tags
8a25d57c83731fa8d66445447cea8a2f39b0997e
Commit Graph

445 Commits

Author SHA1 Message Date
Anuken
2038409283 Removed schematic replacement dialog 2020-02-18 11:35:28 -05:00
Anuken
b96d5c417f Fixed #1601 2020-02-17 09:27:51 -05:00
Anuken
1fe0a7d81e Fixed mock audio package 2020-02-15 12:41:57 -05:00
Anuken
d37886b2cd Fixed #1585 2020-02-14 09:51:09 -05:00
Anuken
58b31bd799 Added support for animations w/ pixelation + map screenshots 2020-02-13 10:04:45 -05:00
Anuken
c067be2add Added client creation event 2020-02-13 09:11:35 -05:00
Anuken
031b6e0bf8 Fixed #1565 2020-02-12 13:26:29 -05:00
Anuken
258945a45a Team validation 2020-02-12 12:47:02 -05:00
Anuken
e798619679 Bugfixes 2020-02-12 11:25:00 -05:00
Anuken
5c48ae2158 Fixed #1558 / Fixed #1556 2020-02-12 10:16:43 -05:00
Anuken
bb380f7feb Fixed #1555 2020-02-11 23:15:51 -05:00
Anuken
3102931cb4 Removed script wrapper 2020-02-11 17:50:16 -05:00
Anuken
fb302d49c7 Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
Anuken
a4a3e7fc48 Merge pull request #1514 from Arkanic/patch-7 
make batteries glow based on power contents (a redo that works)
 2020-02-11 16:31:14 -05:00
Anuken
eb87e5f265 Single-script mod case 2020-02-11 16:14:01 -05:00
Anuken
9c2569d4f5 Merge pull request #1477 from DeltaNedas/patch-5 
controlled script loading
 2020-02-11 16:03:38 -05:00
Anuken
1b94eed9d3 Fixed conveyors blending with enemy teams 2020-02-11 15:54:16 -05:00
Anuken
5aa1e30006 Bugfix 2020-02-11 13:08:42 -05:00
Anuken
ad7c72015c Better admin management 2020-02-11 13:06:52 -05:00
Anuken
d99f9740e8 USID fixes 2020-02-11 12:36:28 -05:00
Anuken
d1840e7c2a Item selection scrolling 2020-02-11 11:55:38 -05:00
Anuken
d6b5f6a311 buildTable improvements 2020-02-11 11:30:22 -05:00
fuzzbuck
f14df52490 Allow admins to bypass the playerlimit [server] (#1549) 2020-02-11 11:10:50 -05:00
Anuken
b15a40fcbd Cleanup / Fixed desktop IDs resetting 2020-02-10 23:26:22 -05:00
Anuken
9da2d1ee9a Merge remote-tracking branch 'origin/master' 2020-02-10 20:22:09 -05:00
Anuken
6882a9a355 Added persistent message server function 2020-02-10 20:22:03 -05:00
Patrick 'Quezler' Mounier
4bb9a93ff9 Do as i say, ¬ do as i do 2020-02-10 13:14:48 +01:00
Patrick 'Quezler' Mounier
ac3ab6971d Undo the last 5 2020-02-10 13:11:49 +01:00
Patrick 'Quezler' Mounier
66c81246b6 Fix single tile check if blendbit is 0 2020-02-10 13:02:21 +01:00
Patrick 'Quezler' Mounier
656c37372d Wrap upstream tile thingie 2020-02-10 12:57:21 +01:00
Patrick 'Quezler' Mounier
b89078733e Revert "Stash revertable" 
This reverts commit 158241b8e2.
 2020-02-10 12:49:44 +01:00
Patrick 'Quezler' Mounier
158241b8e2 Stash revertable 2020-02-10 12:49:36 +01:00
Patrick 'Quezler' Mounier
2bd7c92b9e Allow sideloading the unloader 
Main reason for blendbits > 1 & 2
 2020-02-10 12:38:48 +01:00
Patrick 'Quezler' Mounier
562fa07755 Merge branch 'master' into crater 2020-02-10 12:09:14 +01:00
Daniel Jennings
baab36bfc5 Trim schematic string before calling Base64Decoder (#1537) 
This fixes getting the "Length of Base64 encoded input string is not a multiple of 4." error when importing schematics that have whitespace at the start/end of them, which is easy to accidentally have without knowing by when copying the schematic codes from random different web pages.
 2020-02-08 16:41:33 -05:00
Anuken
f3893533a4 Cleanup 2020-02-08 11:08:31 -05:00
Anuken
9ccf95971e Fixed small launch items button 2020-02-07 20:51:59 -05:00
Anuken
0ffcd0b94c Fixed #1507 / Fixed #1504 2020-02-07 20:21:45 -05:00
Anuken
5a5945cc52 Merge remote-tracking branch 'origin/master' 2020-02-07 20:09:45 -05:00
Anuken
e5fd3dec4c Fixed #1526 2020-02-07 20:09:37 -05:00
扩散性百万甜面包
7b586ea043 Fix a typo (#1528) 
* Fix a typo

* Update core/src/mindustry/mod/Mods.java

Co-Authored-By: Patrick 'Quezler' Mounier <Quezler@me.com>

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
 2020-02-07 08:25:26 -05:00
Patrick 'Quezler' Mounier
d7e8a8e4f4 Add comment to 〃 2020-02-07 11:02:42 +01:00
Patrick 'Quezler' Mounier
b66e03d2a8 Revert "Cache upstream" 
This reverts commit 908018b97c.
 2020-02-07 10:59:51 +01:00
Patrick 'Quezler' Mounier
908018b97c Cache upstream 
But i do ¬ like how this turned out, so reverting :(
 2020-02-07 10:59:45 +01:00
Patrick 'Quezler' Mounier
9abb08152b Prettify upsteam calculator 2020-02-07 10:51:36 +01:00
Patrick 'Quezler' Mounier
94dc220924 Finish 〃 2020-02-07 10:32:43 +01:00
Patrick 'Quezler' Mounier
3d8e83850e Refractor inputs to upstream 2020-02-07 08:41:34 +01:00
Anuken
37a9311202 Merge remote-tracking branch 'origin/master' 2020-02-06 20:25:17 -05:00
Anuken
e9f37ea68e Removed entity processor files 2020-02-06 20:25:10 -05:00
MEEP of Faith
da5755b7c1 For consistancy (#1517) 
Swap "liquids" with "liquid." Also proposing because the category for liquid blocks is "liquid" and not "liquids" when modding.
 2020-02-06 14:46:33 -05:00