Commit Graph

6078 Commits

Author SHA1 Message Date
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
GioIacca9
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 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
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
Prosta4okua
0a53c4c1be Update bundle_uk_UA.properties 2020-02-08 12:26:09 +02:00
Prosta4okua
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
valtsu41
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
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
Anuken
8a9c92227d More movement 2020-02-07 18:55:53 -05:00
Anuken
4265d40024 Movement 2020-02-07 13:02:24 -05:00
Anuken
861b3ac3f4 Tweaks 2020-02-07 11:46:10 -05:00
Anuken
007a1bd1d2 Unit definitions 2020-02-07 11:04:58 -05:00
Anuken
b9841f9cfa a mess 2020-02-07 10:47:58 -05:00
Anuken
33e818a757 Entity name mapping 2020-02-07 09:36:51 -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
Petr Gašparík
e98808bc46 Czech for server categories! 2020-02-07 12:35:09 +01:00
Petr Gašparík
bc37415a10 Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-07 12:32:33 +01:00
Prosta4okua
619b2ba897 Update bundle_uk_UA.properties 2020-02-07 12:42:59 +02: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