 Anuken
|
9e0af97cee
|
Merge remote-tracking branch 'origin/master'
|
2020-04-25 12:30:22 -04:00 |
|
|
Anuken
|
838e12cc0a
|
stop
|
2020-04-25 12:30:18 -04:00 |
|
  Patrick 'Quezler' MounierandGitHub
|
14c9050103
|
Remove power usage from phase bridge endpoints (#1910)
|
2020-04-25 10:32:00 -04:00 |
|
|
Anuken
|
81af481d3a
|
Removed sleep
|
2020-04-25 10:12:37 -04:00 |
|
|
Anuken
|
2e2c8ceab4
|
Bugfixes
|
2020-04-25 00:04:14 -04:00 |
|
|
Anuken
|
09e08a474b
|
Plastanium conveyor + bugfixes
|
2020-04-24 20:17:24 -04:00 |
|
|
Anuken
|
21946cafd1
|
Merge branch 'crater' of https://github.com/Quezler/Mindustry into Quezler-crater
|
2020-04-24 15:46:32 -04:00 |
|
|
Anuken
|
6041e238a6
|
Bugfixes
|
2020-04-24 12:01:08 -04:00 |
|
|
Anuken
|
5d4ca753a7
|
Light cleanup
|
2020-04-24 11:08:02 -04:00 |
|
|
Anuken
|
1b2e10d355
|
Cleanup, re-implementations
|
2020-04-24 11:01:17 -04:00 |
|
|
Anuken
|
018fe5dea2
|
Added lights for laser turret projectiles
|
2020-04-24 09:50:40 -04:00 |
|
|
Patrick 'Quezler' Mounier
|
cf186e0219
|
Merge branch 'master' into crater
# Conflicts:
# core/assets/sprites/sprites2.png
|
2020-04-23 21:15:11 +02:00 |
|
|
Patrick 'Quezler' Mounier
|
39266d23c8
|
Merge branch 'master' into crater
# Conflicts:
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites2.png
# core/assets/sprites/sprites3.png
|
2020-04-23 21:10:48 +02:00 |
|
|
Anuken
|
87ed405916
|
Bugfixes
|
2020-04-23 14:50:30 -04:00 |
|
|
Anuken
|
c738dcb42e
|
progress
|
2020-04-23 12:52:16 -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 |
|
|
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
|
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
|
256f805754
|
Payload fixes
|
2020-04-16 09:55:57 -04:00 |
|
|
Anuken
|
42f227195c
|
Better payload framework
|
2020-04-16 09:44:31 -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 |
|
|
Anuken
|
0eaf9bc9c6
|
Various prototypes
|
2020-04-15 12:44:53 -04:00 |
|
|
Anuken
|
51226d6c88
|
Arc compat
|
2020-04-14 20:29:59 -04:00 |
|
|
Anuken
|
c717084cb9
|
Cleanup
|
2020-04-13 18:07:00 -04:00 |
|
|
Anuken
|
2af12a632a
|
Added basic multi-unit factories
|
2020-04-13 16:56:33 -04:00 |
|
|
Anuken
|
a240c00ebf
|
Set cleanup
|
2020-04-12 17:42:09 -04:00 |
|