8172 Commits

Author	SHA1	Message	Date
Anuken	aa81805f19	Merge pull request #3103 from MEEPofFaith/patch-1 ... [Modding] Custom Base Support	2020-11-02 17:53:14 -05:00
Anuken	51fa2bf30c	blast should be after pyratite	2020-11-02 16:50:50 -05:00
Anuken	304f5b62b3	Sprites repacked	2020-11-02 16:49:24 -05:00
Anuken	e853ed6419	Merge remote-tracking branch 'origin/master' ... # Conflicts: # core/src/mindustry/logic/LCanvas.java	2020-11-02 16:47:33 -05:00
Anuken	8f53d44278	Various fixes	2020-11-02 16:46:11 -05:00
Anuken	075b7d7dc6	Merge pull request #3225 from Voz-Duh/new-texture-for-blast-mixer ... New Texture For Blast Mixer	2020-11-02 15:31:43 -05:00
Voz-Duh	cda8a9b3e9	Texture Fix	2020-11-02 23:02:56 +03:00
Voz-Duh	6e2f097803	Texture Fix	2020-11-02 22:16:46 +03:00
Alstin112	4f46486a14	Update bundle_pt_BR.properties	2020-11-01 22:17:18 -03:00
Anuken	f44cad4c08	Merge pull request #3230 from Quentinchampenois/translation/fr_keys ... Translates few keys in french	2020-11-01 20:11:41 -05:00
DeltaNedas	fc94d68e10	remove redundant stack trace	2020-11-01 23:16:41 +00:00
DeltaNedas	47844e0204	properly log logic build errors	2020-11-01 23:01:18 +00:00
DeltaNedas	1f9ed90cc0	remove unused DataType.java	2020-11-01 19:35:46 +00:00
DeltaNedas	cda6a6973d	make logic stuff public, cleanup	2020-11-01 19:35:22 +00:00
Anuken	a13f7f633e	Fixed serverside error	2020-11-01 10:42:16 -05:00
Anuken	d786c8668e	Fixed logic config() called in clients / JSON-compatible effects	2020-11-01 10:30:30 -05:00
Anuken	187cb79265	Fixed #3222 / Fixed #3218 / Fixed #3228 / Fixed #3217	2020-11-01 09:28:03 -05:00
quentinchampenois	692c4733e8	light translations from english to french keys	2020-11-01 14:11:09 +01:00
Voz-Duh	e8cfd63bc4	Texture Fix	2020-11-01 14:12:52 +03:00
Stijn van der Linden	e778f1ab5d	Update bundle_nl.properties	2020-11-01 11:45:13 +01:00
Stijn van der Linden	5f1d048eea	Update bundle_nl.properties ... Fixed some typo's, added couple more translated lines.	2020-11-01 11:37:11 +01:00
Voz-Duh	3e03c3e49b	New Texture For Blast Mixer	2020-11-01 13:27:09 +03:00
Anuken	54ba4b31a1	Fixed casing eject effects	2020-10-31 20:19:24 -04:00
Anuken	b5e2812d0b	Bugfixes	2020-10-31 16:25:50 -04:00
Anuken	95c444a004	Merge remote-tracking branch 'origin/master'	2020-10-31 16:11:54 -04:00
Anuken	b1b03a7503	Extra legacy block substitution / iOS fixes	2020-10-31 16:11:51 -04:00
summetdev	e6f60505e6	Add group to UnitBlock	2020-10-31 23:03:25 +03:00
summetdev	afe3b0d111	Group for unit factory	2020-10-31 22:30:37 +03:00
Anuken	05dcd7622b	Campaign tweaks	2020-10-31 14:52:03 -04:00
YellOw139	ae595b4564	[stat] where [stat] is needed	2020-10-31 20:47:36 +02:00
Anuken	9c54fcee2e	Sector damage calculation fix	2020-10-31 13:42:43 -04:00
Anuken	4d34f16fcd	Merge remote-tracking branch 'origin/master'	2020-10-31 13:03:22 -04:00
Anuken	2079cfaece	Fixed #3208	2020-10-31 13:03:19 -04:00
Anuken	df54fb0534	Merge pull request #3209 from summetdev/database-button ... Show Core Database Button in Custom Game.	2020-10-31 12:57:45 -04:00
summetdev	51e490e667	Core database button	2020-10-31 19:26:50 +03:00
Anuken	04fcf06ad5	Merge remote-tracking branch 'origin/master'	2020-10-31 12:03:38 -04:00
Anuken	9af8b64046	#3191	2020-10-31 12:03:35 -04:00
DeltaNedas	865beac7fb	fix modded bullets	2020-10-31 15:35:45 +00:00
Anuken	d68ef73407	Fixed bloom resizing improperly	2020-10-31 11:01:39 -04:00
Anuken	8d6ea6b197	Correct team display on maps	2020-10-31 10:35:21 -04:00
Anuken	2c29a06eb5	Fixed #3206	2020-10-31 10:07:01 -04:00
Anuken	b75a03aed8	Fixed #3204	2020-10-31 09:56:35 -04:00
Anuken	42b8ece85a	Fixed #3200 / Fixed #3196 / Fixed #3198	2020-10-31 09:01:06 -04:00
Prosta4okua	ab947c4fe7	Update bundle_uk_UA.properties	2020-10-31 02:25:38 +02:00
Anuken	4ec8e24bd8	Cleanup of merged PR	2020-10-30 19:03:05 -04:00
Anuken	e02458122b	Merge pull request #2970 from genNAowl/ground-support-heal ... Allow Ground Support Units to Heal Blocks	2020-10-30 18:52:04 -04:00
QmelZ	d837879bd8	translation	2020-10-31 00:51:34 +03:00
Anuken	181ad1016c	Reduced tech costs / Added missing blocks to fungal pass	2020-10-30 16:05:40 -04:00
Anuken	466183ffd0	Possibly more accurate wave linear regressions	2020-10-30 15:39:49 -04:00
genNAowl	60f2c67bde	Merge branch 'master' into ground-support-heal	2020-10-30 12:37:33 -07:00
Anuken	28240f730f	Don't show guardian warning when above win wave	2020-10-30 14:57:34 -04:00
Anuken	ed93fa45d3	Preset tweaks	2020-10-30 13:16:59 -04:00
Anuken	a12583eb4d	Campaign survival wave display tweaks	2020-10-30 12:54:24 -04:00
Leonwang4234	de483990ef	formatting ... Why do I always make these mistakes? And I saw that I did the same thing in my incendiary-fire PR too...	2020-10-30 09:04:44 -07:00
Anuken	76ff55d7f1	Campaign tweaks	2020-10-30 11:50:38 -04:00
Anuken	784a280bef	Merge remote-tracking branch 'origin/master'	2020-10-30 10:36:11 -04:00
Anuken	14869041b8	Cleanup	2020-10-30 10:36:07 -04:00
Anuken	17fd3d0bc1	Merge pull request #3099 from skykatik/patch-2 ... Removing spaces at start and end of a message (trim)	2020-10-30 10:29:42 -04:00
Anuken	968d94904a	Merge pull request #3058 from MEEPofFaith/speed-lightning ... v5 Javelin Movement Lightning Ability	2020-10-30 09:40:21 -04:00
Anuken	c8e5994b2f	Merge pull request #3174 from genNAowl/alternate-recalculation ... Change "Alternate" calculation in Turret.java	2020-10-30 09:30:59 -04:00
Anuken	73035b9211	Merge branch 'master' into formatting	2020-10-30 09:26:51 -04:00
Anuken	513ccfe581	Merge remote-tracking branch 'origin/master'	2020-10-30 09:24:09 -04:00
Anuken	782307374f	Fixed #3189 / Fixed #3187	2020-10-30 09:24:05 -04:00
Anuken	c0d1ff0f08	Merge pull request #3192 from Voz-Duh/full-unit-in-menu ... Full Unit In Menu	2020-10-30 09:21:58 -04:00
Voz-Duh	36fdf4afbc	Full Unit In Menu	2020-10-30 14:21:13 +03:00
YellOw139	790a802236	Indev pop-up slip-by fix	2020-10-30 12:33:40 +02:00
TheJaaju	b45e7cd8f3	Update bundle_fi.properties ... More translations	2020-10-30 11:17:58 +02:00
Sunny Kim	ecaa0a4eaa	Some liquid turrets are not caring enough	2020-10-30 16:44:54 +09:00
Anuken	a9f5aa9220	suffering	2020-10-29 19:58:10 -04:00
Anuken	ae35b2ff7e	arc	2020-10-29 19:04:37 -04:00
Anuken	1663497e6c	Better save validation	2020-10-29 19:03:58 -04:00
YellOw139	fca8d6741c	Yet another typo	2020-10-29 23:27:15 +02:00
YellOw139	97e9cdc1fd	Fixed real confusing entry	2020-10-29 23:25:44 +02:00
YellOw139	e9089aae68	Update bundle_ro.properties	2020-10-29 21:53:18 +02:00
Anuken	afed4c4239	Merge pull request #3184 from MEEPofFaith/any-layer-effects ... Any Layer Effects	2020-10-29 13:58:55 -04:00
Anuken	3eb655402f	Merge pull request #2978 from Volas171/patch-1 ... Update bundle_es.properties	2020-10-29 13:39:11 -04:00
Anuken	0c418d1a09	Libs	2020-10-29 11:51:17 -04:00
Anuken	2ad14cc884	Merge remote-tracking branch 'origin/master'	2020-10-29 10:26:35 -04:00
Anuken	77e6030c59	Fixed #3173	2020-10-29 10:26:32 -04:00
Sunny Kim	f2b5553f54	bug squish	2020-10-29 19:04:38 +09:00
Petr Gašparík	bced413810	Czech translation for latest version ... up to commit 44286ce	2020-10-29 09:08:14 +01:00
MEEP of Faith	a14ae1bdf8	Lightning chance fix.	2020-10-28 21:00:24 -07:00
MEEP of Faith	1e3b498671	Any Layer Effects	2020-10-28 20:46:50 -07:00
Leonwang4234	19bc6f6e48	Update Turret.java	2020-10-28 20:09:45 -07:00
Anuken	3dae157a5e	Extra validation	2020-10-28 19:35:15 -04:00
Anuken	55a7089a3d	Merge remote-tracking branch 'origin/master'	2020-10-28 18:51:49 -04:00
Anuken	44286cee59	Wave versions	2020-10-28 18:51:42 -04:00
Anuken	89c35db811	Merge pull request #3168 from Yakuzet/patch-3 ... Update bundle_tr.properties	2020-10-28 16:40:10 -04:00
Anuken	68ab48a1d3	Fixed #3170	2020-10-28 14:05:09 -04:00
老滑稽	e4a8d2cb33	Update bundle_zh_CN.properties	2020-10-28 23:43:57 +08:00
Anuken	d77f1b4fc0	Merge remote-tracking branch 'origin/master'	2020-10-28 10:29:40 -04:00
Anuken	e1fefd1664	Updated RoboVM version	2020-10-28 10:29:32 -04:00
Anuken	9e15434904	Merge pull request #3165 from summetdev/payload-group ... Add transportation group to payload conveyors.	2020-10-28 09:53:02 -04:00
Anuken	4940c277f6	Fixed #3166	2020-10-28 09:42:41 -04:00
Yakuzet	fc317939e2	Update bundle_tr.properties ... I fixed all googled things	2020-10-28 16:36:22 +03:00
Volas171	53e655698b	Update bundle_es.properties	2020-10-28 08:32:23 -05:00
Anuken	63e4bca098	Partial fix of editor multiblock undo/redo	2020-10-28 09:22:27 -04:00
summetdev	a7d1f98f7e	PayloadConveyor with transportation group	2020-10-28 13:50:32 +03:00
Volas171	d91dd2548d	Merge branch 'master' into patch-1	2020-10-27 15:05:36 -05:00
Prosta4okua	a644b64c1c	Update bundle_uk_UA.properties	2020-10-27 21:55:22 +02:00