mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-20 01:07:16 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,229 Commits 4 Branches 160 Tags 2.3 GiB
421d27c50c
Commit Graph

1409 Commits

Author SHA1 Message Date
Anuken
c8da241825 Disrupt weapons complete 2022-02-04 17:34:13 -05:00
Anuken
60621520ee WIP Disrupt missiles 2022-02-04 15:37:51 -05:00
Anuken
fa6ddd5f50 Conquer tank progress 2022-02-03 15:13:08 -05:00
Anuken
18c192d307 More animation improvements 2022-02-03 12:47:52 -05:00
Anuken
2f989d57bb Weapon animation suffering 2022-02-03 00:59:21 -05:00
Anuken
1388d0a4ca WIP unit stuff 2022-02-02 23:36:21 -05:00
Anuken
eb4d2fc3a3 Weapons parts for units / No logic on Erekir 2022-02-02 20:39:22 -05:00
Anuken
a138b7b9a8 Better leg unit death explosion 2022-02-01 23:21:57 -05:00
Anuken
69f59ff803 Removed copper drills in loadouts 2022-02-01 20:29:45 -05:00
Anuken
c0c7e0f468 Mostly finished T2 spider unit 2022-02-01 18:05:56 -05:00
Anuken
092ce9d5ff WIP actually insect-like unit 2022-02-01 00:07:00 -05:00
Anuken
06875d4389 Third sector 2022-01-31 15:50:29 -05:00
Anuken
c6cfaa5ce5 More unit progress 2022-01-31 14:05:50 -05:00
Anuken
7c22478618 Multi-tread support for tanks 2022-01-30 17:10:04 -05:00
Anuken
3f8a7f591a Disabled Erekir invasions & planet simulation 2022-01-30 11:34:52 -05:00
Anuken
1eb39a531f Vent tweaks 2022-01-27 18:15:19 -05:00
Anuken
c65ba7f3fa Rhyolite walls darkened 2022-01-27 15:52:37 -05:00
Anuken
06a4f65728 Aware: Waves 2022-01-26 13:40:32 -05:00
Anuken
121ae08240 New WIP sector preset 2022-01-26 00:13:43 -05:00
Anuken
8853afc221 Removed unused coral chunk block 2022-01-23 16:58:52 -05:00
Anuken
97da66cd44 New environment blocks 2022-01-22 13:33:16 -05:00
Anuken
a121c4d042 Fixed square numbers in stats 2022-01-21 00:08:56 -05:00
Anuken
b3d4dc06d4 Misc 2022-01-20 23:06:04 -05:00
Anuken
8fc7aff7ef More decoration blocks 2022-01-20 15:49:47 -05:00
Anuken
0e790e61f2 Generation tweaks 2022-01-20 15:19:03 -05:00
Anuken
45178046d0 Crystal blocks 2022-01-19 21:24:02 -05:00
Anuken
4bee7e598b Red ice boulders 2022-01-19 18:54:15 -05:00
Anuken
9e1777f5cf Beryllic stone contrast 2022-01-19 14:48:38 -05:00
Anuken
cef3d383b7 Display liquid tooltips 2022-01-19 10:50:28 -05:00
Anuken
7240da5016 More crystals 2022-01-18 22:47:31 -05:00
Anuken
19ddc1dd65 WIP crystal biome 2022-01-18 20:35:43 -05:00
Anuken
f3811d6710 Ore renaming 2022-01-18 10:48:27 -05:00
Anuken
2d19c7ae97 Bulwark shield mechanics mostly done 2022-01-17 13:39:15 -05:00
Anuken
396c087072 Experimenting with abilities 2022-01-16 22:53:58 -05:00
Anuken
b23ea8b965 WIP 'bulwark' unit 2022-01-16 16:26:21 -05:00
Anuken
93cfa243bc Fixed certain turrets working without ammo 2022-01-15 23:08:54 -05:00
Anuken
e14dd00019 Quell missile weapons 2022-01-15 15:57:53 -05:00
Anuken
125994482e Minor polish 2022-01-10 22:52:22 -05:00
Anuken
5509104a44 Moved thorium into the 'next tier' on Erekir 2022-01-10 11:22:53 -05:00
Anuken
feb1135bcc Some visual tweaks 2022-01-09 19:08:35 -05:00
Anuken
acaec08781 Evoke repair weapon 2021-12-28 21:48:32 -05:00
Anuken
9c2618f2e8 Regen projection recolor 2021-12-28 21:07:27 -05:00
Anuken
0ede0dbf0c 5x5 burst drill 2021-12-28 19:18:16 -05:00
Anuken
4fa88296a7 Bugfixes & balancing 2021-12-28 16:00:25 -05:00
Anuken
ad42861daf Better block health scaling system 2021-12-28 11:29:31 -05:00
Anuken
0b9ad22e88 Titan 4x4 2021-12-27 19:44:16 -05:00
Anuken
5bb2df5b89 Misc turret sprite cleanup 2021-12-27 18:34:29 -05:00
Anuken
4e1dec2399 More turret cleanup 2021-12-27 16:41:03 -05:00
Anuken
8021f0082a Turret removal: Switching to bigger designs 2021-12-27 16:24:52 -05:00
Anuken
677abf4924 3x3 breach 2021-12-27 15:54:09 -05:00
Anuken
dd5ce7e365 Regen suppression unit + system 2021-12-27 14:46:51 -05:00
Anuken
180e527a18 Beryllium wall 2021-12-24 13:23:47 -05:00
Anuken
67986ee72c Requirement balancing 2021-12-24 12:52:32 -05:00
Anuken
438661e239 Regen projector 'done' 2021-12-22 16:43:22 -05:00
Anuken
fb09d6bca0 titan recolor 2021-12-21 10:06:02 -05:00
Anuken
6f67ea1742 "Better" build tower sprite / Assembly cleanup 2021-12-20 10:54:09 -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
3844121913 drone construction time 2021-12-19 12:39:29 -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
Anuken
00ed0d017c Unit assembly drones + more visuals 2021-12-15 14:51:42 -05:00
Anuken
bdc3b85346 Unit assembler progress 2021-12-13 23:14:26 -05:00
Anuken
5ac3e08b1d Tungsten walls 2021-12-13 14:42:16 -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
Anuken
3e9747c59c Heat conductor + phase heater 2021-12-10 11:31:32 -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
57e5acdbd7 Vent condenser block 2021-12-09 17:16:32 -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
Anuken
6c10a400ed Directional force projector prototype 2021-12-07 20:37:46 -05:00
Anuken
0b7d8f371e Support for unit missiles 2021-12-07 16:58:11 -05:00
Anuken
f5e9df1265 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ai/BlockIndexer.java
	gradle.properties
 2021-12-07 14:09:03 -05:00
Anuken
3644825dc5 Slightly less terrible regen projector 2021-12-06 22:13:06 -05:00
Anuken
26692a3199 Small deconstructor 2021-12-06 14:30:54 -05:00
Anuken
c4dc6511fd jitpack suck 2021-12-06 13:28:20 -05:00
Anuken
7d6428fcf2 Titan recolor + complaining 2021-12-05 18:19:43 -05:00
Anuken
5103c95f2e Unfinished titan turret 2021-12-04 14:08:50 -05:00
Anuken
8e4fdc92ec WIP terrible-looking regen projector 2021-12-03 20:45:19 -05:00
Anuken
61bb4d2dac Breach turret done / DrawTurret & reload fixes 2021-12-03 12:28:13 -05:00
Anuken
4e181d715f Pyrolysis generator + generation tweaks 2021-12-02 17:00:49 -05:00
Anuken
fff492d89d Erekir generation improvements 2021-12-02 13:25:43 -05:00
Anuken
f754dd1373 Un-cursed standard core shading 2021-12-02 09:57:49 -05:00
Anuken
b6988e631e arkycite floor + fixes 2021-12-01 22:38:21 -05:00
Anuken
585affeeee chemical combustion chamber 2021-12-01 19:31:59 -05:00
Anuken
e30d090a2e arkycite recolor 2021-11-30 22:52:33 -05:00
Anuken
b3dd7f4b8b WIP arkycite 2021-11-30 18:13:34 -05:00
Anuken
6483d924af Unit cargo transport system 2021-11-29 20:06:49 -05:00
smol
582f05fa33
Fix a single pixel in Fuse's sprite (#6387) 
* Create m

* Delete m

* Add files via upload
 2021-11-29 12:23:16 -05:00
Anuken
68e0b0e27e Initial Erekir tech tree 2021-11-28 20:51:26 -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
Anuken
d6fa71ba92 Scuttler disabled for now 2021-11-25 13:29:14 -05:00
Anuken
78590abfc0 reinforced vault/container 2021-11-24 18:28:50 -05:00
Anuken
211c0b2e71 Sublimate visuals, damage/length still broken 2021-11-24 12:30:01 -05:00
Anuken
ba14151a01 A significant waste of time and effort 2021-11-23 22:41:25 -05:00
Anuken
3a9fdc8b3d Phase synthesizer implementation 2021-11-22 22:34:22 -05:00
Anuken
947864269b Slag-based incinerator 2021-11-22 14:48:26 -05:00
Anuken
64efa599d0 Slag heater block 2021-11-21 14:06:18 -05:00
Anuken
0014c7a525 Slag centrifuge implementation 2021-11-21 11:59:35 -05:00
Anuken
4fcd873f65 Gallium 2021-11-20 17:59:24 -05:00
Anuken
a39d156d12 Optional beam drill liquid input / Fixed graphite color 2021-11-20 10:15:55 -05:00
Anuken
7d849b7ea0 I have spent far too much time redrawing this stupid sprite 2021-11-19 20:32:09 -05:00
Anuken
f3ace3a526 low effort large plasma bore 2021-11-18 16:22:53 -05:00
Anuken
275f6eb32f Overflow duct 2021-11-18 14:47:33 -05:00
Anuken
6026beb397 Emanate impl / Rotation lock 2021-11-17 18:02:19 -05:00
Anuken
4d13b8df7a Surge crucible effects 2021-11-17 13:37:51 -05:00
Anuken
29f8ebddb9 Sprite tweaks 2021-11-17 09:42:33 -05:00
Anuken
7798bb6702 Fixed packing issues 2021-11-16 23:10:49 -05:00
Anuken
8d05b878d7 oxidation chamber implementation 2021-11-16 14:54:23 -05:00
Anuken
eefcce5cf1 Better multi-liquid support / Reinforced pump progress 2021-11-16 10:25:59 -05:00
Anuken
bf1909295e Electrolyzer finalization 2021-11-15 15:17:20 -05:00
Anuken
9663d1153f WIP electrolyzer + liquid fixes 2021-11-15 14:31:52 -05:00
Anuken
b99e18478f tweaks 2021-11-15 08:24:16 -05:00
Anuken
486622e3e4 Many crazy things 2021-11-14 23:10:15 -05:00
Anuken
3a6878ef60 T2 reinforced core unit 2021-11-13 10:40:55 -05:00
Anuken
2f0daa6fc4 Core cleanup / Turret draw class 2021-11-12 20:09:27 -05:00
Anuken
8da4e72e77 carbide crucible implementation 2021-11-12 11:07:15 -05:00
Anuken
51301a50cc HeatCrafter 2021-11-11 20:39:43 -05:00
Anuken
a1107eae13 WIP heat reactor system 2021-11-11 18:52:51 -05:00
Anuken
c87bc11ad2 Core: Acropolis 2021-11-10 09:38:18 -05:00
Anuken
da87726176 Core: Citadel 2021-11-09 20:20:44 -05:00
Anuken
501a65e9a3 reorganization 2021-11-09 12:57:14 -05:00
Anuken
34e74834fd Arc furnace recipe fix 2021-11-09 12:49:25 -05:00
Anuken
73f3fe31da Aegis core 2021-11-09 10:41:42 -05:00
Anuken
5f3b3ea559 H 2021-11-08 16:11:55 -05:00
Anuken
dffe90acff Directional liquid bridge 2021-11-08 12:06:55 -05:00
Anuken
ce0e26f008 New liquid tanks/routers/contaienrs 2021-11-08 09:47:00 -05:00
Anuken
07d9feeb09 WIP reinforced conduits 2021-11-07 12:56:58 -05:00
Anuken
09a934385e "stuff" 2021-11-06 22:21:46 -04:00
Anuken
da49328412 Stack router + Consistent item source + Item void flow 2021-11-06 16:31:42 -04:00
Anuken
ed302d978c sprites 2021-11-05 19:50:47 -04:00
Anuken
52a88e7301 removed unused sprites 2021-11-05 16:41:27 -04:00
Anuken
6b3dfa6036 Carbide, surge conveyors 2021-11-05 16:41:08 -04:00
Anuken
57ef7c823e WIP carbide 2021-11-05 08:47:05 -04:00
Anuken
0effae1cd7 sprites 2021-11-04 15:42:25 -04:00
Anuken
240ffe1ca3 impact drill progress 2021-11-04 15:42:16 -04:00
Anuken
1a8a2c326e impact drill wip 2021-11-04 11:41:12 -04:00
Anuken
38f7d2dcd0 tungsten 2021-11-02 14:49:05 -04:00
Anuken
18f28ef224 Full BuildTower impl 2021-11-02 11:47:35 -04:00
Anuken
00293d022c progress 2021-11-02 10:39:05 -04:00
Anuken
fbc140e99d sprites 2021-11-01 12:23:44 -04:00
Anuken
64a6f10338 Misc polish 2021-10-30 19:01:47 -04:00
Anuken
87a8453871 Beam node balance 2021-10-30 15:15:06 -04:00
Anuken
37379b23ae a 2021-10-30 00:30:16 -04:00
Anuken
8ec1976bd5 a 2021-10-29 20:14:43 -04:00
Anuken
0781a325c7 new core unit 2021-10-29 19:42:51 -04:00
Anuken
ee8bcdfa50 gsd 2021-10-28 22:27:36 -04:00
Anuken
58544e6a21 Beam nodes 2021-10-28 22:18:07 -04:00
Anuken
cd909913ca turbine condenser 2021-10-27 19:41:12 -04:00
Anuken
3ee7ee7e79 WIP pressure turbine 2021-10-27 18:25:58 -04:00
Anuken
705c85281c the vent 2021-10-26 20:34:45 -04:00
Anuken
471fdd61b1 klmnbsdfhx 2021-10-25 22:09:18 -04:00
Anuken
bc0b9e9eb3 plasma bore 2021-10-25 20:51:45 -04:00
Anuken
d01404d7ca intellij stop 2021-10-24 18:09:00 -04:00
Anuken
f347ab4714 WIP core bastion 2021-10-24 18:08:07 -04:00
Anuken
b19691078f a 2021-10-24 15:14:43 -04:00
Anuken
255f97dc56 breach 2021-10-23 17:32:58 -04:00
Anuken
693e420074 WIP breach turret 2021-10-23 14:35:37 -04:00
Anuken
d3343c0ae9 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Planets.java
	tools/src/mindustry/tools/Generators.java
 2021-10-20 10:45:51 -04:00
Anuken
a72adef051 Fixed off-tinted cells 2021-10-17 16:03:05 -04:00
Anuken
176343e862 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-15 14:24:48 -04:00
Anuken
9a5ac14bc3 Fixed #6158 2021-10-15 11:40:55 -04:00
Anuken
6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
Anuken
ad1c75d050 WIP branch merging 2021-10-14 19:15:03 -04:00
Anuken
5f3cef251b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/logicids.dat
	core/src/mindustry/content/Blocks.java
	gradle.properties
 2021-09-28 18:45:09 -04:00
TranquillyUnpleasant
dbd31b9031
Cryo tiles (#6054) 
* Cryo tile

* tile name

* Shader

* Icon and property
 2021-09-27 14:46:28 -04:00
Anuken
2d2052e39f "ok" 2021-09-27 11:00:33 -04:00
Anuken
c9fa7356c2 Asteroid background improvements 2021-09-16 12:40:35 -04:00
Anuken
ba0892fdcb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-13 20:52:41 -04:00
Matthew Peng
efae0d3b6a
Anuke what is this (#5949) 2021-09-06 20:45:42 -04:00
CancerGuy
4720f1b876
Add files via upload (#5943) 2021-09-05 17:06:00 -04:00
Anuken
393d3a19a3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/world/meta/StatValues.java
 2021-09-04 23:12:28 -04:00
Anuken
24b0f445b8 Added rivers on Serpulo / Added deep tainted water 2021-09-04 15:23:47 -04:00
Anuken
dddb282ce3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2021-09-04 12:26:07 -04:00
CancerGuy
3901ae1720
change (#5923) 2021-09-04 10:14:40 -04:00
Anuken
cc689fd114 Fixed #5895 2021-08-29 10:26:39 -04:00
Anuken
259d0baeb6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-28 16:30:07 -04:00
Anuken
ced97888e4 why 2021-08-27 21:51:37 -04:00
Anuken
9e16d7385a Implemented #5853 2021-08-25 10:09:00 -04:00
Anuken
26dd7e00eb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/UnitTypes.java
 2021-08-25 09:22:23 -04:00
Anuken
8143cb7be0 Unit balancing 2021-08-24 12:10:44 -04:00
Anuken
dd8279bab3 Crawl progress 2021-08-22 20:25:46 -04:00
Anuken
b2aaca45d5 progress 2021-08-21 18:35:27 -04:00
Anuken
7afc6d3631 CrawlComp progress 2021-08-21 15:32:25 -04:00
Anuken
efb4a643e4 Liquid container tweak 2021-08-19 22:26:54 -04:00
Anuken
9e9cd213f3 Liquid container 2021-08-19 21:48:18 -04:00
Anuken
a39f2bd3a9 wip 2021-08-19 17:46:10 -04:00
Anuken
1d32680ab2 sprite tweaks 2021-08-18 20:09:59 -04:00
Anuken
130f32f3cd Dormany cyst item 2021-08-18 17:38:30 -04:00
Anuken
f3cacb9e99 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-18 15:04:30 -04:00
Sunny Kim
d1271f3e4b
Boss (Guardian) Status Sprite (#5773) 
* boss status

* almost forgot

* Update bundle_ko.properties
 2021-08-17 18:00:00 -04:00
Anuken
2200a44653 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-13 10:08:34 -04:00