575 Commits

Author	SHA1	Message	Date
Patrick 'Quezler' Mounier	39266d23c8	Merge branch 'master' into crater ... # Conflicts: # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites2.png # core/assets/sprites/sprites3.png	2020-04-23 21:10:48 +02:00
Anuken	cec5c24d69	progress	2020-04-23 13:58:06 -04:00
Anuken	eeb8d5ef9c	Renamed key fields and table methods	2020-04-17 11:26:59 -04:00
Patrick 'Quezler' Mounier	1acc6461e6	Grow the circle slightly inward	2020-04-16 22:05:55 +02:00
Patrick 'Quezler' Mounier	9864383300	Revert 〃	2020-04-16 21:15:49 +02:00
Patrick 'Quezler' Mounier	41eb51a340	Experiment with visible ports	2020-04-16 21:11:59 +02:00
Patrick 'Quezler' Mounier	a05f4338c5	Waspify the crater 🐝	2020-04-16 20:24:07 +02:00
Patrick 'Quezler' Mounier	589d4c92d1	Scale crater from 16x16 to 20x20	2020-04-16 18:39:24 +02:00
Patrick 'Quezler' Mounier	83511368f6	Stash shadow draft	2020-04-16 17:44:43 +02:00
Patrick 'Quezler' Mounier	a1d4804fae	Merge branch '6.0' into crater ... # Conflicts: # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites2.png # core/assets/sprites/sprites4.png # core/assets/sprites/sprites6.png # core/src/mindustry/ui/fragments/PlayerListFragment.java	2020-04-16 17:13:18 +02:00
Anuken	256f805754	Payload fixes	2020-04-16 09:55:57 -04:00
Patrick 'Quezler' Mounier	5c28985ee6	Merge branch '6.0' into crater ... # Conflicts: # core/assets/icons/icons.properties # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites3.png # core/assets/sprites/sprites5.png # core/src/mindustry/content/Blocks.java # core/src/mindustry/ui/fragments/PlayerListFragment.java # core/src/mindustry/world/BlockStorage.java	2020-04-16 12:39:52 +02:00
Anuken	a234949b8c	Visual tweaks	2020-04-15 13:03:37 -04:00
Anuken	2af12a632a	Added basic multi-unit factories	2020-04-13 16:56:33 -04:00
Anuken	85e4270536	New water textures	2020-04-04 00:31:29 -04:00
Anuken	0573160b2f	Added sorter cross (#1566)	2020-03-26 17:39:23 -04:00
Patrick 'Quezler' Mounier	14a97976cc	Realign pixels ... Bothered me for ages.	2020-03-05 19:48:36 +01:00
Patrick 'Quezler' Mounier	e5e4884448	Merge branch 'master' into crater ... # Conflicts: # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites3.png # core/assets/sprites/sprites5.png # core/src/mindustry/world/modules/ItemModule.java	2020-03-05 10:00:02 +01:00
Anuken	2afb175560	Generation tweaks	2020-02-22 12:05:31 -05:00
Anuken	baa0eb1149	Added cliffs as separate block	2020-02-21 23:45:25 -05:00
Anuken	6fd0205495	Merge	2020-02-11 19:55:02 -05:00
Anuken	fb302d49c7	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
Anuken	d45d7f21b6	Procedural scorch marks / Bugfixes	2020-02-09 12:07:36 -05:00
Patrick 'Quezler' Mounier	8c7b688f78	Add layered blendbitz	2020-02-06 20:19:00 +01:00
Patrick 'Quezler' Mounier	c0d250560a	🐍 is kil	2020-02-06 19:33:42 +01:00
Anuken	f6b1420103	c l e a n u p	2020-02-05 18:28:19 -05:00
Arkanic	ce7eccf524	i forgot -base	2020-02-05 18:10:57 +00:00
Patrick 'Quezler' Mounier	05ccdfd51b	Merge branch 'master' into crater ... # Conflicts: # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites3.png # core/assets/sprites/sprites5.png # core/src/mindustry/world/modules/ItemModule.java	2020-02-05 10:26:34 +01:00
Arkanic	ff06a005a0	become exist	2020-02-05 00:53:15 +00:00
Anuken	be50997f94	Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl ... # Conflicts: # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites3.png # core/assets/sprites/sprites5.png # core/src/mindustry/Vars.java # core/src/mindustry/entities/traits/SaveTrait.java # core/src/mindustry/maps/generators/MapGenerator.java # core/src/mindustry/ui/dialogs/DeployDialog.java # core/src/mindustry/world/blocks/Floor.java # desktop/src/mindustry/desktop/DesktopLauncher.java # gradle.properties	2020-02-04 12:25:18 -05:00
Patrick 'Quezler' Mounier	9bc24ae47a	Darken yellow square on nucleus core (#1497) ... #1496	2020-02-03 08:51:19 -05:00
Patrick 'Quezler' Mounier	0f92f77b55	Draw crater unto plastanium conveyor icon ... And remove whitespaces from the emoji one.	2020-01-28 10:57:51 +01:00
Anuken	ad6e0bcd0f	Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework ... # Conflicts: # android/src/mindustry/android/AndroidLauncher.java # annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java # annotations/src/main/java/mindustry/annotations/impl/AssetsAnnotationProcessor.java # build.gradle # core/assets-raw/fontgen/config.json # core/assets/bundles/bundle_cs.properties # core/assets/bundles/bundle_it.properties # core/assets/fonts/font.ttf # core/assets/fonts/icon.ttf # core/assets/icons/icons.properties # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites3.png # core/assets/sprites/sprites5.png # core/src/mindustry/content/UnitTypes.java # core/src/mindustry/core/NetClient.java # core/src/mindustry/core/NetServer.java # core/src/mindustry/entities/bullet/BulletType.java # core/src/mindustry/entities/type/TileEntity.java # core/src/mindustry/maps/filters/FilterOption.java # core/src/mindustry/mod/Scripts.java # core/src/mindustry/ui/Fonts.java # core/src/mindustry/ui/dialogs/DeployDialog.java # core/src/mindustry/ui/fragments/HudFragment.java # core/src/mindustry/ui/fragments/MenuFragment.java # core/src/mindustry/world/blocks/production/Cultivator.java # core/src/mindustry/world/blocks/units/CommandCenter.java # gradle.properties # tools/src/mindustry/tools/FontGenerator.java	2020-01-27 15:51:02 -05:00
Patrick 'Quezler' Mounier	58a79d8631	Update to v103 ... # Conflicts: # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites3.png # core/assets/sprites/sprites5.png # core/src/mindustry/content/Blocks.java # core/src/mindustry/content/TechTree.java # core/src/mindustry/world/blocks/distribution/ItemConveyor.java	2020-01-24 20:25:03 +01:00
Anuken	26676d60e1	Added underflow gates	2020-01-20 18:54:25 -05:00
Anuken	c0844304a6	Merge	2020-01-19 11:10:14 -05:00
Anuken	f044f30829	Merge	2020-01-18 11:16:03 -05:00
Anuken	eaa86023f9	Visual tweaks	2020-01-14 17:07:39 -05:00
Anuken	e45df98f26	Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0 ... # Conflicts: # core/src/mindustry/graphics/Bloom.java # gradle.properties	2020-01-10 15:19:07 -05:00
Anuken	f7791a2bb2	Merge; internal changes	2020-01-10 11:30:42 -05:00
Patrick 'Quezler' Mounier	ed765ad10a	Merge branch 'master' into crater ... # Conflicts: # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites3.png # core/assets/sprites/sprites5.png	2020-01-10 12:02:07 +01:00
Anuken	8f208920f7	Merged in liquid void	2020-01-08 11:04:12 -05:00
Patrick 'Quezler' Mounier	5f047603bf	Revert "Blend prototype" ... This reverts commit 35afc94d34. # Conflicts: # core/assets/sprites/sprites.png	2020-01-08 12:17:28 +01:00
Patrick 'Quezler' Mounier	5c485eff04	Ressurect OG corner	2020-01-08 10:58:05 +01:00
Patrick 'Quezler' Mounier	0f2f8f2411	Revert "Stash cursed loading dock" ... This reverts commit 9bdf475049.	2020-01-08 10:42:34 +01:00
Patrick 'Quezler' Mounier	9bdf475049	Stash cursed loading dock	2020-01-08 10:41:09 +01:00
Patrick 'Quezler' Mounier	35afc94d34	Blend prototype	2020-01-08 10:27:06 +01:00
Patrick 'Quezler' Mounier	0b0007502f	Revert "Differentiate texture from armored conveyor" ... This reverts commit 59451fcc0b.	2020-01-03 17:09:13 +01:00
Patrick 'Quezler' Mounier	59451fcc0b	Differentiate texture from armored conveyor ... By removing the turtleshell it looks less armored while still somewhat high-tech (ish)	2020-01-03 17:09:06 +01:00
Patrick 'Quezler' Mounier	0ae6527584	Sacrifice hivemind to convert craters to drawings ... Sad, yes, but crater units would never sync well over the net in its current state, so faking them unto conveyors is the only real option. Forgive me future ai overlord <3	2020-01-02 21:29:19 +01:00