mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-15 12:24:28 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,762 Commits 4 Branches 160 Tags 2.3 GiB
f5b6e13a1c
Commit Graph

1997 Commits

Author SHA1 Message Date
Anuken
89ee04c942 Machine ambient sounds 2019-08-15 13:32:36 -04:00
Anuken
bf21c94bd7 Bugfixes 2019-08-14 10:27:10 -04:00
Anuken
c9178c3f2f Fixed power nodes in multiplayer 2019-08-13 22:47:31 -04:00
Anuken
335b6ae0cc bundle 2019-08-13 17:48:19 -04:00
Anuken
9bde68a86f Merge remote-tracking branch 'origin/master' 2019-08-13 16:51:10 -04:00
Anuken
c3201178ae typo 2019-08-13 16:51:03 -04:00
Teamblur
366636ef7d Create bundle_et.properties (#498) 
* Create bundle_et.properties

* Update bundle_et.properties

lisasin mõne tõlke eest poolt

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties

* Update bundle_et.properties
 2019-08-13 16:49:10 -04:00
Dominik
47112e233e Update bundle_pl.properties (#566) 
* Update bundle_pl.properties

Updated names of blocks in editor and some more

* Update bundle_pl.properties

* Update bundle_pl.properties

* Update bundle_pl.properties

* Update bundle_pl.properties

* Update bundle_pl.properties

* Update bundle_pl.properties
 2019-08-13 16:48:02 -04:00
laohuaji233
88f005be0c Update bundle_zh_CN.properties (#568) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2019-08-13 16:47:48 -04:00
Prosta4okua
f454cd3291 Patch 1 (#569) 
* Fixes

* Капіталізація це зло.

* Update bundle_ru.properties

* Update bundle_uk_UA.properties

* .-.

* Gm

Description

* Oof

* ЈҮУКЕНГШҺЗХҸЖДЛОРПАВЫӘЧСМИТҒБӨ

* dada

* Translate new descriptions

* й

* Ukrainian finished. Fixed some errors.

* Translated everything. Maybe.

* /

* 1

* Added tutorial. Thank to Slava0135 and ymomfe.

* 1
 2019-08-13 16:46:12 -04:00
AmateurPotion
23038dc6f7 Update bundle_ko.properties (#577) 
* Update bundle_ko.properties

Update!

* Update bundle_ko.properties

error xd

* Update bundle_ko.properties

third edit...

* Update bundle_ko.properties

one change

* Update bundle_ko.properties
 2019-08-13 16:36:19 -04:00
Anuken
58b4f64125 Tutorial fixes 2019-08-13 16:26:02 -04:00
Anuken
974ab59fd2 Classic data backup dialog 2019-08-13 15:14:03 -04:00
Anuken
f2f6dc89a2 fire 2019-08-13 12:04:09 -04:00
Anuken
bff9d89232 more sounds 2019-08-13 11:42:01 -04:00
Anuken
a818da5eb7 some bad sounds 2019-08-12 23:29:24 -04:00
Anuken
d0ff0307f5 New icon 2019-08-12 13:29:02 -04:00
Anuken
c4aa0b2863 New discord app ID / New testing sounds 2019-08-12 12:32:13 -04:00
Anuken
0770574f17 Sound things 2019-08-11 16:55:32 -04:00
Anuken
6314bf51df audio cleanup 2019-08-11 13:46:14 -04:00
Anuken
4c08c98f8c Work on sound effects 2019-08-11 10:47:22 -04:00
Anuken
2341da995e Random in-game music, untested 2019-08-10 18:56:20 -04:00
Anuken
4ef60af4a8 Fixed maps not being able to override gamemode-specific settings 2019-08-10 11:43:28 -04:00
Anuken
16f6b51857 Various tweaks, new music tracks 2019-08-09 23:23:45 -04:00
Anuken
59e53eb672 mandatory hosting/joining info 2019-08-09 14:01:25 -04:00
Anuken
c7724e9122 Converted sounds to ogg 2019-08-09 13:51:24 -04:00
Anuken
2c4379acd1 Tutorial improvements 2019-08-09 12:18:08 -04:00
Anuken
70a4c2f3ed slightly less of a mess 2019-08-08 21:45:55 -04:00
Anuken
83c86b3883 more tutorial 2019-08-08 21:26:50 -04:00
Anuken
9924796ad9 A somewhat complete tutorial 2019-08-08 20:50:15 -04:00
Anuken
b587b6bb4d More tutorial 2019-08-08 17:26:20 -04:00
Anuken
4811578c95 Incomplete tutorial basics 2019-08-08 17:03:45 -04:00
Anuken
c1ff370923 Fixed scaling / Improved power node visuals / Balancing 2019-08-08 10:48:35 -04:00
Anuken
e55575f093 Editor music updated 2019-08-07 19:21:50 -04:00
Anuken
703f034054 Bugfixes 2019-08-07 18:16:51 -04:00
Anuken
8359789d4f Bugfixes 2019-08-06 19:10:32 -04:00
Anuken
8162e13f04 Balancing, fixes, general improvements 2019-08-06 18:05:17 -04:00
Anuken
282aab5939 Zone improvements 2019-08-06 13:01:54 -04:00
Anuken
e8bbc2bf4c Sound re-organized 2019-08-05 20:39:16 -04:00
Anuken
99f2b8f536 Deploy music 2019-08-05 14:49:37 -04:00
Anuken
8346d5fc13 Fixed connection not resetting on game load / Experimental click changes 2019-08-05 10:26:24 -04:00
Anuken
3a841c6c0f stuff and things 2019-08-04 20:02:07 -04:00
Anuken
ecd30094b1 Cursor antialiasing 2019-08-04 09:41:25 -04:00
Anuken
81909bd1a9 Moved launch controls to wave button 2019-08-04 08:58:51 -04:00
Anuken
319d65f9a3 New re-balanced attack map 2019-08-03 11:29:37 -04:00
Anuken
2726ebe191 Re-balanced starting item amount 2019-08-03 00:04:33 -04:00
Anuken
878901d05d more ores 2019-08-02 20:30:15 -04:00
Anuken
06c5c92d2c Updated previews 2019-08-02 19:46:18 -04:00
Anuken
438f128e2e New map ore balancing / Reduced item burn rate 2019-08-02 18:32:33 -04:00
Anuken
8e84e7284e Added ore median filter 2019-08-02 12:56:21 -04:00
Anuken
2a518fa7c9 Merge remote-tracking branch 'origin/master' 2019-08-02 10:10:48 -04:00
Anuken
04c8ecf4af New team colors 2019-08-02 10:10:37 -04:00
AmateurPotion
67743dded5 add my nickname (#571) 
I'm Korean translater& r-e server owner. May I be added here?
 2019-08-02 08:23:18 -04:00
Anuken
5acda423d8 UI polish 2019-08-01 22:40:15 -04:00
Anuken
8b3995686f Misc. in-game UI polish 2019-08-01 20:49:03 -04:00
Anuken
f388ca298e Better carried item display 2019-08-01 17:49:10 -04:00
Anuken
26d26b5e7a Drill output/speed display 2019-08-01 13:32:38 -04:00
Anuken
b1980a17ac Fixed editor not showing after second view 2019-08-01 11:26:28 -04:00
Anuken
69ee5257f2 Display current ammo type in turret info 2019-08-01 11:03:20 -04:00
Anuken
2be3cc2f1e a mess 2019-07-31 18:59:28 -04:00
Anuken
d8085d88a8 Re-added classic sound effects for testing 2019-07-31 16:25:25 -04:00
Anuken
d6b023709d Initial menu music test 2019-07-30 22:50:15 -04:00
Anuken
a00a208ff8 Annotation processor for sound asset generation 2019-07-30 12:05:59 -04:00
Anuken
5eadd6608d Updated bundles 2019-07-30 10:23:29 -04:00
Anuken
9db86f212f Typos 2019-07-30 10:12:58 -04:00
Anuken
7292479d9c Added turret ammo deficiency display 2019-07-30 00:44:41 -04:00
Anuken
c65b3f3aca Sound. 2019-07-29 21:59:59 -04:00
Anuken
c7e4fb8021 Audio progress 2019-07-29 17:01:55 -04:00
AmateurPotion
c678a5502d Update bundle_ko.properties (#563) 
* Update bundle_ko.properties

현수님 보시면 빨리 공식 업데이트 하시기 전에 이전 버전으로 돌리시고 괜찮다 싶은 것만 번역 업데이트 해주세요

* Second mistranslation correction

One more mistranslation correction remaining.
 2019-07-29 10:51:36 -06:00
laohuaji233
0ee35721b0 Update bundle_zh_CN.properties (#556) 
Many minor modifications
 2019-07-29 10:51:15 -06:00
Prosta4okua
1932f9a9c3 Fixes (#554) 
* Fixes

* Капіталізація це зло.

* Update bundle_ru.properties

* Update bundle_uk_UA.properties

* .-.

* Gm

Description
 2019-07-29 10:50:52 -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
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
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
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
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
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
Prosta4okua
f51f04d170
Update bundle_uk_UA.properties 2019-07-06 21:30:38 +03:00
Anuken
5ae1e59b5c UI 2019-07-06 12:22:10 -04:00
Anuken
e3956ebcf2 Regression fixes 2019-07-06 11:02:55 -04:00
Anuken
121e0a433b Final tweaks before merge 2019-07-06 10:12:22 -04:00
William So
2bb99bb100
Update Chinese (Taiwan) translation 2019-07-06 10:55:14 +08:00
Anuken
174caef7ca Added turret damage / Removed changelog dialog 2019-07-05 14:01:54 -04:00
Anuken
d2bb3800e3 Added version display, info dialog back 2019-07-05 13:41:22 -04:00
Anuken
f0959ab356 More UI and layout changes 2019-07-05 12:02:02 -04:00
Anuken
a7a565b93e Hacky pad fix 2019-07-04 17:29:31 -04:00
Anuken
ed074bd08b UI stuff 2019-07-04 17:11:30 -04:00
Natchuz
bd88a2378f Updated bundle_pl.properties 2019-07-04 13:21:44 +02:00
Anuken
d43d4a1773 Cleanup, main menu progress 2019-07-03 23:36:51 -04:00
Anuken
0d39400f8b Fixed performance regression / Removed useless fallback sprites 2019-07-03 17:07:22 -04:00
Anuken
d3c8678f80 Splitting UI atlas 2019-07-03 15:59:50 -04:00
Anuken
79dc116e6a Nothing interesting 2019-07-02 22:38:25 -04:00
Anuken
217237b57e New menu background, unfinished 2019-07-02 14:42:24 -04:00
Anuken
cb7b6eb3f8 More menu 2019-07-02 10:01:34 -04:00
CinExPL
09d905b96f
Update bundle_pl.properties 
few changes ;)
 2019-07-01 17:55:16 +02:00
Anuken
94f175e2cd Moved map dialog 2019-07-01 09:31:39 -04:00
Anuken
5e15c5574a menu stuff 2019-06-30 16:52:34 -04:00
Anuken
1c530a6c7a Merge + update 2019-06-30 14:13:13 -04:00
Anuken
3021cc29da Fixed tops of some generator blocks 2019-06-30 11:25:39 -04:00
Anuken
12bff75586 Various fixes 2019-06-30 00:07:04 -04:00
Anuken
ab5319f3d1
Merge pull request #515 from Kieaer/patch-6 
Update bundle_ko.properties
 2019-06-29 13:31:49 -04:00
Anuken
6128df0062
Merge pull request #517 from DVanatic/patch-1 
Request Update (bundle.in_ID.properties)
 2019-06-29 13:31:40 -04:00
Anuken
142938cdca
Merge pull request #521 from Prosta4okua/patch-1 
Patch 1. Fight!
 2019-06-29 13:31:24 -04:00
Anuken
b32efe129e
Merge pull request #523 from Predator127/patch-8 
Update bundle_pt_BR.properties
 2019-06-29 13:31:14 -04:00
Anuken
2b20272a61
Merge pull request #525 from VizardAlpha/patch-22 
Updates bundle_fr_BE.properties
 2019-06-29 13:31:01 -04:00
Anuken
d9ef79a7b5 Regression fix / Slightly better server dialog 2019-06-29 13:19:53 -04:00
Anuken
89a4e6506f Bloom option 2019-06-29 10:40:52 -04:00
키에르
47099a8a9b
Update bundle_ko.properties 2019-06-29 15:00:06 +09:00
Anuken
04dfda0c55 Some minor map tweaks and fixes 2019-06-28 23:47:43 -04:00
Anuken
22656a40b2 Bloom fix 2019-06-28 23:31:34 -04:00
Anuken
b6df916700 Map updates 2019-06-28 23:16:26 -04:00
Anuken
6fa9abd896 discard 2019-06-28 23:04:43 -04:00
Prosta4ok_ua
e239406199 Нові переклади 2019-06-25 23:16:07 +03:00
Anuken
b7a0ebad17 Merge branch 'master' of https://github.com/Anuken/Mindustry into bloom 2019-06-24 19:45:13 -04:00
Anuken
266744b1dd Fixed salvo range 2019-06-24 19:44:57 -04:00
Anuken
f8526e1ac7 Bloom 2019-06-24 19:39:57 -04:00
Anuken
649d527dcf Temporary loading screen 2019-06-23 14:09:29 -04:00
Anuken
b2a4cb42cf Sprite updates 2019-06-23 12:36:13 -04:00
Anuken
8c91aca838 New maps / New generation filter(s) and tweaks 2019-06-22 20:40:53 -04:00
Anuken
43b5cb62bb Fixed #530 / Better icons / Server list ordering 2019-06-20 22:12:17 -04:00
Anuken
1676ad5f1b Bugfixes 2019-06-20 09:14:47 -04:00
Anuken
478d86677d Fixed boulder sprites 2019-06-20 00:16:22 -04:00
Anuken
1fe30bc466 Branch created 2019-06-19 22:20:17 -04:00
Anuken
8e95be0ac2 Crash fix + drill balance 2019-06-19 21:41:49 -04:00
Anuken
3ad1949727 Minor tweaks before release 2019-06-19 18:04:31 -04:00
키에르
5e848ecbb3
Update bundle_ko.properties 2019-06-19 19:38:55 +09:00
Anuken
c9520e607f Implemented craters map, again / Disabled unit editing 2019-06-18 20:45:21 -04:00
Anuken
cb6ffd7810 Testing travis wiki building 2019-06-18 18:30:43 -04:00
Anuken
185a7bb7d8 Bugfixes / Sprite update / Multiplayer in-game editor / Drone tweaks 2019-06-17 21:35:19 -04:00
Anuken
bc3405d11d Bugfixes 2019-06-17 15:45:10 -04:00
Anuken
4f40f3c4b2 More sprite updates 2019-06-17 10:08:24 -04:00
Anuken
897c55c410 Bugfixes 2019-06-16 23:38:50 -04:00
Anuken
9e97b5851e Where did that go? 2019-06-16 19:11:41 -04:00
Anuken
625fbdb2d7 Auto-rebuilding enemy drones / GC improvements 2019-06-16 18:50:51 -04:00
키에르
0f32d3f619
Update bundle_ko.properties 2019-06-16 13:31:16 +09:00
Anuken
273c74b275 Many things 2019-06-15 23:26:43 -04:00
Anuken
25bf3be009 Merge remote-tracking branch 'origin/master' 2019-06-14 21:07:10 -04:00
Anuken
910dab1896 More drone changes 2019-06-14 21:06:58 -04:00
Arkanic
6198ad557a English bundle graphite description (#528) 
* added graphite description

graphite now has a description
Yay. my fist commit

* fixed grammar

thanks @anuken
 2019-06-14 18:40:05 -04:00
Anuken
89b3d3b670 Removed difficulty 2019-06-14 15:53:09 -04:00
Prosta4ok_ua
f5f30d6026 Add new strings 2019-06-14 14:35:15 +03:00
Anuken
8ac497354a Miner drone / Editor bugfixes 2019-06-12 22:09:24 -04:00
Anuken
0cbbcc00a5 Zone rules moved to maps 2019-06-12 19:25:22 -04:00
Anuken
18328320c1 Fixed black blocks/units after quit / Fixed intense wave spawn lag 2019-06-12 18:07:19 -04:00
Anuken
dc3c27297f Team drawing 2019-06-12 10:28:38 -04:00
Anuken
9363946874 Fixed terminology 2019-06-11 23:39:01 -04:00
Anuken
df78412896 Desktop/mobile descriptive tool modes 2019-06-11 23:31:57 -04:00
VizardAlpha
e6e5b95adc
Update bundle_fr_BE.properties 2019-06-11 16:34:08 +02:00
VizardAlpha
990adcd3b3
Updates bundle_fr_BE.properties 2019-06-11 16:23:50 +02:00
Anuken
75a5bbdbb1 Start on multicast 2019-06-11 10:05:35 -04:00
Predator127
56ff5689f4
Update bundle_pt_BR.properties 
Revised translation with a better vocabulary
 2019-06-10 22:02:15 -03:00
Prosta4ok_ua
6f589b5c84 Hello everyone 2019-06-10 18:20:08 +03:00
키에르
cddd7e0e94
Update bundle_ko.properties 2019-06-10 19:42:12 +09:00
Anuken
340bc5f2f7 Ground zero map updated 2019-06-09 23:29:10 -04:00
DVanatic
ecd117cd58
Request Update (bundle.in_ID.properties) 
I have read the guides and yes, i know the consequence of translating all lines despite it going to change soon-ish. i've been a diehard fan of this game since i saw it and really interested in following and working with this game's development!
 2019-06-10 08:39:00 +07:00
Anuken
ea0788f56c Better wave timer / Sprite tweaks / Core wave spawns 2019-06-09 21:09:29 -04:00
Anuken
4199702b9b Updated turret sprites 2019-06-09 14:46:48 -04:00
Anuken
444b5dbd97 Turret balance / Bugfixes 2019-06-09 12:04:45 -04:00
키에르
695ccfcc4d
Update bundle_ko.properties 2019-06-09 18:34:45 +09:00
Prosta4okua
62dbce089f
Update bundle_ru.properties 2019-06-08 22:42:36 +03:00
Anuken
97eb66b0a5 Bundle update 2019-06-08 12:11:32 -04:00
Anuken
dbc49649c0 Merge remote-tracking branch 'origin/master' 2019-06-07 15:04:43 -04:00
Anuken
49ee821029 More stuff fixed / Contributor list 2019-06-07 15:03:01 -04:00
Anuken
e1499330bc
Merge pull request #508 from VizardAlpha/patch-21 
Updates bundle_fr_BE.properties
 2019-06-07 14:19:21 -04:00