mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-05 08:27:37 +07:00
Code Issues Packages Projects Releases Wiki Activity
8,691 Commits 4 Branches 160 Tags 2.3 GiB
3c3c15dcf4
Commit Graph

8691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
J-VdS
f4003fd463 merge 2020-09-22 18:41:24 +02:00
J-VdS
51065b57c4 info popup 2020-09-22 18:40:04 +02:00
Anuken
5895e2f23c #2647 2020-09-22 12:24:40 -04:00
Anuken
08ff36c43e Bugfixes 2020-09-22 12:16:17 -04:00
Anuken
b2b8949e26 Cleanup 2020-09-22 11:16:19 -04:00
Anuken
ce4f67341c Merge remote-tracking branch 'origin/master' 2020-09-22 10:03:10 -04:00
Anuken
a6c10a97f2 Fixed #2654 / Fixed #2651 / fine I'll add a base 2020-09-22 10:03:05 -04:00
Anuken
d4044c3b27
Merge pull request #2609 from DeltaNedas/crashlog 
more info in crash reports
 2020-09-22 09:30:29 -04:00
DeltaNedas
472d408bbc
crash send error code 2020-09-22 06:16:40 +00:00
DeltaNedas
c7cfb290eb
version for mods 2020-09-22 06:15:43 +00:00
DeltaNedas
8b354e7334
Update core/src/mindustry/net/CrashSender.java 
Co-authored-by: Anuken <arnukren@gmail.com>
 2020-09-22 06:13:51 +00:00
YellOw139
5009f3aaf1
Quad, Oct 2020-09-22 07:52:11 +03:00
Anuken
87032c82b1 T4/5 support mechs 2020-09-21 23:32:30 -04:00
Anuken
1d8f837fb1 Fixed #2646 2020-09-21 14:35:39 -04:00
Anuken
ff7c87bec0 Bugfixes 2020-09-21 14:33:15 -04:00
Anuken
ff58ccf659 Sprite tweaks 2020-09-21 13:22:07 -04:00
Felix Corvus
eb0a5d4d14
Update bundle_ru.properties 2020-09-21 19:18:40 +03:00
Anuken
45e77fe3b4 Balance 2020-09-21 12:05:24 -04:00
Anuken
74fadfe603 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-09-21 11:41:15 -04:00
Anuken
1aa8bb9dd2 T5 air support unit 2020-09-21 11:41:11 -04:00
Anuken
b732da09df
Merge pull request #2643 from Remint32/patch-4 
Make Pal.java colors changable for texturepack-mods tweaks
 2020-09-21 11:10:37 -04:00
Felix Corvus
6840fb53b7
Update Pal.java 2020-09-21 16:24:06 +03:00
Anuken
6b56fef512
Merge pull request #2636 from genNAowl/wall-sound-effects 
Add sound variables for when a wall is releasing lightning/deflecting bullets
 2020-09-21 09:11:57 -04:00
Felix Corvus
1b38b2d2f9
Lyagushka just kva'd 2020-09-21 16:00:45 +03:00
Petr Gašparík
50960ff599 Update for Stream plus humble selfpromo 2020-09-21 11:08:46 +02:00
Petr Gašparík
c122d737c1 Czech translation - fixes 2020-09-21 11:01:53 +02:00
Petr Gašparík
3349764421 Czech translation - from 105 to 6.0 alpha 2020-09-21 10:59:02 +02:00
Petr Gašparík
636a332d65 Merge branch 'master' of https://github.com/Anuken/Mindustry into v105 2020-09-21 10:05:24 +02:00
AydenRennaker
9f5e96ff8a
Add Atanner Gaming V6 Server 
Auto Updating server to latest bleeding edge build.
 2020-09-20 22:56:11 -06:00
Leonwang4234
5eb722efee Update Wall.java 2020-09-20 20:25:18 -07:00
Anuken
63e35bd462 T4 air carrier unit (*unfinished*) 2020-09-20 19:34:12 -04:00
Anuken
401384ae5b Anuken/Mindustry-Suggestions/issues/548 2020-09-20 16:35:25 -04:00
DeltaNedas
f9a70b1190 typo 2020-09-20 20:35:44 +01:00
DeltaNedas
632322a2bc add even more info to crash logs 2020-09-20 20:25:57 +01:00
Anuken
b2d054c1f2 Merge remote-tracking branch 'origin/master' 2020-09-20 15:23:41 -04:00
Anuken
0a314e142e Fixed #2632 (among other things) 2020-09-20 15:23:34 -04:00
YellOw139
d6291ea6c5
Merge branch 'master' into patch-2 2020-09-20 17:47:32 +03:00
Felix Corvus
f7b320e838
Update bundle_ru.properties 2020-09-20 17:47:08 +03:00
YellOw139
c82455d994
#2628 2020-09-20 17:42:19 +03:00
Felix Corvus
dd32b4d39d
Merge branch 'master' into master 2020-09-20 16:56:36 +03:00
Anuken
8a3ed9c80b
Merge pull request #2628 from Remint32/patch-5 
[Bundle] Little improvements for convenience
 2020-09-20 09:51:29 -04:00
Félix Córvus
0396cc6ec4 Update Control.java 2020-09-20 16:45:34 +03:00
Félix Córvus
e907d1a23f Updating bundles 2020-09-20 16:43:15 +03:00
Felix Corvus
86446f4f00
Update Control.java 2020-09-20 16:32:38 +03:00
YellOw139
9bdc81e728
Update contributors 2020-09-20 12:11:33 +03:00
YellOw139
a0d81eb18e
[Bundle][RO] Translation Update 
This PR was tested in-game and it's ready to merge at any time (unless marked as draft).

Changelog:
- Changes as per commits c71be9ae32, f53af781ba, 68cf2af6e0, 0bcb48ca31, b4d83f33e9
- Changed Surge Alloy name to 'Supra Aliaj'. 
  The new name is closer to the original, shorter and easier to pronounce. Old name: 'Aliaj de Supratensiune'
- Changed Phase Fabric name to 'Fibră-Fază'.
  It's closer to the original and shorter. Old name: 'Material de Fază'
- Tweaked some stat names
- Tweaked some map editor button names
- Typo fixes & various other improvements
 2020-09-20 12:06:09 +03:00
Anuken
415380f25e Merge remote-tracking branch 'origin/master' 2020-09-19 21:54:18 -04:00
Anuken
b9fd38a76e Various tweaks and speculative changes 2020-09-19 21:54:08 -04:00
Anuken
b4d83f33e9
Merge pull request #2395 from genNAowl/ready-to-merge-force-projectors 
F O R C E P R O J E C T O R S
 2020-09-19 21:15:45 -04:00
Anuken
3b8b762a1c
Removed phase radius display *(see description)* 
Phased radius has been proposed in numerous PRs, but I don't know how to handle it properly yet. New players may be confused about the extra circle/hexagon indicator around blocks - it's not clear what it means. An extra radius easy to implement, so I'll leave it out of this PR and handle it later.
 2020-09-19 21:15:18 -04:00