Anuken
|
2aa05f989b
|
Merged in sprite sorting
|
2020-04-23 14:00:55 -04:00 |
|
Anuken
|
cec5c24d69
|
progress
|
2020-04-23 13:58:06 -04:00 |
|
Anuken
|
c738dcb42e
|
progress
|
2020-04-23 12:52:16 -04:00 |
|
Anuken
|
1bf5b19889
|
progress
|
2020-04-23 12:35:49 -04:00 |
|
Anuken
|
c6e4bf1fa4
|
progress
|
2020-04-23 11:06:58 -04:00 |
|
Anuken
|
71e8c088a6
|
progress
|
2020-04-23 11:01:14 -04:00 |
|
Anuken
|
989ee895e8
|
Functional sorting
|
2020-04-23 10:25:46 -04:00 |
|
Anuken
|
2538273402
|
progress
|
2020-04-23 00:41:18 -04:00 |
|
Anuken
|
18b68fefed
|
how did this compile
|
2020-04-23 00:16:41 -04:00 |
|
Anuken
|
362846bd68
|
progress
|
2020-04-23 00:03:03 -04:00 |
|
Anuken
|
6cf422eebf
|
progress
|
2020-04-22 17:23:30 -04:00 |
|
Anuken
|
fc4f8619f8
|
progress (purge)
|
2020-04-22 16:17:43 -04:00 |
|
Anuken
|
c5f93139bd
|
progress
|
2020-04-22 16:06:26 -04:00 |
|
Anuken
|
9beb23b0e4
|
progress
|
2020-04-22 15:19:39 -04:00 |
|
Anuken
|
d154361e75
|
Merge branch '6.0' of https://github.com/Anuken/Mindustry into sprite-sorting
|
2020-04-22 14:34:34 -04:00 |
|
Anuken
|
67d87f023b
|
Cleanup
|
2020-04-22 14:22:33 -04:00 |
|
Anuken
|
da7c393096
|
progress
|
2020-04-22 12:47:29 -04:00 |
|
Anuken
|
a592144291
|
Catching of schematic preview errors / Fixes #1886
|
2020-04-22 09:49:04 -04:00 |
|
Anuken
|
58e9e0c0de
|
Merged #1882 with some tweaks
|
2020-04-21 11:02:44 -04:00 |
|
Patrick 'Quezler' Mounier
|
561198f517
|
Fix issue with uneven dumping
|
2020-04-18 13:39:12 +02:00 |
|
Patrick 'Quezler' Mounier
|
16a1483f55
|
Require 4 loading docks to saturate a belt
Which encourages using them right from the factory, instead of simply connecting it up to a full titanium belt.
|
2020-04-18 13:28:32 +02:00 |
|
Anuken
|
eeb8d5ef9c
|
Renamed key fields and table methods
|
2020-04-17 11:26:59 -04:00 |
|
Patrick 'Quezler' Mounier
|
32e32ecae2
|
Merge branch '6.0' into crater
# Conflicts:
# core/assets/icons/icons.properties
# core/assets/sprites/block_colors.png
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites2.png
# core/assets/sprites/sprites4.png
# core/assets/sprites/sprites6.png
|
2020-04-16 22:38:51 +02:00 |
|
Anuken
|
280f3dd428
|
Added experimental package
|
2020-04-16 16:31:43 -04:00 |
|
Patrick 'Quezler' Mounier
|
9864383300
|
Revert 〃
|
2020-04-16 21:15:49 +02:00 |
|
Patrick 'Quezler' Mounier
|
41eb51a340
|
Experiment with visible ports
|
2020-04-16 21:11:59 +02:00 |
|
Patrick 'Quezler' Mounier
|
da99286826
|
Remove obsolete valid check
|
2020-04-16 20:33:52 +02:00 |
|
Patrick 'Quezler' Mounier
|
79a095faa8
|
Merge branch '6.0' into crater
|
2020-04-16 20:30:13 +02:00 |
|
Anuken
|
2f3a842f2e
|
isValid() workaround
|
2020-04-16 14:26:09 -04:00 |
|
Anuken
|
2693f9c176
|
Implemented some PR features
|
2020-04-16 13:46:45 -04:00 |
|
Patrick 'Quezler' Mounier
|
361a540ed3
|
Merge branch '6.0' into crater
|
2020-04-16 19:10:10 +02:00 |
|
Patrick 'Quezler' Mounier
|
a83546bc9d
|
Call bumps & upstreams from the objects themselves
|
2020-04-16 19:01:27 +02:00 |
|
Patrick 'Quezler' Mounier
|
e66a1a92c3
|
Phase out the need for isSleeping
Thanks to knowledge gained from the previous commit.
|
2020-04-16 18:56:00 +02:00 |
|
Patrick 'Quezler' Mounier
|
b599bafd5e
|
Override isvalid for sleeping craters
|
2020-04-16 18:48:38 +02:00 |
|
Patrick 'Quezler' Mounier
|
b9b8a4a2f7
|
Move update function up
It felt wrong to put it down below.
|
2020-04-16 18:17:00 +02:00 |
|
Patrick 'Quezler' Mounier
|
7df44ec060
|
Implement anuke’s size calculation
|
2020-04-16 18:12:51 +02:00 |
|
Patrick 'Quezler' Mounier
|
83511368f6
|
Stash shadow draft
|
2020-04-16 17:44:43 +02:00 |
|
Anuken
|
c6bbdfdc9b
|
Fixed compilation
|
2020-04-16 11:35:35 -04:00 |
|
Anuken
|
713dbccf74
|
Bugfixes
|
2020-04-16 11:30:42 -04:00 |
|
Patrick 'Quezler' Mounier
|
a1d4804fae
|
Merge branch '6.0' into crater
# Conflicts:
# core/assets/sprites/block_colors.png
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites2.png
# core/assets/sprites/sprites4.png
# core/assets/sprites/sprites6.png
# core/src/mindustry/ui/fragments/PlayerListFragment.java
|
2020-04-16 17:13:18 +02:00 |
|
Anuken
|
a8f4df8030
|
Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
# Conflicts:
# core/src/mindustry/ui/fragments/PlayerListFragment.java
|
2020-04-16 10:14:13 -04:00 |
|
Anuken
|
256f805754
|
Payload fixes
|
2020-04-16 09:55:57 -04:00 |
|
Anuken
|
ea0358d570
|
Merge remote-tracking branch 'origin/6.0' into 6.0
|
2020-04-16 09:44:36 -04:00 |
|
Anuken
|
42f227195c
|
Better payload framework
|
2020-04-16 09:44:31 -04:00 |
|
Patrick 'Quezler' Mounier
|
7254204ae5
|
[6.0] fix build requirement check for sandbox (#1873)
* Fix not being able to start building in 6.0 sandbox
* Make 〃 more logical
|
2020-04-16 09:11:23 -04:00 |
|
Patrick 'Quezler' Mounier
|
5c28985ee6
|
Merge branch '6.0' into crater
# Conflicts:
# core/assets/icons/icons.properties
# 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/content/Blocks.java
# core/src/mindustry/ui/fragments/PlayerListFragment.java
# core/src/mindustry/world/BlockStorage.java
|
2020-04-16 12:39:52 +02:00 |
|
Patrick 'Quezler' Mounier
|
424e58ff7d
|
Merge branch 'master' into crater
|
2020-04-16 11:20:16 +02:00 |
|
Anuken
|
8a01b87c99
|
Cleanup
|
2020-04-15 23:12:18 -04:00 |
|
Anuken
|
79c8548171
|
Better conveyor animations
|
2020-04-15 19:05:18 -04:00 |
|
Anuken
|
a234949b8c
|
Visual tweaks
|
2020-04-15 13:03:37 -04:00 |
|