mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-19 16:57:15 +07:00
Code Issues Packages Projects Releases Wiki Activity
3,069 Commits 4 Branches 160 Tags 2.3 GiB
fed964e0f7
Commit Graph

3069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
fed964e0f7 a rather large merge 2019-01-07 21:10:57 -05:00
Anuken
77b4f3e930 Merge branch 'crafting-rework' 2019-01-07 18:49:28 -05:00
Anuken
351b8c2469 Fixed content class errors 2019-01-07 18:48:55 -05:00
Anuken
ee9f65d4a3 Block class merge 2019-01-07 18:39:06 -05:00
Anuken
a1a69f62e1 🦀 FX classes are gone 🦀 2019-01-07 17:11:53 -05:00
Anuken
ff52fec663 Cleanup: all bullet definitions moved into one class 2019-01-07 16:53:04 -05:00
Anuken
5743d30851 Removed AmmoType class completely 2019-01-07 16:01:27 -05:00
Anuken
de02061b5e Removed dependency on old BulletEntity/BaseBulletType classes 2019-01-07 12:25:54 -05:00
Anuken
b64c38809e Removed unused upload build script 2019-01-07 10:50:31 -05:00
Anuken
a163db485b Merge branch 'master' into crafting-rework 2019-01-07 10:40:22 -05:00
Anuken
79e722b5ff Ignored annotation out folder 2019-01-06 15:57:39 -05:00
Anuken
307bb7aeec Merge branch 'master' of https://github.com/Anuken/Mindustry into crafting-rework 
# Conflicts:
#	core/src/io/anuke/mindustry/content/Recipes.java
 2019-01-06 09:45:11 -05:00
Anuken
397da91ab4 Fixed all code generation errors 2019-01-06 09:42:08 -05:00
Anuken
fdd0c25a25 Removed core drone 2019-01-06 09:27:56 -05:00
Anuken
d691e9f39d it is commit o'clock 2019-01-05 23:00:58 -05:00
Anuken
a5cbe19d23 Merge branches 'crafting-rework' and 'master' of https://github.com/Anuken/Mindustry into crafting-rework 
# Conflicts:
#	core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
#	core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java
#	core/src/io/anuke/mindustry/core/Renderer.java
#	core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java
 2019-01-04 16:15:23 -05:00
Anuken
1346e163e9 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-01-04 15:27:39 -05:00
Anuken
d5626bfe52 Updated to next version of kryonet 2019-01-04 15:12:34 -05:00
Anuken
3b41ded045 More zoom fixes 2019-01-04 12:18:26 -05:00
Anuken
f61f3af687 Zoom fixes 2019-01-04 11:39:49 -05:00
Anuken
e24d96da6f Note 2019-01-03 18:35:48 -05:00
Anuken
59e5099ed6 Merge remote-tracking branch 'origin/master' 2019-01-03 18:22:26 -05:00
Anuken
b8e6e5df61 Power PR merged / Various bugfixes 
Closes #288
 2019-01-03 18:22:13 -05:00
Anuken
16851a457e Further recipe tweaks 2019-01-03 12:30:25 -05:00
Anuken
1c5bb605c3 Removed recipe dependencies 2019-01-03 12:26:49 -05:00
Anuken
dc12d58054 Standardized item capacity across blocks 2019-01-03 12:00:14 -05:00
Anuken
120e0f6971 Changed several more resources 2019-01-02 18:49:04 -05:00
Anuken
b9136e4e98
Merge pull request #364 from Prosta4okua/patch-43 
(Complete) Close before 64 build
 2019-01-02 21:00:15 -02:00
Prosta4okua
197b97d0db
Update bundle_uk_UA.properties 2019-01-02 13:26:36 +02:00
Anuken
912136d174 Merge remote-tracking branch 'origin/master' 2019-01-01 18:41:07 -05:00
Anuken
653c85c58d Manually implemented #376 2019-01-01 18:41:00 -05:00
Anuken
638c99981d
Merge pull request #389 from Prosta4okua/patch-47 
Create strings.xml
 2019-01-01 21:35:24 -02:00
Anuken
71e61abcd6
Merge pull request #356 from DaGamerFiles/patch-1 
Update bundle_in_ID.properties [INCOMPLETE]
 2019-01-01 21:33:57 -02:00
Anuken
fa1d440bb0
Merge pull request #355 from JustYanns/patch-2 
Update bundle_fr.properties [Incomplete]
 2019-01-01 21:32:16 -02:00
Prosta4okua
f0064e35bc
Create strings.xml 2019-01-02 01:29:06 +02:00
Anuken
88d208268a
Merge pull request #387 from CinExPL/patch-4 
Update bundle_pl.properties
 2019-01-01 21:13:28 -02:00
Anuken
6aa90a44f7
Merge branch 'master' into patch-4 2019-01-01 21:13:20 -02:00
Anuken
3c9322ee08
Update strings.xml (#383) 2019-01-01 21:09:55 -02:00
키에르
b2f47e6b70 Update bundle and fix error (+orignal bundle) (#382) 
* Update bundle_ko.properties

* Update bundle.properties

* Duplicate
 2019-01-01 21:09:45 -02:00
VizardAlpha
c905a870e0 Update bundle_fr_BE.properties (#381) 
* Update bundle_fr_BE.properties

* Update bundle_fr_BE.properties
 2019-01-01 21:09:34 -02:00
William So
b2360e42c6 Update bundle_zh_TW.properties (#379) 2019-01-01 21:09:25 -02:00
Ignacy
0da621745a Update bundle_pl.properties (#386) 2019-01-01 17:17:02 -02:00
SkeptiC
d8fc3851a7 Create bundle_cs.properties (#388) 
Finished translation to czech
 2019-01-01 17:15:45 -02:00
Anuken
edd3fb3440 Graphite, scrap 2019-01-01 14:04:17 -05:00
Anuken
a105c017d5 Tile cost tweak 2019-01-01 13:48:20 -05:00
Anuken
dd1034e37b Merge 2018-12-31 19:03:51 -05:00
Anuken
41f16a54de Logo downscale 2018-12-30 12:54:03 -05:00
Anuken
b91510efb3 Input fixes 2018-12-30 11:41:06 -05:00
Anuken
745d8122f5 Removed GH API calls 2018-12-30 10:27:37 -05:00
Anuken
98e4f7409b Removed main arc dependency 2018-12-30 10:11:54 -05:00