mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-12 11:47:30 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,144 Commits 4 Branches 160 Tags 2.3 GiB
7618b0254f
Commit Graph

3612 Commits

Author SHA1 Message Date
Anuken
aff87a26ce Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-07-22 17:01:55 -04:00
Anuken
18aae0cfa5 Zones 2019-07-22 16:09:50 -04:00
Anuken
6f0bc2ecf8 Minor build fixes 2019-07-22 12:42:42 -04:00
Anuken
8d2a637bd8 Fixed build errors 2019-07-22 00:56:00 -04:00
Anuken
54180c4768 Menu fix 2019-07-22 00:45:09 -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
61f903dcf1
Update InputHandler.java 2019-07-14 12:54:24 -04:00
Anuken
2a10562e9e Merge remote-tracking branch 'origin/master' 2019-07-13 14:04:06 -04:00
Anuken
d64796f32a Clamping of tree views 2019-07-13 14:04:01 -04:00
Franciszek Zaranowicz
f2d67d0a5d Loadout for non-zones maps (#535) 
* Loadout for non-zones maps

* Requested Changes

* Fixed Import

* Requested Changes #2
 2019-07-13 10:28:04 -06:00
Anuken
ad39a51fe8 nothing 2019-07-12 23:52:31 -04:00
Anuken
14d0927fb6 Basic deploy background 2019-07-12 01:03:01 -04:00
Anuken
1697465d0d Core balancing 2019-07-11 23:30:11 -04:00
Anuken
e52965d039 Bugfixes 2019-07-10 09:55:31 -04:00
Anuken
a8d957bf7d
Update OverdriveProjector.java 2019-07-10 09:05:47 -04:00
Anuken
b6b5343e04 Cleanup 2019-07-09 15:43:11 -04:00
Anuken
d4c318438d Removed buggy limited respawns 2019-07-09 12:12:43 -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
Anuken
7fc6b9b940 Removed quit button on iOS as per guidelines 2019-07-08 10:54:02 -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
fb4c65dae0
Update AboutDialog.java 2019-07-08 08:58:31 -04: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
07ea938885 Mobile fix / Readme updated 2019-07-06 19:08:16 -04:00
Anuken
ac87930672 Balancing 2019-07-06 19:02:28 -04: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
ec7bb78ee4 Basic UI improvements 2019-07-06 14:08:43 -04: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
bb75e8f2e0 Removed loading screen 2019-07-06 10:15:21 -04:00
Anuken
a77b1416e5 Merge branches 'master' and 'new-ui' of https://github.com/Anuken/Mindustry 2019-07-06 10:13:11 -04:00
Anuken
121e0a433b Final tweaks before merge 2019-07-06 10:12:22 -04:00
Anuken
988aee3078 Fixed editor saving incorrect map size 2019-07-05 23:34:04 -04:00
William So
2bb99bb100
Update Chinese (Taiwan) translation 2019-07-06 10:55:14 +08:00
Anuken
4e7ddc7e71 Fill tool fix 2019-07-05 14:39:45 -04: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
2c5546c6fb Slight cleanup 2019-07-04 23:40:19 -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
Anuken
d938b22729 Fixed incorrect blend/median previews on mobile 2019-07-04 09:22:13 -04:00
Natchuz
bd88a2378f Updated bundle_pl.properties 2019-07-04 13:21:44 +02:00
Anuken
0371126ccf Various menu fixes 2019-07-04 00:51:42 -04:00
Anuken
ab36b6a2e1 Random flyers 2019-07-03 23:46:55 -04:00
Anuken
d43d4a1773 Cleanup, main menu progress 2019-07-03 23:36:51 -04:00
Anuken
0837c476a1 T 2019-07-03 20:24:11 -04:00
Anuken
77a41b1783 Actually fixed FPS cap 2019-07-03 19:11:22 -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
b7008072f8 Rendering cleanup 2019-07-03 15:35:10 -04:00
Anuken
15737810f0 Fixed unit tests 2019-07-03 13:06:18 -04:00
Anuken
5036c57372 Fixed incorrect fps cap 2019-07-03 13:00:57 -04:00
Anuken
5799e6f567 Laser optimization 2019-07-03 10:41:16 -04:00
Anuken
310e8afc25 Fixed loading of older saves 2019-07-03 10:11:22 -04:00
Anuken
78215363dc Work on fixing entity ID mapping 2019-07-03 09:50:33 -04:00
Anuken
4e873f8bf3 oh no it's broken 2019-07-02 22:44:55 -04:00
Anuken
79dc116e6a Nothing interesting 2019-07-02 22:38:25 -04:00
Anuken
bb398a2f1e Crash fixes 2019-07-02 18:52:04 -04:00
Anuken
79ab2d122d Changed layout structure 2019-07-02 18:40:39 -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
Anuken
6e21d7f560 menu 2019-07-01 14:30:46 -04:00
CinExPL
09d905b96f
Update bundle_pl.properties 
few changes ;)
 2019-07-01 17:55:16 +02:00
Anuken
8f29d4871d Moved version info 2019-07-01 10:27:56 -04: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
c77f51b7ae Bugfixes 2019-06-30 10:09:20 -04:00
Anuken
12bff75586 Various fixes 2019-06-30 00:07:04 -04:00
Anuken
8bc59fb67c Fixed startup logo not fitting on screen 2019-06-29 13:50:59 -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
576f0be4ab Fixed incorrect game-overs on zone attack maps 2019-06-29 11:02:27 -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