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
|
0eaf9bc9c6
|
Various prototypes
|
2020-04-15 12:44:53 -04:00 |
|
Anuken
|
c717084cb9
|
Cleanup
|
2020-04-13 18:07:00 -04:00 |
|
Anuken
|
2af12a632a
|
Added basic multi-unit factories
|
2020-04-13 16:56:33 -04:00 |
|
Anuken
|
603d8b16d0
|
Various tweaks
|
2020-04-12 10:26:18 -04:00 |
|
Anuken
|
67a084a5e7
|
Cleanup
|
2020-04-10 13:49:36 -04:00 |
|
Anuken
|
2395bc9308
|
Bugfixes / Testing reaper sprite
|
2020-04-10 12:55:58 -04:00 |
|
Anuken
|
803538d5be
|
Better detail
|
2020-04-09 20:55:59 -04:00 |
|
Anuken
|
1efbd9dcf2
|
Faster shaders (?)
|
2020-04-09 20:50:11 -04:00 |
|
Anuken
|
a241d6f5bb
|
Minor cleanup
|
2020-04-08 10:54:45 -04:00 |
|
Anuken
|
85e4270536
|
New water textures
|
2020-04-04 00:31:29 -04:00 |
|
Anuken
|
9081f3ff03
|
Fixed antialiasing
|
2020-03-30 12:00:08 -04:00 |
|
Anuken
|
0573160b2f
|
Added sorter cross (#1566)
|
2020-03-26 17:39:23 -04:00 |
|
Anuken
|
148abaccd9
|
Cleanup
|
2020-03-21 16:40:39 -04:00 |
|
Anuken
|
7655b65363
|
Bugfixes / Fixed #1680
|
2020-03-06 17:06:21 -05:00 |
|
Anuken
|
60d28fb01b
|
Bugfixes
|
2020-03-06 16:07:07 -05: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
|
4a40172782
|
Cleaned up bullet sprites
|
2020-02-22 00:28:03 -05:00 |
|
Anuken
|
baa0eb1149
|
Added cliffs as separate block
|
2020-02-21 23:45:25 -05:00 |
|
Anuken
|
e215772f30
|
Added backwards compatibility for legacy saves
|
2020-02-17 11:13:46 -05:00 |
|
Anuken
|
fb302d49c7
|
Improved battery brightness display / Palette tweak / Diffgen buff
|
2020-02-11 17:27:33 -05:00 |
|
Anuken
|
ae7a8e1f65
|
Minor tweaks
|
2020-02-09 14:35:22 -05:00 |
|
Anuken
|
c23e923ffb
|
Merged with master
|
2020-02-09 12:32:29 -05:00 |
|
Anuken
|
d45d7f21b6
|
Procedural scorch marks / Bugfixes
|
2020-02-09 12:07:36 -05:00 |
|
Anuken
|
8814dbe29a
|
Sprite cleanup / Bullets
|
2020-02-08 14:48:04 -05:00 |
|
Anuken
|
33e818a757
|
Entity name mapping
|
2020-02-07 09:36:51 -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
|
a11f6efe0a
|
Rudimentary rendering
|
2020-02-05 23:04:48 -05: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
|
89d143af8f
|
Undo part of 〃
|
2020-01-28 11:00:08 +01: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 |
|
Patrick 'Quezler' Mounier
|
6eb6870bb6
|
Register crater emoji via ui folder
#1458
|
2020-01-27 19:33:36 +01:00 |
|
Patrick 'Quezler' Mounier
|
883a2a9b59
|
Bruteforce crater emoji
|
2020-01-27 18:40:40 +01: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
|
27d6bf067e
|
Added prototype planet sector land system
|
2020-01-20 12:05:26 -05:00 |
|
Anuken
|
8d61ddbbd4
|
Added chat icons for in-game items and blocks
|
2020-01-17 18:08:23 -05:00 |
|
Anuken
|
c3d2351b2d
|
Various icon changes
|
2020-01-17 13:57:04 -05:00 |
|