mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-31 18:04:21 +07:00
Code Issues Packages Projects Releases Wiki Activity
673 Commits 4 Branches 160 Tags 2.3 GiB
938ea19b5e
Commit Graph

673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
938ea19b5e Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java
 2018-02-05 20:57:44 -05:00
Anuken
1ee21d0751 Minor optimizations 2018-02-05 20:57:28 -05:00
Anuken
438994b7cd
Merge pull request #90 from angelickite/master 2018-02-05 16:05:38 -05:00
Anuken
f2c83b733a Changed junction capacity and processing system 2018-02-05 15:37:07 -05:00
Anuken
a3a42bace2 Updated Net version 2018-02-05 09:40:17 -05:00
Anuken
c2c0de170c Fixed junction/tunnel crashes with sorters 2018-02-05 09:38:49 -05:00
angelickite
6af7ec7b4d Merge branch 'master' of https://github.com/angelickite/Mindustry 2018-02-04 23:23:22 +01:00
angelickite
e1d6343c15 adds on-hover info for placement objects 2018-02-04 23:20:51 +01:00
Anuken
3c38deeba8 Fixed junction clogs, tunnel conveyors, power and interpolation 2018-02-04 16:55:14 -05:00
Anuken
d74a836d99 Fixed server displaying FPS as 0 2018-02-04 14:09:30 -05:00
Anuken
6a47facc1d Fixed server shuffle command 2018-02-04 13:36:44 -05:00
Anuken
d5de9019a1 Added server map list command 2018-02-04 13:33:26 -05:00
Anuken
4dee8ba150 Many editor bugfixes, server additions 2018-02-04 13:10:32 -05:00
Anuken
ed34bbff5a Fixed language not switching to english 2018-02-04 11:30:15 -05:00
Anuken
8f31d19e90 Fixed bugs with desynced block events 2018-02-03 23:27:01 -05:00
Anuken
2ba38c2ee3 Fixed glitchy interpolation and block bars 2018-02-03 22:59:46 -05:00
Anuken
618fe6894e Possible fix to 1-enemy bug 2018-02-03 22:09:47 -05:00
Anuken
1c9395ed43 Added 'block info' tool, fixed sorter corruptions 2018-02-03 21:49:43 -05:00
Anuken
da22f8fbce Completely implemented new interpolation 2018-02-03 20:43:48 -05:00
Anuken
23c1edc3fa Merge remote-tracking branch 'origin/master' 2018-02-03 14:43:15 -05:00
Anuken
938a946419 Better player interpolation, block nearby usage fixes 2018-02-03 14:39:18 -05:00
Anuken
d3a6ebb1ba
Merge pull request #88 from Gab351/patch-3 
Update bundle_fr_FR.properties
 2018-02-03 13:15:04 -05:00
Anuken
6a235a4833 Rewrote parts of Junction and Tunnel to use custom scheduling 2018-02-03 12:56:03 -05:00
Anuken
d7d7cf7298
Merge pull request #89 from Anuken/block-sync-rewrite 
Experimental new block sync system
 2018-02-03 12:21:24 -05:00
Anuken
a31c4b273d Various multiplayer tweaks 2018-02-03 12:20:36 -05:00
Gab_351
a1df98dafc
Update bundle_fr_FR.properties 2018-02-03 12:45:58 +01:00
Anuken
9dbed76a53 Experimental new block sync system 2018-02-03 02:18:17 -05:00
Anuken
608343b9d1 Added HTTP methods to Net 2018-02-03 00:57:42 -05:00
Anuken
b83e552b5a Merge remote-tracking branch 'origin/master' 2018-02-02 20:54:28 -05:00
Anuken
d7dc46b5c0 Block display bar cleanup 2018-02-02 20:54:07 -05:00
Epowerj
c9c130505b Merge remote-tracking branch 'origin/master' 2018-02-02 20:27:00 -05:00
Epowerj
c95a93c380 Fixed typo 2018-02-02 20:26:50 -05:00
Anuken
aad61d94e6 Merge remote-tracking branch 'origin/master' 2018-02-02 18:03:08 -05:00
Anuken
7b055a6a79 Updated manifest 2018-02-02 18:03:01 -05:00
Epowerj
2c6ebed0b3 Merge remote-tracking branch 'origin/master' 2018-02-02 16:34:28 -05:00
Epowerj
7b6d84a873 Separated wiki updater into two files 2018-02-02 16:34:05 -05:00
Anuken
da5e58f40b Updated russian bundle 2018-02-02 16:27:47 -05:00
Anuken
2b6894e046 Merge remote-tracking branch 'origin/master' 2018-02-02 16:24:59 -05:00
Anuken
b320fad698 Buffed all weapons and their prices, bugfixes 2018-02-02 16:24:53 -05:00
Epowerj
39c304815c Man I hate bash 2018-02-02 15:24:45 -05:00
Anuken
9818f7e4ac Merge remote-tracking branch 'origin/master' 2018-02-02 15:00:13 -05:00
Anuken
ec67418f8a Fixed various UI bugs 2018-02-02 15:00:00 -05:00
Epowerj
d5e7c9b281 Fixed more typos 2018-02-02 14:56:44 -05:00
Anuken
9cd0545fc4 Merge remote-tracking branch 'origin/master' 2018-02-02 10:21:44 -05:00
Anuken
a0d6ada6c0 Made client queue packets while loading, changed reactor explode code 2018-02-02 10:21:37 -05:00
Epowerj
64a66c89aa fixed typo 2018-02-02 00:32:07 -05:00
Anuken
9814ea1d28 Fixed gradle warnings 2018-02-01 22:16:00 -05:00
Anuken
beded95ffa Updated Gradle to 4.5 2018-02-01 19:31:13 -05:00
Anuken
83ce2329f4 Made save difficulty display in dialog 2018-02-01 18:42:10 -05:00
Anuken
714965329c More fixes to conveyor corruption and extra settings 2018-02-01 17:31:21 -05:00