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 |
|
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
|
7e7d2019af
|
Made Android files external
|
2020-01-11 19:21:16 -05:00 |
|
Anuken
|
f7791a2bb2
|
Merge; internal changes
|
2020-01-10 11:30:42 -05: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
|
6edcbb9120
|
Bugfixes
|
2019-12-29 14:38:03 -05:00 |
|
Anuken
|
730d30ef98
|
Added core schematic selection setting
|
2019-12-29 11:40:52 -05:00 |
|
Anuken
|
8c941c7165
|
Added update trigger / Server moddability tweaks
|
2019-12-28 21:34:20 -05:00 |
|
Anuken
|
e1bf8bdab1
|
Added BE auto-updater / Server config / Fixed #1266
|
2019-12-28 16:30:40 -05: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
|
ede002878e
|
problem solved
|
2019-12-21 21:11:30 -08: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
|
976d0f54b3
|
Merge branches 'master' and 'safe-mod-loading' of https://github.com/Anuken/Mindustry
# Conflicts:
# core/src/io/anuke/mindustry/mod/Mods.java
|
2019-12-15 13:55:30 -05:00 |
|
Anuken
|
1c1db3990f
|
Fully implemented safe content loading
|
2019-12-15 13:54:51 -05:00 |
|
Anuken
|
58e3143e2a
|
Content cleaning
|
2019-12-14 09:33:07 -05:00 |
|
TsjipTsjip
|
7f5e494709
|
Update bundle.properties
|
2019-12-13 14:52:15 +01:00 |
|
joshuaptfan
|
736737f151
|
Make scroll zoom by default, remove zoom hold keybind
|
2019-12-12 12:23:32 -08:00 |
|
Anuken
|
0078a8cb8e
|
Fixed scripts not working on older Android phones
|
2019-12-09 12:48:15 -05:00 |
|
Anuken
|
268f3cc3c2
|
Merge branches 'master' and 'rhino-js-suffering' of https://github.com/Anuken/Mindustry
# Conflicts:
# core/src/io/anuke/mindustry/content/Blocks.java
# gradle.properties
|
2019-12-08 00:15:42 -05:00 |
|
Anuken
|
2b49c300f8
|
Security / Android compat / Functional extension
|
2019-12-06 21:57:47 -05:00 |
|
Anuken
|
ef24e5ecad
|
Merge remote-tracking branch 'origin/master'
|
2019-12-05 22:06:57 -05:00 |
|
Anuken
|
6f146c6cad
|
Added support for mod map/schematic packs
|
2019-12-05 21:15:28 -05:00 |
|
Ali-C-Ila
|
db5bd7eea8
|
Update bundle.properties (#1164)
|
2019-12-05 10:01:47 -05: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 |
|
Felix Corvus
|
2631c4f7af
|
adding millions & thousands localisation (#1132)
* "mil" / "k" localisation adding
* "mil" / "k" localisation adding
* Update bundle.properties
* Update bundle_ru.properties
|
2019-11-25 20:48:53 -05:00 |
|
matheod
|
dabdd094f9
|
Add storable indication in core database (#1124)
* Add storable in core indication in core database
* Add corestorable text
* French translation of corestorable
|
2019-11-24 01:35:16 -05:00 |
|
DeltaNedas
|
38804462a9
|
add reset keybind to english locale (#1116)
* updated english locale for "reset key".
* Update bundle.properties
* Update bundle.properties
|
2019-11-22 16:17:11 -05:00 |
|
Anuken
|
6d6fac00d7
|
Less hacky support for atrocious json
|
2019-11-22 15:33:01 -05:00 |
|
Anuken
|
2c61fcdfa6
|
Added optional mod minimum game version
|
2019-11-21 21:12:05 -05:00 |
|
Anuken
|
3ddb9d166f
|
Update bundle.properties
|
2019-11-20 10:00:36 -05:00 |
|
Patrick 'Quezler' Mounier
|
d03ec3122c
|
Add toggle_power_lines entry to the bundle (#1099)
|
2019-11-19 12:45:27 -05:00 |
|
Anuken
|
39939f8a51
|
Merge https://github.com/joshuaptfan/Mindustry
# Conflicts:
# core/assets/bundles/bundle.properties
# core/src/io/anuke/mindustry/content/Blocks.java
# core/src/io/anuke/mindustry/input/Binding.java
|
2019-11-18 19:40:45 -05:00 |
|
Anuken
|
ad25cd8074
|
Illuminator description
|
2019-11-18 17:00:52 -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
|
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
|
faf64f11f2
|
More lights
|
2019-11-16 19:57:33 -05:00 |
|
Anuken
|
f9ffb78b33
|
Added configurable global server rules
|
2019-11-16 15:51:35 -05:00 |
|
Joshua Fan
|
cafd95859f
|
Clean up text capitalization, misc UI (#1072)
|
2019-11-15 20:01:59 -05:00 |
|