mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-22 02:07:20 +07:00
Code Issues Packages Projects Releases Wiki Activity
13,128 Commits 4 Branches 160 Tags 2.3 GiB
6483d924af
Commit Graph

13128 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
6483d924af Unit cargo transport system 2021-11-29 20:06:49 -05:00
Anuken
635027bb81 Save unit variables in processors 2021-11-29 10:57:42 -05:00
Anuken
ea6d794c36 Fixd unit tests 2021-11-29 10:04:28 -05:00
Anuken
e2576f1538 Persistent unit IDs 2021-11-29 10:02:03 -05:00
Anuken
117fd3769e Fixed ConsumeLiquids dependencies 2021-11-28 20:57:47 -05:00
Anuken
68e0b0e27e Initial Erekir tech tree 2021-11-28 20:51:26 -05:00
Anuken
30e2d52341 Massive TechTree system cleanup 2021-11-28 13:48:06 -05:00
Anuken
c1477e1f2f WIP erekir tech tree 2021-11-27 18:23:41 -05:00
Anuken
d7eb76d4b2 arc 2021-11-27 14:07:02 -05:00
Anuken
5446b7c6f0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-11-27 14:06:57 -05:00
Anuken
bc296728f9 Erekir thorium + Minor visual tweaks 2021-11-27 13:10:10 -05:00
Anuken
a24c15117d Cyanogen synthesis retexture 2021-11-27 12:17:45 -05:00
Anuken
0aa85163d2 weird liquid animations 2021-11-26 22:48:51 -05:00
Anuken
77b3a83826 WIP animated gas 2021-11-26 21:35:58 -05:00
buthed010203
c055407249
Fix editor camera panning (#6380) 
VSync being disabled will make the camera move unbearably fast currently as it isnt tied to frame time.
 2021-11-26 13:45:27 -05:00
Matthew (or Maya) Peng
e1685ef46c
BlueWolf does not want MoveLightningAbility to mirror (#6376) 2021-11-26 11:05:50 -05:00
Anuken
22564de3c8 Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-11-25 18:54:49 -05:00
Anuken
ce065f0324 arc 2021-11-25 18:54:46 -05:00
Anuken
616fa8748f DrawRegion spinSprite 2021-11-25 18:54:35 -05:00
router
4eca2b4b0b
Make updateInUnits description actually readable (#6371) 2021-11-25 15:33:21 -05:00
Anuken
f214f38f08 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-11-25 13:29:51 -05:00
Anuken
04b1ba31a9 Fixed #6370 2021-11-25 13:29:35 -05:00
Anuken
57e0f5ba3f Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2021-11-25 13:29:19 -05:00
Anuken
d6fa71ba92 Scuttler disabled for now 2021-11-25 13:29:14 -05:00
Anuken
3e1954f9de Scuttler disabled for now 2021-11-25 13:29:02 -05:00
Anuken
6c7dbdc91e Generative outlines for mod parts 2021-11-25 13:08:10 -05:00
Anuken
9b291a366a Fixed cyanogen color / Fixed liquid display negative values 2021-11-25 12:31:53 -05:00
Catchears
c24c5c6196
update german translation (#6354) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2021-11-25 12:09:16 -05:00
KuhnChris
cd0fbb4d81
(german translation) add missing liquid-container (#6353) 
* (german translation) add missing liquid-container

For some reason the liquid container has been missing in the translation file (at all)

* Update bundle_de.properties

Reorder and remove duplicate entry for description

* Update bundle_de.properties

bblock=>block

* Update bundle_de.properties

* Update bundle_de.properties

Plural->Singular, making sure tanks only store 1 kind of liquid.
 2021-11-25 12:07:50 -05:00
Anuken
d4ccbaa6df Merge remote-tracking branch 'origin/master' 2021-11-25 11:33:50 -05:00
Anuken
07696c7f92 Closes #6327 2021-11-25 11:33:44 -05:00
MrDuck557
ccfd062c85
ParticleEffect Rotation (#6323) 
* Additive

* ternary

* copypasta

I missed a total of 4 instances

* anuke has spoken

Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-25 11:24:34 -05:00
Anuken
0743243ead Merge remote-tracking branch 'origin/master' 2021-11-25 11:09:18 -05:00
Anuken
4c36abde28 Fixed payEnter creating ghost units 2021-11-25 11:09:13 -05:00
L0615T1C5-216AC-9437
1896a7f024
update CN's available ports for v6 (#6368) 
bring back pvp and sandbox to CN!
 2021-11-24 22:04:16 -05:00
Anuken
1bcd48aadc ContinuousTurret ammo display 2021-11-24 19:23:08 -05:00
Anuken
78590abfc0 reinforced vault/container 2021-11-24 18:28:50 -05:00
Anuken
b7ac1e1d74 Stuff. 2021-11-24 13:33:01 -05:00
Anuken
3512190373 sublimate progress 2021-11-24 12:50:43 -05:00
Anuken
211c0b2e71 Sublimate visuals, damage/length still broken 2021-11-24 12:30:01 -05:00
Rex
010f07ed9f
Update servers_v6.json (#6365) 
new IPs & server
 2021-11-24 09:44:48 -05:00
Anuken
ba14151a01 A significant waste of time and effort 2021-11-23 22:41:25 -05:00
Anuken
54f04d8d2c
Closes #6363 2021-11-23 07:53:23 -05:00
Anuken
4d49b0b2ee Visual tweaks 2021-11-22 23:02:35 -05:00
Anuken
3a9fdc8b3d Phase synthesizer implementation 2021-11-22 22:34:22 -05:00
Anuken
d7adacd932 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-11-22 15:37:16 -05:00
Anuken
41e82881f3 Gradle 7.3 2021-11-22 15:32:00 -05:00
Anuken
947864269b Slag-based incinerator 2021-11-22 14:48:26 -05:00
Anuken
d218480f6f Turret requirement cleanup / WIP ContinuousTurret type 2021-11-22 13:59:09 -05:00
Anuken
f7cf35369b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_zh_CN.properties
	core/assets/bundles/bundle_zh_TW.properties
 2021-11-22 13:17:36 -05:00