7553 Commits

Author	SHA1	Message	Date
slava0135	58ff3f2ef7	Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami	2020-09-30 17:18:20 +03:00
LeoDog896	6db2376835	Revert to if-statement	2020-09-30 09:47:03 -04:00
LeoDog896	2b04ebb14d	Enum follows camelCase rules	2020-09-30 09:46:33 -04:00
LeoDog896	fbb317aa11	Update contributors	2020-09-30 09:30:12 -04:00
LeoDog896	1c04653ffd	Autotiler cleanup and documentation	2020-09-30 09:29:57 -04:00
Voz-Duh	91274ae104	Fix	2020-09-30 16:19:32 +03:00
Voz-Duh	adf0f60abb	Fix	2020-09-30 16:08:32 +03:00
Voz-Duh	20e56ed3d3	Packed Liquid Drawer	2020-09-30 15:58:11 +03:00
LeoDog896	177aa934b6	Merge remote-tracking branch 'upstream/master'	2020-09-30 08:43:08 -04:00
LeoDog896	a8c6c30382	Remove unused package	2020-09-30 08:41:33 -04:00
slava0135	d4402ee3bb	Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami ... Conflicts: core/assets/icons/icons.properties core/assets/sprites/block_colors.png core/assets/sprites/fallback/sprites.atlas core/assets/sprites/fallback/sprites3.png core/assets/sprites/fallback/sprites4.png core/assets/sprites/fallback/sprites5.png core/assets/sprites/fallback/sprites7.png core/assets/sprites/fallback/sprites8.png core/assets/sprites/sprites.atlas core/assets/sprites/sprites.png core/assets/sprites/sprites2.png core/assets/sprites/sprites4.png core/assets/sprites/sprites5.png core/src/mindustry/content/Blocks.java	2020-09-30 09:48:18 +03:00
Anuken	3c3c15dcf4	Merge branch 'master' of https://github.com/Anuken/Mindustry	2020-09-29 23:55:59 -04:00
Anuken	2b2a12267a	Long-range 4x4 turret (wip) / Java 14 language upgrade	2020-09-29 23:55:55 -04:00
summetdev	111e50c3c6	Safe last fileChooser's directory to settings	2020-09-29 22:04:27 +03:00
slava0135	fb53abe593	Final? design	2020-09-29 21:27:41 +03:00
slava0135	83a20810f7	recolor	2020-09-29 21:02:29 +03:00
slava0135	e5dc481d00	new texture	2020-09-29 20:40:09 +03:00
Anuken	c3274622b2	Fixed #2763	2020-09-29 11:53:45 -04:00
slava0135	d4441711a7	balance and size	2020-09-29 18:35:34 +03:00
slava0135	cbc2205347	Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami ... Conflicts: core/assets/sprites/block_colors.png core/assets/sprites/fallback/sprites.atlas core/assets/sprites/fallback/sprites.png core/assets/sprites/fallback/sprites2.png core/assets/sprites/fallback/sprites3.png core/assets/sprites/fallback/sprites4.png core/assets/sprites/fallback/sprites5.png core/assets/sprites/fallback/sprites7.png core/assets/sprites/fallback/sprites8.png core/assets/sprites/sprites.atlas core/assets/sprites/sprites.png core/assets/sprites/sprites2.png core/assets/sprites/sprites4.png core/assets/sprites/sprites5.png	2020-09-29 18:31:42 +03:00
Anuken	521ca1aea4	Fixed mechs not having animations on multiplayer	2020-09-29 10:57:06 -04:00
Anuken	5523ea4752	Slag light	2020-09-28 19:37:18 -04:00
Anuken	c89d6f6b74	Re-packed sprites from PR	2020-09-28 18:42:09 -04:00
Anuken	d3863a7550	Merge remote-tracking branch 'origin/master'	2020-09-28 18:32:48 -04:00
Anuken	a5b1239c2b	Method renaming for consistency	2020-09-28 18:32:39 -04:00
Anuken	95146e032f	Merge pull request #2757 from Voz-Duh/cleaner-sprites ... Cleaner Sprites	2020-09-28 17:34:40 -04:00
Voz-Duh	45e1700237	Fix	2020-09-28 21:58:37 +03:00
Voz-Duh	81ceec8d03	Fix	2020-09-28 21:47:42 +03:00
Anuken	6a45a965c0	Allow unloading non-visible blocks	2020-09-28 12:42:20 -04:00
Anuken	231902aec5	Fixed #2756	2020-09-28 11:02:53 -04:00
Voz-Duh	aef09a18b7	Fix	2020-09-28 17:38:11 +03:00
Voz-Duh	332365adc6	Fix	2020-09-28 17:36:35 +03:00
Voz-Duh	2c3813c94b	Cleaner Sprites	2020-09-28 17:34:05 +03:00
Anuken	f1d09053f3	Fixed #2755 / Fixed #2753	2020-09-28 10:26:08 -04:00
Anuken	078a68a07d	Fixed cores being placeable on nothing	2020-09-27 23:00:38 -04:00
Anuken	482ec4b43c	Fixed #2752	2020-09-27 18:01:17 -04:00
Anuken	3bf01334c9	Many things	2020-09-27 17:15:31 -04:00
Anuken	ff84d72e20	Cleaner wall sprites	2020-09-27 00:43:00 -04:00
Anuken	f46180298f	Merge branch 'master' of https://github.com/Anuken/Mindustry	2020-09-26 22:32:17 -04:00
Anuken	ae46535365	Sprite cleanup	2020-09-26 22:31:49 -04:00
Anuken	0c7ce94b13	Sprite cleanup	2020-09-26 22:29:15 -04:00
Anuken	fea8a3c12b	Merge pull request #2718 from MEEPofFaith/patch-2 ... Make lightning have frag angle properties	2020-09-26 22:27:26 -04:00
Anuken	285f733b61	Merge pull request #2725 from LeoDog896/master ... More sort and target options	2020-09-26 22:27:05 -04:00
Anuken	7b98628084	Unbroke wave sprite	2020-09-26 22:20:02 -04:00
Anuken	f4b6600a6d	Merge pull request #2738 from Voz-Duh/top-for-liquid-turrets ... Top For Liquid Turrets	2020-09-26 20:16:38 -04:00
Anuken	9edd029764	Fixed #2740	2020-09-26 14:38:16 -04:00
Voz-Duh	55081785d0	Fix	2020-09-26 21:24:47 +03:00
Voz-Duh	79aaec80c3	Fix	2020-09-26 20:45:15 +03:00
Voz-Duh	a72b1463b4	Fix	2020-09-26 20:40:09 +03:00
Voz-Duh	18604a397d	Top For Liquid Turrets	2020-09-26 19:11:55 +03:00
Anuken	0f420b625a	Fixed #2737	2020-09-26 11:59:14 -04:00
Anuken	d4d3b71d7d	Fixed #2735	2020-09-26 09:46:16 -04:00
Anuken	ccdd94a090	Build check cleanup	2020-09-25 20:15:00 -04:00
Anuken	c49b3124d5	Merge remote-tracking branch 'origin/master'	2020-09-25 18:49:36 -04:00
Anuken	dc30993898	Fixed #2729	2020-09-25 18:49:31 -04:00
Anuken	47d734873b	Merge pull request #2727 from LeoDog896/drown ... Drown event	2020-09-25 16:27:21 -04:00
LeoDog896	1d52211f93	Update core/src/mindustry/entities/comp/FlyingComp.java ... Co-authored-by: Summet <summet.dev@gmail.com>	2020-09-25 14:21:48 -04:00
Anuken	059b72b3e2	Merge remote-tracking branch 'origin/master'	2020-09-25 14:21:34 -04:00
Anuken	2cc93924f1	Support for Android java mods	2020-09-25 14:21:30 -04:00
LeoDog896	53d4124fc3	Use reportIssueUrl	2020-09-25 12:26:04 -04:00
LeoDog896	c912eb197b	Drown event ... we all need to know when they drown	2020-09-25 12:01:59 -04:00
LeoDog896	35e4f696aa	Merge remote-tracking branch 'upstream/master'	2020-09-25 10:55:04 -04:00
Anuken	85d32cd510	Merge pull request #2726 from Voz-Duh/shadow-fix ... Shadow Fix	2020-09-25 09:53:13 -04:00
Anuken	292793daf1	Fixed #2722	2020-09-25 09:50:38 -04:00
Voz-Duh	41b4cbbce2	Shadow Fix	2020-09-25 15:18:06 +03:00
LeoDog896	6492ffd35d	More sort and target options	2020-09-25 07:58:44 -04:00
slava0135	79f4608e81	Merge remote-tracking branch 'origin/tsunami' into tsunami	2020-09-25 14:22:13 +03:00
slava0135	9050cac19c	added to tech tree	2020-09-25 14:21:52 +03:00
Slava0135	79ac9894b3	Update core/src/mindustry/content/Blocks.java ... s p a c e Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>	2020-09-25 12:58:28 +03:00
slava0135	3e81d194cb	New liquid turret - Tsunami	2020-09-25 11:49:04 +03:00
MEEP of Faith	9f26979419	why variable here	2020-09-24 20:34:02 -07:00
Anuken	3a06cacf1d	Minor fixes	2020-09-24 22:41:13 -04:00
Anuken	2141e2ebab	Cleaned up extra accessor method	2020-09-24 18:32:18 -04:00
MEEP of Faith	55e25cc509	Make lightning have frag angle properties ... Adds `lightningCone`, which is the full angle of where the lightning direction can be, and `lightningAngle` which is the angle compared to the bullet that the center of the lightning cone is.	2020-09-24 15:31:03 -07:00
Anuken	9e0b29b3dd	Cleanup	2020-09-24 18:11:10 -04:00
Anuken	504334999d	Campaign multiplayer note	2020-09-24 16:49:04 -04:00
Anuken	8d8cedaa44	Removed launch mechanic remnants	2020-09-24 16:44:11 -04:00
Anuken	659da0a837	formation tweaks	2020-09-24 15:49:39 -04:00
Anuken	0dccbf8598	Better physics system	2020-09-24 15:39:34 -04:00
Anuken	1682e3b996	Fixed #2714	2020-09-24 14:26:24 -04:00
Anuken	a914bd77f6	Fixed #2712	2020-09-24 14:00:43 -04:00
Anuken	da115e90bc	Merge remote-tracking branch 'origin/master'	2020-09-24 13:05:43 -04:00
Anuken	0a07458186	Power-based ammo / Refactoring / IP kicks / Fixes	2020-09-24 13:05:39 -04:00
LeoDog896	244a587db8	Merge remote-tracking branch 'upstream/master'	2020-09-24 12:08:27 -04:00
LeoDog896	b88302e604	Make shader final ... Seriously, it shouldn't be changed	2020-09-24 12:07:45 -04:00
Anuken	f3f33038e4	Merge pull request #2701 from Voz-Duh/team-indicator-for-command-center ... Team Indicator For Command Center	2020-09-24 11:16:12 -04:00
Voz-Duh	d08c54d9a7	Fix	2020-09-24 18:10:49 +03:00
LeoDog896	e23e8de62a	Added boss as radar target	2020-09-24 10:59:13 -04:00
Voz-Duh	11eb5f464f	Team Indicator For Command Center	2020-09-24 17:47:50 +03:00
Anuken	db94acdb83	Merge remote-tracking branch 'origin/master'	2020-09-24 09:23:42 -04:00
Anuken	68e708cf9a	d	2020-09-24 09:23:38 -04:00
Anuken	35460f0b5f	Merge pull request #2692 from Prosta4okua/master ... immediate RU L10n update	2020-09-23 23:03:54 -04:00
Felix Corvus	90fe7d7e59	immediate RU L10n update	2020-09-24 05:34:37 +03:00
Anuken	0288cb34fb	Cleanup	2020-09-23 22:15:14 -04:00
Anuken	75ebaab3a3	Merge pull request #2660 from J-VdS/schematic ... Server disable schematic option (fix #2382)	2020-09-23 22:01:06 -04:00
Anuken	ada664a2ca	Fixed #2690	2020-09-23 21:46:40 -04:00
Anuken	764b93154e	Turret sprite tweaks	2020-09-23 19:16:33 -04:00
Anuken	28b7ef53bb	Updated bundle contents	2020-09-23 18:28:25 -04:00
Anuken	d7bd4bd0c8	Merge remote-tracking branch 'origin/master'	2020-09-23 18:26:09 -04:00
Anuken	3a618761b3	Pre-release tweaks	2020-09-23 18:26:05 -04:00
Anuken	8efba6ada7	Merge pull request #2564 from Prosta4okua/master ... [Bundle][RU] actual L10n	2020-09-23 18:25:36 -04:00
Anuken	fcff922370	Merge branch 'master' into patch-2	2020-09-23 18:25:12 -04:00
Anuken	14627dbbf7	Merge pull request #2639 from PetrGasparik/6.0-aplha-2 ... Czech translation track for 6.0 aplha 2	2020-09-23 18:24:48 -04:00
Anuken	5df5a6e39f	tweak	2020-09-23 18:01:12 -04:00
Anuken	3db2ffb843	Launch pad destination selection	2020-09-23 18:00:24 -04:00
Anuken	1cc8d7e3f4	Balance	2020-09-23 15:21:06 -04:00
Anuken	84aa4ad602	Merge pull request #2675 from Voz-Duh/turrets-shadow ... Turrets Shadow	2020-09-23 10:50:47 -04:00
J-VdS	d0c6f3274b	Merge branch 'master' into schematic	2020-09-23 16:29:41 +02:00
Voz-Duh	64d4fd5579	Fix	2020-09-23 16:55:59 +03:00
Voz-Duh	868c6a6996	Fix	2020-09-23 16:47:11 +03:00
Anuken	8ed83964a2	Bugfixes	2020-09-23 09:33:56 -04:00
Anuken	ec11e60c7c	Fixed #2679	2020-09-23 09:32:27 -04:00
Voz-Duh	b4d0df03df	Fix	2020-09-23 12:56:21 +03:00
Voz-Duh	d0f6d9fb95	Deleted other files	2020-09-23 12:42:02 +03:00
YellOw139	fb42302720	Update bundle_ro.properties	2020-09-23 12:40:27 +03:00
YellOw139	7701368d1b	Main menu adjustments for mobile	2020-09-23 12:39:13 +03:00
Voz-Duh	9503e26e1d	Add shadow	2020-09-23 12:39:06 +03:00
Felix Corvus	fe9a44d876	Update bundle_ru.properties	2020-09-23 08:35:28 +03:00
Anuken	6b43697891	(2)	2020-09-22 23:32:34 -04:00
Anuken	b601dc5deb	Fixed fuse length being less than expected	2020-09-22 23:25:44 -04:00
Anuken	a4375f9c85	Merge remote-tracking branch 'origin/master'	2020-09-22 23:22:56 -04:00
Anuken	0058d45352	Fixed #2672	2020-09-22 23:22:53 -04:00
Anuken	2eaa7d2745	Merge pull request #2669 from genNAowl/camelcasing1 ... rotatespeed > rotateSpeed	2020-09-22 23:08:50 -04:00
Anuken	cf13717cc8	Fixed #2671	2020-09-22 22:52:55 -04:00
Anuken	721e79eb90	Fixed #2670	2020-09-22 21:48:42 -04:00
Anuken	f685c30178	testing if travis messed up codegen	2020-09-22 21:28:31 -04:00
Leonwang4234	e00b50c1f1	rotatespeed > rotateSpeed	2020-09-22 18:25:05 -07:00
Anuken	ba6ab8483e	Various tweaks	2020-09-22 20:42:36 -04:00
Anuken	4a02315ee5	Small bugfixes	2020-09-22 17:59:37 -04:00
Anuken	f3e08f9cb6	Internal refactoring & cleanup	2020-09-22 15:50:33 -04:00
Anuken	0256a475cf	Fixed #2662	2020-09-22 13:38:08 -04:00
Anuken	3a466475fd	Better error handling on Steam	2020-09-22 13:12:21 -04:00
J-VdS	28cd08bdd1	idk	2020-09-22 19:04:42 +02:00
J-VdS	428c396968	Update SchematicsDialog.java	2020-09-22 19:04:05 +02:00
J-VdS	890dfdeb06	weird intellij	2020-09-22 19:03:27 +02:00
J-VdS	a0913c67df	Update DesktopInput.java	2020-09-22 19:01:51 +02:00
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