Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,128 Commits 4 Branches 180 Tags
v138
Commit Graph
15128 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 63d84bead3 Cleanup 2020-01-31 20:10:21 -05:00
DeltaNedasandGitHub d872656bc5 it works sorta! 2020-01-31 23:51:33 +00:00
Anuken 51b4824c92 Fixed #1484 2020-01-31 11:07:25 -05:00
Petr Gašparík b4e9e6be32 Czech: added Time played + small format corr. 2020-01-31 13:16:27 +01:00
Petr Gašparík 737e3145ec Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-01-31 13:13:51 +01:00
Anuken 2721aa550d Implemented #1444 2020-01-30 22:56:17 -05:00
Anuken f92b91c17b Switched to arc bloom 2020-01-30 17:50:35 -05:00
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
Ali-C-IlaandGitHub 26656b1e32 Update description.txt 2020-01-30 13:01:15 +08:00
Ali-C-IlaandGitHub c4228c0a0c Update achievements.vdf 2020-01-30 12:53:21 +08:00
VanguardandGitHub 91d1abf1e9 1 changed line 
editor.generate
 2020-01-30 04:17:46 +03: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
Vamist b5ccd36315 [Added] Players command 
Allows servers to view current active players in more detail without having to use status
 2020-01-28 20:16:06 +00:00
Patrick 'Quezler' Mounier 4674e5ad68 Merge branch 'master' into crater 2020-01-28 20:06:16 +01:00
Anuken 97cfc33abb Merge remote-tracking branch 'origin/master' 2020-01-28 13:44:13 -05:00
Anuken 867a642859 Fixed #1460 2020-01-28 13:44:06 -05:00
AnukenandGitHub d99cad8793 Update SERVERLIST.md 2020-01-28 13:28:34 -05:00
kf-gamesandAnuken 2a11f65e10 Add server MINDUSTRY.RU (#1463) 
Add server MINDUSTRY.RU
Server 24/7 Online
380+ Maps
Have a motd
There are moderators
Server in uninterrupted operation since October 2019
 2020-01-28 13:05:55 -05: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
Anuken 89e1c5afc0 Conveyor tweaks 2020-01-28 00:21:05 -05:00
Anuken ad6e0bcd0f Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework 
# Conflicts:
#	android/src/mindustry/android/AndroidLauncher.java
#	annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java
#	annotations/src/main/java/mindustry/annotations/impl/AssetsAnnotationProcessor.java
#	build.gradle
#	core/assets-raw/fontgen/config.json
#	core/assets/bundles/bundle_cs.properties
#	core/assets/bundles/bundle_it.properties
#	core/assets/fonts/font.ttf
#	core/assets/fonts/icon.ttf
#	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/UnitTypes.java
#	core/src/mindustry/core/NetClient.java
#	core/src/mindustry/core/NetServer.java
#	core/src/mindustry/entities/bullet/BulletType.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/maps/filters/FilterOption.java
#	core/src/mindustry/mod/Scripts.java
#	core/src/mindustry/ui/Fonts.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/ui/fragments/HudFragment.java
#	core/src/mindustry/ui/fragments/MenuFragment.java
#	core/src/mindustry/world/blocks/production/Cultivator.java
#	core/src/mindustry/world/blocks/units/CommandCenter.java
#	gradle.properties
#	tools/src/mindustry/tools/FontGenerator.java
 2020-01-27 15:51:02 -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