Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,080 Commits 4 Branches 180 Tags
v129.2
Commit Graph
12080 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Petr Gašparík bd6b84dc23 Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-11 17:20:40 +01:00
AmateurPotionandGitHub eaa0b53f30 Update README.md (#1548) 
hey?
 2020-02-11 11:13:26 -05:00
fuzzbuckandGitHub f14df52490 Allow admins to bypass the playerlimit [server] (#1549) 2020-02-11 11:10:50 -05:00
Petr Gašparík 29a6b1a8da Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-11 11:18:54 +01: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
Anuken 47023af3d5 cleanup 2020-02-10 15:51:01 -05:00
Anuken 86d5842868 Testing new quadtree 2020-02-10 11:29:58 -05:00
Anuken 81990cf16c Optimizations 2020-02-10 11:07:10 -05:00
Anuken 6c6861a97a Cleanup 2020-02-10 10:47:21 -05:00
Anuken 0ad8408ba9 Collisions, lots of bugfixes 2020-02-10 09:58:00 -05:00
Anuken fbadb9f4aa Group collisions 2020-02-10 09:22:19 -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
Anuken e9b066b866 Fires, puddles, feature reimplementations 2020-02-09 23:43:08 -05:00
Anuken 3feca9bbf8 Minor tweaks 2020-02-09 22:27:16 -05:00
GioIacca9andGitHub 941449c502 Updated "Full implementation of #1494" (#1541) 2020-02-09 22:26:47 -05:00
Anuken d89189debd Fixed server 2020-02-09 15:40:03 -05:00
Anuken ae7a8e1f65 Minor tweaks 2020-02-09 14:35:22 -05:00
Anuken c23e923ffb Merged with master 2020-02-09 12:32:29 -05:00
Anuken a2706a80b1 Merged with master 2020-02-09 12:27:44 -05:00
Anuken d2ab316072 ?? 2020-02-09 12:25:13 -05:00
Anuken f9bc4a30f0 Merge 2020-02-09 12:16:12 -05:00
Anuken d45d7f21b6 Procedural scorch marks / Bugfixes 2020-02-09 12:07:36 -05:00
Anuken 8e976c20a1 Hitbox fixes 2020-02-08 23:00:26 -05:00
Anuken e23119e330 Feature re-implementations 2020-02-08 21:54:41 -05:00
Daniel JenningsandGitHub 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 5169e197b6 Bugfixes 2020-02-08 16:00:54 -05:00
Anuken ba1f59aa71 Better physics 2020-02-08 15:39:27 -05:00
Anuken 8814dbe29a Sprite cleanup / Bullets 2020-02-08 14:48:04 -05:00
Anuken f46be924b9 Effects, collisions, method overrides 2020-02-08 13:14:23 -05:00
Anuken f3893533a4 Cleanup 2020-02-08 11:08:31 -05:00
Prosta4okuaandGitHub 0a53c4c1be Update bundle_uk_UA.properties 2020-02-08 12:26:09 +02:00
Prosta4okuaandGitHub d7eb0d3ba3 Update bundle_uk_UA.properties 2020-02-08 12:23:50 +02:00
Anuken 659bfea8cf Cleanup 2020-02-07 23:12:39 -05:00
Anuken c8455ddbc8 Added message for non-building units 2020-02-07 21:56:55 -05:00
Anuken 3a2fef3bd7 Merge remote-tracking branch 'origin/master' 2020-02-07 20:52:03 -05:00
Anuken 9ccf95971e Fixed small launch items button 2020-02-07 20:51:59 -05:00
valtsu41andGitHub 9b36125b0c Finnish translation & grammar update (#1473) 
* Finnish translation & grammar update

* More grammar correcting and making things more native

* Just a little more fine-tuning

* Fixes
 2020-02-07 20:42:14 -05:00
Anuken 0ffcd0b94c Fixed #1507 / Fixed #1504 2020-02-07 20:21:45 -05:00
Anuken a6801af128 Use zip files when exporting 2020-02-07 20:11:43 -05:00
Anuken 30ea039246 Fixed #1521 2020-02-07 20:11:05 -05:00
Anuken 5a5945cc52 Merge remote-tracking branch 'origin/master' 2020-02-07 20:09:45 -05:00