7416 Commits

Author	SHA1	Message	Date
J-VdS	ba4612ed96	indent	2020-09-22 19:00:25 +02:00
J-VdS	4608697d0d	capitals	2020-09-22 18:59:35 +02:00
J-VdS	393ca67291	cleanup	2020-09-22 18:42:59 +02:00
J-VdS	f4003fd463	merge	2020-09-22 18:41:24 +02:00
J-VdS	51065b57c4	info popup	2020-09-22 18:40:04 +02:00
Anuken	5895e2f23c	#2647	2020-09-22 12:24:40 -04:00
Anuken	08ff36c43e	Bugfixes	2020-09-22 12:16:17 -04:00
Anuken	b2b8949e26	Cleanup	2020-09-22 11:16:19 -04:00
Anuken	ce4f67341c	Merge remote-tracking branch 'origin/master'	2020-09-22 10:03:10 -04:00
Anuken	a6c10a97f2	Fixed #2654 / Fixed #2651 / fine I'll add a base	2020-09-22 10:03:05 -04:00
Anuken	d4044c3b27	Merge pull request #2609 from DeltaNedas/crashlog ... more info in crash reports	2020-09-22 09:30:29 -04:00
DeltaNedas	472d408bbc	crash send error code	2020-09-22 06:16:40 +00:00
DeltaNedas	c7cfb290eb	version for mods	2020-09-22 06:15:43 +00:00
DeltaNedas	8b354e7334	Update core/src/mindustry/net/CrashSender.java ... Co-authored-by: Anuken <arnukren@gmail.com>	2020-09-22 06:13:51 +00:00
YellOw139	5009f3aaf1	Quad, Oct	2020-09-22 07:52:11 +03:00
Anuken	87032c82b1	T4/5 support mechs	2020-09-21 23:32:30 -04:00
Anuken	1d8f837fb1	Fixed #2646	2020-09-21 14:35:39 -04:00
Anuken	ff7c87bec0	Bugfixes	2020-09-21 14:33:15 -04:00
Anuken	ff58ccf659	Sprite tweaks	2020-09-21 13:22:07 -04:00
Felix Corvus	eb0a5d4d14	Update bundle_ru.properties	2020-09-21 19:18:40 +03:00
Anuken	45e77fe3b4	Balance	2020-09-21 12:05:24 -04:00
Anuken	74fadfe603	Merge branch 'master' of https://github.com/Anuken/Mindustry	2020-09-21 11:41:15 -04:00
Anuken	1aa8bb9dd2	T5 air support unit	2020-09-21 11:41:11 -04:00
Felix Corvus	6840fb53b7	Update Pal.java	2020-09-21 16:24:06 +03:00
Anuken	6b56fef512	Merge pull request #2636 from genNAowl/wall-sound-effects ... Add sound variables for when a wall is releasing lightning/deflecting bullets	2020-09-21 09:11:57 -04:00
Felix Corvus	1b38b2d2f9	Lyagushka just kva'd	2020-09-21 16:00:45 +03:00
Petr Gašparík	50960ff599	Update for Stream plus humble selfpromo	2020-09-21 11:08:46 +02:00
Petr Gašparík	c122d737c1	Czech translation - fixes	2020-09-21 11:01:53 +02:00
Petr Gašparík	3349764421	Czech translation - from 105 to 6.0 alpha	2020-09-21 10:59:02 +02:00
Leonwang4234	5eb722efee	Update Wall.java	2020-09-20 20:25:18 -07:00
Anuken	63e35bd462	T4 air carrier unit (*unfinished*)	2020-09-20 19:34:12 -04:00
Anuken	401384ae5b	Anuken/Mindustry-Suggestions/issues/548	2020-09-20 16:35:25 -04:00
DeltaNedas	f9a70b1190	typo	2020-09-20 20:35:44 +01:00
DeltaNedas	632322a2bc	add even more info to crash logs	2020-09-20 20:25:57 +01:00
Anuken	b2d054c1f2	Merge remote-tracking branch 'origin/master'	2020-09-20 15:23:41 -04:00
Anuken	0a314e142e	Fixed #2632 (among other things)	2020-09-20 15:23:34 -04:00
YellOw139	d6291ea6c5	Merge branch 'master' into patch-2	2020-09-20 17:47:32 +03:00
Felix Corvus	f7b320e838	Update bundle_ru.properties	2020-09-20 17:47:08 +03:00
YellOw139	c82455d994	#2628	2020-09-20 17:42:19 +03:00
Felix Corvus	dd32b4d39d	Merge branch 'master' into master	2020-09-20 16:56:36 +03:00
Félix Córvus	0396cc6ec4	Update Control.java	2020-09-20 16:45:34 +03:00
Félix Córvus	e907d1a23f	Updating bundles	2020-09-20 16:43:15 +03:00
Felix Corvus	86446f4f00	Update Control.java	2020-09-20 16:32:38 +03:00
YellOw139	9bdc81e728	Update contributors	2020-09-20 12:11:33 +03:00
YellOw139	a0d81eb18e	[Bundle][RO] Translation Update ... This PR was tested in-game and it's ready to merge at any time (unless marked as draft). Changelog: - Changes as per commits c71be9ae32, f53af781ba, 68cf2af6e0, 0bcb48ca31, b4d83f33e9 - Changed Surge Alloy name to 'Supra Aliaj'. The new name is closer to the original, shorter and easier to pronounce. Old name: 'Aliaj de Supratensiune' - Changed Phase Fabric name to 'Fibră-Fază'. It's closer to the original and shorter. Old name: 'Material de Fază' - Tweaked some stat names - Tweaked some map editor button names - Typo fixes & various other improvements	2020-09-20 12:06:09 +03:00
Anuken	415380f25e	Merge remote-tracking branch 'origin/master'	2020-09-19 21:54:18 -04:00
Anuken	b9fd38a76e	Various tweaks and speculative changes	2020-09-19 21:54:08 -04:00
Anuken	b4d83f33e9	Merge pull request #2395 from genNAowl/ready-to-merge-force-projectors ... F O R C E P R O J E C T O R S	2020-09-19 21:15:45 -04:00
Anuken	3b8b762a1c	Removed phase radius display *(see description)* ... Phased radius has been proposed in numerous PRs, but I don't know how to handle it properly yet. New players may be confused about the extra circle/hexagon indicator around blocks - it's not clear what it means. An extra radius easy to implement, so I'll leave it out of this PR and handle it later.	2020-09-19 21:15:18 -04:00
Anuken	cdd1e90d1a	Fixed #2622	2020-09-19 17:35:32 -04:00
Anuken	eb8658e140	Mud tweaks / Unit count tweaks	2020-09-19 16:04:50 -04:00
Anuken	84b1c0348d	Merge remote-tracking branch 'origin/master'	2020-09-19 14:11:51 -04:00
Anuken	0bcb48ca31	Costs for unit research	2020-09-19 14:11:48 -04:00
Anuken	c470c0abe1	Merge pull request #2612 from sk7725/patch-17 ... [KO] Update bundle_ko.properties	2020-09-19 13:26:31 -04:00
Anuken	dcbfc2b7aa	Storage team colors	2020-09-19 12:38:24 -04:00
Anuken	ce8e060f29	Merge remote-tracking branch 'origin/master'	2020-09-19 12:31:06 -04:00
Anuken	9b0947a6e5	Fixed #2607 / Fixed #2604	2020-09-19 12:30:58 -04:00
Anuken	c865dbb465	Merge pull request #2610 from DeltaNedas/pubtree ... make techtree funcs public	2020-09-19 12:14:26 -04:00
Anuken	eb60b60b4a	Merge pull request #2615 from Remint32/patch-4 ... [Bundle] Missing keybind lines	2020-09-19 12:12:52 -04:00
Anuken	e19e74cdc5	Bugfixes	2020-09-19 11:40:11 -04:00
Felix Corvus	68cf2af6e0	missing keybind lines	2020-09-19 17:34:49 +03:00
Felix Corvus	db3eaf9a33	missing lines	2020-09-19 17:29:33 +03:00
Felix Corvus	48f6ed47a6	Merge branch 'master' into master	2020-09-19 17:01:57 +03:00
Felix Corvus	c1efb69a91	Update bundle_ru.properties	2020-09-19 16:58:22 +03:00
Vanguard	742b171d5c	2 new lines ... unit.sei.name unit.omura.name	2020-09-19 16:10:07 +03:00
Sunny Kim	8a4dd09137	Update bundle_ko.properties ... + Lots of environmental blocks(reflects 74cefb3ec9)!	2020-09-19 20:49:08 +09:00
DeltaNedas	435ef23eed	Update CrashSender.java	2020-09-19 09:50:02 +00:00
DeltaNedas	cdc1337fcb	make techtree funcs public	2020-09-19 10:00:33 +01:00
DeltaNedas	c324cf2c66	h	2020-09-19 09:56:05 +01:00
DeltaNedas	3894234578	more info in crash reports	2020-09-19 09:54:09 +01:00
Anuken	b29c0ab401	Unit production limit tweaks	2020-09-18 22:42:05 -04:00
Anuken	8a99a89f57	how many times do I neet to press refresh before IntelliJ sees the files that were there all along	2020-09-18 21:19:26 -04:00
Anuken	aae045b5dd	Outline changes	2020-09-18 21:14:04 -04:00
Anuken	8dd1c5f1f8	hhhhh	2020-09-18 18:56:01 -04:00
Anuken	f53af781ba	T4/5 naval / Controversial weapon outlines	2020-09-18 18:54:09 -04:00
Felix Corvus	4cc90c0f4d	Update bundle_ru.properties	2020-09-18 22:25:59 +03:00
Felix Corvus	80490c401a	Update bundle_ru.properties	2020-09-18 21:38:31 +03:00
Anuken	6b6783f201	Fixed #2591 / Fixed #2591 / Fixed #2589 / Fixed #2587	2020-09-18 11:21:50 -04:00
Anuken	c71be9ae32	Mud	2020-09-18 00:13:08 -04:00
Anuken	4c241f9867	Bugfixes	2020-09-17 23:53:35 -04:00
Anuken	f242a2b2cd	Fixed #2585	2020-09-17 22:25:56 -04:00
Anuken	0c7a7e00eb	Merge remote-tracking branch 'origin/master'	2020-09-17 21:05:23 -04:00
Anuken	ea224bd1f1	many things	2020-09-17 21:05:16 -04:00
DeltaNedas	ee08fa8f77	add lua-style integer division with //	2020-09-17 17:46:45 +01:00
Anuken	ce2dd89f44	Fixed #2571	2020-09-16 23:34:56 -04:00
Anuken	bdf814c9b9	Removed sector data cache system	2020-09-16 18:38:23 -04:00
Felix Corvus	e1277da02d	Update bundle_ru.properties	2020-09-17 00:49:02 +03:00
Anuken	030542890e	Bugfixes	2020-09-16 16:04:11 -04:00
Anuken	5c98512e4f	Bugfixes	2020-09-16 14:53:44 -04:00
Anuken	0847fc9f09	Crash fix	2020-09-16 12:58:26 -04:00
Anuken	47b4da59e0	Fixed #2567	2020-09-16 12:56:32 -04:00
TheSlaylord	b24c5ea920	Update contributors	2020-09-16 18:48:04 +03:00
TheSlaylord	7dfe973664	Update bundle_ru.properties	2020-09-16 18:46:04 +03:00
Anuken	ddcfd0728d	Merge remote-tracking branch 'origin/master'	2020-09-16 11:44:46 -04:00
Anuken	9cfd78ee1f	Fixed #2565	2020-09-16 11:44:39 -04:00
Anuken	90978b54da	Merge pull request #2558 from sk7725/patch-16 ... [KO] Unit name changes	2020-09-16 10:50:39 -04:00
Anuken	7e9f5f5dc4	Merge pull request #2562 from Quezler/patch-44 ... + commander	2020-09-16 10:49:39 -04:00
Anuken	edb776a549	Merge pull request #2521 from YellOw139/patch-1 ... Create bundle_ro.properties	2020-09-16 10:29:07 -04:00
Anuken	d015e878c8	Visual fixes	2020-09-16 09:57:12 -04:00
Anuken	e2a838a715	Fixed #2563	2020-09-16 09:23:57 -04:00
Felix Corvus	41f3fcbe16	Update bundle_ru.properties	2020-09-16 16:01:47 +03:00
Felix Corvus	013995b30d	nicknames fixes	2020-09-16 15:13:25 +03:00
YellOw139	66aacd6ef0	Update bundle_ro.properties	2020-09-16 13:39:28 +03:00
YellOw139	703ad61b72	Update bundle_ro.properties	2020-09-16 13:38:54 +03:00
Patrick 'Quezler' Mounier	e7162004f2	+ commander	2020-09-16 12:04:24 +02:00
YellOw139	9e81460adb	Update bundle_ro.properties	2020-09-16 08:18:01 +03:00
YellOw139	71df10c6d8	Update bundle_ro.properties	2020-09-16 07:43:07 +03:00
Anuken	3974497c31	Merge remote-tracking branch 'origin/master'	2020-09-15 23:49:47 -04:00
Anuken	462e6733ed	Cliff-spam cache fix	2020-09-15 23:49:40 -04:00
Sunny Kim	3407520645	[KO] Unit name changes ... [KO] Unit name changes, based on community reactions.	2020-09-16 10:15:38 +09:00
Anuken	2877bdf0d6	Update bundle_ko.properties (#2475) ... * Update bundle_ko.properties * Update bundle_ko.properties * Update bundle_ko.properties	2020-09-15 20:36:18 -04:00
Anuken	23c56974b2	Merge remote-tracking branch 'origin/master' ... # Conflicts: # core/assets/bundles/bundle_uk_UA.properties	2020-09-15 19:28:57 -04:00
Anuken	a5ce57e56d	Deployment fixes	2020-09-15 19:28:38 -04:00
Prosta4okua	7e2b3a6e2d	Ukrainian translation (#2492) ... * Український переклад :flag_ua: * Update bundle_uk_UA.properties * Update bundle_uk_UA.properties * Оновлення перекладу до стану 10.09.2020 * Update bundle_uk_UA.properties * Оновлення на 15.09.2020 * Update bundle_uk_UA.properties * Update bundle_uk_UA.properties * Update bundle_uk_UA.properties	2020-09-15 18:21:11 -04:00
Anuken	234649bd68	Weather tweaks	2020-09-15 18:20:56 -04:00
Anuken	d655f95b67	Random weather wind direction	2020-09-15 18:15:26 -04:00
Anuken	903a2c069e	Merge remote-tracking branch 'origin/master'	2020-09-15 18:00:39 -04:00
Anuken	306a660e87	Custom map weather definition	2020-09-15 18:00:29 -04:00
Petr Gašparík	e624c42026	Czech translation - up-to-date! (#2393) ... * Czech translation - up-to-date! * fix	2020-09-15 16:44:54 -04:00
Felix Corvus	76ed066a95	[Bundle][RU] actual L10n (#2381) ... * Update bundle_ru.properties * Update bundle_ru.properties * Update bundle_ru.properties * *Командный центр* * Update bundle_ru.properties * Update bundle_ru.properties Новые (нет) юниты, Scepter и Reign * Забыл про Toxopid * [ru l10n] Обходчик -> Ползун * Update bundle_ru.properties * Update bundle_ru.properties * Update bundle_ru.properties * BasedUser was trolled by Anuke * Update bundle_ru.properties * Ого, вот это обновление окружения! * *Ы* * Update bundle_ru.properties * Update bundle_ru.properties * Update achievements.vdf * Update bundle_ru.properties * Пункт снаряжения -> Пункт снабжения Co-authored-by: TheSlaylord <62336673+TheSlaylord@users.noreply.github.com>	2020-09-15 16:44:29 -04:00
YellOw139	f52693ae88	Update bundle_ro.properties	2020-09-15 21:55:17 +03:00
Anuken	b06a9cbf16	Query V6 servers on non-BE instead of standard servers	2020-09-15 14:01:20 -04:00
Anuken	f609ee77a4	Bridge align fix	2020-09-15 13:56:42 -04:00
Anuken	d1b5b7eb3c	Fixed #2556	2020-09-15 13:47:00 -04:00
Anuken	b3d7515dcd	Line optimization & cleanup	2020-09-15 13:19:02 -04:00
Anuken	1327a2bef4	Mega repair AI	2020-09-15 10:39:45 -04:00
Anuken	757e0fbda0	Cleanup	2020-09-14 16:56:32 -04:00
Anuken	50816deb9e	Smarter payload routers / 2x display / Campaign tweaks	2020-09-14 14:09:15 -04:00
Anuken	d6447cb31a	Fixed #2553	2020-09-14 11:13:27 -04:00
Anuken	8901838c19	Fixed #2551	2020-09-14 09:41:54 -04:00
YellOw139	ac8c82eaa1	Update bundle_ro.properties	2020-09-14 14:52:45 +03:00
YellOw139	fffa07398e	Update bundle_ro.properties	2020-09-14 10:40:26 +03:00
YellOw139	7021d2b9fd	Update bundle_ro.properties	2020-09-14 09:45:51 +03:00
Anuken	5c63ff889a	what	2020-09-13 23:30:51 -04:00
Anuken	3f1ed6d4a4	Bugfixes	2020-09-13 23:11:24 -04:00
Anuken	bbb9b3ef62	Bugfixes & unit status polish	2020-09-13 22:30:05 -04:00
Anuken	0e78751c6c	Turret ammo display	2020-09-13 21:22:39 -04:00
Anuken	7ce93c7f85	Prototype health/ammo indication	2020-09-13 21:08:24 -04:00
Anuken	be229f441e	click fix	2020-09-13 14:32:15 -04:00
Anuken	f3921e3dcc	Minor optimization	2020-09-13 14:30:31 -04:00
Anuken	48391219fd	Packed sprites for cliff removal	2020-09-13 12:18:41 -04:00
Anuken	27e9b5aeb9	Removed cliffs / Nerfed explosion bombing	2020-09-13 12:13:42 -04:00
YellOw139	140569238b	Update bundle_ro.properties	2020-09-13 18:59:52 +03:00
Anuken	bab43859f5	Bugfixes	2020-09-13 10:02:10 -04:00
YellOw139	12d8cba2a7	Update bundle_ro.properties	2020-09-13 16:11:43 +03:00
YellOw139	a5d36dff7e	Update bundle_ro.properties	2020-09-13 13:59:52 +03:00
Anuken	1fd98fe07c	Bugfixes (2)	2020-09-12 23:43:03 -04:00
Anuken	4d6c8ade98	Bugfixes	2020-09-12 23:41:25 -04:00
Anuken	8234f31e83	Various tweaks	2020-09-12 21:41:43 -04:00
Anuken	e5ff429241	???	2020-09-12 15:32:35 -04:00