8104 Commits

Author	SHA1	Message	Date
YellOw139	b95bf1595b	Fog	2020-10-21 07:28:27 +03:00
YellOw139	92b8981988	Merge branch 'master' into patch-5	2020-10-21 07:22:51 +03:00
YellOw139	83c53a541a	Wall stats (WIP)	2020-10-21 07:10:48 +03:00
Leonwang4234	54fd2e03b4	resolve conflicts	2020-10-20 15:57:48 -07:00
Leonwang4234	df37ce3cef	Merge remote-tracking branch 'upstream/master' into wall-stats	2020-10-20 15:49:46 -07:00
Anuken	18e6a43a87	Added weather to some built-in maps	2020-10-20 17:24:51 -04:00
Anuken	8f58228317	More base parts	2020-10-20 15:43:06 -04:00
Anuken	30abfc0619	Fixed #3045	2020-10-20 14:02:10 -04:00
Anuken	82fe66b931	Titanium fuse ammo	2020-10-20 12:14:53 -04:00
Anuken	03c60a93f0	Merge remote-tracking branch 'origin/master'	2020-10-20 11:21:54 -04:00
Anuken	9ab272a01f	Better server colors	2020-10-20 11:21:47 -04:00
ballgamer56	f0c5c98633	Merge branch 'master' into patch-2	2020-10-20 20:23:15 +07:00
Anuken	e68d28ef51	Merge pull request #3041 from summetdev/admin-chat ... Admin chat.	2020-10-20 09:10:18 -04:00
Anuken	9060a9518a	Fixed #3037	2020-10-20 09:05:41 -04:00
ballgamer56	8e164269cc	Formated to the newest update ... Updated to commit 2ff749bd17	2020-10-20 20:02:41 +07:00
Summet	ffb94576ac	Better colors ... Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>	2020-10-20 15:04:03 +03:00
Quick-Korc	a1a2007b3e	Zone description and typo fixed	2020-10-20 19:00:13 +07:00
summetdev	0c1c0f9557	Admin -> A	2020-10-20 13:56:53 +03:00
summetdev	9f95aa035d	Indents	2020-10-20 13:56:09 +03:00
summetdev	89fca49b91	Put admin color to Pal	2020-10-20 13:51:21 +03:00
summetdev	d3e26c7c16	Admin chat command	2020-10-20 13:33:28 +03:00
WinterUnderTheSnow	877999dd1e	Update bundle_zh_CN.properties	2020-10-20 07:13:10 +08:00
Thomas Widyantoko	0ba653ddd0	Merge branch 'master' into patch-2	2020-10-20 05:55:02 +07:00
Anuken	c27251cfb0	Fog	2020-10-19 18:28:37 -04:00
Anuken	d5fb0e924a	Merge remote-tracking branch 'origin/master'	2020-10-19 16:26:03 -04:00
Anuken	6e8732387b	Better weather classes	2020-10-19 16:25:59 -04:00
Sunny Kim	3c2e12621e	rainbow liquid	2020-10-20 01:01:45 +09:00
Sunny Kim	efb42296cf	remove final	2020-10-20 00:57:08 +09:00
Anuken	cab08de1f7	Merge remote-tracking branch 'origin/master'	2020-10-19 11:34:59 -04:00
Anuken	2ff749bd17	Unified stat system	2020-10-19 11:34:52 -04:00
Anuken	073b82b70f	Merge pull request #3029 from abomb4/patch-mod-environment ... Json in Mod should be able to define OreBlock type	2020-10-19 10:43:53 -04:00
abomb4	9e79ed8a26	Json in Mod should be able to define OreBlock type ... That in mindustry.world.blocks.environment package	2020-10-19 22:34:52 +08:00
Anuken	59e1fd1eb6	typo	2020-10-19 10:04:30 -04:00
Anuken	d1d674cfc9	Merge remote-tracking branch 'origin/master'	2020-10-19 10:04:13 -04:00
Anuken	80f801db36	Fixed #3023 / Fixed #3020	2020-10-19 10:04:10 -04:00
GlennFolker	cae66a1e6d	allow mods to easily load icon region	2020-10-19 19:13:06 +07:00
Thomas Widyantoko	e88a2f8437	Space block name changed	2020-10-19 14:50:56 +07:00
Thomas Widyantoko	4b4cde288b	Update bundle_in_ID.properties ... Improved translation, new lines and a slight text color format fix.	2020-10-19 13:43:59 +07:00
Ilya246	ad5d3581f6	armor defined twice in mega	2020-10-19 10:09:39 +04:00
Petr Gašparík	538c198113	Czecg translation up to commit 46ec457	2020-10-19 07:48:57 +02:00
Petr Gašparík	8f4ac642d1	Merge branch 'master' of https://github.com/Anuken/Mindustry into v107	2020-10-19 07:34:10 +02:00
Anuken	7f21d61078	Crash fix	2020-10-18 19:54:52 -04:00
Anuken	c7622198fd	Cleanup	2020-10-18 19:21:59 -04:00
Anuken	3a52fb2afe	Merge branch 'router'	2020-10-18 19:03:13 -04:00
Anuken	e63bbe6ac9	Merge remote-tracking branch 'origin/master'	2020-10-18 18:34:24 -04:00
Anuken	dac236b0e9	Better launch selection	2020-10-18 18:34:19 -04:00
Leonwang4234	1e0545c1ec	Merge branch 'wall-stats' of https://github.com/genNAowl/Mndstry into wall-stats	2020-10-18 14:29:18 -07:00
Leonwang4234	cff2799c72	remove changes in description	2020-10-18 14:29:15 -07:00
genNAowl	7a7fa74e65	Update core/src/mindustry/world/blocks/defense/Wall.java ... Co-authored-by: Summet <summet.dev@gmail.com>	2020-10-18 14:26:48 -07:00
Summet	8ceb155e38	:)	2020-10-19 00:14:40 +03:00
Leonwang4234	db3db47ca1	Add wall stats + other changes	2020-10-18 13:35:20 -07:00
Anuken	97fd9abd8c	Merge remote-tracking branch 'origin/master'	2020-10-18 15:46:24 -04:00
Anuken	00d6997b5a	Hex/bin logic number support	2020-10-18 15:46:20 -04:00
Anuken	58ff6c60aa	Merge pull request #3012 from summetdev/typo ... Grammatical fix	2020-10-18 14:57:26 -04:00
Anuken	7fc2d6be18	Merge pull request #3010 from summetdev/units-payload ... Units payload.	2020-10-18 14:43:23 -04:00
summetdev	bd6aebb961	fixed a typo in comment	2020-10-18 21:38:01 +03:00
summetdev	801eca5ca3	prevent sending extra packets	2020-10-18 21:26:32 +03:00
summetdev	12e35b643c	sync fix	2020-10-18 20:24:09 +03:00
Anuken	563e99aded	Fixed #3009	2020-10-18 13:02:55 -04:00
summetdev	8625ef09cc	Units payload	2020-10-18 19:54:10 +03:00
Anuken	ce6292cc53	Recipe display for reconstructors	2020-10-18 11:53:36 -04:00
Anuken	14c42c5652	Removed issue workaround from README	2020-10-18 09:29:49 -04:00
Anuken	c1c41a19c8	Cleanup	2020-10-18 09:08:47 -04:00
키에르	48885a814c	Update bundle_ko.properties	2020-10-18 13:56:55 +09:00
YellOw139	2ff6630e23	Bumped up a couple of commits	2020-10-18 05:39:38 +03:00
Anuken	521d44714d	Disabled spawnpoints during ongoing attack maps	2020-10-17 19:49:13 -04:00
Anuken	4ab0c8a1ca	Merge remote-tracking branch 'origin/master'	2020-10-17 18:37:57 -04:00
Anuken	7349af4753	Various small tweaks	2020-10-17 18:37:54 -04:00
Anuken	55a8ae083b	Merge pull request #2992 from DeltaNedas/planetdraw ... allow modded planets to customize drawing	2020-10-17 17:56:12 -04:00
Anuken	e9131b4631	Minor payload acceptor fixes	2020-10-17 17:05:34 -04:00
Felix Corvus	6ab7496a9d	Update bundle_ru.properties	2020-10-18 00:04:01 +03:00
Anuken	5d9beb4c28	Fixed #2582	2020-10-17 14:37:51 -04:00
Anuken	a47432c20b	Merge remote-tracking branch 'origin/master'	2020-10-17 13:03:03 -04:00
Anuken	8043c09e2b	Breaking logic change: Coordinates are now tile-based	2020-10-17 13:02:57 -04:00
DeltaNedas	091593c84d	Merge branch 'master' into planetdraw	2020-10-17 16:59:28 +00:00
Anuken	1324e75eea	Merge pull request #2996 from DeltaNedas/universe ... add universe draw events	2020-10-17 12:52:26 -04:00
Volas171	f364892fce	Merge branch 'master' into patch-1	2020-10-17 10:50:53 -05:00
Anuken	c99873c823	Added bool to enable editor cliff button	2020-10-17 11:02:48 -04:00
DeltaNedas	ef2bf2e129	add universeDraw event	2020-10-17 15:38:12 +01:00
Anuken	46ec457819	Cleanup	2020-10-17 10:37:28 -04:00
DeltaNedas	35a86a1aac	add universe draw events	2020-10-17 15:34:00 +01:00
Anuken	3a7ee50db3	Merge remote-tracking branch 'origin/master'	2020-10-17 10:10:34 -04:00
Anuken	be394c4b33	Checks to prevent uncaptureable sectors	2020-10-17 10:10:29 -04:00
Anuken	41dcf7a6f2	Merge pull request #2817 from ThePythonGuy3/patch-7 ... Some typo fixes and various stuff for spanish bundle.	2020-10-17 09:19:05 -04:00
Anuken	c3d0819cc1	Fixed #2988	2020-10-17 09:17:16 -04:00
DeltaNedas	8e0c5023c9	hh	2020-10-17 12:28:46 +01:00
DeltaNedas	54b0d308be	h	2020-10-17 12:16:47 +01:00
DeltaNedas	05b77d787e	hide orbits of hidden planets	2020-10-17 12:10:52 +01:00
WinterUnderTheSnow	699f2ca5a2	Update bundle_zh_CN.properties ... Confirmed units,name this may be the final version of translation by main translating team for v108	2020-10-17 17:38:12 +08:00
Anuken	962d0729d6	Merge remote-tracking branch 'origin/master'	2020-10-16 20:09:55 -04:00
Anuken	fc1b03f322	Various tweaks	2020-10-16 20:09:48 -04:00
Anuken	91b4fb1c97	Merge pull request #2979 from DeltaNedas/planet ... PlanetGrid stuff	2020-10-16 19:46:05 -04:00
DeltaNedas	0fa947bfaa	make calc stuff pkg private again	2020-10-16 23:22:39 +01:00
DeltaNedas	060152fc29	make calc stuff pkg private again	2020-10-16 23:06:46 +01:00
DeltaNedas	97b0461d7f	allow modded planets to customize drawing	2020-10-16 23:00:06 +01:00
DeltaNedas	fd54c66726	make ptile/edge/corner mutable	2020-10-16 22:26:50 +01:00
Felix Corvus	db28e82faf	Update bundle_ru.properties	2020-10-16 22:50:01 +03:00
Anuken	e00daffe6d	Bugfixes	2020-10-16 15:27:30 -04:00
DeltaNedas	bddcdc0aa2	make planet stuff public, constructor protected	2020-10-16 19:57:13 +01:00
Anuken	1fbced0433	Corrected loadout placement function	2020-10-16 14:09:29 -04:00
Volas171	df0bb9583b	Update bundle_es.properties ... Added 6.0 new block translation and fixed some misspells/english missed words	2020-10-16 13:08:40 -05:00
Anuken	d6c5d2bc10	Merge remote-tracking branch 'origin/master'	2020-10-16 12:56:51 -04:00
Anuken	b0ea725142	Sector tweaks	2020-10-16 12:56:48 -04:00
Anuken	8be6eabec9	Merge pull request #2974 from abomb4/patch-homing-delay ... New feature request: bullet homing delay	2020-10-16 12:44:51 -04:00
Sunny Kim	89f04ed3e9	oh no	2020-10-17 01:22:07 +09:00
Anuken	f391e7a5ac	Sector production bugfixes	2020-10-16 12:16:00 -04:00
abomb4	83756a6ea0	New feature: bullet homing delay	2020-10-17 00:05:19 +08:00
Prosta4okua	a8f45b464c	Update bundle_uk_UA.properties	2020-10-16 18:57:13 +03:00
Leonwang4234	9b95b97568	(Should) prevent vela from setting fires to friendly tiles	2020-10-16 08:54:29 -07:00
Leonwang4234	69b7d15beb	Merge remote-tracking branch 'upstream/master' into ground-support-heal	2020-10-16 08:49:55 -07:00
Felix Corvus	e31d293bab	Update bundle_ru.properties	2020-10-16 18:34:29 +03:00
Anuken	f5decdaa1c	Disabled spawner radius/warning when waves off	2020-10-16 11:27:17 -04:00
Anuken	2f54edf34f	Sector refactoring, invasions and cleanup	2020-10-16 11:02:24 -04:00
Sunny Kim	956840b50b	oops	2020-10-16 20:59:40 +09:00
Sunny Kim	b79e0373f4	Add colors to StatusEffects	2020-10-16 20:12:54 +09:00
Felix Corvus	421fcd5705	Update bundle_ru.properties	2020-10-16 04:55:31 +03:00
Leonwang4234	ba77f8e2aa	implement content	2020-10-15 17:59:03 -07:00
Rodrigo	685fd51b6f	S ... completely useless "S"	2020-10-15 21:43:06 -03:00
Anuken	5ee4101ba4	Moved some static regions	2020-10-15 16:33:51 -04:00
Anuken	45b87ec615	fixed some sector things, broke more things	2020-10-15 15:41:09 -04:00
Anuken	988e1add82	Merge remote-tracking branch 'origin/master'	2020-10-15 13:44:29 -04:00
Anuken	86c2fe8805	too many things to list	2020-10-15 13:44:20 -04:00
Sharlotte	fa2cdb752a	changed private -> public of checkRadius method ... when i try to change color of forceField by using draw method , the Mindustry is crashed because of that private method.	2020-10-15 20:46:29 +09:00
xXextremeduro69420Xx	17725ddfe8	Update bundle_pt_BR.properties ... Small changes and fixed some typos.	2020-10-14 11:32:37 -03:00
Anuken	2b435c2600	UnitType serializer set	2020-10-14 09:13:29 -04:00
Anuken	d630110396	JITPack version check	2020-10-14 09:08:03 -04:00
Anuken	f96552a1a1	Merge remote-tracking branch 'origin/master'	2020-10-14 08:49:09 -04:00
Anuken	6b4a7d025b	Fixed #2938 / Fixed #2936	2020-10-14 08:49:05 -04:00
Prosta4okua	592708811b	Update bundle_uk_UA.properties	2020-10-14 14:54:21 +03:00
YellOw139	99b3a224d0	Typo fix	2020-10-14 11:49:13 +03:00
YellOw139	80bf157752	[Bundle][RO] Translation Update ... This PR was tested in-game and is ready to merge at any time (unless marked as draft). Changelog: - New strings/changes up to commit 1554fd0394 - Typo fixes & various other improvements	2020-10-14 11:45:09 +03:00
Petr Gašparík	a85a20b346	Czech translation up to commit 1554fd0	2020-10-14 08:00:43 +02:00
Anuken	bb655100ee	Merge pull request #2865 from sk7725/patch-18 ... Update bundle_ko.properties	2020-10-13 19:38:18 -04:00
Anuken	bea9deb386	Removed planet switch debug code	2020-10-13 19:37:45 -04:00
Felix Corvus	4b0c34c5c9	Перевод небесных тел	2020-10-14 02:03:10 +03:00
Anuken	1554fd0394	Planet selection for mods	2020-10-13 18:50:18 -04:00
Anuken	6bfae1c34f	Merge pull request #2932 from Prosta4okua/master ... Update bundle_ru.properties	2020-10-13 18:09:59 -04:00
Anuken	cce8b5a530	Merge remote-tracking branch 'origin/master'	2020-10-13 18:09:49 -04:00
Anuken	a8b55c27e8	x	2020-10-13 18:09:46 -04:00
Anuken	41c08a64e2	Merge pull request #2724 from Prosta4okua/patch-6 ... Ukrainian localisation	2020-10-13 18:07:35 -04:00
Felix Corvus	f846125e78	Update bundle_ru.properties	2020-10-14 01:07:32 +03:00
Anuken	caab6c1fa3	Merge pull request #2720 from Prosta4okua/master ... [Bundle][RU] actual L10n	2020-10-13 18:06:45 -04:00
Anuken	7a770d8aed	Merge pull request #2696 from YellOw139/patch-4 ... [Bundle][RO] Translation Update	2020-10-13 18:06:31 -04:00
Anuken	77458e1e4d	Merge pull request #2694 from PetrGasparik/v106-alpha ... [v107-alpha] Czech translation - update	2020-10-13 18:06:16 -04:00
Anuken	64cae7d877	Merge pull request #2693 from laohuaji233/patch-38 ... Update bundle_zh_CN.properties(finished)	2020-10-13 18:06:07 -04:00
Anuken	0e544825f9	Merge pull request #2481 from Pietro303HD/patch-2 ... some small changes, and also removed a typo	2020-10-13 18:03:56 -04:00
Anuken	3bf80e6732	Merge pull request #2420 from DaGamerFiles/patch-1 ... Indonesian translation	2020-10-13 18:03:47 -04:00
Felix Corvus	e612213969	Update bundle_ru.properties	2020-10-14 00:44:10 +03:00
Anuken	37bb48076d	Fixed #2931	2020-10-13 17:41:47 -04:00
Summet	37cafe5081	Бета	2020-10-13 23:31:41 +03:00
Anuken	4bf2b3b43e	Now in beta	2020-10-13 16:18:11 -04:00
Anuken	b1acc90739	Cleanup	2020-10-13 16:13:18 -04:00
Anuken	5d76dd0e2f	Fixed #2929	2020-10-13 15:56:00 -04:00
Anuken	c05f40af4a	Merge remote-tracking branch 'origin/master'	2020-10-13 10:53:50 -04:00
Anuken	b2c236fe7b	Difficulty settings for sector presets	2020-10-13 10:53:40 -04:00
Anuken	d4c72b2a9c	Merge pull request #2915 from genNAowl/pierce-cap-info ... Add `pierceCap` Info	2020-10-13 10:53:17 -04:00
Sunny Kim	4364851cf4	let buildTable accept closeSelect	2020-10-13 22:29:55 +09:00
Leonwang4234	24d295a924	add infinitepierce + bugfixes	2020-10-12 17:57:00 -07:00
Anuken	06877b457e	Rule selection fixes	2020-10-12 15:59:22 -04:00
Felix Corvus	7564f93445	Merge branch 'master' into master	2020-10-12 22:11:18 +03:00
Anuken	fde1881fd5	Merge remote-tracking branch 'origin/master'	2020-10-12 14:33:29 -04:00
Anuken	876534bd26	Wave balancing & AI tweaks	2020-10-12 14:33:22 -04:00
Anuken	fbda1fb7cf	Merge pull request #2863 from MEEPofFaith/patch-2 ... If units can have `chargeSound`, why not `chargeTurret`s too?	2020-10-12 10:40:50 -04:00
Vanguard	e2403b96e6	3 changed lines ... indev.popup block.silicon-smelter.description block.alloy-smelter.description	2020-10-12 17:38:56 +03:00
Summet	2a1ce6109e	Дацитовый валун (#23)	2020-10-12 17:25:13 +03:00
Vanguard	eec7408b0e	3 lines added; 1 line changed ... Added: wave.guardianwarn wave.guardianwarn.one lastaccessed Changed: block.silicon-smelter.description	2020-10-12 17:08:57 +03:00
Anuken	f10c5c1ca8	Merge remote-tracking branch 'origin/master'	2020-10-12 10:06:41 -04:00
Anuken	378e81cd90	Fixed #2917	2020-10-12 10:06:34 -04:00
Wiki Updater	08629bb7f7	add bundle entry for dacit boulder	2020-10-12 10:49:41 +02:00
Leonwang4234	7f5561f037	add...	2020-10-11 17:03:48 -07:00
Anuken	66ecf96be2	Merge pull request #2904 from Quezler/patch-52 ... Make deconstructing scrap walls return scrap	2020-10-11 19:11:52 -04:00
Anuken	6807b589a3	Logic unit control tweaks	2020-10-11 19:10:33 -04:00
MEEP of Faith	7662174dc4	oki doki	2020-10-11 12:58:50 -07:00
Anuken	ee50995dde	Removed "sector attacked" message	2020-10-11 14:54:05 -04:00
Anuken	2f6f205dc7	Better builder detection for ConstructBlock	2020-10-11 14:20:53 -04:00
Anuken	f1ec26f82b	Correct logic control position rendering	2020-10-11 14:10:55 -04:00
Anuken	7df575e76a	Merge remote-tracking branch 'origin/master'	2020-10-11 14:05:19 -04:00
Anuken	af54de894c	Balancing / LogicAI sync	2020-10-11 14:05:16 -04:00
YellOw139	8ed6f1e3a8	Updates until commit 3fe79531a6	2020-10-11 21:01:37 +03:00
Summet	4f258b54c5	Fix Vars.loops declaration	2020-10-11 20:47:04 +03:00
Anuken	ad2bda8ec1	Better sector gen	2020-10-11 13:33:02 -04:00
Felix Corvus	6d436ce680	избегаем потенциальных проблем	2020-10-11 19:18:28 +03:00
Summet	504d29ca54	Подключения узлов ⚡ ... * Подключения узлов ⚡ * Подключения -> Подключений	2020-10-11 19:10:02 +03:00
Anuken	f12379ee07	Fixed #2910	2020-10-11 11:55:45 -04:00
Anuken	3fe79531a6	Added message for last accessed player of block	2020-10-11 11:47:22 -04:00
Anuken	e11a8565d0	Merge remote-tracking branch 'origin/master' ... # Conflicts: # core/src/mindustry/ui/dialogs/PausedDialog.java	2020-10-11 10:51:46 -04:00
Anuken	3d99e38f10	Sector simplification	2020-10-11 10:51:33 -04:00
Anuken	cc051dd787	Merge pull request #2905 from DeltaNedas/uinames ... add names to lots of ui elements	2020-10-11 10:36:18 -04:00
DeltaNedas	0f2c38b0c0	oh no	2020-10-11 15:28:50 +01:00
Anuken	d9aa1f765d	Merge pull request #2906 from Quezler/patch-53 ... Visualize maximum amount of power node wires	2020-10-11 10:19:58 -04:00
Anuken	62baf5cab2	Update core/src/mindustry/world/blocks/power/PowerNode.java ... Co-authored-by: Patrick 'Quezler' Mounier <patrick@queztech.net>	2020-10-11 09:24:27 -04:00
Anuken	65d9978fa1	Fixed #2901 / Fixed #2903	2020-10-11 09:02:20 -04:00
Patrick 'Quezler' Mounier	6d632fc532	Update bundle.properties	2020-10-11 14:59:44 +02:00
Patrick 'Quezler' Mounier	a975da543b	Add a connections bar to powernodes ... Bundle entry in next commit.	2020-10-11 14:58:53 +02:00
Vanguard	ec8708067b	1 new line ... editor.center	2020-10-11 14:59:05 +03:00
DeltaNedas	5eb8a87528	h	2020-10-11 12:59:00 +01:00
DeltaNedas	1539d86846	add names to some major dialog elements	2020-10-11 12:57:18 +01:00
DeltaNedas	a60ae3a060	add names to major fragment elements	2020-10-11 12:56:55 +01:00
Patrick 'Quezler' Mounier	eaf7a86bce	Make deconstructing scrap walls return scrap	2020-10-11 13:54:28 +02:00
MEEP of Faith	5600f96a37	Make the sound pitch not random.	2020-10-10 18:03:53 -07:00
Anuken	bcb248907c	Campaign core item incineration + better idle gen	2020-10-10 19:02:47 -04:00
Anuken	ab772d4901	fewer destruction turns	2020-10-10 17:31:16 -04:00
Anuken	7bcecea539	Merge remote-tracking branch 'origin/master'	2020-10-10 17:09:22 -04:00
Anuken	4d889cd8d1	Weather fixes	2020-10-10 17:09:19 -04:00
Anuken	a3e42b28bd	Merge pull request #2821 from summetdev/schems-description ... Descriptions for schematics.	2020-10-10 16:22:00 -04:00
Anuken	c2202a0173	Bugfixes	2020-10-10 15:50:03 -04:00
Anuken	316e6e298c	Fixed #2896	2020-10-10 14:55:21 -04:00
Anuken	8482221c83	.	2020-10-10 14:47:59 -04:00
summetdev	d94fdfa50f	don't show desc at schem save	2020-10-10 20:28:43 +03:00
Anuken	2079a91ac6	Merge remote-tracking branch 'origin/master'	2020-10-10 13:16:03 -04:00
Anuken	d61ad8d2ef	Fixed #2895	2020-10-10 13:15:59 -04:00
Patrick 'Quezler' Mounier	f2bd4bf38c	Who needs two pairs of legs?	2020-10-10 18:35:00 +02:00
Anuken	837a8cecb3	Wave balancing & other tweaks	2020-10-10 12:26:57 -04:00
Anuken	3f74c61c0a	Map center button	2020-10-10 12:05:11 -04:00
Anuken	63bf066cff	Merge remote-tracking branch 'origin/master'	2020-10-10 11:38:05 -04:00
Anuken	fb831e8fef	Better cliff sprites	2020-10-10 11:37:58 -04:00
Pietro303HD	2e4cbdcc05	Update bundle_pt_BR.properties	2020-10-10 09:51:23 -03:00
DeltaNedas	4b9659d4fa	thank you quezler	2020-10-10 12:23:08 +01:00
DeltaNedas	fd71e159d3	make storageblock instantiable	2020-10-10 11:16:04 +01:00
Anuken	5a31d419fc	Bugfixes	2020-10-09 19:10:16 -04:00
Summet	be1cc21ff5	Протекает меньше -> Не протекает (#21)	2020-10-10 01:04:31 +03:00
Anuken	7639f8102f	Bugfixes	2020-10-09 15:34:25 -04:00
Anuken	7da400608c	Bugfixes	2020-10-09 15:18:13 -04:00
Anuken	81633dace4	Merge remote-tracking branch 'origin/master'	2020-10-09 13:52:15 -04:00
Anuken	c78088ab5f	Harder default waves	2020-10-09 13:52:07 -04:00
Patrick 'Quezler' Mounier	d776744905	Update leak behaviour in plated conduit description	2020-10-09 19:11:56 +02:00
Anuken	96656bac6b	Bugfixes	2020-10-09 12:59:59 -04:00
Anuken	99539bbab0	Merge remote-tracking branch 'origin/master'	2020-10-09 10:02:12 -04:00
Anuken	22f1c3b2d1	Bugfixes	2020-10-09 10:02:08 -04:00
Anuken	1d34b8474b	Merge pull request #2877 from genNAowl/pierce-cap ... Adds a Pierce Cap Variable	2020-10-09 09:59:53 -04:00
Patrick 'Quezler' Mounier	ae9093bfd6	Update ArmoredConduit.java	2020-10-09 10:10:50 +02:00
Patrick 'Quezler' Mounier	f3473e78b4	Update Conduit.java	2020-10-09 10:10:34 +02:00
Patrick 'Quezler' Mounier	1672c70c99	Update BuildingComp.java	2020-10-09 10:07:56 +02:00
Sunny Kim	30a5c6631b	consistency	2020-10-09 15:50:27 +09:00
Leonwang4234	e73a813d69	prevent from breaking other things	2020-10-08 19:27:01 -07:00
Leonwang4234	af5fd4551c	true it is	2020-10-08 19:18:53 -07:00
Leonwang4234	0eb0f34908	add pierceCap	2020-10-08 19:14:05 -07:00
Anuken	e2b58528d0	New waves for sectors, quite possibly broken	2020-10-08 19:33:54 -04:00
Anuken	0a0af9c291	Random derelicts in sectors	2020-10-08 19:11:20 -04:00
Felix Corvus	fcb027f3e5	Космос ✨	2020-10-09 00:56:42 +03:00
Anuken	2d70e00193	getChild -> remove	2020-10-08 15:15:47 -04:00
Anuken	c7f1204119	space	2020-10-08 15:14:28 -04:00
Anuken	2c905cdbf1	Merge branch 'space'	2020-10-08 14:47:41 -04:00
Anuken	f14d631ff9	Internal changes for surface-less floors	2020-10-08 14:44:02 -04:00
Anuken	6aa1144429	Hot rock + basalt generation for sectors	2020-10-08 14:37:51 -04:00
Anuken	d06449f311	space	2020-10-08 14:06:07 -04:00
Anuken	e05ac5ae41	Cleanup	2020-10-08 13:08:49 -04:00
Anuken	eb0ab3b3e5	Fixed #2870	2020-10-08 12:59:57 -04:00
Anuken	ac496a60b7	More tests	2020-10-08 09:22:42 -04:00
Anuken	3ec243a49b	Fixed #2866	2020-10-08 09:15:33 -04:00
Sunny Kim	a698258b67	Update bundle_ko.properties ... some stuff, unit shield(방어막) vs force field(보호막) distinction and more	2020-10-08 19:17:30 +09:00
MEEP of Faith	f93b80dd36	thx	2020-10-07 21:24:32 -07:00
MEEP of Faith	4317cad110	Since my Gradle is broken or something, I'll be relying on Travis until I get it fixed.	2020-10-07 19:07:01 -07:00
MEEP of Faith	3d4ace6ca8	If units can have chargeSound, why not chargeTurrets too?	2020-10-07 18:24:30 -07:00
Anuken	773e4c7053	Unified command	2020-10-07 16:37:48 -04:00
Anuken	261c1b1611	(2)	2020-10-07 14:20:23 -04:00
Anuken	8ba4458a1a	Select effect	2020-10-07 14:20:09 -04:00
Anuken	30f5340a22	Mobile manual aiming / Mobile control changes [UNSTABLE]	2020-10-07 14:19:08 -04:00
Anuken	583a12a47b	Fixed #2856	2020-10-07 11:13:11 -04:00
Anuken	be66a15287	Extra mod field parsing (untested)	2020-10-07 11:00:02 -04:00
Petr Gašparík	0ae23b637f	Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha	2020-10-07 09:50:58 +02:00
Anuken	b23dc62c86	Save unit flags	2020-10-06 17:07:10 -04:00
Anuken	79bd9f1f81	More logic commands	2020-10-06 16:27:02 -04:00
Anuken	2d539565c3	More logic commands	2020-10-06 14:03:21 -04:00
Anuken	9182b48b85	Various unit logic additions	2020-10-06 11:26:25 -04:00
Anuken	06925e70c8	Merge pull request #2841 from genNAowl/healbullets-bullets ... Merge `HealBulletType` with `BulletType`	2020-10-06 09:09:18 -04:00
Vanguard	f81a88feca	2 new lines; 1 changed line ... New: rules.enemyLights units.processorcontrol Changed: item.titanium.description	2020-10-06 13:54:01 +03:00
Petr Gašparík	38ef46aa41	Czech translation - update for commit 7088ae8	2020-10-06 10:09:24 +02:00
Petr Gašparík	91875ec45f	Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha	2020-10-06 10:06:06 +02:00
Leonwang4234	d8a06da79a	Should Compile Now	2020-10-05 19:08:23 -07:00
Anuken	c87f0c27b3	Logic tweaks	2020-10-05 19:59:15 -04:00
genNAowl	cba2fd4351	Merge branch 'master' into healbullets-bullets	2020-10-05 16:04:29 -07:00
Anuken	5cc6ac0216	Small tweaks	2020-10-05 17:44:06 -04:00
Anuken	e8e9c14ec9	Merge remote-tracking branch 'origin/master'	2020-10-05 17:09:30 -04:00
Anuken	efbc871967	Pathfind command	2020-10-05 17:09:27 -04:00
Anuken	93e21c6bf9	Merge pull request #2806 from genNAowl/burning-affects-tiles ... Incendiary Bullets Make Fires When Hitting Tiles	2020-10-05 16:35:13 -04:00
genNAowl	7722d697c6	Update core/src/mindustry/entities/bullet/BulletType.java ... Co-authored-by: Anuken <arnukren@gmail.com>	2020-10-05 13:10:52 -07:00
genNAowl	68e67ae0f2	Update core/src/mindustry/entities/bullet/BulletType.java ... Co-authored-by: Anuken <arnukren@gmail.com>	2020-10-05 13:10:46 -07:00
Anuken	7088ae89b3	Logic unit control	2020-10-05 15:42:37 -04:00
Leonwang4234	f9d6ef8e91	Sublime Text is messing with whitespace	2020-10-05 11:58:35 -07:00
Leonwang4234	28ea336966	whitespace	2020-10-05 11:57:19 -07:00
Leonwang4234	e17f28b636	merge healbullets with bullettype	2020-10-05 11:49:12 -07:00
Petr Gašparík	bf4b01e46c	name change	2020-10-05 12:05:53 +02:00
Petr Gašparík	cbb1058dc7	Merge branch 'v106-alpha' of https://github.com/PetrGasparik/Mindustry into v106-alpha	2020-10-05 12:04:38 +02:00
Petr Gašparík	26f6bcccb7	Czech - up to date for commit 14156c1	2020-10-05 12:04:35 +02:00
Petr Gašparík	81e4fb3759	Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha	2020-10-05 11:56:55 +02:00
Petr Gašparík	55be1fd969	Apply suggestions from code review ... Co-authored-by: Roman Plášil <me@rplasil.name>	2020-10-05 11:55:01 +02:00
Anuken	8e49d73765	Nullable region arrays	2020-10-04 15:22:41 -04:00
Anuken	d0d0f5a26f	Fixed #2834	2020-10-04 15:06:13 -04:00
Anuken	702ba0ae84	Bugfixes	2020-10-04 12:48:33 -04:00
Anuken	605a370679	Fixed turrets firing without power as players	2020-10-04 09:58:53 -04:00
Anuken	c4fb84c359	Weapon charge sound	2020-10-04 09:42:49 -04:00
Anuken	55feb38cb7	Merge remote-tracking branch 'origin/master'	2020-10-04 09:11:42 -04:00
Anuken	3ad5167dc9	Fixed #2827	2020-10-04 09:11:38 -04:00
summetdev	bdc69249bb	fix newline	2020-10-04 16:03:48 +03:00
summetdev	eedb90ed16	bigger description area	2020-10-04 15:27:05 +03:00
TheMrAlbert	c1be33cf2f	Minor update ... These are the minor translations, please review this translation before merging. Also, block.consecutive (line 611) are left untranslated to allow other translator who are capable to translate it well.	2020-10-04 12:45:08 +07:00
grimsoul10	5d2c36f186	Small changes (#1) ... * Small changes * Capitalizations	2020-10-04 10:48:48 +07:00
Thomas Widyantoko	3e49c68ec2	Updated for missing lines	2020-10-04 10:08:42 +07:00
Wina	903424654d	Updates to bundle_es.properties	2020-10-03 22:39:33 -03:00