Anuken
|
221b28c153
|
Merge remote-tracking branch 'origin/master'
|
2020-01-30 17:43:48 -05:00 |
|
Anuken
|
7c2541afa2
|
Fixed bloom black screen on iOS/Android
|
2020-01-30 17:43:36 -05:00 |
|
DeltaNedas
|
9da505119b
|
it compiles but cant find module
help
|
2020-01-30 00:53:05 +00:00 |
|
DeltaNedas
|
677debd475
|
testing script loading stuff
is not allowed in console, only from `LoadedMod`s.
|
2020-01-30 00:38:51 +00:00 |
|
DeltaNedas
|
864c73f791
|
make it semi work maybe
still completely insecure
|
2020-01-30 00:21:50 +00:00 |
|
DeltaNedas
|
9ed7719464
|
compile dammit
|
2020-01-30 00:04:42 +00:00 |
|
DeltaNedas
|
187e1f5848
|
create new branch
|
2020-01-29 23:52:58 +00:00 |
|
Vam-Jam
|
36782a2454
|
[Fix] lastMessage doesnt change if prevented by antispam (#1471)
Fixes issue #1470
|
2020-01-29 11:32:41 -05:00 |
|
Anuken
|
867a642859
|
Fixed #1460
|
2020-01-28 13:44:06 -05:00 |
|
Anuken
|
89e1c5afc0
|
Conveyor tweaks
|
2020-01-28 00:21:05 -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
|
a2933e030a
|
More severe votekick
|
2020-01-27 15:43:17 -05:00 |
|
Anuken
|
5ad0193a86
|
Fixed reduced conveyor edge throughput
|
2020-01-27 13:15:12 -05:00 |
|
Anuken
|
65211a6021
|
Fixed #1447
|
2020-01-27 11:01:48 -05:00 |
|
Anuken
|
b7e1adb8b1
|
Fixed 103 network compatibility
|
2020-01-27 10:19:18 -05:00 |
|
Anuken
|
b9e8694e68
|
Added synced server label + effect methods
|
2020-01-27 00:25:32 -05:00 |
|
Anuken
|
cd1ed97e52
|
Merge branch 'master' of https://github.com/Anuken/Mindustry
|
2020-01-27 00:11:24 -05:00 |
|
Anuken
|
a61234d21e
|
Minor tweaks
|
2020-01-26 21:50:55 -05:00 |
|
키에르
|
9499b9dfaf
|
Add custom text on screen (#1448)
|
2020-01-26 17:56:11 -05:00 |
|
Anuken
|
9baaacc8ac
|
Crash fix
|
2020-01-26 16:55:24 -05:00 |
|
Anuken
|
621233a5b3
|
More optimization
|
2020-01-26 16:12:11 -05:00 |
|
Anuken
|
9a3245c23e
|
Clamp
|
2020-01-26 15:13:55 -05:00 |
|
Anuken
|
6fe2697185
|
2x faster conveyor optimization
|
2020-01-26 15:04:00 -05:00 |
|
Anuken
|
adbfb15932
|
Cleanup
|
2020-01-26 13:13:01 -05:00 |
|
Anuken
|
93cada6a16
|
Conveyor benchmark test
|
2020-01-26 11:40:09 -05:00 |
|
Anuken
|
0d5dd146ef
|
Fixed #1451
|
2020-01-26 10:58:14 -05:00 |
|
Anuken
|
e14a36a97e
|
Fixed #1445
|
2020-01-25 17:50:59 -05:00 |
|
Anuken
|
923d576a5f
|
Fixed #1436 / Fixed crawlers not exploding
|
2020-01-24 23:21:23 -05:00 |
|
Anuken
|
69711151a5
|
Bugfixes
|
2020-01-24 18:48:26 -05:00 |
|
Anuken
|
83f44abb5a
|
Suppress d/c messages when necessary
|
2020-01-24 14:27:23 -05:00 |
|
Anuken
|
f2bc3e78d7
|
Fixed #1429
|
2020-01-24 14:00:06 -05:00 |
|
Anuken
|
2fe6a3525b
|
Added null check for attribute
|
2020-01-24 13:37:23 -05:00 |
|
Anuken
|
78fb427120
|
Minor fixes
|
2020-01-24 13:02:03 -05:00 |
|
Anuken
|
b9876e267b
|
Headless load fix
|
2020-01-24 12:31:34 -05:00 |
|
Anuken
|
4c1459c47e
|
Fixed page limits in /help
|
2020-01-24 11:50:51 -05:00 |
|
Anuken
|
8141361a30
|
Fix script whitelist
|
2020-01-24 11:27:47 -05:00 |
|
Anuken
|
99e51411d5
|
Implemented #1048
|
2020-01-24 11:24:35 -05:00 |
|
Anuken
|
125d6ef8cd
|
Cleanup
|
2020-01-24 11:17:18 -05:00 |
|
Anuken
|
d58098ca94
|
Added server info toast method
|
2020-01-24 11:03:15 -05:00 |
|
Anuken
|
63c277f78e
|
Implemented mod name display in content desc
|
2020-01-24 10:26:10 -05: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
|
f4940fffab
|
Minor tweaks
|
2020-01-23 18:33:32 -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
|
1716076cdf
|
Minor UI tweaks
|
2020-01-23 14:40:07 -05:00 |
|
Anuken
|
78b2fe64a3
|
Fixed annotation source version warnings
|
2020-01-22 15:59:02 -05:00 |
|
Anuken
|
5e977312a7
|
Annotation processor cleanup
|
2020-01-22 12:24:00 -05:00 |
|
Anuken
|
26e93c2f06
|
Cleanup
|
2020-01-22 11:36:13 -05:00 |
|
Anuken
|
85e0103ff8
|
UI fixes
|
2020-01-22 11:13:27 -05:00 |
|