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
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
Patrick 'Quezler' Mounier
1acc6461e6
Grow the circle slightly inward
2020-04-16 22:05:55 +02: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
Patrick 'Quezler' Mounier
a05f4338c5
Waspify the crater 🐝
2020-04-16 20:24:07 +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
589d4c92d1
Scale crater from 16x16 to 20x20
2020-04-16 18:39:24 +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
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
Patrick 'Quezler' Mounier and GitHub
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
Patrick 'Quezler' Mounier and GitHub
9e811be477
Name which map name has a conflict when importing ( #1844 )
2020-04-12 09:56:36 -04:00
Patrick 'Quezler' Mounier and GitHub
68c20ae728
Complete me senpai ( #1810 )
2020-04-03 10:48:51 -04:00
Patrick 'Quezler' Mounier
74e94e5344
Merge branch 'master' into crater
2020-04-02 12:05:04 +02:00
Patrick 'Quezler' Mounier and GitHub
dcb27eb9ba
Turn bug report brackets into checkbox ( #1790 )
2020-03-31 09:32:34 -04:00
Patrick 'Quezler' Mounier
975221f4cc
Revert "Revert "Revert "Revert "Revert "Repurpose branch to be played"""""
...
This reverts commit 164dd0c405
2020-03-26 16:53:34 +01:00
Patrick 'Quezler' Mounier
104fd78966
Collapse while
2020-03-23 17:07:11 +01:00
Patrick 'Quezler' Mounier
6b27d19057
Alter comments
2020-03-23 17:05:03 +01:00
Patrick 'Quezler' Mounier
6228b5353f
Pack dump into conveyor rotation
2020-03-23 17:01:47 +01:00
Patrick 'Quezler' Mounier
164dd0c405
Revert "Revert "Revert "Revert "Repurpose branch to be played""""
...
This reverts commit 8caa9ed548
2020-03-16 09:15:44 +01:00
Patrick 'Quezler' Mounier
8caa9ed548
Revert "Revert "Revert "Repurpose branch to be played"""
...
This reverts commit 4b08cfd2b7
2020-03-15 22:04:10 +01:00
Patrick 'Quezler' Mounier
4f195b72d1
Merge branch 'master' into crater
2020-03-15 22:00:51 +01:00
Patrick 'Quezler' Mounier
4b08cfd2b7
Revert "Revert "Repurpose branch to be played""
...
This reverts commit 9df875354a
2020-03-15 22:00:45 +01:00
Patrick 'Quezler' Mounier
f931469132
This does ¬ seem nececary anymore somehow
2020-03-06 18:08:18 +01:00
Patrick 'Quezler' Mounier
afdb0aa8c2
Fix sleep visualizer
2020-03-06 17:21:17 +01:00
Patrick 'Quezler' Mounier
73414d7c2a
Collapse if
2020-03-06 14:59:12 +01:00
Patrick 'Quezler' Mounier
c1f025db52
Rename reload to cooldown
2020-03-06 14:57:11 +01:00
Patrick 'Quezler' Mounier
087aef6b85
Move capacity into crater
2020-03-06 11:06:35 +01:00
Patrick 'Quezler' Mounier
7ddcd93a57
Use extended position
2020-03-06 10:28:49 +01:00
Patrick 'Quezler' Mounier
caa25b811b
Condense single use rotation
2020-03-06 10:22:37 +01:00
Patrick 'Quezler' Mounier
5a60ab1d2a
Privatize drawer
2020-03-06 10:20:47 +01:00
Patrick 'Quezler' Mounier
8a25d57c83
This looks good to
2020-03-06 10:17:02 +01:00
Patrick 'Quezler' Mounier
c5de6706e0
Eyecandyfi
2020-03-06 10:14:52 +01:00
Patrick 'Quezler' Mounier
f50ee2ecf2
Try to clean up the end of tile logic
2020-03-06 09:52:28 +01:00
Patrick 'Quezler' Mounier
11fc494284
Clean up transfer code
2020-03-06 09:34:09 +01:00
Patrick 'Quezler' Mounier
e05f755a4e
Remove unused import
2020-03-05 21:30:18 +01:00
Patrick 'Quezler' Mounier
44bff5b7cf
Remove conveyor integration remnants
2020-03-05 21:29:19 +01:00
Patrick 'Quezler' Mounier
e2b9977ebc
Remove omnidirectional due to issues
2020-03-05 21:27:28 +01:00
Patrick 'Quezler' Mounier
3e51abf6eb
Try to fix blending with omnidirectional
2020-03-05 21:24:51 +01:00
Patrick 'Quezler' Mounier
c1f765a467
Bodge in a rotational blend bypass
2020-03-05 20:26:34 +01:00
Patrick 'Quezler' Mounier
e67667e4a3
Remove preemtive unload
2020-03-05 20:09:09 +01:00
Patrick 'Quezler' Mounier
14a97976cc
Realign pixels
...
Bothered me for ages.
2020-03-05 19:48:36 +01:00
Patrick 'Quezler' Mounier
4a3e00f822
Fix early return
2020-03-05 15:21:41 +01:00
Patrick 'Quezler' Mounier
3ac50a3f3e
,
2020-03-05 14:42:37 +01:00
Patrick 'Quezler' Mounier
6fb4c79f82
Fix sleeping while reloading
2020-03-05 14:29:27 +01:00
Patrick 'Quezler' Mounier
9c75133fc8
Blend tripod dumper with conveyors
2020-03-05 14:21:41 +01:00
Patrick 'Quezler' Mounier
fd61add2e4
Cleanup update loop
2020-03-05 14:10:28 +01:00
Patrick 'Quezler' Mounier
acd695a469
Messy cleanup
2020-03-05 13:40:44 +01:00
Patrick 'Quezler' Mounier
5036506547
Rotate smoother
2020-03-05 13:28:23 +01:00
Patrick 'Quezler' Mounier
b0becbad38
Fix unloading prematurely
2020-03-05 13:22:50 +01:00
Patrick 'Quezler' Mounier
bcb87f8f76
Update description accordingly
2020-03-05 12:15:38 +01:00
Patrick 'Quezler' Mounier
ecb09c0f04
Dump like bridges do
2020-03-05 12:11:55 +01:00
Patrick 'Quezler' Mounier
e7298702a1
Delete drafts
2020-03-05 10:50:21 +01:00
Patrick 'Quezler' Mounier
b74cf71f40
Come up with a new description
2020-03-05 10:50:08 +01:00
Patrick 'Quezler' Mounier
2025c7c669
Fix mech dropoff ¬ working
2020-03-05 10:35:48 +01:00
Patrick 'Quezler' Mounier
00249f62b6
Cleanup if chains
2020-03-05 10:28:10 +01:00
Patrick 'Quezler' Mounier
9df875354a
Revert "Repurpose branch to be played"
...
This reverts commit ff578c8540
2020-03-05 10:10:00 +01:00
Patrick 'Quezler' Mounier
9bc340ba17
Fix end ¬ rendering
2020-03-05 10:08:22 +01:00
Patrick 'Quezler' Mounier
79c965bf8d
Move sleep detector to renderer
2020-03-05 10:08:15 +01:00
Patrick 'Quezler' Mounier
e5e4884448
Merge branch 'master' into crater
...
# 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/world/modules/ItemModule.java
2020-03-05 10:00:02 +01:00
Patrick 'Quezler' Mounier and GitHub
3b2b7be72a
Remove nested app.post ( #1667 )
2020-03-04 11:58:16 -05:00
Patrick 'Quezler' Mounier and GitHub
8bbd8489e0
Remember scroll position when a new message gets added ( #1638 )
2020-02-25 12:06:18 -05:00
Patrick 'Quezler' Mounier and GitHub
ce1884512d
Null the block as well? ( #1630 )
2020-02-24 11:44:39 -05:00
Patrick 'Quezler' Mounier and GitHub
e592d6fe52
Add nydus to global server list ( #1625 )
2020-02-23 10:34:53 -05:00
Patrick 'Quezler' Mounier and GitHub
f891c42847
Remove bundle key space ( #1619 )
2020-02-22 08:43:54 -05:00
Patrick 'Quezler' Mounier and GitHub
b7a8fa4191
Fix typo in banned comment ( #1617 )
2020-02-21 13:49:15 -05:00
Patrick 'Quezler' Mounier and GitHub
ff652f2515
+1 technical correctness ( #1615 )
2020-02-21 09:57:48 -05:00
Patrick 'Quezler' Mounier and GitHub
1ac22bec61
Oh look, another penny! 💸
2020-02-13 08:57:10 +01:00
Patrick 'Quezler' Mounier and GitHub
5dd86c0cbd
Remove unappropriate spelling of appropriate
2020-02-13 08:54:44 +01:00
Patrick 'Quezler' Mounier
4bb9a93ff9
Do as i say, ¬ do as i do
2020-02-10 13:14:48 +01:00
Patrick 'Quezler' Mounier
ac3ab6971d
Undo the last 5
2020-02-10 13:11:49 +01:00
Patrick 'Quezler' Mounier
66c81246b6
Fix single tile check if blendbit is 0
2020-02-10 13:02:21 +01:00
Patrick 'Quezler' Mounier
656c37372d
Wrap upstream tile thingie
2020-02-10 12:57:21 +01:00
Patrick 'Quezler' Mounier
b89078733e
Revert "Stash revertable"
...
This reverts commit 158241b8e2
2020-02-10 12:49:44 +01:00
Patrick 'Quezler' Mounier
158241b8e2
Stash revertable
2020-02-10 12:49:36 +01:00
Patrick 'Quezler' Mounier
2bd7c92b9e
Allow sideloading the unloader
...
Main reason for blendbits > 1 & 2
2020-02-10 12:38:48 +01:00
Patrick 'Quezler' Mounier
562fa07755
Merge branch 'master' into crater
2020-02-10 12:09:14 +01:00
Patrick 'Quezler' Mounier
d7e8a8e4f4
Add comment to 〃
2020-02-07 11:02:42 +01:00
Patrick 'Quezler' Mounier
b66e03d2a8
Revert "Cache upstream"
...
This reverts commit 908018b97c
2020-02-07 10:59:51 +01:00
Patrick 'Quezler' Mounier
908018b97c
Cache upstream
...
But i do ¬ like how this turned out, so reverting :(
2020-02-07 10:59:45 +01:00
Patrick 'Quezler' Mounier
9abb08152b
Prettify upsteam calculator
2020-02-07 10:51:36 +01:00
Patrick 'Quezler' Mounier
94dc220924
Finish 〃
2020-02-07 10:32:43 +01:00
Patrick 'Quezler' Mounier
3d8e83850e
Refractor inputs to upstream
2020-02-07 08:41:34 +01:00
Patrick 'Quezler' Mounier
4147d8a512
Cleanup 〃
2020-02-06 20:23:42 +01:00
Patrick 'Quezler' Mounier
8c7b688f78
Add layered blendbitz
2020-02-06 20:19:00 +01:00
Patrick 'Quezler' Mounier
99d1a2829f
Merge branch 'master' into crater
2020-02-06 19:33:57 +01:00
Patrick 'Quezler' Mounier
c0d250560a
🐍 is kil
2020-02-06 19:33:42 +01:00
Patrick 'Quezler' Mounier
502e8f78ce
Move some stuff around
2020-02-06 17:25:54 +01: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
Patrick 'Quezler' Mounier and GitHub
8bb533f646
3rd times the charm ( #1509 )
2020-02-05 13:06:16 -05:00
Patrick 'Quezler' Mounier
05ccdfd51b
Merge branch 'master' into crater
...
# 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/world/modules/ItemModule.java
2020-02-05 10:26:34 +01:00
