Anuken
|
9ddd76d6cb
|
Cleanup
|
2020-03-01 15:41:10 -05:00 |
|
Anuken
|
18d4efa315
|
Merge
|
2020-02-17 09:30:36 -05:00 |
|
Anuken
|
6d68e10804
|
Bugfixes, cleanup
|
2020-02-16 22:22:10 -05:00 |
|
Anuken
|
1fe0a7d81e
|
Fixed mock audio package
|
2020-02-15 12:41:57 -05:00 |
|
Anuken
|
024f2d62e2
|
Planet sector metadata
|
2020-02-14 20:08:07 -05:00 |
|
Anuken
|
ad248e2e20
|
Autogeneration of some IO code
|
2020-02-13 13:30:30 -05:00 |
|
Anuken
|
6fd0205495
|
Merge
|
2020-02-11 19:55:02 -05:00 |
|
Anuken
|
3102931cb4
|
Removed script wrapper
|
2020-02-11 17:50:16 -05:00 |
|
Anuken
|
eb87e5f265
|
Single-script mod case
|
2020-02-11 16:14:01 -05:00 |
|
Anuken
|
9c2569d4f5
|
Merge pull request #1477 from DeltaNedas/patch-5
controlled script loading
|
2020-02-11 16:03:38 -05:00 |
|
Anuken
|
a2706a80b1
|
Merged with master
|
2020-02-09 12:27:44 -05:00 |
|
扩散性百万甜面包
|
7b586ea043
|
Fix a typo (#1528)
* Fix a typo
* Update core/src/mindustry/mod/Mods.java
Co-Authored-By: Patrick 'Quezler' Mounier <Quezler@me.com>
Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
|
2020-02-07 08:25:26 -05:00 |
|
Anuken
|
f6b1420103
|
c l e a n u p
|
2020-02-05 18:28:19 -05:00 |
|
Anuken
|
a7b39e56bd
|
Cleanup continues
|
2020-02-04 18:00:32 -05:00 |
|
DeltaNedas
|
fea9f51513
|
!dir.exists() and new line
|
2020-02-03 18:36:17 +00:00 |
|
DeltaNedas
|
4709b5dddc
|
remove old mainScript, it is always main.js
|
2020-02-03 18:35:24 +00:00 |
|
Anuken
|
f2f31120a0
|
Gradual component conversion
|
2020-02-02 20:17:22 -05:00 |
|
DeltaNedas
|
a9f07f3603
|
formatting
|
2020-02-02 15:49:10 +00:00 |
|
DeltaNedas
|
c458c77322
|
cleanup
|
2020-02-02 13:40:53 +00:00 |
|
DeltaNedas
|
b93692ad41
|
yes
|
2020-02-02 13:40:38 +00:00 |
|
DeltaNedas
|
d84217300c
|
fixed error message
|
2020-02-02 12:58:00 +00:00 |
|
DeltaNedas
|
49ab7ceb77
|
main.js required now
|
2020-02-02 12:44:37 +00:00 |
|
DeltaNedas
|
4c45716149
|
first part of what cat wants
|
2020-02-02 02:49:47 +00:00 |
|
DeltaNedas
|
51bc5c3b74
|
local changes
|
2020-02-01 18:28:25 +00:00 |
|
DeltaNedas
|
a45a14025d
|
oops
|
2020-02-01 18:26:38 +00:00 |
|
DeltaNedas
|
e1a215ae0b
|
wrapper works now
|
2020-02-01 01:18:18 +00:00 |
|
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 |
|