Anuken
5869b7d27e
leg 1
2020-06-08 10:03:46 -04:00
Anuken
210971fedb
Bugfixes
2020-06-07 17:22:17 -04:00
Anuken
42a6b0e369
Unit cleanup
2020-06-07 14:17:42 -04:00
Anuken
8993c1db04
Fixed editor crash
2020-06-07 13:28:22 -04:00
Anuken
93fe794f63
Sprite tweaks
2020-06-05 22:38:41 -04:00
Anuken
65e94850ca
Sprite tweaks
2020-06-05 20:59:30 -04:00
EyeOfDarkness
305c19496e
Updated Segment and Lich sprite ( #2143 )
...
* updated sprite
* lich
2020-06-05 20:39:58 -04:00
Anuken
803f9e8eb6
Made save format support removed blocks
2020-06-04 14:50:08 -04:00
Anuken
5bcaed54c6
3x3 separator
2020-06-03 19:42:42 -04:00
Anuken
6fff4ad8a1
Point defense blocks
2020-06-03 16:22:07 -04:00
Anuken
3d98de34eb
Thermal -> AttributeSmelter
2020-06-03 12:19:27 -04:00
Anuken
3c89ccf7c3
Added silicon crucible
2020-06-03 12:11:40 -04:00
Anuken
7f6dcbd75a
Cleanup
2020-06-03 01:27:40 -04:00
Anuken
0382d40dcc
Payload router
2020-06-03 01:13:44 -04:00
Anuken
5b4a22e219
Implemented #1329
2020-05-31 20:16:32 -04:00
Anuken
8598b0a23a
Fixed bizzare planet render bugs
2020-05-31 16:45:03 -04:00
Anuken
bd349803d3
Moved some blocks around
2020-05-31 14:39:10 -04:00
Anuken
0842c3f0a0
Progress on sector state
2020-05-30 21:04:41 -04:00
Anuken
b08eafc78e
Revenant
2020-05-29 20:08:23 -04:00
Anuken
92d265402b
Payload support
2020-05-27 18:11:42 -04:00
Anuken
a375dd3fc2
Cleanup
2020-05-26 19:39:50 -04:00
Anuken
5c4ce00dec
Sprites
2020-05-26 13:00:20 -04:00
Anuken
a7c7295893
Various tweaks
2020-05-26 12:59:05 -04:00
Anuken
90f38fd135
Cleanup
2020-05-25 23:56:03 -04:00
Anuken
39e3ae931c
more legs
2020-05-25 22:19:31 -04:00
Anuken
732d90635f
Removed pad sprites
2020-05-25 14:36:52 -04:00
Anuken
1ae9d04f47
Experimental: block loader/unloaders
2020-05-25 14:36:40 -04:00
Anuken
0e59a22cbe
Respawn key
2020-05-24 22:27:14 -04:00
Anuken
65f63fd4d2
Re-added Tau
2020-05-23 21:53:11 -04:00
Anuken
46bc2207ff
Initial reconstructor impl
2020-05-23 18:49:28 -04:00
Anuken
d8ee862125
Functional payload factories
2020-05-23 11:53:49 -04:00
Anuken
39b0051b73
Directional unit factories (unfinished)
2020-05-23 10:39:44 -04:00
Anuken
f250008db3
Cleanup
2020-05-22 20:00:02 -04:00
Anuken
76aa201a99
Name changes / Bugfixes
2020-05-22 17:37:38 -04:00
Anuken
12d9479184
Added dart as default starter
2020-05-22 14:35:25 -04:00
Anuken
61d9fd3d72
Cleanup / Armor support
2020-05-21 14:57:15 -04:00
Anuken
5b445c59c1
Implemented ground mech boosting
2020-05-20 18:48:04 -04:00
Anuken
dc58626602
Removed zone files
2020-05-20 14:11:40 -04:00
Anuken
aa19c80567
Targeting bugfixes
2020-05-20 13:56:17 -04:00
Anuken
371debceb7
Unit tweaks
2020-05-19 21:06:07 -04:00
Anuken
1bc7454146
Unit tweaks
2020-05-19 21:05:34 -04:00
Anuken
945be0c524
Various tweaks
2020-05-19 17:49:25 -04:00
Anuken
77c0163a79
Re-implemented some units / Bugfixes
2020-05-19 14:58:04 -04:00
Anuken
434a754c9a
Better pad animations / Balancing
2020-05-14 23:16:26 -04:00
Anuken
a4987f864f
Refactoring / Launch pad tweaks
2020-05-14 22:00:04 -04:00
Anuken
27ffefa0cd
Added sprites
2020-05-12 09:41:07 -04:00
Patrick 'Quezler' Mounier
8280d11054
Move pump fluid sprite from production to liquid ( #1980 )
2020-05-04 10:04:00 -04:00
MEEP of Faith
9def4eaba4
Unjank Plated Conduit Background Transparency ( #1961 )
...
The background transparent part was for some reason 3-6 different colors. Invisible, but still there.
2020-05-01 18:09:39 -04:00
Anuken
626a06ca00
Bugfixes / Better titan sprite
2020-04-30 18:21:50 -04:00
Anuken
3397557737
Sprites
2020-04-30 16:04:43 -04:00
Patrick 'Quezler' Mounier
a226cd390c
Cleanup stack conveyor code ( #1946 )
...
- removes now obsolete adhoc boosteffect listing
- clarrify comments a bit more
- monospace align some code
- retexture to avoid shadow conflict
2020-04-30 15:16:19 -04:00
Anuken
2dbb099d79
AI tweaks / Control tweaks / Plastanium conveyor tweaks / Unit factories
2020-04-30 14:46:22 -04:00
Anuken
dfcf11fb07
Removed mech-related bundle entries
2020-04-26 11:24:52 -04:00
Anuken
fa62336096
Cleanup
2020-04-25 23:14:12 -04:00
Anuken
08f8323465
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# core/assets-raw/sprites/units/phantom-cell.png
2020-04-25 22:49:38 -04:00
Anuken
9b74b69950
Unit tweaks
2020-04-25 22:49:30 -04:00
MEEP of Faith
46762ab0e1
New power cells for everything ( #1915 )
...
* Ground Unit Power Cells
* Flying Unit Cells
* Player/Mech Cells
2020-04-25 22:48:58 -04:00
Anuken
8b7d75c5ba
Unit tweaks
2020-04-25 22:48:25 -04:00
Anuken
ceee1d36e6
Bugfixes
2020-04-25 17:34:35 -04:00
Anuken
09e08a474b
Plastanium conveyor + bugfixes
2020-04-24 20:17:24 -04:00
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
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
2395bc9308
Bugfixes / Testing reaper sprite
2020-04-10 12:55:58 -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
Anuken
06e94b1800
Cleaned up weather class
2020-03-11 10:08:27 -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
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
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
a4a3e7fc48
Merge pull request #1514 from Arkanic/patch-7
...
make batteries glow based on power contents (a redo that works)
2020-02-11 16:31:14 -05:00
Anuken
a2706a80b1
Merged with master
2020-02-09 12:27:44 -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
Patrick 'Quezler' Mounier
8c7b688f78
Add layered blendbitz
2020-02-06 20:19:00 +01:00
Patrick 'Quezler' Mounier
99d1a2829f
Merge branch 'master' into crater
2020-02-06 19:33:57 +01:00
Patrick 'Quezler' Mounier
c0d250560a
🐍 is kil
2020-02-06 19:33:42 +01:00
Patrick 'Quezler' Mounier
e06d8eabec
[formatting] add newline to file(s) ( #1508 )
...
* Trail appropriate files with a new line
* For some ironic reason it ignored itself
Probably because it wasn’t tracked/commited yet.
* Rename newlines to server executable naming pattern
2020-02-05 18:36:56 -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
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
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
a4e820f907
Added default ore flags for modded ores
2020-01-23 20:20:04 -05:00
Anuken
b16ad97d93
Updated font
2020-01-23 19:17:11 -05:00
Anuken
26676d60e1
Added underflow gates
2020-01-20 18:54:25 -05:00
Anuken
2c4dcff72d
Cleanup
2020-01-20 16:15:15 -05:00
Anuken
f6595937f4
Cleanup
2020-01-20 16:14:45 -05:00
Anuken
85cf7e9d5c
Added previously-missing icons
2020-01-19 18:45: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
95352e1729
Added server descriptions
2020-01-18 10:05:18 -05:00
Anuken
6e6f8f3cdb
Icon cleanup
2020-01-17 22:50:27 -05:00
Anuken
ca519a94af
Font improvements
2020-01-17 18:29:18 -05:00
Anuken
d9e5dc8ba2
Added missing icons
2020-01-17 15:24:34 -05:00
Anuken
c3d2351b2d
Various icon changes
2020-01-17 13:57:04 -05:00
Anuken
4f29c80814
Single-texture font+UI packing
2020-01-16 22:25:57 -05:00
Anuken
ce18e32826
Added font icon generate+merge pipeline
2020-01-16 17:05:20 -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
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
f6af699428
Revert " 🎩 "
...
This reverts commit 10e4268dd5
2020-01-03 17:26:19 +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
Patrick 'Quezler' Mounier
10e4268dd5
🎩
...
Leaving this here until it gets merged or something :)
2020-01-02 09:02:37 +01:00
Patrick 'Quezler' Mounier
c3186b63ce
Rename compression to plastanium
...
Breaking change.
2020-01-01 13:43:14 +01:00
Patrick 'Quezler' Mounier
56351b427b
Revert "Attempt to remove unused regions"
...
This reverts commit 4f5b737f7c
2019-12-30 10:53:50 +01:00
Patrick 'Quezler' Mounier
4f5b737f7c
Attempt to remove unused regions
...
Failed, conveyor code depends to much on it, gonna revert this.
2019-12-30 10:53:45 +01:00
Patrick 'Quezler' Mounier
e0cfbc7609
All hail the cuteness of this crater roomba critter
2019-12-27 20:45:27 +01:00
Anuken
186a2aaa45
Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework
...
# 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/ai/BlockIndexer.java
# core/src/mindustry/core/World.java
# core/src/mindustry/entities/traits/Entity.java
# core/src/mindustry/entities/type/BaseEntity.java
# core/src/mindustry/entities/type/TileEntity.java
# core/src/mindustry/world/blocks/defense/MendProjector.java
# core/src/mindustry/world/blocks/defense/OverdriveProjector.java
# core/src/mindustry/world/blocks/production/Drill.java
# gradle.properties
2019-12-27 01:41:06 -05:00
Anuken
32d28a4070
Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
...
# 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/sprites3.png
# core/assets/sprites/sprites5.png
# core/src/io/anuke/mindustry/ctype/ContentType.java
# core/src/io/anuke/mindustry/ctype/UnlockableContent.java
# core/src/io/anuke/mindustry/io/LegacyMapIO.java
# core/src/io/anuke/mindustry/type/WeatherEvent.java
# gradle.properties
2019-12-24 12:40:23 -05:00
Patrick 'Quezler' Mounier
f89af1b26a
Override inverted sorter arrow colours ( #1252 )
...
Override hex’s of the arrows by those of the unloader.
2019-12-24 00:32:04 -05:00
Patrick 'Quezler' Mounier
c279fda5e4
Suggest liquid void sprite
...
Uses the color of the corner(s) for the inner ring, just like how the item void is colored based on the item source.
2019-12-23 17:24:38 +01:00
ado1928
5e568eac0d
Added Feathub to the "About" tab ( #1234 )
...
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* Update Links.java
2019-12-19 19:33:24 -05:00
Anuken
3d8e5bd36a
Added new Cyrillic font
2019-12-15 21:31:55 -05:00
Anuken
61d724ee2b
Added Thai font
2019-12-12 15:54:25 -05:00
TsjipTsjip
2366d25de7
Add liquid void block.
2019-12-12 21:11:14 +01:00
Anuken
9e3870acbe
Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework
...
# 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/io/anuke/mindustry/world/blocks/defense/MendProjector.java
# gradle.properties
2019-12-02 22:45:05 -05:00
Anuken
78f146fbcf
Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
...
# 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/io/anuke/mindustry/graphics/Shaders.java
# gradle.properties
2019-12-01 17:42:56 -05:00
Anuken
a5fbc07561
Texture overrides / Potential mod texture binding optimizations
2019-11-25 20:50:32 -05:00
Patrick 'Quezler' Mounier
7830372477
Beep boop add f-droid ( #1087 )
...
Full credit to @ZacBytes for the initial implementation.
2019-11-18 15:52:44 -05:00
Anuken
9b732017a9
Added contribution guide
2019-11-18 00:55:33 -05:00
Anuken
fad6fe9a2a
Added armored conduit / Lighting improvements / Moved liquid package
2019-11-17 13:51:36 -05:00
Anuken
84968c9f73
Added color picker / Customizable lighting rules
2019-11-16 23:27:42 -05:00
Anuken
913a703d41
Illuminator textures
2019-11-16 20:06:11 -05:00
Anuken
faf64f11f2
More lights
2019-11-16 19:57:33 -05:00
Anuken
8798fa101a
Merge
2019-11-16 00:15:45 -05:00
Patrick 'Quezler' Mounier
8a089ba3c9
Resolve conflicts
...
# 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
2019-11-12 08:44:26 +01:00
Anuken
56917483d6
Cleaned up diode
2019-11-11 23:32:49 -05:00
Patrick 'Quezler' Mounier
f5c1eb74af
🔩 Add (plastanium) diode ( #964 )
...
* Add plastanium diode
* Only rotate the arrow part
* Use the sum of graph batteries from both sides
* Make diode send power overflow
Diode keeps one-way equalizing while the sending graph has batteries that are ¬ yet fully filled.
* Remove redundant block != null check
* Remove free power
* Stash
* Revert "Stash"
This reverts commit 0c14854519
2019-11-11 23:29:03 -05:00
Anuken
7d9963d542
Merge
2019-11-11 19:09:37 -05:00
Anuken
52f592a357
Lighting improvements
2019-11-10 16:18:47 -05:00
Anuken
8952dd7f56
Begin work on 6.0
2019-11-10 14:05:29 -05:00
Anuken
c70fb5940f
Display document import errors on iOS
2019-11-09 15:30:02 -05:00
Patrick 'Quezler' Mounier
8e2c12848c
Add a cap against leaking
...
Doesn’t fully prevent leaking, there are intentional gaps, but its significantly slower.
2019-11-05 14:30:46 +01:00
Patrick 'Quezler' Mounier
521da56e70
Add plated conduits
...
Went with “plated” instead of “armored” since the titanium one wasn’t named like the conveyors as well.
2019-11-05 14:00:50 +01:00
Anuken
91dc25f69d
Mobile schematics / Randomized projector reloads
2019-10-31 22:44:07 -04:00
Patrick 'Quezler' Mounier
bd5c98cc0d
🚧 Add insulator wall ( #840 )
...
* Stash insulator prototype
* Fix automatic wires when placing non-powernodes
* Implement requested changes
Stopping lightning has yet to be added.
* ❤️
* Implement lightning absorption
* Visually distinguish insulated power lines
* Stop lightning infront of wall
* Highlight insulators instead of recipients
* Attempt to implement requested changes
* Implement requested changes
* Remove spaces between if and (
* Snap lightning to insulated blocks
* Update bundle.properties
2019-10-27 17:41:00 -04:00
Anuken
ef2817513a
Layout fixes
2019-10-27 16:26:33 -04:00
Anuken
7179b147b2
Added Reddit link
2019-10-23 20:13:22 -04:00
Anuken
e4b267d757
Merge pull request #838 from ado1928/master
...
Added more rubble pngs
2019-10-20 16:32:07 -04:00
Anuken
4c7259843c
Merge branch 'master' of https://github.com/Anuken/Mindustry into mech-rework
...
# Conflicts:
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
2019-10-20 10:21:35 -04:00
ado1928
7fdbd27ebb
Add files via upload
2019-10-19 10:58:34 +02:00
Anuken
4977f598fd
Config drawing
2019-10-17 21:58:49 -04:00
Anuken
9f9e838a3a
Alpha stuff
2019-10-16 18:57:19 -04:00
Anuken
0f52fc1f4f
Alpha sprite
2019-10-16 18:36:02 -04:00
Anuken
b2ea1b7ca5
Some refactoring
2019-10-16 14:22:54 -04:00
Anuken
47f423540d
Vanguard mech visuals
2019-10-15 20:35:43 -04:00
Anuken
a3871cca90
Added correctly named mech pads for alpha/dart
2019-10-15 18:32:47 -04:00
Anuken
3d624f7eaf
Added inverted sorter
2019-10-13 12:58:58 -04:00
Anuken
989e0d8fd1
Removal of drone requests
2019-10-07 17:17:01 -04:00
Anuken
002a052371
Fixed #748 / Better mod loading
2019-09-29 21:41:32 -04:00
Anuken
ecd73dcc2c
Various bugfixes / Added new blocks to tech tree
2019-09-24 17:02:34 -04:00
Anuken
b6e97c4261
Added armored conveyors
2019-09-22 15:12:15 -04:00
Anuken
3f293190cf
Merge branch 'master' of https://github.com/Anuken/Mindustry into messages
...
# 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/sprites5.png
2019-09-21 18:59:49 -04:00
Anuken
dda1f18f67
Unit enemy spawnpoint camping
2019-09-20 23:09:11 -04:00
Anuken
e4cdf515c9
More workshop implementation
2019-09-10 20:53:31 -04:00
Anuken
c4c0f45228
cleaning up what remains
2019-09-08 22:55:36 -04:00
Anuken
d981bb95b9
it is gone
2019-09-08 22:32:47 -04:00
Anuken
c9f0a59339
time for a crusade against dialogs
2019-09-08 15:08:55 -04:00
Anuken
5651d1b023
Support for built-in servers
2019-09-05 19:23:17 -04:00
Anuken
209f0902c9
message blocks
2019-09-03 16:11:01 -04:00
Anuken
5cc32b9001
Fixed map loading bugs
2019-09-01 10:46:44 -04:00
Anuken
26d44ea030
Save slot previews
2019-08-30 15:01:38 -04:00
Anuken
5134aca723
Put zone previews into atlas
2019-08-27 19:33:41 -04:00
Anuken
e314d199f0
By popular demand, re-added command center
2019-08-24 15:39:01 -04:00
Anuken
89ee04c942
Machine ambient sounds
2019-08-15 13:32:36 -04:00
Anuken
c9178c3f2f
Fixed power nodes in multiplayer
2019-08-13 22:47:31 -04:00
Anuken
f2f6dc89a2
fire
2019-08-13 12:04:09 -04:00
Anuken
c4aa0b2863
New discord app ID / New testing sounds
2019-08-12 12:32:13 -04:00
Anuken
2341da995e
Random in-game music, untested
2019-08-10 18:56:20 -04:00
Anuken
16f6b51857
Various tweaks, new music tracks
2019-08-09 23:23:45 -04:00
Anuken
4811578c95
Incomplete tutorial basics
2019-08-08 17:03:45 -04:00
Anuken
8346d5fc13
Fixed connection not resetting on game load / Experimental click changes
2019-08-05 10:26:24 -04:00
Anuken
81909bd1a9
Moved launch controls to wave button
2019-08-04 08:58:51 -04:00
Anuken
77d4b0972d
Balancing
2019-08-02 12:39:21 -04:00
Anuken
04c8ecf4af
New team colors
2019-08-02 10:10:37 -04:00
Anuken
5acda423d8
UI polish
2019-08-01 22:40:15 -04:00
Anuken
8b3995686f
Misc. in-game UI polish
2019-08-01 20:49:03 -04:00
Anuken
b1980a17ac
Fixed editor not showing after second view
2019-08-01 11:26:28 -04:00
Anuken
69ee5257f2
Display current ammo type in turret info
2019-08-01 11:03:20 -04:00
Anuken
c4157d2ec8
New map / Better filters / Sand boulders
2019-07-26 18:59:33 -04:00
Anuken
518bffe644
SDL backend / Valid mode sprites / Better layout
2019-07-25 11:45:49 -04:00
Anuken
c80be4940f
Fixed unit tests / Fixed some major tile loading flaws
2019-07-23 23:29:48 -04:00
Anuken
6f0bc2ecf8
Minor build fixes
2019-07-22 12:42:42 -04:00
Anuken
e52965d039
Bugfixes
2019-07-10 09:55:31 -04:00
Anuken
fc9543baa7
Updated sprites/UI colors
2019-07-07 14:11:57 -04:00
Anuken
3dfef06bba
Bugfixes
2019-07-06 18:42:05 -04:00
Anuken
5ae1e59b5c
UI
2019-07-06 12:22:10 -04:00
Anuken
121e0a433b
Final tweaks before merge
2019-07-06 10:12:22 -04:00
Anuken
174caef7ca
Added turret damage / Removed changelog dialog
2019-07-05 14:01:54 -04:00
Anuken
d2bb3800e3
Added version display, info dialog back
2019-07-05 13:41:22 -04:00
Anuken
f0959ab356
More UI and layout changes
2019-07-05 12:02:02 -04:00
Anuken
a7a565b93e
Hacky pad fix
2019-07-04 17:29:31 -04:00
Anuken
ed074bd08b
UI stuff
2019-07-04 17:11:30 -04:00
Anuken
0371126ccf
Various menu fixes
2019-07-04 00:51:42 -04:00
Anuken
d43d4a1773
Cleanup, main menu progress
2019-07-03 23:36:51 -04:00
Anuken
0d39400f8b
Fixed performance regression / Removed useless fallback sprites
2019-07-03 17:07:22 -04:00
Anuken
d3c8678f80
Splitting UI atlas
2019-07-03 15:59:50 -04:00
Anuken
217237b57e
New menu background, unfinished
2019-07-02 14:42:24 -04:00
Anuken
cb7b6eb3f8
More menu
2019-07-02 10:01:34 -04:00
Anuken
5e15c5574a
menu stuff
2019-06-30 16:52:34 -04:00
Anuken
1c530a6c7a
Merge + update
2019-06-30 14:13:13 -04:00
Anuken
3021cc29da
Fixed tops of some generator blocks
2019-06-30 11:25:39 -04:00
Anuken
12bff75586
Various fixes
2019-06-30 00:07:04 -04:00
Anuken
ab716e96e2
Bugfixes
2019-06-24 16:54:50 -04:00
Anuken
b2a4cb42cf
Sprite updates
2019-06-23 12:36:13 -04:00
Anuken
8c91aca838
New maps / New generation filter(s) and tweaks
2019-06-22 20:40:53 -04:00
Anuken
43b5cb62bb
Fixed #530 / Better icons / Server list ordering
2019-06-20 22:12:17 -04:00
Anuken
478d86677d
Fixed boulder sprites
2019-06-20 00:16:22 -04:00
Anuken
1fe30bc466
Branch created
2019-06-19 22:20:17 -04:00
Anuken
185a7bb7d8
Bugfixes / Sprite update / Multiplayer in-game editor / Drone tweaks
2019-06-17 21:35:19 -04:00
Anuken
bc3405d11d
Bugfixes
2019-06-17 15:45:10 -04:00
Anuken
4f40f3c4b2
More sprite updates
2019-06-17 10:08:24 -04:00
Anuken
910dab1896
More drone changes
2019-06-14 21:06:58 -04:00
Anuken
8ac497354a
Miner drone / Editor bugfixes
2019-06-12 22:09:24 -04:00
Anuken
df78412896
Desktop/mobile descriptive tool modes
2019-06-11 23:31:57 -04:00
Anuken
af1746932f
Fixed incorrect scaling
2019-06-11 08:47:16 -04:00
Anuken
ea0788f56c
Better wave timer / Sprite tweaks / Core wave spawns
2019-06-09 21:09:29 -04:00
