Anuken
e677538c53
Fixed a crash
2020-02-15 15:55:37 -05:00
Anuken
024f2d62e2
Planet sector metadata
2020-02-14 20:08:07 -05:00
Anuken
7f56cdc1e9
Better planet terrain
2020-02-14 14:12:22 -05:00
Anuken
e3621f44da
Barely functional IO
2020-02-13 19:26:36 -05:00
Anuken
d89189debd
Fixed server
2020-02-09 15:40:03 -05:00
Anuken
a2706a80b1
Merged with master
2020-02-09 12:27:44 -05:00
Anuken
f9bc4a30f0
Merge
2020-02-09 12:16:12 -05:00
Patrick 'Quezler' Mounier and GitHub
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
Anuken
f6b1420103
c l e a n u p
2020-02-05 18:28:19 -05:00
Anuken
da97aee8e4
it never ends
2020-02-05 13:03:22 -05:00
Anuken
a7b39e56bd
Cleanup continues
2020-02-04 18:00:32 -05:00
Anuken
be50997f94
Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl
...
# Conflicts:
# core/assets/sprites/block_colors.png
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites3.png
# core/assets/sprites/sprites5.png
# core/src/mindustry/Vars.java
# core/src/mindustry/entities/traits/SaveTrait.java
# core/src/mindustry/maps/generators/MapGenerator.java
# core/src/mindustry/ui/dialogs/DeployDialog.java
# core/src/mindustry/world/blocks/Floor.java
# desktop/src/mindustry/desktop/DesktopLauncher.java
# gradle.properties
2020-02-04 12:25:18 -05:00
Anuken
36b9451e01
Read-only component fields / Removed get/set prefix
2020-02-04 12:14:09 -05:00
Anuken
a942ed2cad
More cleanup
2020-02-03 20:24:49 -05:00
Anuken
a4e820f907
Added default ore flags for modded ores
2020-01-23 20:20:04 -05:00
Anuken
26e93c2f06
Cleanup
2020-01-22 11:36:13 -05:00
Anuken
df1a102021
Cleanup
2020-01-20 16:14:29 -05:00
Anuken
27d6bf067e
Added prototype planet sector land system
2020-01-20 12:05:26 -05:00
Anuken
b9dd6cc4b5
Cleanup
2020-01-19 21:06:45 -05:00
Anuken
85cf7e9d5c
Added previously-missing icons
2020-01-19 18:45:25 -05:00
Anuken
b2f9b2ef77
Planet cleanup
2020-01-18 17:03:03 -05:00
Anuken
47695f1f8c
Added accurate planet generation
2020-01-18 13:24:14 -05:00
Anuken
f044f30829
Merge
2020-01-18 11:16:03 -05:00
Anuken
c3d2351b2d
Various icon changes
2020-01-17 13:57:04 -05:00
Anuken
3ae8065cf1
Merge
2020-01-06 17:20:16 -05:00
Anuken
de5979f4ee
Many various internal changes
2019-12-26 17:46:01 -05:00
Anuken
c307fc02cf
Full merge
2019-12-25 13:34:27 -05:00
Anuken
c681cc5cf8
Compile fixes
2019-12-25 13:25:44 -05:00
Anuken
1e7c83f0c9
Partial merge
2019-12-25 13:22:36 -05:00
Anuken
c0f14185a8
More fixes
2019-12-25 12:35:23 -05:00
Anuken
475794640d
More cleanup
2019-12-25 11:16:54 -05:00
Anuken
514d4817c8
it is done
2019-12-25 01:39:38 -05:00
Anuken
Patrick 'Quezler' MounierandGitHub