 Anuken
|
fd202421b1
|
Changed console keybind to prevent confusion
|
2019-12-08 00:25:13 -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
|
477ebc91bf
|
Fixed reloading
|
2019-12-07 21:53:50 -05:00 |
|
|
Anuken
|
fd6abaff62
|
More class support
|
2019-12-07 21:46:35 -05:00 |
|
|
Anuken
|
5ca01bf234
|
Effect parsing
|
2019-12-07 15:55:51 -05:00 |
|
|
Anuken
|
d3747f0d4c
|
Content loading improvements
|
2019-12-07 15:41:52 -05:00 |
|
|
Anuken
|
07598e3f2f
|
Minor tweaks
|
2019-12-07 14:26:14 -05:00 |
|
|
Anuken
|
dd5e3b2aba
|
JS console / Scripting tweaks
|
2019-12-07 14:10:39 -05:00 |
|
|
Anuken
|
06abc43aea
|
Fixed slow imports
|
2019-12-07 11:37:13 -05:00 |
|
|
Anuken
|
93fd6c5bd6
|
Removed massive import wall
|
2019-12-07 01:51:09 -05:00 |
|
|
Anuken
|
96aa3ccee0
|
Various improvements
|
2019-12-07 00:34:27 -05:00 |
|
|
Anuken
|
f3a5798a7f
|
Various fixes
|
2019-12-06 22:24:32 -05:00 |
|
|
Anuken
|
2b49c300f8
|
Security / Android compat / Functional extension
|
2019-12-06 21:57:47 -05:00 |
|
|
Anuken
|
50a6071cfc
|
Fixed maps not reloading on mod reload
|
2019-12-06 14:07:18 -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 |
|
|
Anuken
|
a087df0771
|
Added experimental server block syncing
|
2019-12-04 17:03:49 -05:00 |
|
|
Anuken
|
c85847567d
|
h
|
2019-12-03 18:03:21 -05:00 |
|
|
Anuken
|
1e3bfba31a
|
this engine is also broken
|
2019-12-03 17:16:23 -05:00 |
|
|
Anuken
|
5788c27aaa
|
hmmm
|
2019-12-03 01:01:18 -05:00 |
|
|
Anuken
|
5c30f4bc9c
|
Fixed nothing
|
2019-12-02 17:52:49 -05:00 |
|
|
Anuken
|
5a9957c578
|
Merge remote-tracking branch 'origin/master'
|
2019-12-01 17:36:30 -05:00 |
|
|
Anuken
|
42687fb47e
|
Fixed crash caused by missing sounds
|
2019-12-01 17:35:47 -05:00 |
|
|
Anuken
|
9cb55b9745
|
a mess
|
2019-12-01 14:21:47 -05:00 |
|
|
Anuken
|
e66ecb6c90
|
Removed unnecessary option
|
2019-12-01 12:50:11 -05:00 |
|
|
Anuken
|
0e7c403bd8
|
Tweaks
|
2019-12-01 12:32:35 -05:00 |
|
|
Anuken
|
b6915a0483
|
Fixed script load crash
|
2019-12-01 01:30:40 -05:00 |
|
|
Anuken
|
b21c25bccf
|
Added features that don't work
|
2019-11-30 22:15:30 -05:00 |
|
|
Anuken
|
ceae04aa5b
|
Desktop-specific scripting
|
2019-11-30 18:30:39 -05:00 |
|
|
Anuken
|
3abcdf2063
|
Better access
|
2019-11-30 17:45:02 -05:00 |
|
|
Anuken
|
f784e893dd
|
Merge remote-tracking branch 'origin/master'
|
2019-11-29 22:17:45 -05:00 |
|
|
Anuken
|
7e993c15dc
|
Moved documentation
|
2019-11-29 21:56:53 -05:00 |
|
|
Anuken
|
e733b4be1b
|
Added msch handling definition
|
2019-11-27 17:46:15 -05:00 |
|
|
Anuken
|
57f9aeee86
|
Public block fields / Better scripting
|
2019-11-27 13:51:07 -05:00 |
|
|
Anuken
|
eabbd2fa32
|
"""security"""
|
2019-11-27 00:07:37 -05:00 |
|
|
Anuken
|
d9aa9b6278
|
Desktop scripting support
|
2019-11-26 23:32:30 -05:00 |
|
|
Anuken
|
1e1b84a201
|
Merge branches 'master' and 'mod-spritepack-refactor' of https://github.com/Anuken/Mindustry
|
2019-11-25 23:55:18 -05:00 |
|
|
Anuken
|
e6753ace87
|
Cleanup
|
2019-11-25 23:43:58 -05:00 |
|
|
Anuken
|
a5fbc07561
|
Texture overrides / Potential mod texture binding optimizations
|
2019-11-25 20:50:32 -05:00 |
|
|
Anuken
|
01304bf734
|
Fixed bizzare crash
|
2019-11-25 18:41:09 -05:00 |
|
|
Anuken
|
0dd8267e21
|
Merge remote-tracking branch 'origin/master'
|
2019-11-23 21:27:58 -05:00 |
|
|
Anuken
|
7b69310f1b
|
Deployment tweak
|
2019-11-23 21:27:52 -05:00 |
|
|
Anuken
|
78fefdacca
|
Merge remote-tracking branch 'origin/master'
|
2019-11-22 23:12:44 -05:00 |
|
|
Anuken
|
a1fb3e27ab
|
Fixed launched items not saving
|
2019-11-22 23:10:50 -05:00 |
|
|
Anuken
|
cb29bee8f5
|
Remove js mod ext support
|
2019-11-22 18:42:10 -05:00 |
|
|
Anuken
|
2d42704062
|
Switched to hjson extension
|
2019-11-22 18:19:18 -05:00 |
|
|
Anuken
|
fbe58bec04
|
Merge remote-tracking branch 'origin/master'
|
2019-11-22 17:54:25 -05:00 |
|
|
Anuken
|
5f81a0c7f3
|
Bugfixes
|
2019-11-22 17:51:29 -05:00 |
|
|
Anuken
|
f28eb4027c
|
Log # of fetched servers; cleanup
|
2019-11-22 16:13:09 -05:00 |
|
|
Anuken
|
c324dce034
|
Added potential global server list
|
2019-11-22 16:00:53 -05:00 |
|
|
Anuken
|
0efced4fd8
|
Merge remote-tracking branch 'origin/master'
|
2019-11-22 15:33:22 -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
|
18b6c37a89
|
Item bridge fixes
|
2019-11-21 20:50:15 -05:00 |
|
|
Anuken
|
31c294e972
|
Merge remote-tracking branch 'origin/master'
|
2019-11-21 20:43:03 -05:00 |
|
|
Anuken
|
b8e3b70fcc
|
Made 'custom' the default shuffle mode for backwards compat
|
2019-11-21 20:42:57 -05:00 |
|
|
Anuken
|
f162d815fe
|
Better error messages
|
2019-11-20 18:10:34 -05:00 |
|
|
Anuken
|
7f2a529c08
|
Merge remote-tracking branch 'origin/master'
|
2019-11-20 18:10:08 -05:00 |
|
|
Anuken
|
968f3ace33
|
Better mod parsing
|
2019-11-20 18:09:43 -05:00 |
|
 AnukenandGitHub
|
2a8fca33ea
|
Update CONTRIBUTING.md
|
2019-11-20 16:58:34 -05:00 |
|
|
Anuken
|
8be948300e
|
Merge remote-tracking branch 'origin/master'
|
2019-11-20 14:51:02 -05:00 |
|
|
Anuken
|
f2c9c2e5fb
|
Bugfixes
|
2019-11-20 14:50:57 -05:00 |
|
|
AnukenandGitHub
|
3ddb9d166f
|
Update bundle.properties
|
2019-11-20 10:00:36 -05:00 |
|
|
Anuken
|
fac217a836
|
Fixed infinite place distance, impact meltdown
|
2019-11-20 00:05:00 -05:00 |
|
|
Anuken
|
c4c19a204f
|
Bugfixes
|
2019-11-19 23:09:35 -05:00 |
|
|
Anuken
|
496677725e
|
Use the sane maven plugin
|
2019-11-19 22:32:59 -05:00 |
|
|
Anuken
|
a6523c670f
|
Merge remote-tracking branch 'origin/master'
|
2019-11-19 22:04:15 -05:00 |
|
|
Anuken
|
879f90ebf4
|
Added changelogs / Updated link registry
|
2019-11-19 22:04:10 -05:00 |
|
|
Anuken
|
8daaea3536
|
Minor power tweaks
|
2019-11-19 19:52:15 -05:00 |
|
|
Anuken
|
cc7aaae52c
|
Fixed inverted sorter chains
|
2019-11-19 19:16:35 -05:00 |
|
|
Anuken
|
4ce494cc22
|
Merge remote-tracking branch 'origin/master'
|
2019-11-19 19:08:52 -05:00 |
|
|
Anuken
|
9461d7a360
|
Hjson unit tests
|
2019-11-19 19:08:41 -05:00 |
|
|
Anuken
|
fd6c6b2aab
|
Merge remote-tracking branch 'origin/master'
|
2019-11-19 03:23:58 -05:00 |
|
|
Anuken
|
44fdda09c6
|
it's 3 am and ios file imports are finally fixed
|
2019-11-19 03:23:40 -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 |
|
|
AnukenandGitHub
|
7e5c276e7f
|
Update PlacementFragment.java
|
2019-11-18 19:21:43 -05:00 |
|
|
Anuken
|
7e8503cde7
|
Merge remote-tracking branch 'origin/master'
|
2019-11-18 18:56:54 -05:00 |
|
|
Anuken
|
134fea445c
|
Custom map providers / Added next map specification command
|
2019-11-18 18:56:49 -05:00 |
|
|
Anuken
|
ad25cd8074
|
Illuminator description
|
2019-11-18 17:00:52 -05:00 |
|
|
Anuken
|
6bc98bbe67
|
Configurable lights
|
2019-11-18 16:58:39 -05:00 |
|
|
Anuken
|
5e2dd89d3b
|
Entity type cleanup
|
2019-11-18 16:24:57 -05:00 |
|
|
AnukenandGitHub
|
425f63c673
|
Update Blocks.java
|
2019-11-18 12:43:04 -05:00 |
|
|
AnukenandGitHub
|
7523f20d85
|
Update BuildVisibility.java
|
2019-11-18 12:40:03 -05:00 |
|
|
Anuken
|
13cc136fe2
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# CONTRIBUTING.md
|
2019-11-18 08:30:25 -05:00 |
|
|
Anuken
|
c41cbc8bea
|
Added formatting file
|
2019-11-18 08:29:52 -05:00 |
|
|
AnukenandGitHub
|
d232d249e9
|
Update CONTRIBUTING.md
|
2019-11-18 01:07:26 -05:00 |
|
|
Anuken
|
e0a52f4779
|
More guidelines
|
2019-11-18 01:04:37 -05:00 |
|
|
Anuken
|
8d431e5b40
|
Contribution guide cleanup
|
2019-11-18 01:00:16 -05:00 |
|
|
Anuken
|
dcb1f0b00a
|
Merge remote-tracking branch 'origin/master'
|
2019-11-18 00:55:49 -05:00 |
|
|
Anuken
|
9b732017a9
|
Added contribution guide
|
2019-11-18 00:55:33 -05:00 |
|
|
Anuken
|
dc1b073882
|
Revert #961
|
2019-11-17 15:45:47 -05:00 |
|
|
Anuken
|
fad6fe9a2a
|
Added armored conduit / Lighting improvements / Moved liquid package
|
2019-11-17 13:51:36 -05:00 |
|
|
Anuken
|
c8eee3b825
|
Made solar panels less efficient in darkness
|
2019-11-17 11:35:32 -05:00 |
|
|
Anuken
|
73b6cc73ff
|
Fixed tests
|
2019-11-17 11:30:03 -05:00 |
|
|
Anuken
|
2593e96999
|
Bugfixes
|
2019-11-17 11:20:36 -05:00 |
|
|
Anuken
|
629999a1cd
|
More unit tests / Lighting improvements
|
2019-11-16 23:45:31 -05:00 |
|
|
Anuken
|
4d3e268972
|
Merge branches 'lights' and 'master' of https://github.com/Anuken/Mindustry
|
2019-11-16 23:29:33 -05:00 |
|
|
Anuken
|
84968c9f73
|
Added color picker / Customizable lighting rules
|
2019-11-16 23:27:42 -05:00 |
|
|
Anuken
|
d73b99945f
|
Minor light optimization
|
2019-11-16 22:49:36 -05:00 |
|
|
Anuken
|
1d15316cbb
|
Configurable ambient light, darkness
|
2019-11-16 20:18:00 -05:00 |
|