Anuken
cf31293d7b
Many internal changes
2020-03-04 13:32:31 -05:00
Anuken
aeae286273
Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config
...
# Conflicts:
# core/src/mindustry/entities/traits/BuilderTrait.java
# core/src/mindustry/entities/type/TileEntity.java
# core/src/mindustry/game/EventType.java
# core/src/mindustry/game/Schematics.java
# core/src/mindustry/input/InputHandler.java
# core/src/mindustry/io/TypeIO.java
# core/src/mindustry/world/Block.java
# core/src/mindustry/world/blocks/distribution/Sorter.java
2020-03-04 08:38:36 -05:00
Anuken
2581353c5e
Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config
...
# Conflicts:
# core/src/mindustry/entities/traits/BuilderTrait.java
# core/src/mindustry/entities/type/TileEntity.java
# core/src/mindustry/game/EventType.java
# core/src/mindustry/game/Schematics.java
# core/src/mindustry/input/InputHandler.java
# core/src/mindustry/io/TypeIO.java
# core/src/mindustry/world/Block.java
# core/src/mindustry/world/blocks/distribution/Sorter.java
2020-03-03 21:33:03 -05:00
Anuken
087f8129b9
Tile code cleanup
2020-03-03 19:29:41 -05:00
Anuken
bac1648d4b
Added support for changing cached floor/terrain
2020-03-03 17:01:09 -05:00
Anuken
a2a9cffdee
Moved some methods around
2020-03-01 00:09:03 -05:00
Anuken
4b36a6d5bd
Bugfixes
2020-02-29 19:37:14 -05:00
Anuken
04f8282821
Better lighting
2020-02-28 13:44:03 -05:00
Anuken
dcf75222d9
Cleanup
2020-02-27 10:04:56 -05:00
Anuken
1e53ea50b0
Added support for export/import of all basic terrain as image
2020-02-26 19:37:22 -05:00
Anuken
cfbe631e66
Merge
2020-02-23 20:14:38 -05:00
Anuken
6e4b02db5a
Correctly seeded sectors
2020-02-22 15:28:56 -05:00
Anuken
2afb175560
Generation tweaks
2020-02-22 12:05:31 -05:00
Anuken
baa0eb1149
Added cliffs as separate block
2020-02-21 23:45:25 -05:00
DeltaNedas
fe22d334dc
Separate ambient light and solar panel efficiency ( #1593 )
...
* new branch
* Separate ambient light and solar panel efficiency
* Made ambient light -> solar efficiency default
2020-02-21 11:38:56 -05:00
Anuken
97f342aceb
.
2020-02-20 10:34:17 -05:00
Anuken
1d1c73fd6f
Merge
2020-02-19 13:10:25 -05:00
Anuken
65800a51c6
Sector darkness boundaries
2020-02-19 00:29:48 -05:00
Anuken
48c04bda8c
Map tweaks
2020-02-18 20:07:07 -05:00
Anuken
0f43690aaf
More unlocks?
2020-02-18 11:43:06 -05:00
Anuken
da2cc292c3
Wall generation
2020-02-17 20:33:01 -05:00
Anuken
e215772f30
Added backwards compatibility for legacy saves
2020-02-17 11:13:46 -05:00
Anuken
18d4efa315
Merge
2020-02-17 09:30:36 -05:00
Anuken
b96d5c417f
Fixed #1601
2020-02-17 09:27:51 -05:00
Anuken
8b4fcf99a6
Building / Fixed some tests
2020-02-15 14:51:31 -05:00
Anuken
d37886b2cd
Fixed #1585
2020-02-14 09:51:09 -05:00
Anuken
09c57c32d6
Better IO
2020-02-13 22:11:59 -05:00
Anuken
e3621f44da
Barely functional IO
2020-02-13 19:26:36 -05:00
Anuken
ad248e2e20
Autogeneration of some IO code
2020-02-13 13:30:30 -05:00
Anuken
47f075133f
Merge
2020-02-13 11:22:29 -05:00
Anuken
e798619679
Bugfixes
2020-02-12 11:25:00 -05:00
Anuken
5c48ae2158
Fixed #1558 / Fixed #1556
2020-02-12 10:16:43 -05:00
Anuken
bb380f7feb
Fixed #1555
2020-02-11 23:15:51 -05:00
Anuken
6fd0205495
Merge
2020-02-11 19:55:02 -05:00
Anuken
fb302d49c7
Improved battery brightness display / Palette tweak / Diffgen buff
2020-02-11 17:27:33 -05:00
Anuken
a4a3e7fc48
Merge pull request #1514 from Arkanic/patch-7
...
make batteries glow based on power contents (a redo that works)
2020-02-11 16:31:14 -05:00
Anuken
1b94eed9d3
Fixed conveyors blending with enemy teams
2020-02-11 15:54:16 -05:00
Anuken
d1840e7c2a
Item selection scrolling
2020-02-11 11:55:38 -05:00
Anuken
d6b5f6a311
buildTable improvements
2020-02-11 11:30:22 -05:00
Anuken
6c6861a97a
Cleanup
2020-02-10 10:47:21 -05:00
Anuken
e9b066b866
Fires, puddles, feature reimplementations
2020-02-09 23:43:08 -05:00
Anuken
a2706a80b1
Merged with master
2020-02-09 12:27:44 -05:00
Anuken
e23119e330
Feature re-implementations
2020-02-08 21:54:41 -05:00
Anuken
ba1f59aa71
Better physics
2020-02-08 15:39:27 -05:00
Anuken
0ffcd0b94c
Fixed #1507 / Fixed #1504
2020-02-07 20:21:45 -05:00
Anuken
e5fd3dec4c
Fixed #1526
2020-02-07 20:09:37 -05:00
Anuken
70c06b58ef
Conveyor cleanup
2020-02-06 11:38:36 -05:00
Anuken
a11f6efe0a
Rudimentary rendering
2020-02-05 23:04:48 -05:00
Anuken
dfecfa3964
.
2020-02-05 20:11:49 -05:00
Patrick 'Quezler' Mounier
e06d8eabec
[formatting] add newline to file(s) ( #1508 )
...
* Trail appropriate files with a new line
* For some ironic reason it ignored itself
Probably because it wasn’t tracked/commited yet.
* Rename newlines to server executable naming pattern
2020-02-05 18:36:56 -05:00
