Anuken
|
63d84bead3
|
Cleanup
|
2020-01-31 20:10:21 -05:00 |
|
DeltaNedas
|
d872656bc5
|
it works sorta!
|
2020-01-31 23:51:33 +00: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 |
|
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
|
8141361a30
|
Fix script whitelist
|
2020-01-24 11:27:47 -05:00 |
|
Anuken
|
f4940fffab
|
Minor tweaks
|
2020-01-23 18:33:32 -05:00 |
|
Anuken
|
b5258cd809
|
Fixed #1402 / Fixed #1404
|
2020-01-20 14:13:20 -05:00 |
|
Anuken
|
a797618f6c
|
Fixed #1397
|
2020-01-19 14:56:12 -05:00 |
|
Anuken
|
c0844304a6
|
Merge
|
2020-01-19 11:10:14 -05:00 |
|
Anuken
|
b1df52e0c8
|
Added self-destruct bullet property
|
2020-01-19 10:43:38 -05:00 |
|
Anuken
|
87b4c37d82
|
Cleanup of scripts
|
2020-01-19 09:49:55 -05:00 |
|
Anuken
|
121301c7bd
|
Prevented extra memory leaks
|
2020-01-17 21:33:14 -05:00 |
|
Anuken
|
569b1f788f
|
Fixed segfault during mod loading
|
2020-01-17 21:28:12 -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
|
f7c4ea3e58
|
Weapon mount cleanup
|
2020-01-16 10:52:20 -05:00 |
|
Anuken
|
f7791a2bb2
|
Merge; internal changes
|
2020-01-10 11:30:42 -05:00 |
|
Anuken
|
71da1f1135
|
Added mod listing data class
|
2020-01-05 00:08:48 -05:00 |
|
Simon Woodburry-Forget
|
439605f6e8
|
use findAll to iterate through mod content (#1313)
|
2020-01-04 00:32:03 -05:00 |
|
Anuken
|
e214a8e7c0
|
Merge remote-tracking branch 'origin/master'
|
2020-01-02 14:10:22 -05:00 |
|
Anuken
|
cb76e80836
|
Bugfixes
|
2020-01-02 14:08:41 -05:00 |
|
KSean222
|
d161ba442f
|
Set primitive wrapping to false for scripts (#1302)
* Set primitive wrapping to false for scripts
* Added one newline cause why not
|
2020-01-02 14:07:38 -05:00 |
|
Anuken
|
ddb0d7eff2
|
Fixed #1304
|
2020-01-01 12:16:23 -05:00 |
|
Anuken
|
566052cabf
|
Fixed #1272
|
2019-12-29 12:24:51 -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
|
c0c0ffa682
|
Bugfixes
|
2019-12-27 01:22:50 -05:00 |
|
Anuken
|
98f8a1732e
|
Renamed Calls -> Call
|
2019-12-26 23:00:26 -05:00 |
|
Anuken
|
6080a7e4bc
|
Possibly fixed tests / Added support for mod icons
|
2019-12-26 20:53:53 -05:00 |
|
Anuken
|
c7ea4e85c9
|
Serialize fixes
|
2019-12-25 12:47:14 -05:00 |
|
Anuken
|
c0f14185a8
|
More fixes
|
2019-12-25 12:35:23 -05:00 |
|
Anuken
|
475794640d
|
More cleanup
|
2019-12-25 11:16:54 -05:00 |
|
Anuken
|
514d4817c8
|
it is done
|
2019-12-25 01:39:38 -05:00 |
|