 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
|
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 |
|
|
Anuken
|
913a703d41
|
Illuminator textures
|
2019-11-16 20:06:11 -05:00 |
|
|
Anuken
|
5d949f6bc0
|
Correct reactor consumption display
|
2019-11-16 20:05:52 -05:00 |
|
|
Anuken
|
faf64f11f2
|
More lights
|
2019-11-16 19:57:33 -05:00 |
|
|
Anuken
|
430c4fa1d0
|
Fixed #1077
|
2019-11-16 16:54:51 -05:00 |
|
|
Anuken
|
a90f2545d9
|
Disable reactor explosions on servers by default
|
2019-11-16 16:43:31 -05:00 |
|
|
Anuken
|
eba0a96b6d
|
Merge remote-tracking branch 'origin/master'
|
2019-11-16 15:51:51 -05:00 |
|
|
Anuken
|
f9ffb78b33
|
Added configurable global server rules
|
2019-11-16 15:51:35 -05:00 |
|
|
AnukenandGitHub
|
083f2e38d4
|
Update BuilderTrait.java
|
2019-11-16 09:37:09 -05:00 |
|
|
Anuken
|
1f6ef9d9ae
|
Merge remote-tracking branch 'origin/master'
|
2019-11-15 21:12:12 -05:00 |
|
|
Anuken
|
e6afe584e5
|
Fixed 'underwater' ores
|
2019-11-15 21:12:08 -05:00 |
|
|
Anuken
|
b795d97d0e
|
Merge remote-tracking branch 'origin/master'
|
2019-11-15 19:49:48 -05:00 |
|
|
Anuken
|
ec7379cc86
|
Updated to gradle 6.0
|
2019-11-15 19:48:26 -05:00 |
|
|
Anuken
|
016823d446
|
Bridge cleanup
|
2019-11-14 18:53:24 -05:00 |
|
|
Anuken
|
0cf9ef66fa
|
Merge remote-tracking branch 'origin/master'
|
2019-11-14 18:48:21 -05:00 |
|
|
Anuken
|
1f583dc7a2
|
Bugfixes
|
2019-11-14 18:48:12 -05:00 |
|
|
Anuken
|
618a050414
|
Fix getProgressIncrease
|
2019-11-14 15:02:09 -05:00 |
|
|
Anuken
|
ec7f49c94b
|
Merge remote-tracking branch 'origin/master'
|
2019-11-14 14:59:10 -05:00 |
|
|
Anuken
|
30ea285ca0
|
Change power "satisfaction" -> "status", use efficiency() in blocks
|
2019-11-14 14:59:04 -05:00 |
|
|
Anuken
|
c5a4d7331f
|
Switched to using core attack events
|
2019-11-14 14:40:42 -05:00 |
|
|
AnukenandGitHub
|
230428f2e0
|
Update CoreBlock.java
|
2019-11-14 12:35:59 -05:00 |
|
|
AnukenandGitHub
|
1a26a1bf63
|
Update CoreBlock.java
|
2019-11-14 12:28:35 -05:00 |
|
|
AnukenandGitHub
|
77001324e9
|
Update EventType.java
|
2019-11-14 09:59:33 -05:00 |
|
|
Anuken
|
0fd6207689
|
Cleanup
|
2019-11-14 08:51:12 -05:00 |
|
|
Anuken
|
dd175747ab
|
Permissive extensions
|
2019-11-13 19:40:03 -05:00 |
|
|
Anuken
|
3106389f6a
|
Switched to HJson content parsing
|
2019-11-13 19:12:12 -05:00 |
|
|
Anuken
|
d8c997b355
|
Methods renamed / Better build request handling
|
2019-11-12 23:40:45 -05:00 |
|