8197 Commits

Author	SHA1	Message	Date
Anuken	f814fa861c	Merge remote-tracking branch 'origin/master'	2020-10-26 10:07:38 -04:00
Anuken	7370e398cc	#3125	2020-10-26 10:07:33 -04:00
Anuken	ca572163d4	Merge pull request #3115 from YellOw139/patch-5 ... Add Vietnamese characters to font.woff	2020-10-26 10:00:41 -04:00
Anuken	78afbb3e95	Merge remote-tracking branch 'origin/master'	2020-10-26 09:57:04 -04:00
Anuken	23b9556105	#3121	2020-10-26 09:56:56 -04:00
DeltaNedas	1e12faaf65	h ... h is for headless, which i am	2020-10-26 13:37:53 +00:00
DeltaNedas	6c7428a1fb	minor serverside optimisation	2020-10-26 13:32:50 +00:00
Felix Corvus	0ab06392c1	Update bundle_ru.properties	2020-10-26 14:54:35 +03:00
Leonwang4234	2a8a00afab	source/void replacement	2020-10-25 17:28:11 -07:00
Anuken	526b1add26	Unused bullet cleanup	2020-10-25 20:04:14 -04:00
Anuken	514aa26054	Minor rendering & AI tweaks	2020-10-25 18:34:12 -04:00
Anuken	baf6bdf6a5	Increased sector damage calculation radius	2020-10-25 17:21:34 -04:00
Anuken	59b5d809db	Balance	2020-10-25 15:55:23 -04:00
Anuken	6c3372e71c	Slightly more reasonable waves	2020-10-25 15:07:51 -04:00
Anuken	1cdea49383	Merge remote-tracking branch 'origin/master'	2020-10-25 12:35:52 -04:00
Anuken	a6307039b0	Fixed some nullability issues	2020-10-25 12:35:48 -04:00
Anuken	aaacf244d2	Merge pull request #3096 from azureblue/placement-direction ... make ending direction follow the path	2020-10-25 12:28:41 -04:00
Anuken	2a0af620be	Sector land announcement	2020-10-25 12:00:57 -04:00
Anuken	b801093597	Merge remote-tracking branch 'origin/master'	2020-10-25 11:22:19 -04:00
Anuken	81dae580a4	Bugfixes / Removed tile unit multi-mining	2020-10-25 11:22:10 -04:00
YellOw139	1d54e939cb	Add new font.woff	2020-10-25 17:02:04 +02:00
YellOw139	a40c49a915	Delete font.woff	2020-10-25 17:01:29 +02:00
Anuken	03f58a1b02	Merge pull request #2972 from sk7725/patch-20 ... Add colors to StatusEffects	2020-10-25 10:35:42 -04:00
YellOw139	103e408cb7	[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 41d388aa7f - Typo fixes & various other improvements	2020-10-25 15:45:57 +02:00
Anuken	b2b0082c7d	Fixed #3108 / Fixed #3112	2020-10-25 09:23:13 -04:00
Wiki Updater	1d4da170ef	änderungen von shawak	2020-10-25 14:22:36 +01:00
老滑稽	3b75527e4c	Update bundle_zh_CN.properties	2020-10-25 19:24:57 +08:00
老滑稽	83d4825bf2	Update bundle_zh_CN.properties	2020-10-25 18:57:57 +08:00
Prosta4okua	3d47389a39	Update bundle_uk_UA.properties	2020-10-25 11:19:09 +02:00
MEEP of Faith	2c03516998	I thought this failed. I guess not..	2020-10-24 17:27:01 -07:00
MEEP of Faith	062b319ab3	ok, then try this?	2020-10-24 17:16:56 -07:00
MEEP of Faith	8ad4349d18	test this	2020-10-24 17:12:44 -07:00
Anuken	1d85495f7a	Merge remote-tracking branch 'origin/master'	2020-10-24 19:06:09 -04:00
Anuken	41d388aa7f	Item sprite cleanup	2020-10-24 19:06:05 -04:00
MEEP of Faith	2ec3eee138	Custom Base Support	2020-10-24 15:02:36 -07:00
MEEP of Faith	705728f16a	"diable" ... oh no	2020-10-24 13:49:30 -07:00
Skat	6b94cbd089	Oh	2020-10-24 23:44:16 +03:00
Skat	7b8a9ff15e	Update ChatFragment.java ... This will avoid exceeding the message length limit if player send a message with spaces in end/start message	2020-10-24 23:34:18 +03:00
azureblue	a7c24d4bfd	fixing formatting	2020-10-24 22:10:02 +02:00
Anuken	79ace277ed	Merge remote-tracking branch 'origin/master'	2020-10-24 15:55:25 -04:00
Anuken	bc035f9490	Fixed #3095	2020-10-24 15:55:20 -04:00
azureblue	73a5af2e5e	make ending direction follow the path	2020-10-24 21:34:47 +02:00
Anuken	ee7bdbf44e	Merge pull request #3081 from genNAowl/standardize-liquid-stats ... Remove timePeriod in LiquidBaseValue	2020-10-24 15:18:47 -04:00
Anuken	b611726c3e	Merge remote-tracking branch 'origin/master'	2020-10-24 15:11:31 -04:00
Anuken	819686e812	Unit factory production list	2020-10-24 15:11:27 -04:00
DeltaNedas	3b2669fa21	pattern variables?	2020-10-24 17:23:54 +00:00
DeltaNedas	801ff1701e	silly	2020-10-24 17:19:50 +00:00
Vanguard	b4deb6caca	1 line changed ... unit.nobuild	2020-10-24 20:06:02 +03:00
DeltaNedas	364a2b43c2	add Content fallback	2020-10-24 17:04:58 +00:00
DeltaNedas	279d898d68	add more info to print object	2020-10-24 16:37:55 +00:00
Felix Corvus	ba7645e531	Update bundle_ru.properties	2020-10-24 19:14:18 +03:00
Anuken	a930b34c3e	Merge pull request #3090 from QmelZ/master ... Turkish Translation	2020-10-24 11:58:21 -04:00
QmelZ	232a3dfe87	one last little fix	2020-10-24 17:28:10 +03:00
Anuken	ddbca62f92	Merge remote-tracking branch 'origin/master'	2020-10-24 10:22:04 -04:00
Anuken	646b022d38	Bugfixes	2020-10-24 10:21:57 -04:00
QmelZ	19ef414e5c	even more fixes	2020-10-24 17:18:56 +03:00
QmelZ	f46eb24615	some other fixes	2020-10-24 17:07:52 +03:00
Anuken	4e6faf3bac	Merge pull request #3083 from genNAowl/titanium-ammo-fuse ... Switch places of titanium and thorium ammo in `Blocks.java`	2020-10-24 09:47:21 -04:00
Anuken	56acbcecfd	Merge branch 'master' into patch-5	2020-10-24 09:46:02 -04:00
QmelZ	7d0952d858	small fix	2020-10-24 15:59:28 +03:00
QmelZ	ef40a2e78e	Update bundle_tr.properties	2020-10-24 15:56:51 +03:00
Wiki Updater	280f0d6e21	Improve german translation for v6	2020-10-24 09:20:57 +02:00
Leonwang4234	f2a984f3e7	Lets hope this compiles because I don't have time to test it	2020-10-23 19:53:21 -07:00
Anuken	1ffa3f21f0	(2)	2020-10-23 20:41:32 -04:00
Anuken	7e323f1ebf	Logic locate fix	2020-10-23 20:38:33 -04:00
SilentOwl476	bff79d7c27	Update bundle_tr.properties	2020-10-24 01:46:02 +03:00
Anuken	117f002545	Fixed #3082	2020-10-23 18:24:18 -04:00
Anuken	953c1889b5	Fixed #3080	2020-10-23 17:18:49 -04:00
Leonwang4234	cc024a0bac	remove timePeriod in LiquidBaseValue	2020-10-23 13:34:07 -07:00
Anuken	42bfab6e40	Fixed #3079	2020-10-23 16:12:36 -04:00
Anuken	c8ef7ebafb	Fixed #3078 + action listeners for player control events	2020-10-23 15:59:52 -04:00
Anuken	5512c1817d	Extra scrap for debris field map	2020-10-23 14:09:05 -04:00
Anuken	f5888a7c56	Android crash fixes	2020-10-23 13:42:28 -04:00
Anuken	754aba9013	Merge remote-tracking branch 'origin/master'	2020-10-23 13:31:58 -04:00
Anuken	cf3f540df4	New map	2020-10-23 13:31:55 -04:00
Anuken	f2f805e140	Merge pull request #2969 from rodrigolitzius/patch-1 ... S	2020-10-23 12:01:43 -04:00
Anuken	84171a8619	Slightly better terrain filter	2020-10-23 12:00:06 -04:00
Anuken	92d573bdcb	Merge remote-tracking branch 'origin/master' ... # Conflicts: # core/assets/bundles/bundle_ro.properties	2020-10-23 11:52:27 -04:00
Anuken	f81f4ded03	Updated bundles	2020-10-23 11:52:01 -04:00
YellOw139	92327bfd1d	[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 <need to check number> - Typo fixes & various other improvements	2020-10-23 18:49:48 +03:00
Anuken	7d194094ff	Merge remote-tracking branch 'origin/master'	2020-10-23 11:48:56 -04:00
Anuken	d8798b5a0d	function	2020-10-23 11:48:53 -04:00
Anuken	6d846cc3a5	Merge pull request #2934 from Prosta4okua/master ... [Bundle][RU] actual L10n	2020-10-23 11:48:35 -04:00
Anuken	4dfb743273	Merged translations	2020-10-23 11:42:12 -04:00
Anuken	2b5ee5c463	Merge remote-tracking branch 'origin/master'	2020-10-23 10:39:05 -04:00
Anuken	bf1268bb6e	Shooting -> Function category / Dialog cleanup	2020-10-23 10:39:01 -04:00
Felix Corvus	9cb601c569	Update bundle_ru.properties	2020-10-23 17:11:51 +03:00
Felix Corvus	bf8ab8e34e	Update bundle_ru.properties	2020-10-23 16:49:43 +03:00
Anuken	9db4d287dd	Merge branch 'master' into patch-2	2020-10-23 09:47:22 -04:00
Anuken	4ca3909220	Merge pull request #3024 from DaGamerFiles/patch-2 ... Update bundle_in_ID.properties	2020-10-23 09:38:24 -04:00
Anuken	6983577b20	Merge pull request #3006 from Kieaer/patch-5 ... Update bundle_ko.properties	2020-10-23 09:38:10 -04:00
Anuken	3d46ed580e	Merge branch 'master' into patch-7	2020-10-23 09:35:13 -04:00
Anuken	d7e5828347	Merge pull request #2942 from YellOw139/patch-5 ... [Bundle][RO] Translation Update	2020-10-23 09:34:40 -04:00
Anuken	2dfb9830a3	Merge branch 'master' into v107	2020-10-23 09:34:04 -04:00
Anuken	a1de6e5288	Merge branch 'master' into patch-7	2020-10-23 09:30:23 -04:00
Anuken	a16b9240d6	Merge branch 'master' into patch-15	2020-10-23 09:28:47 -04:00
Anuken	e163a80ba7	Merge pull request #2748 from ballgamer56/patch-2 ... Update Thai translation	2020-10-23 09:25:05 -04:00
Anuken	a0f55861fe	Merge pull request #3028 from GlennFolker/master ... allow mods to easily load icon region	2020-10-23 09:21:43 -04:00
Anuken	d66cf13ac6	Added buttons to clear campaign saves & research	2020-10-23 09:08:17 -04:00
Anuken	436a020c3e	Fixed attack mode gamover check	2020-10-22 20:44:18 -04:00
Anuken	23673f0b11	typo	2020-10-22 20:34:02 -04:00
Anuken	bd659d2c97	Don't clear legacy unlocks after read	2020-10-22 20:33:26 -04:00
Anuken	514e2503fa	Editor generation cleanup	2020-10-22 19:26:55 -04:00
MEEP of Faith	5203d17910	Comment stuff	2020-10-22 15:18:12 -07:00
Anuken	4f21ea7799	Fixed archipelago map / filters messing with block data	2020-10-22 18:11:12 -04:00
Anuken	a773edd838	(slightly) fewer polys in campaign	2020-10-22 17:12:38 -04:00
Anuken	ace9aebf2b	Fixed #3068	2020-10-22 16:28:08 -04:00
Anuken	a2e75df096	Map editor tweaks & fixes / New map	2020-10-22 15:27:30 -04:00
Anuken	c2ff5a69ef	Buffered map-load filter support / Spawn path filter	2020-10-22 12:27:22 -04:00
YellOw139	f4fcb8daa6	Update bundle_ro.properties	2020-10-22 19:14:48 +03:00
Anuken	46b2f4cccb	Minor bugfixes & wave tweaks	2020-10-22 11:54:27 -04:00
Felix Corvus	c63b98150f	Merge branch 'master' into master	2020-10-22 18:21:52 +03:00
Vanguard	91164f659b	smol breyn	2020-10-22 18:02:39 +03:00
Vanguard	70750920fa	anuke shenanigans ... a lot of them	2020-10-22 17:14:41 +03:00
Anuken	a732237005	Allowed enemy spawns on water	2020-10-22 09:43:21 -04:00
YellOw139	76d2fc0f54	Typo	2020-10-22 16:23:21 +03:00
Anuken	f2dd5ba113	Fixed #3062 / Fixed #3064	2020-10-22 09:11:48 -04:00
YellOw139	4d28b5083c	Quezler Status Fielded my mind	2020-10-22 14:27:56 +03:00
MEEP of Faith	da3c11a201	Comments	2020-10-21 23:14:54 -07:00
YellOw139	dabdf514d6	Space	2020-10-22 07:50:35 +03:00
MEEP of Faith	e7b6013d8d	doot	2020-10-21 21:39:55 -07:00
MEEP of Faith	ed2825b0d9	doot	2020-10-21 21:37:52 -07:00
MEEP of Faith	50410be90a	Define color instead of based on team	2020-10-21 21:33:57 -07:00
MEEP of Faith	0bd07866d8	m hm	2020-10-21 19:51:32 -07:00
MEEP of Faith	2dd234d960	oopeth	2020-10-21 19:32:29 -07:00
MEEP of Faith	43d1f363e5	Lightning Ability	2020-10-21 19:12:24 -07:00
Anuken	6c13250705	Merge remote-tracking branch 'origin/master'	2020-10-21 20:32:40 -04:00
Anuken	f0d74e2705	New map / Unit stat tweaks / FileChooser keyboard input	2020-10-21 20:32:35 -04:00
Anuken	1d65d54d9a	Merge pull request #3055 from summetdev/patch-6 ... [typo] Keybinds and keybinds.	2020-10-21 19:05:50 -04:00
Anuken	b71ae99301	Merge pull request #3054 from Catchears/cleanup ... change surgealloy to surgeAlloy and phasefabric to phaseFabric	2020-10-21 16:34:40 -04:00
Summet	80bd1daea4	typo	2020-10-21 23:34:38 +03:00
YellOw139	21022436e8	Stats are finally consistent and up to date	2020-10-21 22:02:24 +03:00
Anuken	a80d0cc457	Fixed #3053	2020-10-21 14:10:28 -04:00
Wiki Updater	4d575364f4	change surgeAlloy and phaseFabric	2020-10-21 20:04:41 +02:00
Volas171	dec9e8d4aa	Merge branch 'master' into patch-1	2020-10-21 10:53:20 -05:00
Anuken	87dda1ba4b	Merge remote-tracking branch 'origin/master'	2020-10-21 11:37:48 -04:00
Anuken	1cbcb742e9	Fixed #3052	2020-10-21 11:37:44 -04:00
Anuken	48f5be6623	Merge pull request #3051 from skykatik/patch-1 ... var -> let	2020-10-21 10:48:22 -04:00
Anuken	ee8f18796e	Merge remote-tracking branch 'origin/master'	2020-10-21 10:37:07 -04:00
Anuken	3517da8214	Fixed #3049	2020-10-21 10:37:03 -04:00
Skat	aba001f499	var deprecated, use let or const	2020-10-21 16:05:36 +03:00
키에르	f3f5872159	Merge branch 'master' into patch-5	2020-10-21 20:14:40 +09:00
YellOw139	eba9578a0d	More conflict changes. Should be ok now.	2020-10-21 07:30:18 +03:00
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