Commit Graph

1784 Commits

Author SHA1 Message Date
Anuken
dc81071c58 Merge branch 'master' into patch-1 2019-07-29 10:50:40 -06:00
Anuken
8e85b71669 Fixed mobile layout 2019-07-29 12:49:09 -04:00
Anuken
f439afae9e Descriptions for nearly everything 2019-07-29 12:33:11 -04:00
Anuken
fdd749be18 Pre-description change 2019-07-29 10:15:44 -04:00
Prosta4ok_ua
f6093f483c Gm
Description
2019-07-28 22:30:52 +03:00
Anuken
666e3e51a3 Bugfixes 2019-07-28 10:53:26 -04:00
Anuken
b930d5a1f9 might as well merge bloom 2019-07-27 16:16:22 -04:00
Anuken
67b4fa6f68 Map tweaks 2019-07-27 12:21:32 -04:00
Anuken
aa3e7a8ef5 Finalized map number 2019-07-27 10:52:46 -04:00
Anuken
7bf6099528 Added 2 new maps 2019-07-27 09:27:03 -04:00
Prosta4ok_ua
fde88e437b Merge branch 'patch-1' of https://github.com/Prosta4okua/Mindustry into patch-1 2019-07-27 12:27:02 +03:00
Prosta4ok_ua
eb5ce3e05d .-. 2019-07-27 12:26:12 +03:00
Anuken
7b83406ee4 Blend filter parameters / New map 2019-07-26 20:46:06 -04:00
Anuken
c4157d2ec8 New map / Better filters / Sand boulders 2019-07-26 18:59:33 -04:00
Anuken
0ffa0351b5 Removed ores from existing built-in maps / Default oregen 2019-07-25 23:24:12 -04:00
Anuken
c4ceb89240 Implemented random map load filters 2019-07-25 21:27:16 -04:00
Anuken
795e774119 Canyon map 2019-07-25 13:08:07 -04:00
Anuken
518bffe644 SDL backend / Valid mode sprites / Better layout 2019-07-25 11:45:49 -04:00
Anuken
3310f49f68 steamed generators 2019-07-25 00:22:33 -04:00
Anuken
bf7803d554 Implemented gamemode validation 2019-07-24 23:05:16 -04:00
Anuken
c9bd253960 Fixed drones being idiots / Added another PvP map 2019-07-24 21:25:33 -04:00
Anuken
859591cea5 Added pvp/attack map 2019-07-24 16:23:56 -04:00
Anuken
b99b13a6e4 Added mirror tool for attack/PvP maps 2019-07-24 12:07:12 -04:00
Anuken
c80be4940f Fixed unit tests / Fixed some major tile loading flaws 2019-07-23 23:29:48 -04:00
Anuken
52374ce06d Zone changes 2019-07-23 11:45:46 -04:00
Prosta4okua
8ba04a98be Update bundle_uk_UA.properties 2019-07-23 10:56:15 +03:00
Prosta4okua
62634c0fe0 Update bundle_ru.properties 2019-07-23 10:55:22 +03:00
Anuken
5a594f7d9a Bugfixes / unfinished new zones 2019-07-22 18:47:23 -04:00
Anuken
6f0bc2ecf8 Minor build fixes 2019-07-22 12:42:42 -04:00
Anuken
4e22384ed1 Merge branches 'master' and 'uiscale' of https://github.com/Anuken/Mindustry 2019-07-17 21:19:16 -04:00
Anuken
029f801159 Added UI scale slider 2019-07-17 17:20:21 -04:00
L5474
fd53671430 Removed duplicate of my name (#558)
just saw #557 and got reminded of this file and checked it out. Why is my name on here twice lol.
2019-07-14 15:25:42 -06:00
Anuken
7b09548261 Merge remote-tracking branch 'origin/master' 2019-07-14 15:25:38 -04:00
Anuken
63e1311656 Bugfixes / Incomplete zone description field 2019-07-14 15:25:30 -04:00
Arkanic
36a303a86f I meekly request (#557) 2019-07-14 12:19:35 -06:00
Anuken
14d0927fb6 Basic deploy background 2019-07-12 01:03:01 -04:00
Anuken
e52965d039 Bugfixes 2019-07-10 09:55:31 -04:00
Prosta4ok_ua
6161fb10af Капіталізація це зло. 2019-07-09 16:38:12 +03:00
Anuken
d8d04f2ac3 Moved block icons to UI atlas 2019-07-08 15:49:47 -04:00
Anuken
1c38e73290 a warning 2019-07-08 11:07:45 -04:00
Prosta4ok_ua
4b4fc8e9ee Fixes 2019-07-08 16:35:54 +03:00
Prosta4okua
ed50ed8550 Update bundle.properties (#553)
* Update bundle.properties

* Update bundle.properties

* Update bundle.properties

* Update bundle.properties
2019-07-08 07:20:08 -06:00
Anuken
fc9543baa7 Updated sprites/UI colors 2019-07-07 14:11:57 -04:00
Anuken
aab13a5582 Merge branch 'master' into patch-8 2019-07-06 17:13:06 -06:00
Anuken
f852ba02d8 Merge pull request #546 from Natchuz/polish-translation
Updated bundle_pl.properties
2019-07-06 17:12:35 -06:00
Anuken
4aa074b9fc Merge pull request #547 from etaoinshrdlcumwfgypbvkjxqz/zh-TW
Update Chinese (Taiwan) translation
2019-07-06 17:12:19 -06:00
Anuken
2f7503c752 Merge pull request #548 from Prosta4okua/patch-3
Update bundle_uk_UA.properties
2019-07-06 17:12:03 -06:00
Anuken
d754593c2b Merge pull request #549 from Prosta4okua/patch-4
Update bundle_ru.properties
2019-07-06 17:11:43 -06:00
Anuken
3dfef06bba Bugfixes 2019-07-06 18:42:05 -04:00
Prosta4okua
120faf3806 Update bundle_ru.properties 2019-07-06 21:31:01 +03:00