mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-11 07:39:39 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,150 Commits 4 Branches 160 Tags 2.1 GiB
2be3cc2f1e
Commit Graph

3616 Commits

Author SHA1 Message Date
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
Anuken
228690b400 Fixed net disconnect error 2019-06-19 22:20:45 -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
Anuken
441680861e Player spawning bugfix 2019-06-19 13:32:38 -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
40a8c52ba1 Testing travis build again 2019-06-18 18:41:03 -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
2804361436 Bugfix 2019-06-17 12:18: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
2500d0a930 Fixed maps getting rejected even with cores 2019-06-14 23:03:19 -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
Anuken
50104d2532 Fixed door toggle 2019-06-14 13:29:40 -04:00
Prosta4ok_ua
f5f30d6026 Add new strings 2019-06-14 14:35:15 +03:00
Anuken
114cd48521 Actually functional builder drones 2019-06-13 22:34:24 -04:00
Anuken
548da3ea5f Further drone splitting / Even drone player distribution 2019-06-13 22:22:25 -04:00
Anuken
2a8b8d040b Fixed deconstruction exploit 2019-06-13 20:17:48 -04: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
5cfab33ada Fixed unit tests / Fixed zones having incorrect waves 2019-06-12 18:42:12 -04:00
Anuken
18328320c1 Fixed black blocks/units after quit / Fixed intense wave spawn lag 2019-06-12 18:07:19 -04:00
Anuken
62bd0442df Testing loading of old saves 2019-06-12 15:29:41 -04:00
Anuken
0aee75c1c1 Splitting of building+mining into separate traits 2019-06-12 14:03:50 -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
Anuken
16190aa878 Better server discovery 2019-06-11 13:01:28 -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
Anuken
af1746932f Fixed incorrect scaling 2019-06-11 08:47:16 -04:00
Predator127
56ff5689f4
Update bundle_pt_BR.properties 
Revised translation with a better vocabulary
 2019-06-10 22:02:15 -03:00
Anuken
0dd15f3141 Fixed build errors 2019-06-10 18:51:06 -04:00
Anuken
72fb7b9df7 Net refactor 2019-06-10 18:46:58 -04:00
Anuken
d7e1297cce Tweaks 2019-06-10 15:14:57 -04:00
Anuken
828e6bb1b7 New changes, possible fixes to UI layout bugs 2019-06-10 13:55:18 -04:00
Prosta4ok_ua
6f589b5c84 Hello everyone 2019-06-10 18:20:08 +03:00
Anuken
6d1b8b81fa Bugfixes 2019-06-10 10:11:28 -04: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
5946aaa31f Merge remote-tracking branch 'origin/master' 2019-06-09 12:04:49 -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
Fenr1r
a6d5bdd001 Fix some mistyping and refactoring (#503) 
* remove unused import

* fix mixtyping (duplicated ;)

* remove redundant type casting
detail: item's type is defined as short.

* Revert "remove redundant type casting"

This reverts commit 39bf91d9ff.
 2019-06-08 23:20:47 -04:00
Anuken
bd4d8efd78 Fixed invisible ship bug 2019-06-08 22:20:30 -04:00
Anuken
53baad766f More balancing and cleanup 2019-06-08 17:34:29 -04:00
Anuken
8ac746188b Unit pad balance 2019-06-08 17:22:46 -04:00
Prosta4okua
62dbce089f
Update bundle_ru.properties 2019-06-08 22:42:36 +03:00
Anuken
fd5d0b2cbb Fixed PvP core assignment 2019-06-08 14:41:35 -04:00
Anuken
6226e0c5a3 Fixed old pathfinding targets not resetting on death 2019-06-08 13:04:26 -04:00
Anuken
01a9be835f what 2019-06-08 12:29:27 -04:00
Anuken
97eb66b0a5 Bundle update 2019-06-08 12:11:32 -04:00
Anuken
048c5e68f1 Crash fix 2019-06-08 11:28:33 -04:00
Anuken
8f39def993 Changed wiki link to point to unfinished 4.0 wiki 2019-06-08 10:56:47 -04:00
Anuken
0be674d7af Changed back overflow gate speed 2019-06-08 10:48:32 -04:00
Anuken
e6499f7e5a Bugfixes 2019-06-08 10:41:22 -04:00
Anuken
10bd1d1969 Fixed #509 2019-06-08 10:05:08 -04:00
Anuken
13879dd374 Fixed #513 2019-06-07 18:58:07 -04:00
Anuken
0f519fd358 Bugfixes for 78.1 2019-06-07 17:34:46 -04:00
Anuken
e7fb128499 Fixed sorter loading 2019-06-07 16:13:48 -04:00
Anuken
c2d619cb7f Save IO fixes 2019-06-07 16:06:23 -04:00
Anuken
78176cca90 unused -> unchecked 2019-06-07 15:06:17 -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
4458ae042e hhh 2019-06-07 11:18:06 -04:00
Anuken
1c3d7c1c73 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-06-07 10:25:14 -04:00
Anuken
cb3bbd169f Map temporarily removed 2019-06-07 08:57:51 -04:00
Anuken
ab107bfc0d Additional default wave tweaks 2019-06-07 08:49:41 -04:00
Anuken
d0b5b49bf8 Fixed many various bugs 2019-06-06 23:29:21 -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
Anuken
d300d45f22 Fixed unit factory sprites 2019-06-06 15:38:19 -04:00
Anuken
dd05f5278c Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-06-06 12:05:46 -04:00
Anuken
1897008c72 Pump sprites 2019-06-06 10:27:11 -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
d608cf6536 Fixed player respawning at editor location 2019-06-04 20:52:58 -04:00
Anuken
0b49bd1985 Pathfinding tweak / Doors now update pathfinding 2019-06-04 17:10:45 -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
Anuken
8247ff15ed Fixed invalid phase weaver shader 2019-06-02 10:42:44 -04:00
Anuken
af8db9062c Balance 2019-06-01 23:16:59 -04:00
VizardAlpha
9039d52817
Updates bundle_fr_BE.properties 2019-06-01 23:12:52 +02:00
Anuken
88d5e1cca8 Fixed low-FPS pad orbiting 2019-06-01 15:16:10 -04:00
Anuken
57544e615f Removed event inheritance 2019-06-01 14:24:52 -04:00
Anuken
61a92d55ae Balance / UUID logging in d/c messages 2019-05-31 19:55:09 -04:00
Anuken
940965f03d .mmap file importing / Better exception parsing 2019-05-31 10:24:51 -04:00
Anuken
30a254e9be
decoupling editor/MapEditor from editor/OperationStack (#504) 2019-05-31 09:11:16 -04:00
Anuken
581782af28 Mass driver power fix / Bugfixes 2019-05-31 09:10:37 -04:00
Anuken
72cad1409f Bugfixes / Balance of fuse 2019-05-30 23:05:15 -04:00
Anuken
e7e4985761 Fixed maps converting improperly / Minor balancing 2019-05-30 20:47:47 -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
1a0b22ef15 Overflow gate delay 2019-05-29 22:57:32 -04:00
Anuken
bc78d1a561 Balancing 2019-05-29 22:29:49 -04:00
Anuken
00b953a04e Spawnpoint repultion 2019-05-29 21:41:56 -04:00
Doyoung Gwak
aa0ef529f5 decoupling editor/MapEditor from editor/OperationStack 2019-05-29 00:04:42 +09:00
Anuken
bd134bf9c9 Cleanup 2019-05-28 09:24:13 -04:00
Anuken
752267c521 Fixed many various map bugs 2019-05-26 16:46:44 -04:00
Anuken
34635e3460 Fixed fire not syncing 2019-05-26 11:03:49 -04:00
Anuken
ba0b4513f1 New tile transitions 2019-05-25 23:56:21 -04:00
Anuken
4764808450 Merge remote-tracking branch 'origin/master' 2019-05-25 21:10:47 -04:00
Anuken
c66fd67510 Fixed #500 / Fixed units not appearing in edited maps 2019-05-25 21:10:42 -04:00
Fenr1r
3997ca6454 Minor fix - rename some variable on editor. (#495) 
- editor/EditorTool.java
- editor/MapInfoDialog.java
- editor/MapRenderer.java
 2019-05-25 12:08:00 -04:00
Anuken
4242100c53 More descriptive entity load errors 2019-05-25 12:01:55 -04:00
Anuken
32adcc3676 Merge remote-tracking branch 'origin/master' 2019-05-22 21:07:13 -04:00
Anuken
80c26606f0 Fixed unit duplication 2019-05-22 21:07:08 -04:00
Fenr1r
a7852098f1 Remove code duplication and rename set/get method on editor/DrawOperation.java (#496) 
- remove code duplication in undo and redo method
- rename set/get method to setTile/getTile
 2019-05-22 10:06:43 -04:00
Anuken
72638fc215 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-05-21 13:19:27 -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
Anuken
2461331e32 Fixed wave turret being sporadic / Fixed unnecessary fluid usage 2019-05-19 09:09:22 -04:00
Anuken
3464f40da3 Fixed unit pads, rule selection, gameover state 2019-05-18 10:02:36 -04:00
Anuken
3b2b79d539 Buffed impact reactor 2019-05-17 18:10:03 -04:00
Anuken
8616fc6b05 Made invalid legacy maps be properly discarded 2019-05-16 17:15:22 -04:00
Anuken
9e9c001422 Cleanup 2019-05-16 15:16:17 -04:00
Anuken
93bbd34055 ...except overflow gates 2019-05-16 11:44:02 -04:00
Anuken
cac953e812 Buffers for everything 2019-05-16 11:43:02 -04:00
Anuken
aeb3662414 Bugfixes 2019-05-15 17:40:31 -04:00
Prosta4ok_ua
1687ce3182 Added new translations 2019-05-14 23:59:24 +03:00
Anuken
2888e87bb8 Map conversion fix 2019-05-14 16:38:49 -04:00
Anuken
094ebb8020 Removed some TODOs 2019-05-14 13:18:05 -04:00
Anuken
54ad52edc2 Merging of map saves 2019-05-14 11:54:22 -04:00
Anuken
0e869f3cb5 Fixed rules not saving / Memory usage reduction 2019-05-14 11:48:14 -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
c4c4b473e5 Server cleanup 2019-05-13 00:43:06 -04:00
Anuken
90f6fff1ae Layout fixes 2019-05-12 19:55:26 -04:00
Anuken
52f2b52990 Somewhat functional rule selection 2019-05-12 19:43:23 -04:00
Anuken
48ed4b0e49 Fixed startup crash / Fixed editor rule issue 2019-05-12 12:51:25 -04:00
Anuken
c3c609e7b9 Fixed invisible enemies 2019-05-12 12:38:40 -04:00
Anuken
ffb6d398d7 Layout fixes 2019-05-12 12:00:19 -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
e5d19a9819 Entity placement/removal 2019-05-11 21:42:06 -04:00
Anuken
dd75d88d2f Unit creation, team switch 2019-05-11 12:32:13 -04:00
Anuken
65ea01218a Fixed core-less editor gameover, respawning 2019-05-11 00:58:13 -04:00