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 |
|
Anuken
|
7e5c276e7f
|
Update PlacementFragment.java
|
2019-11-18 19:21:43 -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 |
|
Patrick 'Quezler' Mounier
|
7830372477
|
Beep boop add f-droid (#1087)
Full credit to @ZacBytes for the initial implementation.
|
2019-11-18 15:52:44 -05:00 |
|
Anuken
|
425f63c673
|
Update Blocks.java
|
2019-11-18 12:43:04 -05:00 |
|
Anuken
|
7523f20d85
|
Update BuildVisibility.java
|
2019-11-18 12:40:03 -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
|
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
|
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 |
|
Anuken
|
0c0573a7b1
|
Filter fixes
|
2019-11-16 13:07:40 -05:00 |
|
Anuken
|
aa6229be4b
|
Fixed spawn/core select filters
|
2019-11-16 13:04:04 -05:00 |
|
Anuken
|
edfe58cb38
|
Refactoring of tile storage, filters
|
2019-11-16 12:34:29 -05:00 |
|
Anuken
|
083f2e38d4
|
Update BuilderTrait.java
|
2019-11-16 09:37:09 -05:00 |
|
Zachary
|
7feed8828c
|
Increase time taken for reactor to explode (#1067)
yes
|
2019-11-16 00:16:09 -05:00 |
|
Anuken
|
8798fa101a
|
Merge
|
2019-11-16 00:15:45 -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 |
|
Fayti1703
|
76c63443af
|
Deduplicate requirements assignment for Tar Fields (#1065)
|
2019-11-15 20:02:27 -05:00 |
|
Joshua Fan
|
cafd95859f
|
Clean up text capitalization, misc UI (#1072)
|
2019-11-15 20:01:59 -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 |
|
Patrick 'Quezler' Mounier
|
74212771dc
|
Might as well add a tech tree entry
|
2019-11-14 21:36:58 +01:00 |
|
Patrick 'Quezler' Mounier
|
6bcea7af66
|
Pressurize identically as the pulse conduit
|
2019-11-14 21:33:36 +01:00 |
|
Patrick 'Quezler' Mounier
|
3ec7e40213
|
Merge branch 'master' into armored-conduit
|
2019-11-14 21:32:15 +01:00 |
|
Patrick 'Quezler' Mounier
|
836e72119c
|
🗜 Pressure conduit (#949)
* Suggest pressure conduit
* Revert "Suggest pressure conduit"
This reverts commit 721dd9255e.
* Increase pulse conduit output pressure
* Remove `tile.block().`
|
2019-11-14 15:21:29 -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 |
|
Joshua Fan
|
a9b822089f
|
Make Esc mirror back button behavior in settings (#1061)
|
2019-11-14 14:41:15 -05:00 |
|
Anuken
|
c5a4d7331f
|
Switched to using core attack events
|
2019-11-14 14:40:42 -05:00 |
|
Anuken
|
230428f2e0
|
Update CoreBlock.java
|
2019-11-14 12:35:59 -05:00 |
|
Anuken
|
1a26a1bf63
|
Update CoreBlock.java
|
2019-11-14 12:28:35 -05:00 |
|
Anuken
|
77001324e9
|
Update EventType.java
|
2019-11-14 09:59:33 -05:00 |
|