mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-28 08:30:03 +07:00
Code Issues Packages Projects Releases Wiki Activity
3,402 Commits 4 Branches 160 Tags 2.3 GiB
22fadab3b3
Commit Graph

2973 Commits

Author SHA1 Message Date
Anuken
a6799dd29b Kiln texture fix / New map resize dialog 2019-02-01 18:08:09 -05:00
Anuken
163ecb160a Added new unit type / Made reactor use cryo only / Balancing 2019-02-01 15:55:11 -05:00
Anuken
f00d1f9505 Added missing tech tree blocks / Zone improvements 2019-02-01 13:14:42 -05:00
Anuken
87b489a541 Tile cleanup 2019-02-01 09:22:08 -05:00
Anuken
f670ade2ee Work on new maps continues 2019-02-01 00:04:21 -05:00
Anuken
b5508c1152 New power node type / Bugfixes / Random item caches 2019-01-31 15:57:21 -05:00
Anuken
564c258c86 Core tiers 2019-01-31 15:33:07 -05:00
Anuken
745ff1a270 Map implemented / Editor pick key / Crash fix 2019-01-31 12:45:11 -05:00
Anuken
e727ee6d4a Even more blocks / Map generator config / Editor fixes 2019-01-31 10:58:26 -05:00
Anuken
e6a39a8255 Shader crash fix / More blocks / Kiln / Removed (unused) flux 2019-01-30 22:51:24 -05:00
Anuken
43bff5c34d Removed camera clamp / Self-destruct timer / More blend tweaks 2019-01-30 19:48:41 -05:00
Anuken
c046a1b474 New blocks / Floor edge fixes 2019-01-30 18:39:10 -05:00
Anuken
209e3f03c1 Implemented shore map / New blocks / Bugfixes 2019-01-30 13:34:38 -05:00
Anuken
dbf05a1419 New basic water sprite 2019-01-29 22:26:02 -05:00
Anuken
5af35b6771 Zone balancing 2019-01-29 14:33:41 -05:00
Anuken
00abba11ae Removed carrying 2019-01-29 14:13:29 -05:00
Anuken
d268d94f76 Edge cleanup / Spawn warn / Bugfixes 2019-01-29 11:51:41 -05:00
Anuken
76af3e3077 Customizable edge stencil / Reduced redundant sprites 2019-01-28 23:30:11 -05:00
Anuken
54bade668e New tile edge algorithms / Struct value type generation 2019-01-28 22:11:23 -05:00
Anuken
5a3ec8f407 Fixed server crash / Struct annotation begins 2019-01-28 15:43:33 -05:00
Anuken
c043664ad6 2 2019-01-28 09:04:59 -05:00
Anuken
7e9ca6fbb6 Compile fix 2019-01-28 09:04:28 -05:00
Anuken
e9a82652a0 New blocks 2019-01-27 23:26:07 -05:00
Anuken
db2e6b6973 Better launch / Better spawns / Tweaks 2019-01-27 18:09:59 -05:00
Anuken
da9278ad8d Added recorder module 2019-01-27 12:31:14 -05:00
Anuken
5a9307e9a7 Smooth block shadows / Large procedural blocks 2019-01-27 12:09:01 -05:00
Anuken
f31fd622dd Fixed #396 2019-01-27 09:19:23 -05:00
Anuken
6723157ca5 Power tweaks 2019-01-26 17:33:20 -05:00
Anuken
956448a1a5 Fixed tests again, locally 2019-01-26 13:20:07 -05:00
Anuken
4be675f977 Thermal generator now based on floor / Power restructuring 2019-01-26 12:48:15 -05:00
Anuken
7924051c0d Graphite press balancing 2019-01-26 11:32:39 -05:00
Anuken
83b5f6ef2d Custom game loading 2019-01-26 10:52:16 -05:00
Anuken
0f26d62a0a Bundle update / Custom game button / Join button 2019-01-26 10:37:04 -05:00
Anuken
a9f11256cd Unfinished graphite press block 2019-01-25 23:15:30 -05:00
Anuken
ead0547d59 Tree-based zone layout 2019-01-25 21:48:03 -05:00
Anuken
89e29bce62 Incomplete zone layout 2019-01-25 14:09:08 -05:00
Anuken
058db5d5d0 Sprite cleanup 2019-01-24 20:00:35 -05:00
Anuken
76aa409f89 Changed unnecessary server output to 'debug' log level 2019-01-24 16:36:48 -05:00
Anuken
923d0497e6 Added sprites 2019-01-24 13:11:41 -05:00
Anuken
dd4f4b83fc Editor variant display / Visual changes 2019-01-24 13:11:22 -05:00
William So
c2bed82db5
Update 'bundle_zh_TW.properties' 2019-01-24 20:07:59 +08:00
Anuken
9a444da343 Unfinished block / Bugfixes 2019-01-23 23:43:31 -05:00
Anuken
9dd6a77c76 Various blocks added / Crater map updated / Fixed status effect bugs 2019-01-23 20:08:28 -05:00
Anuken
895725df64 Removed ores near enemy spawns 2019-01-23 16:55:35 -05:00
Anuken
6f07576748 Merge branches 'master' and 'new-map-format' of https://github.com/Anuken/Mindustry into new-map-format 
# Conflicts:
#	core/src/io/anuke/mindustry/editor/MapEditorDialog.java
#	core/src/io/anuke/mindustry/io/MapIO.java
#	core/src/io/anuke/mindustry/maps/MapTileData.java
 2019-01-23 13:52:36 -05:00
Anuken
550a11962e Fixed compile errors in MapIO 2019-01-23 09:23:34 -05:00
Anuken
c3883cdad0 Slight improvements to editor rendering / Renamed blockpart -> part 2019-01-23 08:51:21 -05:00
Anuken
e9e2cd614d Basic crater map / Spray tool / Crater floor / canProduce() 2019-01-22 23:02:04 -05:00
Anuken
55e1759b47 Block optimizations 2019-01-22 19:35:00 -05:00
Anuken
33f5215e6d Finished ground zero map layout 2019-01-22 17:58:43 -05:00
Anuken
5459a646b3 In-game block team display / Editor bugfix 2019-01-22 15:46:22 -05:00
Anuken
6229f99a2e Fixed tests / Various build tools updated 2019-01-22 15:01:30 -05:00
Anuken
0e5b95e3aa Added health bars to block info / Fixed block info refresh bug 2019-01-22 13:46:10 -05:00
Anuken
72d7c1ba54 Fixed 'unlocks' dialog entries 2019-01-21 22:29:50 -05:00
Anuken
ee9a2ee03d Deploy dialog requirements done 2019-01-21 19:37:02 -05:00
Anuken
6bfbcc4aa9 Added zone requirement display 2019-01-21 16:04:50 -05:00
Anuken
a9d7ed50b7 Re-added all recipes to blocks 2019-01-20 21:11:58 -05:00
Anuken
bc77ebc10c Automatic tech node cost generation 2019-01-20 15:44:54 -05:00
Anuken
cbdce79d7d Misc. cleanup 2019-01-20 15:21:46 -05:00
Anuken
46dfa064d0 Removed recipe definitions 2019-01-20 13:50:56 -05:00
Anuken
0478af2564 Recipe class removed completely 2019-01-20 13:49:53 -05:00
Anuken
750388a425 Defined first 12 zones 2019-01-20 11:49:17 -05:00
Anuken
ea9155b903 Further UI cleanup 2019-01-19 23:13:46 -05:00
Anuken
d34f228d2f Functional tech tree 2019-01-19 22:16:28 -05:00
Anuken
093043750b UI cleanup 2019-01-19 17:45:33 -05:00
Anuken
4fb0c246db Tech tree filled out 2019-01-19 14:58:29 -05:00
Anuken
5e951f27c9 Block icon rework / Dynamic icon generation / Tech tree tweaks 2019-01-19 12:42:02 -05:00
Anuken
49253964d8 Tech tree rendering + layout 2019-01-19 00:26:39 -05:00
Anuken
4ff1d0c2e1 Render fix 2019-01-18 15:41:49 -05:00
Anuken
2385011f96 Better build request display / Fixed incorrect rotation axes 2019-01-18 11:30:15 -05:00
Anuken
7527f9326c Fixed units not rotating to target 2019-01-18 09:23:39 -05:00
Anuken
9c7b80f066 Scrap ore / Player shadows 2019-01-18 09:19:42 -05:00
Anuken
48facc0978 Launch button 2019-01-17 23:17:17 -05:00
Anuken
22a6c4e8af Glass 2019-01-17 19:28:25 -05:00
Anuken
bd6cfa6461 Removed UnitCommand / Disabled mechs flying over env. blocks 2019-01-17 19:00:18 -05:00
Anuken
c63dca1c0d Map distortion / Multi-spawns 2019-01-17 16:28:42 -05:00
Anuken
c6af151bf3 Sprite cleanup / Stats / More balancing / New events 2019-01-17 15:30:50 -05:00
Anuken
ccc20a9716 Balancing 2019-01-17 13:03:06 -05:00
Anuken
47605583d1 Saving fix 2019-01-16 23:48:21 -05:00
Anuken
58e83c11f0 Saves / Paused dialog cleanup / Zone rule save 2019-01-16 23:25:43 -05:00
Anuken
836a4eb892 Antialiasing 2019-01-16 22:45:51 -05:00
Anuken
6d50a747e3 Basic map shading 2019-01-16 20:37:43 -05:00
Anuken
4344af1f02 Added unlock messages for all content 2019-01-16 19:52:58 -05:00
Anuken
6510d83524 Starting items / No editor unlocks / Fixed Block#synthetic() 2019-01-16 19:36:30 -05:00
Anuken
6d01193e1e Tweaks 2019-01-15 23:04:27 -05:00
Anuken
8c3d6d05ab broken stuff 2019-01-15 22:16:02 -05:00
Anuken
733a064c79 NetworkIO cleanup 2019-01-15 21:33:08 -05:00
Anuken
8715f6a301 Removed zone init() 2019-01-15 21:26:45 -05:00
Anuken
b51725633e Merge remote-tracking branch 'origin/master' 2019-01-15 21:21:32 -05:00
Anuken
5ec11c61bd Added map-specific generator 2019-01-15 21:21:28 -05:00
Anuken
a976a7affb
Merge branch 'master' into patch-19 2019-01-15 20:29:34 -05:00
Anuken
2f76684113 Cheaper arc 2019-01-14 18:38:32 -05:00
Anuken
017b83d375 push time 2019-01-13 14:20:25 -05:00
Anuken
650b443fd0 Starting items / Zone balancing 2019-01-12 18:51:21 -05:00
Anuken
8aa1509f47 Gamemodes removed 2019-01-12 16:55:24 -05:00
VizardAlpha
b21bf2d544
Updates bundle_fr_BE.properties 2019-01-12 14:56:51 +01:00
Anuken
777bd60f88 Added basic ore generator 2019-01-11 20:29:50 -05:00
Anuken
7889db43a8 Zone generator requirement 2019-01-11 09:46:49 -05:00
Anuken
ae3aa20508 elevation is gone but this time I'm not doing the crab rave meme 2019-01-10 21:45:18 -05:00
Anuken
84e754dd10 Added zone class / Dialog method inline 2019-01-09 18:50:10 -05:00
Anuken
b9618d66f2 Removed 'text.*' prefix 2019-01-09 16:58:06 -05:00
Anuken
daa7b20e4a World generation launch pad preset 2019-01-09 16:37:14 -05:00
Anuken
2bc63b37e4 Bugfixes 2019-01-09 11:49:28 -05:00
Anuken
33afab7294 Launchpad block 2019-01-09 11:44:33 -05:00
VizardAlpha
8010a82776
Update bundle_fr_BE.properties 2019-01-09 16:49:25 +01:00
Anuken
048b7bd32f Global inventory / 'Deploying' / Removed command center 2019-01-09 09:07:48 -05:00
Anuken
28fa0b070d Merge branch 'unsector' 
# Conflicts:
#	core/src/io/anuke/mindustry/maps/SectorPresets.java
#	core/src/io/anuke/mindustry/maps/Sectors.java
#	core/src/io/anuke/mindustry/maps/TutorialSector.java
#	core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
#	core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java
#	core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
 2019-01-08 22:28:13 -05:00
Anuken
dc0be93b25 Status effect cleanup 2019-01-08 20:32:22 -05:00
Anuken
1d8efe5f9d Packer reorganization 2019-01-08 17:41:51 -05:00
Anuken
521174f911 Removed autogenerated liquid sprites 2019-01-08 09:56:42 -05:00
Anuken
a6f7bd9099 Cleanup 2019-01-07 21:22:06 -05:00
Anuken
fed964e0f7 a rather large merge 2019-01-07 21:10:57 -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
568e55e373 Crash fix 2019-01-07 10:37:58 -05:00
Anuken
415252a5b2 Merge branches 'master' and 'unsector' of https://github.com/Anuken/Mindustry into unsector 2019-01-06 10:21:15 -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
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
5661124d86 Merge branches 'master' and 'unsector' of https://github.com/Anuken/Mindustry into unsector 2019-01-04 16:11:30 -05:00
Anuken
1346e163e9 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-01-04 15:27:39 -05:00
Anuken
0900c13fa1 Cleanup 2019-01-04 15:11:58 -05:00
Anuken
5019f200b7 Large world size optimizations 2019-01-04 13:55:06 -05:00
Anuken
3b41ded045 More zoom fixes 2019-01-04 12:18:26 -05:00
Anuken
9f84b84819 Removed all extra floor rendering for larger worlds 2019-01-04 12:17:42 -05:00
Anuken
f61f3af687 Zoom fixes 2019-01-04 11:39:49 -05:00
Anuken
0a6f7ac817 Functional play button 2019-01-03 20:42:34 -05:00
Anuken
153e6c5f1b Re-structuring 2019-01-03 19:46:25 -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
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
Anuken
6aa90a44f7
Merge branch 'master' into patch-4 2019-01-01 21:13:20 -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
d01b8c7ad1 Improved snapshot netcode 2018-12-29 22:46:46 -05:00
Anuken
7c35b6e95a Minor build file fixes 2018-12-29 15:58:11 -05:00
Anuken
86b35fc43d Various graphical fixes 2018-12-29 13:06:17 -05:00
Anuken
4386d3169a JITPack-based dependencies 2018-12-29 11:59:43 -05:00
Anuken
35348f1150 Re-implemented block shadows / Removed alpha drones 2018-12-29 09:12:37 -05:00
Anuken
36b27458b6 Merged 4x graphics 2018-12-28 23:46:09 -05:00
Anuken
bbb2153112 Merge branch 'arc-port' of https://github.com/Anuken/Mindustry 2018-12-28 22:22:08 -05:00
Anuken
9ec1d8f16b Vars cleanup 2018-12-28 22:18:58 -05:00
Anuken
e1858df645 Clamping fix 2018-12-28 22:03:34 -05:00
Anuken
3b1066e16f Removed block bars / Fixed some input issues 2018-12-28 16:54:19 -05:00
Anuken
75709a7812 Fixed android version / Smooth zoom 2018-12-28 16:05:49 -05:00
Anuken
81c68e90cb Fixed shadow rendering 2018-12-28 13:22:44 -05:00
Anuken
bc9110b344 Fixed most world rendering 2018-12-28 13:01:35 -05:00
CinExPL
89d5618232
Update bundle_pl.properties 2018-12-28 14:36:06 +01:00
Anuken
1e8b844eac Debugging, cleanup 2018-12-27 20:26:18 -05:00
Anuken
3fc278c7b7 Fixed most main menu bugs 2018-12-27 17:14:07 -05:00
Anuken
db546412f1 Arc compatibility update 2018-12-27 15:47:17 -05:00
Anuken
3b42b604e1 Successful desktop compilation 2018-12-26 17:38:40 -05:00
Prosta4okua
f22caed088
Update bundle_uk_UA.properties 2018-12-26 22:49:18 +02:00
Prosta4okua
1f4e611629
Update bundle_uk_UA.properties 2018-12-26 22:45:13 +02:00
Anuken
8879593381 hhhhhhh 2018-12-26 13:22:31 -05:00
Anuken
22b7086bea Additional fixes 2018-12-23 23:58:24 -05:00
Anuken
44e4ffbe62 Fixed most things besides drawing 2018-12-22 22:17:28 -05:00
Prosta4okua
84f60f63b8
Update bundle_uk_UA.properties 2018-12-22 17:11:52 +02:00
Prosta4okua
572f358bda
Update bundle_uk_UA.properties 2018-12-22 16:47:57 +02:00
Prosta4okua
46df7726c3
Update bundle_uk_UA.properties 2018-12-22 11:38:01 +02:00
Anuken
3abfaf1bca ctrl-shift-f 2018-12-21 21:33:05 -05:00
Anuken
94908bc599 🔥🔥🔥🔥🔥🔥maximum breakage 2018-12-20 12:38:27 -05:00
Anuken
cabcfc7136 Initial creation of Arc port 2018-12-20 11:49:32 -05:00
beito
ecab13af57 Update Japanese translations (#378) 
* Add new japanese translation

It translated on commit 66810c8.
so it don't apply changes from commit 17e0489.

* Update Japanese translation

Applies commit 7a51693. and small changes.

* Upadte Japanese translations

* Update Japanese

* Update Japanese

* Update Japanese translations

Improve and update for new changes

* Update Japanese

* Update Japanese translations

* Update Japanese translations

* Update Japanese translations

* Update Japanese translations

* Update Japanese translations

* Update Japanese translations

* Update Japanese translation

* Update Japanese translations

* Update Japanese translations
 2018-12-17 02:50:01 -02:00
Anuken
6dc64cf2f6 Cleanup 2018-12-15 21:00:03 -05:00
Anuken
832582caa9 Cleanup 2018-12-15 20:59:28 -05:00
Timmeey86
828661e9de More efficient way of retrieving ConsumePower subclasses 2018-12-15 23:49:46 +01:00
Anuken
6029b6d67f Updated smooth UI 2018-12-14 22:07:43 -05:00
Anuken
9d744580a1 Merge 2018-12-14 21:48:34 -05:00
Anuken
b295f51c29 Merge branch 'master' of https://github.com/Anuken/Mindustry into crafting-rework 2018-12-14 19:11:50 -05:00
Anuken
5c6aea0d50 Merge remote-tracking branch 'origin/master' 2018-12-14 19:11:05 -05:00
Anuken
99bf50ee52 Core recipe tweak 2018-12-14 19:10:58 -05:00
Timmeey86
f48a19a3bc Merged master into branch 2018-12-15 00:49:38 +01:00
Timmeey86
fed11db92e Buffered consumers now fill instantly 2018-12-15 00:47:47 +01:00
Timmeey86
23fb15fe78 Buffered consumers will no longer have their buffer reset when being unlinked 2018-12-14 21:14:19 +01:00
Prosta4okua
7a533f6053
Update bundle_uk_UA.properties 2018-12-14 18:28:40 +02:00
Prosta4okua
a292ff4287
Update bundle_uk_UA.properties 2018-12-14 18:24:06 +02:00
BasedUser
29329383e4 Update bundle_ru.properties (#377) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-12-14 11:14:30 -05:00
Anuken
fefdad5335 Minimap switched to container 2018-12-14 10:27:23 -05:00
Anuken
982f9ce8fb Padding fix 2018-12-14 00:12:08 -05:00
Anuken
5c6d4b9ac2 Fixed extremely strange join dialog server padding 2018-12-14 00:09:44 -05:00
Anuken
49954f5c07 Merge remote-tracking branch 'origin/master' 2018-12-13 18:02:05 -05:00
Anuken
0b837925a2 Build script reformatting / 'Fixed' all unchecked warnings 2018-12-13 18:01:51 -05:00
Clarence "Sparr" Risher
54dd67a435 Center sectors map on most recently saved (played and not abandoned) sector (#375) 2018-12-13 17:35:24 -05:00
Anuken
18ddc040d1 Merge remote-tracking branch 'origin/master' 2018-12-13 16:46:50 -05:00
Anuken
aeb28f67e4 Overlapping icon button casings will bother me no more 2018-12-13 16:46:45 -05:00
CrazyBearTR
54b892cd29 Incomplete update for turkish translation (#272) 
Its incomplete. Still needed to work on it.
 2018-12-13 15:58:06 -05:00
Anuken
2e28525c4b Typo fix 2018-12-13 08:37:05 -05:00
Anuken
8aa8de570f Fixed editor UI bug 2018-12-12 22:19:46 -05:00
Anuken
6723479c32 Removed sound config 2018-12-12 20:13:21 -05:00
Anuken
e318b6a113 Fixed #374 (temporary workaround) 2018-12-12 13:17:11 -05:00
Anuken
df44f82198 Drownable tar and lava 2018-12-12 10:10:15 -05:00
Anuken
97d54868e9 Grid mode tweak 2018-12-11 17:48:55 -05:00
Anuken
65e65ba308 Formatting cleanup / Bugfix 2018-12-11 17:29:13 -05:00
Anuken
2056d5e350 Merge branch 'master' of https://github.com/Anuken/Mindustry 2018-12-11 17:24:14 -05:00
indielm
8b3b72243f Gridmode and eyedropper select (#372) 
* Gridmode

Adds keybindings to category and block selection

* bugfixes and comments

* more keybind

* Update PlacementFragment.java

* Update PlacementFragment.java

* eyedropper crashfix

* formatted with default.xml
 2018-12-11 17:24:05 -05:00
Timmeey86
511983e1ea Merge branch 'master' of https://github.com/Anuken/Mindustry into baltitenger 2018-12-11 00:17:15 +01:00
Anuken
13e5df62c9 Removed fog classes 2018-12-10 14:12:50 -05:00
Anuken
8debf8caf8 Message cleanup / Player target reset 2018-12-10 14:10:54 -05:00
William So
eab90cac05 [Completed] Translate the rest of bundle_zh_TW.properties (#370) 
* Translate unit strings

* Translate tutorial strings

* Translate walls', projecters', and turrents' strings

* Translate recently added strings

* Translate strings to the part before power

* Translate strings to the part before containers

* Translate containers', drills', and mechs' strings

* Translate factories' strings

* Translate everything else untranslated
 2018-12-10 10:47:40 -05:00
VizardAlpha
ce401b01b6 Updates bundle_fr_BE.properties (#373) 2018-12-10 10:39:14 -05:00
Anuken
271dcd46bc Bugfixes 2018-12-10 10:38:09 -05:00
Anuken
c1a7b452e0 Misc cleanup 2018-12-09 23:28:36 -05:00
Timmeey86
e50ff6b0a5 Merged current master and fixed conflicts 2018-12-09 22:40:33 +01:00
Anuken
34ddb92e4d Merge remote-tracking branch 'origin/master' 2018-12-09 14:42:25 -05:00
Anuken
35b16c7292 New placement unit tests / Placing bugfix 2018-12-09 14:42:22 -05:00
Anuken
931fc93b4b Merge branch 'master' of https://github.com/Anuken/Mindustry into crafting-rework 2018-12-09 11:16:39 -05:00
BasedUser
aacd9dc62c Update bundle_ru.properties (#369) 2018-12-09 00:05:09 -05:00
Anuken
061c55614b Balancing / Tau mech mobile block repair 2018-12-08 20:11:15 -05:00
Timmeey86
41c6887f33 Merge branch 'master' of https://github.com/Anuken/Mindustry into baltitenger 2018-12-08 20:07:45 +01:00
Anuken
b427185fac 'Added' attack mode / Core inventory sharing 2018-12-07 19:32:44 -05:00
Anuken
6fa14accfe Added proper core blocks / Murdered snek 2018-12-07 15:19:14 -05:00
Timmeey86
e6261a6bf8 Merge branch 'master' of https://github.com/Anuken/Mindustry into baltitenger 2018-12-07 19:40:10 +01:00
Timmeey86
0a76647175 ForceProjector should now work properly 2018-12-07 19:38:14 +01:00
Timmeey86
787706b1f7 Set default minimum power to 50% and set four blocks to 100% 2018-12-07 19:37:51 +01:00
Anuken
94665e8055 Formatting / Removed mobile map screenshots due to crashes 2018-12-07 13:10:25 -05:00
Anuken
b24770629e Merge remote-tracking branch 'origin/master' 2018-12-07 12:12:09 -05:00
Anuken
a09bd09a0e Removed tank chaining 2018-12-07 12:11:58 -05:00
Prosta4okua
988df8742c
Update bundle_uk_UA.properties 2018-12-07 10:27:11 +02:00
Prosta4okua
10c41bf443
Update bundle_uk_UA.properties 2018-12-07 10:16:21 +02:00
Prosta4okua
bb30876557
From Ber and 2018-12-07 10:13:22 +02:00
Anuken
81c24b3de1 Fixed file chooser style / Fixed sector save invisibility 2018-12-06 22:27:39 -05:00
Anuken
4e1f734af7 Merge remote-tracking branch 'origin/master' 2018-12-06 19:57:31 -05:00
Anuken
2f726cf7f2 (2) 2018-12-06 19:57:26 -05:00
Timmeey86
e726d16094 Removed power bars from direct consumers 2018-12-06 19:49:49 +01:00
Timmeey86
5bda5124e6 Merged current master to branch 2018-12-06 19:48:01 +01:00
Anuken
1a66b7c4c3 Graphical fix 2018-12-06 11:41:05 -05:00