mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-22 04:28:27 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,464 Commits 4 Branches 160 Tags 2.3 GiB
b5f1e566b2
Commit Graph

1913 Commits

Author SHA1 Message Date
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
Anuken
e47836cc64
Merge branch 'master' into patch-2 2019-06-07 14:16:00 -04:00
Anuken
f8f48f1c88
Merge pull request #491 from MrPickles14/patch-1 
Update bundle_fr.properties
 2019-06-07 14:14:29 -04:00
Anuken
95e8a603a5
Merge pull request #489 from Kieaer/patch-5 
bundle_ko
 2019-06-07 14:14:03 -04:00
Anuken
c400fd88f3
Merge pull request #487 from beito123/master 
Update Japanese translations
 2019-06-07 14:13:06 -04:00
Anuken
095d90fd22
Merge pull request #484 from Deyvid67/patch-2 
Update bundle_pt_BR.properties
 2019-06-07 14:11:47 -04:00
Anuken
797be92ddd
Merge pull request #482 from laohuaji233/patch-7 
Update bundle_zh_CN.properties
 2019-06-07 14:11:32 -04:00
Anuken
7f23bd694c
Merge pull request #480 from Prosta4okua/patch-1 
Update bundle_uk_UA.properties
 2019-06-07 14:11:15 -04:00
Anuken
1cbf8b960a Added clarifying mode descriptions 2019-06-07 14:10:23 -04:00
Anuken
c8ce195522 Reverted buffers / Added Dexapnow's fixed zone maps [untested] 2019-06-07 14:07:32 -04:00
Anuken
1b4b1d5c9f Maps updated / 100 starting copper in custom maps 2019-06-06 22:45:25 -04:00
Anuken
aee800ab7a Changed turret outlines / Wall block tweaks 2019-06-06 21:18:54 -04:00
Anuken
895b46307a Sprite tweaks 2019-06-06 18:47:53 -04:00
VizardAlpha
328cdac60f
Update bundle_fr_BE.properties 2019-06-06 15:38:24 +02:00
Anuken
3942c6cd55 Even more sprites cleaned up 2019-06-06 00:28:09 -04:00
Anuken
f0f7b5aaf7 Updated sprites 2019-06-05 21:29:34 -04:00
키에르
3ad9e44891
Update bundle_ko.properties 2019-06-05 23:05:01 +09:00
Anuken
80bdaa1edc Cleanup 2019-06-04 23:30:07 -04:00
Anuken
39acb224d1 Merged replacement sprites. Scaling is now disabled by default. 2019-06-04 22:54:01 -04:00
Anuken
f51d565db8 Darker decals / map tweaks 2019-06-04 22:06:17 -04:00
Anuken
fce69005a9 Islands map 2019-06-03 22:09:43 -04:00
Anuken
b73420b156 Added map assets 2019-06-02 23:15:36 -04:00
Anuken
fb863cb39b Editor bugfixes / Median filter 2019-06-02 17:45:44 -04:00
VizardAlpha
9039d52817
Updates bundle_fr_BE.properties 2019-06-01 23:12:52 +02:00
Anuken
940965f03d .mmap file importing / Better exception parsing 2019-05-31 10:24:51 -04:00
Anuken
581782af28 Mass driver power fix / Bugfixes 2019-05-31 09:10:37 -04:00
Prosta4okua
cdb3d29767
Update bundle_uk_UA.properties 2019-05-30 09:56:57 +03:00
Prosta4okua
90fe5329e3
Update bundle_uk_UA.properties 2019-05-30 09:53:37 +03:00
Prosta4okua
22e20cb2da
Update bundle_ru.properties 2019-05-30 09:51:54 +03:00
Anuken
a3454e50d7 Merge 2019-05-30 00:27:05 -04:00
Anuken
75b8f5e543 Properly rounded sprites for 'source/sorter' blocks 2019-05-29 23:42:03 -04:00
Anuken
752267c521 Fixed many various map bugs 2019-05-26 16:46:44 -04:00
Anuken
ba0b4513f1 New tile transitions 2019-05-25 23:56:21 -04:00
Prosta4ok_ua
ceea0d1730 Hmmmm 
Hmmmm
 2019-05-20 21:25:16 +03:00
키에르
764ea699b1
Update bundle_ko.properties 2019-05-20 13:14:59 +09:00
Anuken
bdb7f522fb Balancing / Item tweaks 2019-05-19 17:50:11 -04:00
Prosta4ok_ua
1687ce3182 Added new translations 2019-05-14 23:59:24 +03:00
Anuken
54ad52edc2 Merging of map saves 2019-05-14 11:54:22 -04:00
Anuken
4d40af6ac0 More helpful in-game edit button 2019-05-13 11:47:38 -04:00
Anuken
b2341bf75c Added map default rule editing 2019-05-13 11:31:25 -04:00
Anuken
52674b4668 Mobile diagonal toggle / Cancel button moved 2019-05-12 11:19:31 -04:00
Anuken
4ae2370137 New WIP custom map selection 2019-05-12 10:32:08 -04:00
키에르
cee55afa5c
Update bundle_ko.properties 2019-05-12 15:46:03 +09:00
키에르
f998bbbe4c
Update bundle_ko.properties 2019-05-12 14:45:25 +09:00
Anuken
dd75d88d2f Unit creation, team switch 2019-05-11 12:32:13 -04:00
Anuken
3e51fab387 In-game editing (broken) 2019-05-10 19:13:55 -04:00
Anuken
ae6c938abb Merge remote-tracking branch 'origin/master' 2019-05-10 16:02:15 -04:00
Anuken
68faae69c5 Fixed compilation errors / Re-added basic trace dialog 2019-05-10 16:02:05 -04:00
MrPickles14
08edce7906
Update core/assets/bundles/bundle_fr.properties 
Co-Authored-By: Math2128 <math2128@gmail.com>
 2019-05-10 14:32:24 -04:00
MrPickles14
55eb493d1f
Update bundle_fr.properties 
J'ai changé 2 ou 3 trucs et ajouté des traductions qui n'étaient pas faites
 2019-05-10 14:30:38 -04:00
MrPickles14
df26148e7c
Update bundle_fr.properties 2019-05-10 12:23:21 -04:00
Anuken
23843be981 More bugfix stuff 2019-05-09 12:57:00 -04:00
Anuken
486e3ffc0a Actual map conversion, loading of saves 2019-05-09 10:53:52 -04:00
Leone25
24374cf7e3 Update bundle_it.properties (#490) 
please merge as soon as possible
 2019-05-07 09:34:42 -04:00
키에르
bb322f1bff
Update bundle_ko.properties 2019-05-06 16:20:54 +09:00
키에르
72843e9c92
Update bundle_ko.properties 2019-05-06 16:19:20 +09:00
Prosta4ok_ua
e4e2b6ab00 Hmmmmmm 2019-05-05 18:37:24 +03:00
beito123
b37ae484c0
Update Japanese translations 2019-05-05 23:39:15 +09:00
Anuken
a3f5583326 Fixed tar fields 2019-05-04 22:17:17 -04:00
beito123
18f1b5f9d2
Update Japanese translations 2019-05-05 01:52:35 +09:00
beito123
96a92fd85f
Update Japanese translations 2019-05-04 18:42:05 +09:00
beito123
e5175d6309
Update Japanese translations 2019-05-04 18:37:44 +09:00
beito123
b5ceee3336
Merge remote-tracking branch 'upstream/master' 2019-05-04 16:42:48 +09:00
Anuken
93ffb66e59 Fixed all known issues with power system 2019-05-03 21:19:41 -04:00
Anuken
a161c09441 Switched default mech to dart / Bugfixes 2019-05-03 09:21:45 -04:00
Anuken
b2408b1a7c New block stats / Junction bugfixes 2019-05-02 23:10:41 -04:00
Deyvid67
c97826ed29
Update bundle_pt_BR.properties 2019-05-02 14:33:29 -03:00
beito123
9f5a183793
Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	core/assets/bundles/bundle_ja.properties
 2019-05-02 20:08:10 +09:00
L5474
4054c7d12d fix #481 + capitalization (#483) 
hope you're happy based
 2019-05-01 15:40:37 -04:00
laohuaji233
bb5e454b91
Update bundle_zh_CN.properties 
Most of them have been translated into Chinese, but there are still some uncertainties.
 2019-05-01 23:19:27 +08:00
Prosta4okua
ffb12f9c0b
Update bundle_ru.properties 2019-05-01 18:18:01 +03:00
Prosta4okua
a89786d079
Update bundle_uk_UA.properties 2019-05-01 18:17:35 +03:00
Anuken
2d3fd513d8 1 2019-05-01 11:12:27 -04:00
Prosta4ok_ua
271d01dc9d Tar fields, Overgrowth, Dart Mech Pad 2019-05-01 13:16:12 +03:00
Prosta4okua
d3ffaea042
Update bundle_uk_UA.properties 2019-05-01 11:36:13 +03:00
Anuken
f3385e6453 Pruned bundles 2019-04-30 23:34:41 -04:00
Anuken
761e0114a5 Apparent typo fix 2019-04-30 12:56:57 -04:00
laohuaji233
dcae128d06 Update bundle_zh_CN.properties (#475) 
more translations
 2019-04-30 12:49:39 -04:00
J-VdS
a891a8badc NL_BE bundle progress (Fishbuilder) (#474) 
* Create bundle_nl_BE.properties

work in progress, just to save the file

* tot 148
 2019-04-30 12:47:54 -04:00
Zachary
f3ec5b533e Update bundle_ja.properties (#473) 
Translated like one name lmao
 2019-04-30 12:47:42 -04:00
Zachary
d50397edf1 Update bundle_zh_CN.properties (#472) 
Translated more block names.
 2019-04-30 12:47:32 -04:00
Predator127
70f279d978 Update bundle_pt_BR.properties (#467) 
This is an updated version of the Brazillian translation, Made by Hanko
 2019-04-30 12:46:01 -04:00
VizardAlpha
84c5a75b6c Updates bundle_fr_BE.properties (#462) 
* Updates bundle_fr_BE.properties

* Update bundle_fr_BE.properties

* Update bundle_fr_BE.properties
 2019-04-30 12:45:38 -04:00
Paul T
97663e87a6 Update bundle_de.properties (#452) 
* Update bundle_de.properties

* Update bundle_de.properties
 2019-04-30 12:45:06 -04:00
laohuaji233
5956edcb8e Update bundle_zh_CN.properties (#453) 
More translations
 2019-04-30 12:44:57 -04:00