Commit Graph
100 Commits
Author SHA1 Message Date
Patrick 'Quezler' MounierandGitHub 6d632fc532 Update bundle.properties 2020-10-11 14:59:44 +02:00
Patrick 'Quezler' MounierandGitHub a975da543b Add a connections bar to powernodes
Bundle entry in next commit.
2020-10-11 14:58:53 +02:00
Patrick 'Quezler' MounierandGitHub eaf7a86bce Make deconstructing scrap walls return scrap 2020-10-11 13:54:28 +02:00
Patrick 'Quezler' MounierandGitHub f2bd4bf38c Who needs two pairs of legs? 2020-10-10 18:35:00 +02:00
Patrick 'Quezler' MounierandGitHub d776744905 Update leak behaviour in plated conduit description 2020-10-09 19:11:56 +02:00
Patrick 'Quezler' MounierandGitHub ae9093bfd6 Update ArmoredConduit.java 2020-10-09 10:10:50 +02:00
Patrick 'Quezler' MounierandGitHub f3473e78b4 Update Conduit.java 2020-10-09 10:10:34 +02:00
Patrick 'Quezler' MounierandGitHub 1672c70c99 Update BuildingComp.java 2020-10-09 10:07:56 +02:00
Patrick 'Quezler' MounierandGitHub 637317f3a5 Add a yes command to the server console 2020-10-09 09:29:37 +02:00
Patrick 'Quezler' MounierandGitHub ce463d225f Clarify stack conveyor recharge property
(also, should be minimum & multiple of 1)
2020-10-01 11:54:58 +02:00
Patrick 'Quezler' MounierandGitHub 8e4d00d594 Move cryofluid mixer emoji back to the old number 2020-10-01 11:03:59 +02:00
Patrick 'Quezler' MounierandGitHub e7162004f2 + commander 2020-09-16 12:04:24 +02:00
Patrick 'Quezler' MounierandGitHub 765aa15473 Remove trailing space in connected log message 2020-08-13 20:19:30 +02:00
Patrick 'Quezler' MounierandGitHub ee0b946ea6 Update servers_be.json 2020-08-07 13:47:13 +02:00
Patrick 'Quezler' MounierandGitHub 7bf299bcc0 Remove some spaces 2020-07-24 19:44:26 +02:00
Patrick 'Quezler' MounierandGitHub e41d2d66c5 Make room for a space (#2179) 2020-06-20 11:35:26 -04:00
Patrick 'Quezler' MounierandGitHub 018ef5daf4 Change baseunit pred variable from b to u (#2002) 2020-05-07 11:28:42 -04:00
Patrick 'Quezler' MounierandGitHub 8a48a8bf3d Fix only the output of the last chat filter mattering (#1997) 2020-05-07 09:41:16 -04:00
Patrick 'Quezler' MounierandGitHub f10bdbf775 Swap bottom & top liquid block regions (#1982) 2020-05-04 10:07:29 -04:00
Patrick 'Quezler' MounierandGitHub 19649104a7 Fix pump ohno liquid texture (#1979) 2020-05-04 10:04:18 -04:00
Patrick 'Quezler' MounierandGitHub 8280d11054 Move pump fluid sprite from production to liquid (#1980) 2020-05-04 10:04:00 -04:00
Patrick 'Quezler' MounierandGitHub 440226fecc Scale stack conveyor edge regions for requests (#1981) 2020-05-04 10:03:50 -04:00
Patrick 'Quezler' MounierandGitHub 969eb4c57f Add missing super load call to StackConveyor (#1964) 2020-05-02 10:13:12 -04:00
Patrick 'Quezler' MounierandGitHub c0e149f5f3 Finetune itemsmoved stat on stack conveyors (#1954) 2020-05-01 10:17:14 -04:00
Patrick 'Quezler' MounierandGitHub a226cd390c Cleanup stack conveyor code (#1946)
- removes now obsolete adhoc boosteffect listing
- clarrify comments a bit more
- monospace align some code
- retexture to avoid shadow conflict
2020-04-30 15:16:19 -04:00
Patrick 'Quezler' MounierandGitHub 5fc8901e0b Fix plastanium conveyor icon generation (#1920) 2020-04-26 11:08:27 -04:00
Patrick 'Quezler' MounierandGitHub 0589290380 Prevent colored map author name from tainting gameover (#1922) 2020-04-26 10:59:27 -04:00
Patrick 'Quezler' MounierandGitHub efc1d9040b Add nydus 6.0 server entry (#1909) 2020-04-25 12:53:58 -04:00
Patrick 'Quezler' MounierandGitHub 14c9050103 Remove power usage from phase bridge endpoints (#1910) 2020-04-25 10:32:00 -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
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
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' MounierandGitHub 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' MounierandGitHub 9e811be477 Name which map name has a conflict when importing (#1844) 2020-04-12 09:56:36 -04:00
Patrick 'Quezler' MounierandGitHub 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' MounierandGitHub 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.

# Conflicts:
#	tools/crater-deploy.sh
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