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
|
f1aadd97a8
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0
# Conflicts:
# core/src/mindustry/core/Logic.java
# gradle.properties
|
2020-03-03 12:12:25 -05:00 |
|
Anuken
|
f88fe898ff
|
Updated bundle
|
2020-03-01 21:23:50 -05:00 |
|
Anuken
|
1e53ea50b0
|
Added support for export/import of all basic terrain as image
|
2020-02-26 19:37:22 -05:00 |
|
Anuken
|
cfbe631e66
|
Merge
|
2020-02-23 20:14:38 -05:00 |
|
DeltaNedas
|
fe22d334dc
|
Separate ambient light and solar panel efficiency (#1593)
* new branch
* Separate ambient light and solar panel efficiency
* Made ambient light -> solar efficiency default
|
2020-02-21 11:38:56 -05:00 |
|
Anuken
|
32dcae8fd3
|
Update bundle.properties
|
2020-02-19 13:49:40 -05:00 |
|
Anuken
|
1d1c73fd6f
|
Merge
|
2020-02-19 13:10:25 -05:00 |
|
Anuken
|
4a55dde5ee
|
Bugfixes
|
2020-02-18 19:54:35 -05:00 |
|
Anuken
|
2038409283
|
Removed schematic replacement dialog
|
2020-02-18 11:35:28 -05:00 |
|
Anuken
|
47f075133f
|
Merge
|
2020-02-13 11:22:29 -05:00 |
|
Anuken
|
0678f54e25
|
Fixed bloom darkening sprites / Changed pixelate desc
|
2020-02-13 10:17:43 -05:00 |
|
Anuken
|
a2706a80b1
|
Merged with master
|
2020-02-09 12:27:44 -05:00 |
|
Anuken
|
c8455ddbc8
|
Added message for non-building units
|
2020-02-07 21:56:55 -05:00 |
|
Patrick 'Quezler' Mounier
|
99d1a2829f
|
Merge branch 'master' into crater
|
2020-02-06 19:33:57 +01:00 |
|
Anuken
|
a5fd881f8d
|
Full implementation of #1494
|
2020-02-05 19:01:53 -05: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 |
|
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 |
|
Anuken
|
f2f31120a0
|
Gradual component conversion
|
2020-02-02 20:17:22 -05:00 |
|
Anuken
|
2721aa550d
|
Implemented #1444
|
2020-01-30 22:56:17 -05: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
|
8edcebd3a6
|
Undo moving other bundle keys into their place
Should be a different commit/pull
|
2020-01-27 19:42:27 +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
|
63c277f78e
|
Implemented mod name display in content desc
|
2020-01-24 10:26:10 -05:00 |
|
Anuken
|
d031efe1f2
|
Added Steam player limit + reduced votekick cooldown
|
2020-01-23 17:49:53 -05:00 |
|
Anuken
|
235142c869
|
Implemented #1093
|
2020-01-23 15:50:03 -05: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
|
c3d2351b2d
|
Various icon changes
|
2020-01-17 13:57:04 -05:00 |
|
Anuken
|
ce18e32826
|
Added font icon generate+merge pipeline
|
2020-01-16 17:05:20 -05:00 |
|
Anuken
|
3eaeac3618
|
Testing icon font
|
2020-01-16 11:10:53 -05:00 |
|
Anuken
|
bbf87df373
|
a revelation
|
2020-01-11 23:41:12 -05:00 |
|
Anuken
|
7e7d2019af
|
Made Android files external
|
2020-01-11 19:21:16 -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 |
|
J-VdS
|
9b82333a69
|
typo (#1343)
|
2020-01-08 17:36:58 -05:00 |
|
Anuken
|
a7cddf97b8
|
Implemented bridge opacity from #1006
|
2020-01-08 16:16:19 -05:00 |
|
Anuken
|
8f208920f7
|
Merged in liquid void
|
2020-01-08 11:04:12 -05:00 |
|
Anuken
|
3ae8065cf1
|
Merge
|
2020-01-06 17:20:16 -05:00 |
|
Patrick 'Quezler' Mounier
|
9b55eeaa38
|
Rename batches to something simpler
|
2020-01-06 18:04:56 +01:00 |
|
Patrick 'Quezler' Mounier
|
1a177ef239
|
Rephase dotted
|
2020-01-06 18:00:43 +01:00 |
|
Patrick 'Quezler' Mounier
|
207d95dbd8
|
Refractor away throughput stat
|
2020-01-06 17:57:14 +01:00 |
|
Patrick 'Quezler' Mounier
|
c6299c8f2c
|
Add throughput stat entry
|
2020-01-05 15:28:28 +01:00 |
|
Patrick 'Quezler' Mounier
|
095c65f36c
|
Remove crater from bundle
|
2020-01-04 21:10:09 +01:00 |
|
Patrick 'Quezler' Mounier
|
e2d0ab5161
|
Move bundle entries around
|
2020-01-03 17:42:05 +01:00 |
|
Patrick 'Quezler' Mounier
|
73040de839
|
Change bundle description
|
2020-01-03 17:41:05 +01:00 |
|
Patrick 'Quezler' Mounier
|
f0bfe24008
|
Remove crater bundle entry
|
2020-01-02 21:34:56 +01:00 |
|
Patrick 'Quezler' Mounier
|
1bcfc69206
|
Tweak stat pages
|
2020-01-01 14:01:54 +01:00 |
|
Patrick 'Quezler' Mounier
|
c3186b63ce
|
Rename compression to plastanium
Breaking change.
|
2020-01-01 13:43:14 +01:00 |
|