mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-25 22:17:59 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,423 Commits 4 Branches 160 Tags 2.3 GiB
91643d94c4
Commit Graph

12176 Commits

Author SHA1 Message Date
Anuken
8fae99e780 Fixed JSON part support 2022-05-07 10:22:33 -04:00
Anuken
17d8d5875e Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-07 10:09:05 -04:00
Anuken
7c8cbd41a4 Added DrawPart to ClassMap 2022-05-07 10:08:59 -04:00
Epowerj
d4acf3c9a5 Fixed level four requirements 2022-05-07 01:35:56 -04:00
Anuken
dfb01ebdf1 Fixed mod crash 2022-05-07 01:12:20 -04:00
Anuken
9c86433047 Unit command tweaks 2022-05-07 00:41:27 -04:00
Anuken
8b2d4d8f3e Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-07 00:34:31 -04:00
Anuken
c9b9cf6cc4 Fixed potential divide-by-zero in bloom shader 2022-05-07 00:34:28 -04:00
Github Actions
043cd7f5be Automatic bundle update 2022-05-07 04:31:11 +00:00
Anuken
aa0e254f0e Mobile unit command support 2022-05-07 00:30:25 -04:00
Anuken
6740b60af2 Misc bugfixes, AI hit retaliation 2022-05-06 23:33:22 -04:00
Anuken
f6e68e91d0 Temporary sprite packing fix 2022-05-06 22:13:52 -04:00
Anuken
2c07b9cdb1 Removed unused class 2022-05-06 21:12:57 -04:00
Anuken
3367fa37be Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-06 21:05:43 -04:00
Anuken
7fbd196919 Five is inaccessible 2022-05-06 21:05:38 -04:00
Github Actions
88821befe6 Automatic bundle update 2022-05-07 00:35:16 +00:00
Anuken
59674dfcf2 Maps updated, ready to go 2022-05-06 20:26:33 -04:00
Anuken
fb389c9984 Bugfixes 2022-05-06 20:20:09 -04:00
Anuken
62b632758b Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-06 20:07:44 -04:00
Anuken
9c0fd7c4c1 Bugfixes 2022-05-06 20:07:41 -04:00
Epowerj
768fac38c6 Update map three to now allow walkers to get through to the enemy base area from the north 2022-05-06 20:06:06 -04:00
Anuken
bb6b8b020d more 2022-05-06 19:13:39 -04:00
Anuken
688e02c04a Fixed reserach cost of certain units 2022-05-06 19:12:48 -04:00
Anuken
ed774a6aa2 actually 2022-05-06 18:46:00 -04:00
Anuken
a2af906f1a Fab cost fix 2022-05-06 18:43:59 -04:00
Anuken
46f43a3456 Bugfixes 2022-05-06 18:28:51 -04:00
Anuken
a86f62cbe8 Balancing 2022-05-06 16:00:47 -04:00
Anuken
f8789244d6 Balancing 2022-05-06 15:43:50 -04:00
Anuken
d4411fd234 Tech tree things 2022-05-06 14:53:44 -04:00
Epowerj
c73e364b55 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-05-06 14:47:16 -04:00
Epowerj
63da9c40f7 Fixed issues with map four 2022-05-06 14:47:11 -04:00
Anuken
0c1926ade6 Block renaming done 2022-05-06 14:35:06 -04:00
Anuken
7540b1c10a Fixed load map limit 2022-05-06 14:14:10 -04:00
Anuken
5ef423c185 ClassMap updae 2022-05-06 14:03:30 -04:00
Anuken
55f729565b Modding API-related tweaks 2022-05-06 13:45:43 -04:00
Anuken
9da97c4d3c Better erekir wave map 2022-05-06 00:43:49 -04:00
Anuken
a7f84e8690 Better json mod warning logging 2022-05-05 22:31:27 -04:00
Anuken
f7175540f8 Disable world processor rule 2022-05-05 20:36:11 -04:00
Anuken
60fb2e537f Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-05 20:30:41 -04:00
Anuken
4d680ec91d Docs 2022-05-05 20:30:37 -04:00
Epowerj
efbc0c96be Updated a bunch of maps for correct names and changes to unit production 2022-05-05 19:58:08 -04:00
Anuken
429e07adec More units renamed 2022-05-05 13:39:14 -04:00
Anuken
7782331dbc Unit renamings 2022-05-05 12:26:23 -04:00
Anuken
05d5a160fe Block tweaks 2022-05-05 10:46:58 -04:00
Anuken
6a026f7286 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
 2022-05-05 00:31:49 -04:00
Anuken
7508e1e0e3 Quell buff 2022-05-05 00:31:30 -04:00
Anuken
d8cf443cd9 Docs 2022-05-04 23:10:42 -04:00
Anuken
e81438a7a9 Styles documented 2022-05-04 22:31:53 -04:00
Anuken
93d299716c WIP style refactoring 2022-05-04 20:24:59 -04:00
Anuken
705b419799 Removed some unused content 2022-05-04 17:02:05 -04:00
Anuken
c28db45c4b Assembler module block stuff 2022-05-04 16:55:27 -04:00
Anuken
22905de094 Cleanup of some GL stuff 2022-05-04 15:25:39 -04:00
Anuken
771c2270df Phase tech tree fix 2022-05-04 00:57:00 -04:00
Anuken
7640fa0bf0 Misc cleanup & target/hit movements 2022-05-03 20:39:54 -04:00
Anuken
8b9eb0b466 Cleanup 2022-05-03 15:27:30 -04:00
Anuken
a784d184aa Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-03 14:42:15 -04:00
Anuken
210481703f Lots of balancing/tweaks 2022-05-03 14:42:11 -04:00
Epowerj
bc1de34296 Tweaked objectives for level 1 2022-05-03 14:41:49 -04:00
Anuken
459428ef25 Crash fix, begin rebalancing 2022-05-03 11:23:24 -04:00
Anuken
6c3eb3fe1e Delta fix 2022-05-02 22:41:37 -04:00
Anuken
4dcfdbe82f Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-02 22:24:48 -04:00
Anuken
78f3e23f0b WIP bullet shotgun for T4 tank 2022-05-02 22:24:45 -04:00
Epowerj
9f255f8178 Tweaked level three 2022-05-02 20:28:17 -04:00
Anuken
de9a41159f Discord link in desktop menu 2022-05-02 19:41:43 -04:00
Anuken
61d145e233 Advanced reconstructor in tech tree 2022-05-02 19:26:21 -04:00
Anuken
6553ff9e56 diffuse in tech tree 2022-05-02 18:54:39 -04:00
Anuken
02eec0e43c Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-02 18:53:15 -04:00
Anuken
98b01953a4 Diffuse turret 2022-05-02 18:53:12 -04:00
Epowerj
e0062edc42 Tweaked level three 2022-05-02 18:42:07 -04:00
Epowerj
be13df6bd8 Tweaked level three 2022-05-02 17:54:30 -04:00
Epowerj
fce48cd92e Changed reinforcedLiquidRouter requirements to use graphite instead of tungsten 2022-05-02 17:54:20 -04:00
Anuken
068c0dbe4d Walker in tech tree 2022-05-02 17:51:40 -04:00
Anuken
4d54b8251d Map rename 2022-05-02 16:33:41 -04:00
Epowerj
383beb3e8d Map 4 mostly done 2022-05-02 16:31:42 -04:00
Epowerj
85fb2bfa85 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-05-02 15:47:36 -04:00
Epowerj
c259a36922 Map 4 mostly done 2022-05-02 15:47:31 -04:00
Anuken
3542bd9e90 T3 tank done 2022-05-02 15:37:43 -04:00
Anuken
5f0ef9b27e WIP T3 tank 2022-05-02 14:29:32 -04:00
Anuken
07c24d7164 Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-01 23:50:52 -04:00
Anuken
1d249f233f UnitType docs 2022-05-01 23:50:49 -04:00
Epowerj
0cb6f00ed2 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-05-01 20:19:29 -04:00
Epowerj
b982f987c8 Map 4 tweaks 2022-05-01 20:19:25 -04:00
Anuken
5e7428f034 Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-05-01 17:45:40 -04:00
Anuken
f85fba264a Fixed crawler targeting 2022-05-01 17:45:36 -04:00
Epowerj
51a6260798 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-05-01 16:57:18 -04:00
Epowerj
20a1094f42 Map 4 tweaks 2022-05-01 16:57:14 -04:00
Anuken
3914f45c2c Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-01 14:49:32 -04:00
Anuken
865a5d56ed Two units complete 2022-05-01 14:49:30 -04:00
Epowerj
0540017ef2 Map 4 tweaks 2022-05-01 13:44:40 -04:00
Anuken
41a8be1b29 Hover unit thingy done 2022-05-01 10:14:55 -04:00
Anuken
8ea9c094ab Unit repair tower sprite/effects 2022-04-30 23:24:28 -04:00
Anuken
1c84e6d7ea Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-30 23:00:38 -04:00
Anuken
25208d0797 Hover unit stuff 2022-04-30 23:00:35 -04:00
Epowerj
eab9b7eb48 Map 4 tweaks 2022-04-30 21:19:19 -04:00
Anuken
f833a4e1bb Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-30 21:11:20 -04:00
Anuken
512fbe0199 T1 walker thing done 2022-04-30 21:11:17 -04:00
Epowerj
bf1f621bbe Wave set up for map four 2022-04-30 21:07:18 -04:00
Epowerj
5e7bd82f39 Start working on fourth map's objectives 2022-04-30 20:15:29 -04:00
Anuken
59be28b5eb Time to begin adding the new units 2022-04-30 18:08:40 -04:00
Anuken
fe62e1b6e3 Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-04-30 09:02:51 -04:00
Anuken
79ffe22b7f Build consistency tweaks 2022-04-30 09:02:45 -04:00
Epowerj
045d59fedf Start working on fourth map's objectives 2022-04-30 02:45:20 -04:00
Anuken
2dd8cb01ec fixed router update 2022-04-29 22:10:40 -04:00
Anuken
76ec6591a5 Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-29 21:44:49 -04:00
Anuken
c61e058231 fine 2022-04-29 21:44:46 -04:00
Epowerj
7153797b5a Continue working on level four 2022-04-29 20:47:54 -04:00
Epowerj
58941ba2d7 Start reworking four 2022-04-29 18:54:36 -04:00
Anuken
b696e1c89a Radar only on Erekir 2022-04-29 18:38:58 -04:00
Anuken
712fa95e88 File chooser bracket escape 2022-04-29 16:48:01 -04:00
Anuken
30685e2865 Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-29 15:00:00 -04:00
Anuken
dcb51ca73f Misc balance/bugfixing 2022-04-29 14:59:57 -04:00
Epowerj
7db5e551f1 Added a couple vents back to three 2022-04-29 13:27:43 -04:00
Epowerj
22b4d11b36 Updated map three to have arkecyte earlier 2022-04-29 13:18:21 -04:00
Epowerj
ffdd04a278 Changed time before nuke to 8 minutes 2022-04-29 12:53:52 -04:00
Anuken
db7e567832 All stat stuff converted to non-enums 2022-04-29 12:10:49 -04:00
Anuken
a2d4363c9f Slower enemy build speed in map3 2022-04-29 11:33:05 -04:00
Anuken
e3c1b7ba30 Better objective indicators for 3rd map 2022-04-29 10:08:50 -04:00
Anuken
636f464f95 Logic cutscene fix 2022-04-28 22:30:43 -04:00
Anuken
a46cc17d38 Nuke cutscene 2022-04-28 22:05:46 -04:00
Anuken
6e04c70b16 Better nuke announcement 2022-04-28 19:57:21 -04:00
Anuken
9f501a33a3 Many misc bugfixes 2022-04-28 19:46:52 -04:00
Anuken
60c74ee65d Map tweaks, etc 2022-04-28 19:20:31 -04:00
Anuken
6c42dff884 Bugfixes 2022-04-28 18:25:39 -04:00
Anuken
969b70d512 cost tweaks 2022-04-28 18:07:19 -04:00
Anuken
7a6da35356 Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-28 17:47:59 -04:00
Anuken
2d488e9614 Tech tree/balance tweaks 2022-04-28 17:47:56 -04:00
Epowerj
875d40a34b tweaked map three 2022-04-28 17:46:22 -04:00
Anuken
c2452e2370 Misc 2022-04-28 17:34:18 -04:00
Anuken
512e409417 Less turret HP 2022-04-28 17:23:54 -04:00
Anuken
7e665d376e Bugfixes 2022-04-28 17:09:34 -04:00
Anuken
12130c7a61 further tweaks 2022-04-28 15:34:06 -04:00
Anuken
5ddd394214 Map/cost tweaks 2022-04-28 15:31:51 -04:00
Anuken
1fae8f20af Reconstructor cost tweaks, part 2 2022-04-28 15:17:07 -04:00
Anuken
6ffb3b61d8 Reconstructor cost tweaks 2022-04-28 15:13:40 -04:00
Epowerj
6d615bf641 Bundled nuclear launch text 2022-04-28 14:56:39 -04:00
Epowerj
798aa5ba7d Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-04-28 14:53:40 -04:00
Anuken
293311087d Fixed destroyblocks objective 2022-04-28 14:52:51 -04:00
Anuken
fe4b32be1f Color tweak 2022-04-28 14:51:38 -04:00
Anuken
90a2f00041 Nuke launch format string 2022-04-28 14:51:20 -04:00
Epowerj
074442bfc2 Fixed teams issue on level three 2022-04-28 14:49:36 -04:00
Epowerj
668b6aa563 Tweaked tech tree for level 3 2022-04-28 14:44:19 -04:00
Epowerj
97e6c0ec2a More tweaks to level 3 2022-04-28 14:26:26 -04:00
Anuken
e92e307431 Minor fixes 2022-04-28 12:21:19 -04:00
Anuken
ee23886666 Better bullet aiming 2022-04-28 10:49:29 -04:00
Anuken
d40fcc10ab Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-04-27 23:14:21 -04:00
Anuken
1075e4b1b7 Mod subtitles 2022-04-27 23:14:14 -04:00
Epowerj
f8316a71cd Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-04-27 20:34:41 -04:00
Epowerj
0f6e0044bd Tweaks and objectives for level three 2022-04-27 20:34:33 -04:00
Anuken
f892811ac3 More shieldbreaker health 2022-04-27 18:16:46 -04:00
Anuken
3d12b66f3c DestroyBlocksObjective 2022-04-27 16:37:38 -04:00
Anuken
fa92c7ed3e Fixed crash 2022-04-27 14:18:53 -04:00
Anuken
8ab584c33b Save fixes 2022-04-27 13:37:26 -04:00
Anuken
8d39ba69ee Fixed logic finding invalid units 2022-04-27 12:56:33 -04:00
Anuken
2f4a6fc235 Crash fix 2022-04-27 12:54:32 -04:00
Anuken
b03df75609 Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-04-27 11:17:06 -04:00
Anuken
9b8098f731 Added flag for killable units 2022-04-27 11:17:01 -04:00
Epowerj
76e7e8037d Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-04-26 17:30:13 -04:00
Epowerj
04c1e6992f begin reworking of level three 2022-04-26 17:30:08 -04:00
Anuken
1ee8687d94 Sublimate nerf 2022-04-26 17:26:25 -04:00
Anuken
1b884c1a5c Unit artillery fix 2022-04-26 15:30:06 -04:00
Anuken
b3ec8745d2 Multiplayer fixes 2022-04-26 15:23:38 -04:00
Anuken
b03fe2c86c Skip overriding non-existent sprites 2022-04-26 12:03:18 -04:00
Anuken
42781bd754 Many misc bugfixes 2022-04-26 10:13:33 -04:00
Anuken
8f5b3ee1e0 Removed destruction delay when core is destroyed 2022-04-26 09:41:25 -04:00
Anuken
f6e0c0ce11 Better bloom 2022-04-26 00:19:14 -04:00
Anuken
aab6c3a9df Spawn wave instruction 2022-04-25 18:52:33 -04:00
Anuken
1ac7317986 Bloom config options 2022-04-25 10:53:18 -04:00
Github Actions
953052cb95 Automatic bundle update 2022-04-25 04:07:29 +00:00
Nunting
e631e7a3a6
Update bundle_ko.properties (#6713) 
* Update bundle_ko.properties

* 용어 통일 및 변경
- medium : 긴 단어를 비슷한 의미인 "보통"으로 변경 
- unit - "기체"로 통일 
- biomass - 포자의 목적을 고려하여 ( 전력 생산의 원료) "생물자원"으로 번역
- at enemy - "~을 향해"로 통일. 예외 : 호라이즌과 쿼드는 현재 위치에 탄환을 투하하므로 "~에"로 작성함.
- 이 외에도 같은 문장이지만 다른 의미로 해석된 문단 통일

* 불필요한 설명 삭제 및 간소화
- 자원 : 추후 추가적인 번역 수정이 필요함.
- 번역 원문에 없는 부가적인, 굳이 필요하지 않는 설명 삭제
- 직역 지향

*  details에서 커뮤니티 밈 혹은 개드립 삭제
- 특정 커뮤니티에 속하지 않은 유저의 시선에서 보았을 때, 이해하기 힘든 문구들 삭제 
- 게임과 관련된, 유용한 팁을 추가하는 것이 여러모로 좋을 것 같음. 추후 수정 필요.

* Unify and change terms
- medium: Change the long word to "보통" which means something similar
- Unit - Unify as "기체"
- Biomass - Translated as "생물자원" (raw material for power production) considering the purpose of spores
- at enemy - Unify as "~을 향해". Exception: Horizon and Quad drop bullets at their current location, so write "~에"
- In addition to this, paragraph unification, which is interpreted in different ways in the same sentence

* Delete and simplify unnecessary comments
- Resources: Additional translation modifications are required later.
- Delete additional, unnecessary descriptions that are not in the original translation
- a literal orientation

* Delete a community meme or comment from details
- Delete phrases that are hard to understand when viewed from the perspective of users who do not belong to a particular community
- I think it would be good to add useful tips related to games in many ways. Need to be corrected later.

* Update bundle_ko.properties

* Update bundle_ko.properties

- 지적한 사항 수정. 미처 발견하지 못한 문제점이 남아있을 수 있음.
- description에는 간결하고 정확한 설명만 있는 것이 좋음. "기본 액체 운송 블록" 같이 불필요한 설명, "~에서 유용합니다"와 같이 부가적인 설명은 추후 details에 추가해도 무방하다 생각하여 일단 제거. 
- 기존 번역에 존재하던 피동 표현을 수정했는데 수정본에도 피동 표현이 많다...? 일단 수정하였지만, 더 자세한 지적이 필요함.
- 이것 외에도 힌트의 문체 통일, 캠페인 설명의 수정이 필요해 보입니다.


- Corrected the points you pointed out. There may be more problems you haven't discovered.
- Description should be concise and accurate. Unnecessary descriptions such as "기본 액체 운송 블록" and additional descriptions such as "~에서 유용합니다" may be added to the details later, so remove them.
-I modified the passive expression that existed in the previous translation, but there are many passive expressions in the revised version...? Once revised, more detailed points are needed.

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties
 2022-04-25 00:06:41 -04:00
Anuken
eb880ba2be Fixed low-FPS continuous bullets 2022-04-24 23:12:28 -04:00
Anuken
1d74011c3e Better continuous laser bullet visuals (2) 2022-04-24 22:57:50 -04:00
Anuken
9251ba6008 Better continuous laser bullet visuals 2022-04-24 22:49:36 -04:00
Anuken
d5e522994e Configurable RTS AI parameters for logic 2022-04-24 16:46:26 -04:00
Anuken
abdb1c1252 "Hugging" fix for RTS AI 2022-04-24 14:11:21 -04:00
Anuken
03a469e56f malis team swap 2022-04-24 13:24:14 -04:00
Anuken
14dcd71819 Faction color changes again 2022-04-24 12:50:33 -04:00
Anuken
ac5a14c18c Easier map 2022-04-23 16:01:31 -04:00
Anuken
fa8b94722e Second map polish 2022-04-23 14:57:52 -04:00
Anuken
43aeb90eb9 Min attack weight rule 2022-04-23 12:26:59 -04:00
Anuken
a91ca72f51 Revert "Cullable LogicCanvas (#6699)" 
This reverts commit 815a396fbd.
 2022-04-23 11:43:25 -04:00
Anuken
7b496b610e Revert "Cullable LogicCanvas (#6699)" 
This reverts commit 815a396fbd.
 2022-04-23 11:33:06 -04:00
Anuken
12eb2dec4e Fog rule 2022-04-23 11:32:39 -04:00
Anuken
8b8ca85d96 Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-04-23 09:26:57 -04:00
Anuken
9a05b36478 Minor bullet despawn fix 2022-04-23 09:26:52 -04:00
Epowerj
fbd6fb61f5 Tweaked level two 2022-04-22 20:42:09 -04:00
Anuken
d559cd2412 Better timed destroy with overlap 2022-04-22 20:22:09 -04:00
Anuken
764b1c27bf Configurable min squad size 2022-04-22 17:46:47 -04:00
Anuken
520d80a96b Minimap marker support 2022-04-22 15:45:27 -04:00
Anuken
76d7a31b65 Fixed electrolyzer 2022-04-22 15:33:34 -04:00
Anuken
5a6d1787c5 Better timer objective formatting 2022-04-22 15:05:23 -04:00
Epowerj
2d025b43ed Lots of tweaks after testing second map 2022-04-22 14:52:08 -04:00
Anuken
eb12c64f07 Fixed "waiting for players" 2022-04-22 14:30:09 -04:00
Anuken
8212d441c2 Fixed autobuilding 2022-04-22 13:17:42 -04:00
Anuken
9c46ae8b0f sprite update 2022-04-21 23:49:47 -04:00
Anuken
1133283e0e Bullet hit position snap 2022-04-21 23:22:32 -04:00
Anuken
2bed4b25eb sprite for T2 ship 2022-04-21 21:36:49 -04:00
Epowerj
30100b4e7c Replaced two with a new map 2022-04-21 21:01:51 -04:00
Anuken
209e71255b Block type fetching 2022-04-21 18:25:52 -04:00
Anuken
45a0f3c588 Proper shield breaker 2022-04-21 14:39:30 -04:00
Anuken
09221f952a Shield breaker block 2022-04-21 14:34:01 -04:00
Anuken
bfdf07d0eb Fixed override issue 2022-04-21 11:10:36 -04:00
Anuken
e5f8eb3a30 Burst drill stat fix 2022-04-21 11:06:42 -04:00
Anuken
34ba60d526 Made turrets ignore passable buildings 2022-04-20 14:27:23 -04:00
Anuken
b40957e28b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/JoinDialog.java
 2022-04-20 14:16:20 -04:00
Qendolin
2dae8fdef4
Use sprites instead of polygons (#6725) 
Lines.circle is quite expensive and used for some minor effects. This has been changed to use sprites in certain places.
 2022-04-20 14:15:35 -04:00
Anuken
f1c6b6f949 Launch sector description 2022-04-20 14:15:23 -04:00
YozoZChomutova
ee3911cceb
Updated bundle_cs.properties (#6716) 
* Updated bundle_cs.properties

All unstraslated words I've found were translated. Spacing between lines were synchronized with bundle.properties. +Added self to contributors file.

* Updated bundle_cs.properties

Replaced with shorters words, fixing issue with multilined text in buttons.
 2022-04-20 10:48:13 -04:00
Anuken
6441d0b2d5 Log atlas utilization 2022-04-20 10:38:57 -04:00
bendn
471dbd8bab
impact reactor fix(only) (#6718) 2022-04-20 10:33:32 -04:00
Anuken
c883fbdb81 Slightly more accurate unit payloads 2022-04-19 21:32:43 -04:00
Anuken
6d7f8a1123 Added map objective button 2022-04-19 19:00:22 -04:00
Anuken
be9d3b334c Minor wording changes 2022-04-19 17:15:29 -04:00
Anuken
81acc5285c Better mod unit packing 2022-04-19 16:51:43 -04:00
Epowerj
56c02faedc Finished first level enemy base 2022-04-19 16:36:24 -04:00
Anuken
415402e61b Better mod sprite packing 2022-04-19 12:21:54 -04:00
Anuken
a74c5ef943 Minor bugfixes 2022-04-19 09:14:56 -04:00
Anuken
78c44bf237 Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-04-18 22:43:48 -04:00
Anuken
1fc983bd4e Duct transparent color tweak 2022-04-18 22:43:44 -04:00
Epowerj
569aaf1156 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-04-18 22:19:07 -04:00
Epowerj
261aa45d07 Finished overall objectives and scripting for first map 2022-04-18 22:19:02 -04:00
Anuken
0915598d64 sfgdhjk 2022-04-18 22:14:33 -04:00
Anuken
41865631ed Polish 2022-04-18 22:07:18 -04:00
Anuken
7fd470c1cb New insectoid almost done + DestroyBlockObjective 2022-04-18 21:37:48 -04:00
Anuken
4f9999c700 Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-18 21:34:24 -04:00
Anuken
5b4e424cda New insectoid almost done + DestroyBlockObjective 2022-04-18 21:34:21 -04:00
Epowerj
cdb7a4c9d8 Some small tweaks on first level 2022-04-18 21:32:41 -04:00
Anuken
5721cc75b6 Mod load fixes 2022-04-18 17:22:47 -04:00
Anuken
5e349e237a Fast pack 2022-04-18 16:58:50 -04:00
Anuken
e9205482e7 WIP t2 insect 2022-04-18 12:28:59 -04:00
Tegas Aziz
c7ace935aa
[ID] Desolate rift description change (#6720) 
* Desolate rift description change

* skill issue
 2022-04-18 09:26:52 -04:00
Anuken
5d8fb01710 Removed something pointless 2022-04-18 00:02:22 -04:00
Anuken
1e9a21023f Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-04-17 21:23:58 -04:00
Anuken
cce1d1ac8f Fixed last-planet clearing 2022-04-17 21:23:54 -04:00
Epowerj
2350175373 Updated map logic and research cost for first map 2022-04-17 21:23:39 -04:00
Anuken
dded736c8f Flag set instruction fix 2022-04-17 21:05:50 -04:00
Epowerj
68e6b7ff3e Updated and tweaked everything for first map 2022-04-17 21:04:26 -04:00
Epowerj
a3b54f7bdb Updated objectives for the now-first level, and changed the map itself 2022-04-17 20:51:00 -04:00
Anuken
9ea891bf64 Timer objective text 2022-04-17 20:31:49 -04:00
Anuken
854dbacd14 Timer objective 2022-04-17 20:22:45 -04:00
Anuken
f21f649387 Fixed privileged blocks being "built" on landing 2022-04-17 20:06:08 -04:00
Anuken
224b1b022a Better team building presence check 2022-04-17 19:59:36 -04:00
Anuken
eb299f5ec7 Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-04-17 19:33:17 -04:00
Anuken
a69595ee4e Fixed naval pathfinding somehow 2022-04-17 19:33:11 -04:00
Epowerj
287e7b478c Updated objectives for the now-first level 2022-04-17 19:19:09 -04:00
Anuken
9af256fffa Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-17 19:13:32 -04:00
Anuken
8364a6ac78 Destroy units objective, WIP 2022-04-17 19:13:29 -04:00
Epowerj
37525861a7 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-04-17 18:58:39 -04:00
Epowerj
50c173e95d Updated objectives for the now-first level 2022-04-17 18:58:33 -04:00
Anuken
d1cf1e2aba Avoid caching paths on servers 2022-04-17 18:53:28 -04:00
Anuken
42c14ecfbb Mouse position option 2022-04-17 17:55:33 -04:00