 Anuken
|
103f24d41d
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
Conflicts:
core/src/mindustry/world/blocks/environment/Floor.java
core/src/mindustry/world/blocks/payloads/Payload.java
gradle.properties
|
2021-07-15 09:13:35 -04:00 |
|
|
Anuken
|
4f98bc95a2
|
Better sliders
|
2021-07-12 12:36:45 -04:00 |
|
|
Anuken
|
42497d8627
|
ClassMap regen
|
2021-07-04 09:55:12 -04:00 |
|
|
Anuken
|
4ed9f10c1b
|
Cleanup
|
2021-07-04 09:51:39 -04:00 |
|
|
Anuken
|
e7ec2da063
|
Asteroid variants
|
2021-06-23 16:21:12 -04:00 |
|
|
Anuken
|
d4b6073c01
|
Name cleanup
|
2021-06-22 16:52:48 -04:00 |
|
|
Anuken
|
1630e1a7fb
|
Asteroid gen progress
|
2021-06-22 14:22:31 -04:00 |
|
|
Anuken
|
afec6181c4
|
More stone blocks
|
2021-06-21 20:52:49 -04:00 |
|
|
Anuken
|
ff3940865e
|
A.
|
2021-06-21 19:35:00 -04:00 |
|
|
Anuken
|
4a88f64fa9
|
Asteroid ores (1)
|
2021-06-20 21:02:31 -04:00 |
|
|
Anuken
|
448d1e2c77
|
Cleanup
|
2021-06-20 09:50:25 -04:00 |
|
|
Anuken
|
5d74795c02
|
Cleanup
|
2021-06-20 08:47:30 -04:00 |
|
|
Anuken
|
b7b9d48d1e
|
Cleanup
|
2021-06-19 21:31:37 -04:00 |
|
|
Anuken
|
3c65a26d72
|
New ferric blocks, improved asteroid generation
|
2021-06-19 21:19:46 -04:00 |
|
|
Anuken
|
ca60309fde
|
Asteroid generator progress
|
2021-06-19 11:17:52 -04:00 |
|
|
Anuken
|
b77b89abfb
|
More environmental support
|
2021-06-17 14:34:57 -04:00 |
|
|
Anuken
|
016e5ab97e
|
Env rules for many various blocks
|
2021-06-17 11:08:01 -04:00 |
|
|
Anuken
|
afe963ca5d
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
Conflicts:
core/src/mindustry/editor/MapInfoDialog.java
core/src/mindustry/maps/filters/ClearFilter.java
core/src/mindustry/mod/ClassMap.java
gradle.properties
|
2021-06-17 10:44:51 -04:00 |
|
|
Anuken
|
efcae883fb
|
Experimental core-capture PvP map / Editor filter fixes
|
2021-06-16 11:09:18 -04:00 |
|
|
Anuken
|
97729fd659
|
Stateless simplex (2)
|
2021-06-15 19:31:51 -04:00 |
|
|
Anuken
|
eed91eaaa0
|
# Conflicts:
# core/src/mindustry/mod/ClassMap.java
|
2021-06-15 19:29:12 -04:00 |
|
|
Anuken
|
fe9ff212b2
|
Stateless simplex
|
2021-06-15 19:28:54 -04:00 |
|
|
Anuken
|
210fb349de
|
Less editor filter state
|
2021-06-15 12:26:00 -04:00 |
|
|
Anuken
|
69d8af7874
|
Editor filter seed saving & cleanup
|
2021-06-15 11:58:26 -04:00 |
|
|
Anuken
|
183c922b6b
|
Do not save MirrorFilter temporary vectors
|
2021-06-15 11:32:49 -04:00 |
|
|
Anuken
|
4eb0852f9f
|
Lighting bugfixes
|
2021-06-12 17:22:12 -04:00 |
|
|
Anuken
|
3d76609f42
|
.
|
2021-06-12 14:09:24 -04:00 |
|
|
Anuken
|
9a8c9dff17
|
Red ice
|
2021-06-12 10:54:58 -04:00 |
|
|
Anuken
|
d710c2e8b5
|
Minor generation improvements
|
2021-06-12 10:11:37 -04:00 |
|
|
Anuken
|
31ebb1d156
|
Planet progress
|
2021-06-10 20:46:10 -04:00 |
|
|
Anuken
|
1ce6772601
|
Merge
|
2021-06-09 17:15:22 -04:00 |
|
|
Anuken
|
8c32c00e2b
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
Conflicts:
core/src/mindustry/content/Blocks.java
|
2021-06-09 17:10:49 -04:00 |
|
|
Anuken
|
a7de30ba53
|
RidgedPerlin cleanup / More river noise options
|
2021-06-07 20:38:17 -04:00 |
|
|
Anuken
|
1c9589eb26
|
Editor filter bugfixes
|
2021-06-07 18:07:37 -04:00 |
|
|
Anuken
|
974ebe6937
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
Conflicts:
core/src/mindustry/content/Blocks.java
|
2021-06-05 11:57:14 -04:00 |
|
  TranquillyUnpleasantandGitHub
|
eb7e65668c
|
Rotate slider in the mirror filter. (#5228)
* Rotate
* ToggleOption
|
2021-06-03 14:35:31 -04:00 |
|
|
Anuken
|
dd7542032c
|
Unnecessary Time.mark()
|
2021-06-02 12:52:49 -04:00 |
|
|
Anuken
|
e9129e6f43
|
Unspoiled
|
2021-06-02 11:15:30 -04:00 |
|
|
Anuken
|
28b235ef07
|
Partial 7.0 merge - API preview
|
2021-06-02 11:08:08 -04:00 |
|
|
Anuken
|
786d638ad0
|
Misc cleanup
|
2021-03-16 21:51:12 -04:00 |
|
|
Anuken
|
e9df213d0a
|
Decreased sector damage check radius
|
2021-03-16 18:25:30 -04:00 |
|
|
Anuken
|
e5413cebdc
|
Fixed #4766
|
2021-02-23 11:29:51 -05:00 |
|
|
Anuken
|
2d3a9b605a
|
Fixed #4337 / Fixed #4336
|
2021-01-15 17:09:12 -05:00 |
|
|
Anuken
|
a342a7d638
|
Cleanup & bugfixes
|
2021-01-15 11:16:08 -05:00 |
|
|
Anuken
|
95c04eb085
|
Minor sector damage calculation changes
|
2021-01-13 17:09:18 -05:00 |
|
|
TranquillyUnpleasantandGitHub
|
dbe2f7eefa
|
Fix mirror being offset (#4248)
Because apparently it isn't a valid map even though its been a known issue for months.
|
2021-01-03 13:45:35 -05:00 |
|
|
Anuken
|
6357c17f8a
|
Fixed #4164 / Fixed #4159
|
2020-12-29 10:13:27 -05:00 |
|
|
Anuken
|
db40f154c5
|
Sector damage tweaks
|
2020-12-28 10:42:51 -05:00 |
|
 rMuchanandGitHub
|
9a777f3ce5
|
fix health calculation in background sectors (#4011)
|
2020-12-17 10:09:28 -05:00 |
|
|
Anuken
|
d0cba1aff2
|
Code cleanup
|
2020-12-16 10:39:28 -05:00 |
|