mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-06 07:30:35 +07:00
Code Issues Packages Projects Releases Wiki Activity
13,328 Commits 4 Branches 160 Tags 2.3 GiB
9e1777f5cf
Commit Graph

13328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
a093ba5511 Merge remote-tracking branch 'origin/master' 2021-12-21 10:25:54 -05:00
Anuken
24420c4371 Added temporary client debug status methods 2021-12-21 10:25:47 -05:00
Anuken
fb09d6bca0 titan recolor 2021-12-21 10:06:02 -05:00
Anuken
f8b360bca6 Fixed assembly modules yeeting into obstruction 2021-12-20 15:31:50 -05:00
Anuken
6f67ea1742 "Better" build tower sprite / Assembly cleanup 2021-12-20 10:54:09 -05:00
Anuken
0ccb8846d3 Unit assembler gallium requirement 2021-12-19 21:33:39 -05:00
Anuken
430fe2fd0a Unit assembly finalizations 2021-12-19 20:31:00 -05:00
Anuken
59550f58ee Assembler sprites mostly done 2021-12-19 13:06:23 -05:00
Anuken
94583d468d Merge remote-tracking branch 'private/7.0-features' into 7.0-features 
# Conflicts:
#	core/src/mindustry/world/blocks/units/UnitAssembler.java
 2021-12-19 12:39:51 -05:00
Anuken
3844121913 drone construction time 2021-12-19 12:39:29 -05:00
Anuken
93b625bab7 decide on a head size 2021-12-19 12:38:52 -05:00
Anuken
8023ea1d34 aaaaaaaAAAAAAAAAAAAAAAAAA 2021-12-18 23:23:35 -05:00
Anuken
41b669d6e1 Unit assembly system progress 2021-12-18 11:50:21 -05:00
Valeriy
24d3054bac
End of this nightmare (#6444) 
SMoA/Skaarj was end of existing
 2021-12-18 08:35:58 -05:00
Anuken
3866a9a8e7 the obligatory daily commit 2021-12-17 17:55:03 -05:00
L0615T1C5-216AC-9437
7880135824
Allow setting to be reset through the use of config key default (#6442) 2021-12-17 17:13:49 -05:00
Anuken
e481de9d28 Payload router sorter mode 2021-12-16 10:31:16 -05:00
Anuken
00ed0d017c Unit assembly drones + more visuals 2021-12-15 14:51:42 -05:00
KuhnChris
4b6541ae4e
Update missing "core launch animation skip" in german translation file (bundle_de) (#6430) 
* Update settings file (bundle_de)

* Update bundle_de.properties
 2021-12-14 12:52:26 -05:00
Anuken
b5ce9e1a38 More unit assembler progress 2021-12-14 09:40:57 -05:00
Anuken
bdc3b85346 Unit assembler progress 2021-12-13 23:14:26 -05:00
Matthew (or Maya) Peng
339d87ad78
Check the status, not the bullet (#6434) 2021-12-13 21:44:54 -05:00
Matthew (or Maya) Peng
052b47fbe4
remove space from perSecond and perMinute (#6435) 2021-12-13 21:44:10 -05:00
Anuken
121b992d56 Decreased crucible slag usage 2021-12-13 15:09:22 -05:00
Anuken
5ac3e08b1d Tungsten walls 2021-12-13 14:42:16 -05:00
Fancy2209
b5c1972040
Update bundle_pt_PT.properties so that the portuguese word for settings is right (#6433) 
* Update bundle_pt_PT.properties

* Fix the other 2 words with -/ I didn't notice
 2021-12-13 13:20:30 -05:00
RebornTrack970
6c26edbd84
Fixed Omega Servers on V7 (#6432) 
* Fixed Omega Servers

* Update servers_v7.json
 2021-12-13 11:18:53 -05:00
Anuken
0e99e121e8 Improved vanquish weapon style 2021-12-13 10:33:46 -05:00
Anuken
32cb25af62 Vanquish weapons & sprite tweaks 2021-12-13 00:08:01 -05:00
Anuken
53b55a9f0e Tank animations & FX 2021-12-12 20:05:37 -05:00
Anuken
0d33768f58 WIP tank unit type 2021-12-12 18:29:44 -05:00
Prosta4okua
192588d373
Update LanguageDialog.java (#6431) 2021-12-12 18:15:26 -05:00
Anuken
86a6ec6bd2 Editor crash fix 2021-12-11 16:23:42 -05:00
RebornTrack970
a3100980dc
Fixed 2R2T (#6426) 2021-12-11 09:26:38 -05:00
Anuken
7e9dd2d6f0 Fixed beam damage hit position 2021-12-10 12:39:37 -05:00
Anuken
4a59bc952f Tech tree selection fixes 2021-12-10 12:25:35 -05:00
Anuken
9614997482 Temporary measure to reduce atlas size 2021-12-10 11:55:17 -05:00
Anuken
3e9747c59c Heat conductor + phase heater 2021-12-10 11:31:32 -05:00
Anuken
761ee12e6f LAccess.speed / Merged #6293 2021-12-10 00:36:47 -05:00
Anuken
84c5bc9bdf This quad detail has been bothering me for ages 2021-12-09 19:39:05 -05:00
Anuken
3bd4cc8e81 Vent condenser resprite 2021-12-09 18:02:45 -05:00
Anuken
f582462177 wip 2021-12-09 17:41:55 -05:00
Anuken
57e5acdbd7 Vent condenser block 2021-12-09 17:16:32 -05:00
Volas171
f4c7637071
Update Omega v7 and v6 ips (serverlist) (#6420) 
* update omega ip

* omega v7 ip change

* i forgo 💀
 2021-12-09 09:49:11 -05:00
Anuken
8a2908374a Selectable tech tree 2021-12-08 21:57:10 -05:00
Anuken
36dc0e9e3e Fracture impl 2021-12-08 20:19:46 -05:00
Anuken
acb4593390 Fill#rect bugfix 2021-12-08 19:39:44 -05:00
Anuken
5fbfe52d0a Misc bugfixes 2021-12-08 14:28:27 -05:00
Darkness#3729
3a91460e24
Fix (#6414) 2021-12-08 10:01:02 -05:00
Matthew (or Maya) Peng
b70c08c2ec
Removes -> Destroys (#6409) 
* Removes -> Destroys

* inputed

* bad language design TM

english sucks
 2021-12-08 00:03:11 -05:00