mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-25 22:58:47 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,055 Commits 4 Branches 160 Tags 2.3 GiB
fc9543baa7
Commit Graph

3528 Commits

Author SHA1 Message Date
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
Anuken
7a2234cd25 Tweaks to improve in-game editing 2019-05-11 00:37:29 -04:00
Anuken
11ede2756e Functional in-game map edits and loading 2019-05-10 20:25:09 -04:00
Anuken
3e51fab387 In-game editing (broken) 2019-05-10 19:13:55 -04:00
Anuken
962f413421 Cleanup 2019-05-10 16:16:21 -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
Anuken
d6be07f1b8 Fixed crash 2019-05-10 13:42:04 -04:00
Anuken
064a012b25 Map previews functional 2019-05-10 12:57:45 -04:00
MrPickles14
df26148e7c
Update bundle_fr.properties 2019-05-10 12:23:21 -04:00
Anuken
d26f533111 Basic non-in-game editor functionality 2019-05-10 00:01:48 -04:00
Anuken
69575dbab3 Fixed multiblocks not drawing 2019-05-09 18:10:12 -04:00
Anuken
9f4a430412 Fixed tests 2019-05-09 14:39:52 -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
Anuken
8127e5a66f Made save format actually functional, many things still broken 2019-05-08 23:16:08 -04:00
Anuken
53167a3b52 Map conversion code 2019-05-07 17:30:37 -04:00
Anuken
1b77247c40 wow it builds 2019-05-07 11:56:17 -04:00
Leone25
24374cf7e3 Update bundle_it.properties (#490) 
please merge as soon as possible
 2019-05-07 09:34:42 -04:00
Anuken
88de54ec90 Further unfinished map tweaks 2019-05-06 18:32:18 -04:00
Anuken
3035d569cc Editor<->world data merging 2019-05-06 17:03:53 -04:00
Anuken
51f9ad5a2c many things 2019-05-06 14:34:21 -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
Anuken
20fbe2fbbe even less broken 2019-05-05 22:09:02 -04:00
Anuken
bf073a84c8 a bit less broken but still broken 2019-05-05 19:05:46 -04:00
Anuken
35b158dba7 everything is borked 2019-05-05 14:16:34 -04:00
Anuken
465c0e7dc3 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-05-05 12:50:04 -04:00
Anuken
eb4f6f2e9f Merge branch 'master' of https://github.com/Anuken/Mindustry into save-rewrite 2019-05-05 12:39:38 -04:00
Anuken
0ff56e3a68 Fixed meltdown not firing when cheating 2019-05-05 12:36:30 -04:00
Anuken
4ddc59589c Error display 2019-05-05 12:19:32 -04:00
Anuken
1e15d7a33e Fixed some power/save/pathfinding bugs 2019-05-05 12:14:42 -04:00
Prosta4ok_ua
e4e2b6ab00 Hmmmmmm 2019-05-05 18:37:24 +03:00
Anuken
af67690e75 WIP save refactoring 2019-05-05 11:36:38 -04:00
beito123
b37ae484c0
Update Japanese translations 2019-05-05 23:39:15 +09:00
Anuken
13969bdd29 Fixed shields not working / Fixed player text not fading 2019-05-04 22:33:08 -04:00
Anuken
a3f5583326 Fixed tar fields 2019-05-04 22:17:17 -04:00
Anuken
f137c11c6c Harder default waves 2019-05-04 17:14:47 -04:00
beito123
18f1b5f9d2
Update Japanese translations 2019-05-05 01:52:35 +09:00
Anuken
a4fd88a440 Bugfixes 2019-05-04 10:44:21 -04: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
a1624f61ae Minor turret balancing 2019-05-03 22:58:06 -04:00
Anuken
5ee26fc3f4 Fixed power tests 2019-05-03 22:26:37 -04:00
Anuken
93ffb66e59 Fixed all known issues with power system 2019-05-03 21:19:41 -04:00
Anuken
4b9bcfb014 Crash fix 2019-05-03 10:26:56 -04:00
Anuken
a161c09441 Switched default mech to dart / Bugfixes 2019-05-03 09:21:45 -04:00
Anuken
0c396f76b2 Fixed impact reactor warming up without satisfied power 2019-05-03 00:13:37 -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
Anuken
9c653a46bc Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/io/anuke/mindustry/game/Version.java
 2019-05-02 12:59:05 -04:00
Anuken
eaa2ad4f05 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle.properties
 2019-05-02 08:57:09 -04:00
Anuken
88ce7837a6 Partial power usage / Drill ID priority / Liquid source deselect 2019-05-02 08:56:29 -04:00
beito123
9f5a183793
Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	core/assets/bundles/bundle_ja.properties
 2019-05-02 20:08:10 +09:00
Anuken
c2a6690d24 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-05-01 20:52:02 -04:00
Anuken
5e5b719704 Added version toggle 2019-05-01 20:51:44 -04: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
a2e55f7861 Removed creeptree for now 2019-04-30 13:09:40 -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
Prosta4okua
7e975f2134 Update bundle_uk_UA.properties and bundle_ru.properties (#454) 
* Update bundle_uk_UA.properties

Виправив помилку, переклав Slag.

* Update bundle_uk_UA.properties

Додав переклад дьогтю

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_ru.properties

Commit from Github Desktop

* Update bundle_ru.properties

* New translations was added

Salt Rocks and Pebbles

* Update bundle_ru.properties

* Update bundle_ru.properties

* New text

* Fix error

* Update bundle_ru.properties

* Add new translations

* Add Solonchaki :D

* 1
 2019-04-30 12:44:41 -04:00
키에르
40de13f9c7 Update bundle_ko.properties (#457) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

*  Apr 22, 2019

* fix typo

* Update bundle_ko.properties
 2019-04-30 12:44:08 -04:00
Dominik
70946539e3 Update bundle_pl.properties (#458) 
Translated: wave info, generate, ammo info, drill, power efficency
 2019-04-30 12:43:20 -04:00
CinExPL
996c594dfc Update bundle_pl.properties (#460) 
Improvements based on comparison with original bundle file.
 2019-04-30 12:39:00 -04:00
Anuken
d8eeb79b63 Un-debugged content 2019-04-30 12:29:19 -04:00
Anuken
cf61dd0704 Removed antialiasing due to bugs / Improved default waves 2019-04-30 12:05:01 -04:00
Anuken
6fd5f1563a Fixed incorrect power source sprite 2019-04-30 00:07:38 -04:00
Anuken
3c643c917a Map bugfixes / Sprite tweak / Zone loadout moved to dialog 2019-04-29 23:58:16 -04:00
Anuken
378be0ef86 Better Discord presence 2019-04-29 13:34:27 -04:00
Anuken
29e90969eb Removed UIUtils 2019-04-29 11:50:49 -04:00
Anuken
fb724514f3 Fixed portrait custom game dialog 2019-04-29 11:27:15 -04:00
Anuken
1f11da75d2 Push test 2019-04-29 08:34:40 -04:00