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
Patrick 'Quezler' Mounier and GitHub
627321304d
zzzz ( #1503 )
2020-02-03 15:55:53 -05:00
Patrick 'Quezler' Mounier and GitHub
9bc24ae47a
Darken yellow square on nucleus core ( #1497 )
...
#1496
2020-02-03 08:51:19 -05:00
Patrick 'Quezler' Mounier and GitHub
4c369dd17c
Hide drop zone warning if you're part of the wave team ( #1492 )
2020-02-02 10:41:09 -05:00
Patrick 'Quezler' Mounier
55932d03c9
Do ¬ bump empty conveyors
2020-01-29 10:33:39 +01:00
Patrick 'Quezler' Mounier
93faf128b7
Bump up the chain to update in unison
2020-01-29 10:12:18 +01:00
Patrick 'Quezler' Mounier
56b2cc2745
Fix unloading on a corner
2020-01-29 09:05:00 +01:00
Patrick 'Quezler' Mounier
d2869b976d
Fix comment in 〃
2020-01-29 09:04:46 +01:00
Patrick 'Quezler' Mounier
432b555f1b
Optimize with sleeps
...
Ehmm i meant recharge cycles, beep boop.
2020-01-29 09:02:53 +01:00
Patrick 'Quezler' Mounier
db1a2ddc64
Move start & end logic into entity snek bits
2020-01-29 08:03:53 +01:00
Patrick 'Quezler' Mounier
88282a8c0b
Prevent turns from being considered the end
2020-01-29 07:48:14 +01:00
Patrick 'Quezler' Mounier
4674e5ad68
Merge branch 'master' into crater
2020-01-28 20:06:16 +01:00
Patrick 'Quezler' Mounier
babe00245a
Comment on crater-deploy.sh
2020-01-28 14:52:09 +01:00
Patrick 'Quezler' Mounier
ff578c8540
Repurpose branch to be played
...
When anuke shows more interest in this branch the changes that stem from this can be reversed and squashed, but people want to play it, and keeping 2 crater related branches in sync is frankly a pain 😗
2020-01-28 14:31:32 +01:00
Patrick 'Quezler' Mounier
445126ea65
Rename Track to CraterConveyor
...
though it does not extend the conveyor class.
2020-01-28 11:41:20 +01:00
Patrick 'Quezler' Mounier
2683c74800
Avoid assigning new object?
2020-01-28 11:10:23 +01:00
Patrick 'Quezler' Mounier
61197fe974
Remove duplicate code between first & take
2020-01-28 11:08:40 +01:00
Patrick 'Quezler' Mounier
89d143af8f
Undo part of 〃
2020-01-28 11:00:08 +01:00
Patrick 'Quezler' Mounier
0f92f77b55
Draw crater unto plastanium conveyor icon
...
And remove whitespaces from the emoji one.
2020-01-28 10:57:51 +01:00
Patrick 'Quezler' Mounier
683211cb1f
Untangle conveyor entanglement
...
Made track a standalone block due to the influx of conveyor code changes, and if it were ever to return it would make sense to also include the conduits in one form or another, like a 🐍 class/trait/abstract/method/etc
2020-01-28 10:41:30 +01:00
Patrick 'Quezler' Mounier
af83d08fb1
FIx inconsistencies in the diff
2020-01-28 07:59:11 +01:00
Patrick 'Quezler' Mounier
28765ef909
Merge branch 'master' into crater
2020-01-28 07:45:03 +01:00
Patrick 'Quezler' Mounier
8edcebd3a6
Undo moving other bundle keys into their place
...
Should be a different commit/pull
2020-01-27 19:42:27 +01:00
Patrick 'Quezler' Mounier
6eb6870bb6
Register crater emoji via ui folder
...
#1458
2020-01-27 19:33:36 +01:00
Patrick 'Quezler' Mounier
038fc72d7b
Merge branch 'master' into crater
2020-01-27 19:17:22 +01:00
Patrick 'Quezler' Mounier
2e3f7d8db2
Merge branch 'master' into crater
2020-01-27 18:40:51 +01:00
Patrick 'Quezler' Mounier
883a2a9b59
Bruteforce crater emoji
2020-01-27 18:40:40 +01:00
Patrick 'Quezler' Mounier
9a289c83e6
Fuse with conveyor optimization
...
# Conflicts:
# core/src/mindustry/world/blocks/distribution/ItemConveyor.java
2020-01-27 18:06:48 +01:00
Patrick 'Quezler' Mounier
6e970cb84d
Fix tech tree entry
2020-01-24 20:26:49 +01:00
Patrick 'Quezler' Mounier
58a79d8631
Update to v103
...
# 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/content/Blocks.java
# core/src/mindustry/content/TechTree.java
# core/src/mindustry/world/blocks/distribution/ItemConveyor.java
2020-01-24 20:25:03 +01:00
Patrick 'Quezler' Mounier
ed765ad10a
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
2020-01-10 12:02:07 +01:00
