mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-05 00:17:33 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,244 Commits 4 Branches 160 Tags 2.3 GiB
a06f6f0b2d
Commit Graph

6199 Commits

Author SHA1 Message Date
Anuken
a06f6f0b2d Refactoring 2020-05-13 22:29:27 -04:00
Anuken
6e62936458 Refactoring 2020-05-13 18:11:28 -04:00
Anuken
e64122bbbb Moved MessageBlock 
it *technically* stores text
 2020-05-13 17:07:47 -04:00
Anuken
8abe6c4270 Merge remote-tracking branch 'origin/master' 2020-05-13 17:05:10 -04:00
Anuken
04dc701c25 Various campaign-related tweaks 2020-05-13 17:04:59 -04:00
zethnest
2dfa334ba6
Lowercases ColorNames (#2053) 
* lowercase colornames

* change yellow to accent
 2020-05-13 14:38:26 -04:00
ian
b758b69243
Partially add to and fix swedish translations (#2052) 2020-05-13 14:37:05 -04:00
Anuken
c432639dfa Bugfixes 2020-05-12 21:41:45 -04:00
Anuken
ab49825d35 Merge remote-tracking branch 'origin/master' 2020-05-12 21:34:40 -04:00
Anuken
6a22d45320 Prototype unit cap mechanic 2020-05-12 21:34:27 -04:00
Summet
fea5142955
Replaced all upper-case colors to lower-case (#2044) 2020-05-12 20:03:35 -04:00
Alberto Galera
4910afbc82
Fix translation typo (#2045) 
* Fix translation typo

* typo
 2020-05-12 20:03:23 -04:00
Anuken
fe9df51721 Upgraded to 'implementation' / 'api' 2020-05-12 12:31:09 -04:00
Anuken
0663d8067a Merge remote-tracking branch 'origin/master' 2020-05-12 09:41:12 -04:00
Anuken
27ffefa0cd Added sprites 2020-05-12 09:41:07 -04:00
zethnest
3c4c046e1f
align opacity check with ItemBridge (#2036) 
* align opacity check with ItemBridge

* align opacity check with ItemBridge
 2020-05-12 09:38:27 -04:00
Anuken
f6d8658ee2 Fixed #2040 / Fixed #2039 / Fixed #2038 / Fixed #2037 / Fixed #2035 2020-05-12 09:34:26 -04:00
Anuken
7f3f1d7d76 Merge remote-tracking branch 'origin/master' 2020-05-11 23:40:34 -04:00
Anuken
43642ff546 Bugfixes / Cleanup 2020-05-11 23:40:23 -04:00
sk7725
911424b2e2
Changed [lighthray] to [lightgray] (#2033) 
If somehow the color [lighthray] will be added, ignore this pull request!
 2020-05-11 21:23:50 -04:00
Anuken
8e50228df2 Merge remote-tracking branch 'origin/master' 2020-05-11 13:20:38 -04:00
Anuken
9cca79adaa Fixed #2032 2020-05-11 13:20:27 -04:00
Lapis
130eee35ec
Update bundle_ja.properties (#2029) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix

* fix typo

* bundle_ja.properties

* Small fix

* Small fix
 2020-05-11 10:46:34 -04:00
Anuken
03d0849538 Merge remote-tracking branch 'origin/master' 2020-05-11 00:41:39 -04:00
Anuken
3ea2360290 Removal of unused assets/classes 2020-05-11 00:41:35 -04:00
TheMainOne
a5b235d829
Fixed "Restart required" (#2025) 2020-05-10 22:56:24 -04:00
Lapis
1514f9f7ec
Update bundle_ja.properties (#2026) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix

* fix typo

* bundle_ja.properties
 2020-05-10 22:48:14 -04:00
Anuken
a344c1a5d0 Better sun 2020-05-10 19:17:08 -04:00
Anuken
686c451ea6 Minor tweaks 2020-05-10 17:22:13 -04:00
Anuken
c7d2be5a7f Selection tweaks 2020-05-10 13:58:04 -04:00
Anuken
07701f8c01 Merge remote-tracking branch 'origin/master' 2020-05-10 13:34:57 -04:00
Anuken
2cb9cfb097 Cleanup 2020-05-10 13:34:52 -04:00
DLJ-345
11d2ed06cd
Update bundle_fi.properties (#2020) 2020-05-10 12:27:44 -04:00
Summet
c62a87e81a
Deleting a block in the editor by right-clicking (#2021) 
* Deleting a block in the editor by right-clicking

* Small fix

Co-authored-by: Anuken <arnukren@gmail.com>

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-05-10 10:44:54 -04:00
Anuken
dabc891791 Cleanup 2020-05-10 10:37:36 -04:00
Anuken
0adc2811bb Bugfixes 2020-05-10 09:14:13 -04:00
Anuken
d6412bf19c Static cleanup 2020-05-09 22:25:19 -04:00
Anuken
fce89d4db5 Fixed #2015 2020-05-09 22:24:13 -04:00
Anuken
1fdd9dd124 Merge remote-tracking branch 'origin/master' 2020-05-09 16:29:07 -04:00
Anuken
f0d2f7b728 "grabage struct" 2020-05-09 16:29:01 -04:00
Lapis
53d60e9cf6
Update bundle_ja.properties (#2013) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix

* fix typo
 2020-05-09 10:21:34 -04:00
Anuken
bc658f9f45 Synced weather 2020-05-08 21:55:40 -04:00
Anuken
95a1d84eb9 Support for weather in rules / Sector weather 2020-05-08 21:51:17 -04:00
Anuken
d7eb365446 Merge remote-tracking branch 'origin/master' 2020-05-08 20:22:16 -04:00
Anuken
8d5cd7b814 Serialization that makes more sense 2020-05-08 20:22:11 -04:00
valtsu41
dcaf0dded5
Better zone naming in finnish (#2008) 2020-05-08 18:28:20 -04:00
cinnx
21e446e6f0
Update bundle_pl.properties (#2010) 
updated, fixed and translated some phrases.
thanks @Kubek0212 for reporting old description of power nodes ❤
 2020-05-08 16:43:11 -04:00
Anuken
aab97fefc8 Fixed puddles not appearing / Overdrive tweaks 
- Bridges, routers and junctions can (probably) be overdrived now, untested
 2020-05-08 16:41:59 -04:00
Anuken
bcec6261d1 Added rain, better snow implementation 2020-05-08 16:13:49 -04:00
Anuken
cda3c3743b Merge remote-tracking branch 'origin/master' 2020-05-08 09:30:48 -04:00