mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 23:28:52 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,364 Commits 4 Branches 160 Tags 2.1 GiB
3d69e9c763
Commit Graph

3790 Commits

Author SHA1 Message Date
Anuken
d1304abb9e Increased node limit 2019-08-02 20:18:42 -04:00
Anuken
4ae39e851d Optional core spawn mech support 2019-08-02 20:03:04 -04:00
Anuken
06c5c92d2c Updated previews 2019-08-02 19:46:18 -04:00
Anuken
fc6e529049 mixer. 2019-08-02 18:37:06 -04:00
Anuken
438f128e2e New map ore balancing / Reduced item burn rate 2019-08-02 18:32:33 -04:00
Anuken
878af1ea28 1/2 cost rebalance 2019-08-02 13:22:45 -04:00
Anuken
8e84e7284e Added ore median filter 2019-08-02 12:56:21 -04:00
Anuken
77d4b0972d Balancing 2019-08-02 12:39: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
636b92205b Implemented sound volume 2019-08-01 16:54:36 -04:00
Anuken
26d26b5e7a Drill output/speed display 2019-08-01 13:32:38 -04:00
Anuken
01efb59d25 Fixed high sound memory usage / Basic drill output speed display 2019-08-01 13:08:50 -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
5573031d07 Created tutorial branch 2019-08-01 10:43:41 -04:00
Anuken
b812fcddf8 Merge branch 'sound' of https://github.com/Anuken/Mindustry 2019-08-01 10:38:16 -04:00
Anuken
8393639735 Moved music control 2019-08-01 10:37:04 -04:00
Anuken
28ab2b3917 Fixed crashes not saving or displaying 2019-08-01 02:28:01 -06: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
2459fb23ae cleanup 2019-07-30 22:06:21 -04:00
Anuken
4bd3f415a9 Smooth menu fade 2019-07-30 20:04:25 -04:00
Anuken
4414ee6d38 Fade-in effect / Fixed mobile scaling 2019-07-30 19:48:06 -04:00
Anuken
fdd84066f5 format 2019-07-30 16:00:32 -04:00
Anuken
4ebf39449e . 2019-07-30 15:52:20 -04:00
Anuken
d4f26e0340 Fixed sound crackle 2019-07-30 14:15:10 -04:00
Anuken
a00a208ff8 Annotation processor for sound asset generation 2019-07-30 12:05:59 -04:00
Anuken
bc77fd619d Spatial sound / Minor refactoring 2019-07-30 11:38:02 -04:00
Anuken
5eadd6608d Updated bundles 2019-07-30 10:23:29 -04:00
Anuken
1340b8d4d8 Better consumption display 2019-07-30 10:20:49 -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
301c11c208 possible oregen fix 2019-07-29 22:12:39 -04:00
Anuken
71b218ad62 just in case 2019-07-29 22:11:59 -04:00
Anuken
ec2f21b944 Fixed crash on loading some older maps 2019-07-29 22:07:25 -04:00
Anuken
c65b3f3aca Sound. 2019-07-29 21:59:59 -04:00
Anuken
43280ee077 Fixed numerical rules resetting on Android 2019-07-29 17:19:17 -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
5c10a2662d Moved clear color 2019-07-27 16:12:51 -04:00
Anuken
214f451cc1 Tweak 2019-07-27 16:10:17 -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
e90a4eb71d SDL tools 2019-07-26 21:24:07 -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
2bdfaef2d9 Fixed ores generating over spawnpoints 2019-07-26 00:11:31 -04:00
Anuken
2b0fbd9904 """better""" map generation dialog 2019-07-26 00:04:36 -04:00
Anuken
0ffa0351b5 Removed ores from existing built-in maps / Default oregen 2019-07-25 23:24:12 -04:00
Anuken
951cbf3d16 Fixed some generation issues 2019-07-25 22:18:45 -04:00
Anuken
c4ceb89240 Implemented random map load filters 2019-07-25 21:27:16 -04:00
Anuken
4a638cba79 Merge remote-tracking branch 'origin/master' 2019-07-25 19:18:14 -04:00
Anuken
c209528271 Cleaned up generation filter code 2019-07-25 19:18:04 -04:00
Anuken
0d1f590937
Update CrashSender.java 2019-07-25 17:44:33 -04:00
Anuken
513243ba0f Fixed version not parsing on crash 2019-07-25 13:21:55 -04:00
Anuken
795e774119 Canyon map 2019-07-25 13:08:07 -04:00
Anuken
d02d419729 Fixed SDL crash 2019-07-25 12:46:31 -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
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
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
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
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
ab716e96e2 Bugfixes 2019-06-24 16:54:50 -04:00
Anuken
649d527dcf Temporary loading screen 2019-06-23 14:09:29 -04:00
Anuken
c5e7ddaf7a
Added option to set TextField length for showTextInput() (#534) 
* Add files via upload

* Added option to set TextField length for showTextInput()

the character length default was 12, and unchangeable afaik, so I added an option to change the character length, as well as suggesting a new character length for save file's name.
(I actually have no idea if this PR can be delivered correctly, wish me luck.)

* Rename UI.java to core\src\io\anuke\mindustry\ui/UI.java

* Rename SaveDialog.java to core\src\io\anuke\mindustry\ui\dialogs\SaveDialog.java

* Delete UI.java

* Added option to set TextField length for showTextInput()

the character length default was 12, and unchangeable afaik, so I added an option to change the character length, as well as suggesting a new character length for save file's name. (I actually have no idea if this PR can be delivered correctly, wish me luck.)

* Delete UI.java

* Delete SaveDialog.java

* Add files via upload

* Add files via upload

* Delete UI.java

* Delete SaveDialog.java

* Delete core\src\io\anuke\mindustry\ui\dialogs\SaveDialog.java

* Delete Mindustry-64.zip
 2019-06-23 12:45:37 -04:00
Anuken
b2a4cb42cf Sprite updates 2019-06-23 12:36:13 -04:00
Anuken
3fc5941f54 Wiki whitespace fix 2019-06-23 11:16:11 -04:00
Anuken
98a51c1f61 Testing improved deployment script 2019-06-23 10:29:22 -04:00
(G_H)
aa84eefa8f
Merge branch 'master' into GH-v80 2019-06-23 21:07:06 +08:00
(G_H)
7bdd21bb75
Add files via upload 2019-06-23 17:59:14 +08:00
(G_H)
0dd3736f2a
Add files via upload 2019-06-23 17:58:42 +08:00
(G_H)
deb2d30706
Delete SaveDialog.java 2019-06-23 17:57:30 +08:00
(G_H)
c416e1546d
Delete UI.java 2019-06-23 17:57:16 +08:00
Anuken
8c91aca838 New maps / New generation filter(s) and tweaks 2019-06-22 20:40:53 -04:00
Anuken
b47e282747 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-06-21 16:16:28 -04:00
Anuken
ffb5eee62a
Update BuilderTrait.java 2019-06-21 09:11:17 -04:00
Anuken
387d9b39da Icon fixes 2019-06-20 22:20:25 -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
c5e0db8de9 Why are these synced? 2019-06-19 22:59:28 -04:00