Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,411 Commits 4 Branches 180 Tags
3ac50a3f3e3c72e47e3717f4542a03788d74f38e
Commit Graph
5439 Commits
Author SHA1 Message Date
Anuken 221b28c153 Merge remote-tracking branch 'origin/master' 2020-01-30 17:43:48 -05:00
Anuken 7c2541afa2 Fixed bloom black screen on iOS/Android 2020-01-30 17:43:36 -05:00
Petr Gašparík bfa24cca4c Merge branch 'v103.3' of https://github.com/PetrGasparik/Mindustry; branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-01-30 16:06:46 +01:00
DeltaNedasandGitHub 9da505119b it compiles but cant find module 
help
 2020-01-30 00:53:05 +00:00
DeltaNedasandGitHub 677debd475 testing script loading stuff 
is not allowed in console, only from `LoadedMod`s.
 2020-01-30 00:38:51 +00:00
DeltaNedasandGitHub 864c73f791 make it semi work maybe 
still completely insecure
 2020-01-30 00:21:50 +00:00
DeltaNedasandGitHub 9ed7719464 compile dammit 2020-01-30 00:04:42 +00:00
DeltaNedasandGitHub 187e1f5848 create new branch 2020-01-29 23:52:58 +00:00
Vam-JamandGitHub 36782a2454 [Fix] lastMessage doesnt change if prevented by antispam (#1471) 
Fixes issue #1470
 2020-01-29 11:32:41 -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
Prosta4okuaandGitHub 6a48a1e0a3 Update bundle_uk_UA.properties 2020-01-29 01:12:12 +02:00
Prosta4okuaandGitHub d0faecbea5 Update bundle_uk_UA.properties 2020-01-29 01:07:24 +02:00
Patrick 'Quezler' Mounier 4674e5ad68 Merge branch 'master' into crater 2020-01-28 20:06:16 +01:00
Anuken 867a642859 Fixed #1460 2020-01-28 13:44:06 -05: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
Anuken 89e1c5afc0 Conveyor tweaks 2020-01-28 00:21:05 -05:00
Anuken a2933e030a More severe votekick 2020-01-27 15:43:17 -05: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
Anuken 5ad0193a86 Fixed reduced conveyor edge throughput 2020-01-27 13:15:12 -05: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
Anuken 65211a6021 Fixed #1447 2020-01-27 11:01:48 -05:00
Anuken b7e1adb8b1 Fixed 103 network compatibility 2020-01-27 10:19:18 -05:00
Petr Gašparík 69069e2ef3 Czech translation - mod display 2020-01-27 11:32:31 +01:00
Anuken b9e8694e68 Added synced server label + effect methods 2020-01-27 00:25:32 -05:00
Anuken cd1ed97e52 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-01-27 00:11:24 -05:00
Anuken a61234d21e Minor tweaks 2020-01-26 21:50:55 -05:00
키에르andAnuken 9499b9dfaf Add custom text on screen (#1448) 2020-01-26 17:56:11 -05:00
Anuken 9baaacc8ac Crash fix 2020-01-26 16:55:24 -05:00
Anuken 621233a5b3 More optimization 2020-01-26 16:12:11 -05:00
Anuken 9a3245c23e Clamp 2020-01-26 15:13:55 -05:00
Anuken 6fe2697185 2x faster conveyor optimization 2020-01-26 15:04:00 -05:00
Anuken adbfb15932 Cleanup 2020-01-26 13:13:01 -05:00
Anuken 93cada6a16 Conveyor benchmark test 2020-01-26 11:40:09 -05:00