626 Commits

Author	SHA1	Message	Date
Anuken	6f0bc2ecf8	Minor build fixes	2019-07-22 12:42:42 -04:00
Anuken	741360022b	Typo	2019-06-23 11:03:05 -04:00
Anuken	86e2f62aed	Fixed locales not generating	2019-06-23 10:52:03 -04:00
Anuken	580923a646	Render tests	2019-06-20 16:27:57 -04:00
Anuken	06444f497b	Internal tool changes	2019-06-20 15:34:48 -04:00
Anuken	0aee75c1c1	Splitting of building+mining into separate traits	2019-06-12 14:03:50 -04:00
Anuken	bd134bf9c9	Cleanup	2019-05-28 09:24:13 -04:00
Anuken	54ad52edc2	Merging of map saves	2019-05-14 11:54:22 -04:00
Anuken	ffb6d398d7	Layout fixes	2019-05-12 12:00:19 -04:00
Anuken	af67690e75	WIP save refactoring	2019-05-05 11:36:38 -04:00
Anuken	b9f1dea914	Removed gen tweaks	2019-04-30 23:57:56 -04:00
Anuken	ad13c83f93	Fixed gen copying for earlier versions of IntelliJ	2019-04-27 09:58:14 -04:00
Anuken	01e1438382	Switched to ArcNet networking extension	2019-04-17 21:59:26 -04:00
Anuken	8a983c784d	Added missing jcenter repository	2019-04-13 14:57:26 -04:00
Anuken	a443263439	Updated Discord RPC	2019-04-13 14:41:56 -04:00
Anuken	b40beb0d1d	Source reformat	2019-04-08 09:03:18 -04:00
Anuken	503fc980f4	Bugfixes	2019-04-05 14:10:01 -04:00
Anuken	a84e9f2aaa	Updated RoboVM plugin	2019-03-26 20:35:29 -04:00
Anuken	d0e026d597	Bugfixes	2019-03-25 13:12:55 -04:00
Anuken	97f5bf3cc4	Code cleanup	2019-03-24 19:58:51 -04:00
Anuken	30e5f2b17d	iOS building fix	2019-03-23 18:33:33 -04:00
Anuken	fdecd55278	Updated build files	2019-03-23 13:40:13 -04:00
Anuken	f86a07daee	Removed awt use / Sand recolor / Bugfixes / Link fix	2019-03-09 16:47:08 -05:00
Anuken	a5d1350815	Removed map screenshot key / Basic zone guide	2019-03-05 16:07:48 -05:00
Anuken	56bcabedf7	Balancing / Bugfixes / Badly antialiased turret outlines	2019-02-07 23:06:43 -05:00
Anuken	5a3ec8f407	Fixed server crash / Struct annotation begins	2019-01-28 15:43:33 -05:00
Anuken	da9278ad8d	Added recorder module	2019-01-27 12:31:14 -05:00
Anuken	48a7254aa3	Code generation fix	2019-01-09 11:52:45 -05:00
Anuken	397da91ab4	Fixed all code generation errors	2019-01-06 09:42:08 -05:00
Anuken	d5626bfe52	Updated to next version of kryonet	2019-01-04 15:12:34 -05:00
Anuken	b8e6e5df61	Power PR merged / Various bugfixes ... Closes #288	2019-01-03 18:22:13 -05:00
Anuken	b91510efb3	Input fixes	2018-12-30 11:41:06 -05:00
Anuken	745d8122f5	Removed GH API calls	2018-12-30 10:27:37 -05:00
Anuken	98e4f7409b	Removed main arc dependency	2018-12-30 10:11:54 -05:00
Anuken	cdb3971b8d	Update build.gradle	2018-12-30 09:21:16 -05:00
Anuken	7c35b6e95a	Minor build file fixes	2018-12-29 15:58:11 -05:00
Anuken	86b35fc43d	Various graphical fixes	2018-12-29 13:06:17 -05:00
Anuken	5b2c8ac337	Removed '-snapshot' based dependencies	2018-12-29 12:22:41 -05:00
Anuken	4386d3169a	JITPack-based dependencies	2018-12-29 11:59:43 -05:00
Anuken	bbb2153112	Merge branch 'arc-port' of https://github.com/Anuken/Mindustry	2018-12-28 22:22:08 -05:00
Anuken	db546412f1	Arc compatibility update	2018-12-27 15:47:17 -05:00
Anuken	3b42b604e1	Successful desktop compilation	2018-12-26 17:38:40 -05:00
Anuken	8879593381	hhhhhhh	2018-12-26 13:22:31 -05:00
Anuken	44e4ffbe62	Fixed most things besides drawing	2018-12-22 22:17:28 -05:00
Anuken	3abfaf1bca	ctrl-shift-f	2018-12-21 21:33:05 -05:00
Anuken	cabcfc7136	Initial creation of Arc port	2018-12-20 11:49:32 -05:00
Anuken	414af6a5d5	Minor button optimizations	2018-12-17 05:09:17 -02:00
Timmeey86	f48a19a3bc	Merged master into branch	2018-12-15 00:49:38 +01:00
Anuken	fefdad5335	Minimap switched to container	2018-12-14 10:27:23 -05:00
Anuken	0b837925a2	Build script reformatting / 'Fixed' all unchecked warnings	2018-12-13 18:01:51 -05:00
Timmeey86	5bda5124e6	Merged current master to branch	2018-12-06 19:48:01 +01:00
Anuken	6caf0fc1cc	Merge remote-tracking branch 'origin/master'	2018-12-05 19:00:18 -05:00
Anuken	8d28976b0d	Misc cleanup	2018-12-05 19:00:10 -05:00
iczero	8a582f8872	Check client version type against server version type (#367)	2018-12-05 15:43:13 -05:00
Anuken	51475d600c	iOS fix	2018-11-30 17:48:09 -05:00
Timmeey86	149f7a1d9d	Merged current master into branch (with manual changes)	2018-11-30 21:33:09 +01:00
Anuken	99fb1a4c5f	Implemented null-items for sorters and item sources	2018-11-30 10:28:27 -05:00
Anuken	7fd05b7ca6	Added mobile copy/paste	2018-11-29 13:04:34 -05:00
Anuken	dcea8ae64f	New UI	2018-11-26 22:47:54 -05:00
Timmeey86	a9517096f9	Merged current Anuke master into branch	2018-11-26 23:25:24 +01:00
Anuken	70507258ae	Cleanup	2018-11-25 22:55:13 -05:00
Anuken	54ad9ba243	Added fullscreen map screenshot	2018-11-25 20:43:45 -05:00
Anuken	942eed402a	uCore update	2018-11-22 23:38:59 -05:00
Timmeey86	560d388df4	Added Tests, fixed detected bugs and updated JUnit	2018-11-22 23:30:49 +01:00
Anuken	729f5ed5e4	New version format / Updated bundles / ConnectPacket encoding fix	2018-11-21 11:00:50 -05:00
Anuken	7c073f76ae	Added automatic build incrementing	2018-11-20 19:28:26 -05:00
Anuken	a932111040	Removed ContentUnlockSet	2018-11-19 14:38:46 -05:00
Anuken	afec65eb56	New mobile text dialog / Cleanup / Minimap fix / Collision optimization	2018-11-17 11:13:59 -05:00
Anuken	dcc4732748	Updated to libGDX 1.9.9	2018-11-16 23:36:11 -05:00
Anuken	6a5bf08d55	Implemented local server configs	2018-11-16 22:28:27 -05:00
Anuken	9f97ed331b	Various bugfixes / Updated uCore	2018-11-14 09:55:54 -05:00
Anuken	51a51833d4	iOS build fix	2018-11-09 10:18:53 -05:00
Anuken	c554390de5	Crash fix	2018-11-08 18:48:19 -05:00
Anuken	a781b4a387	Updated uCore	2018-11-06 21:00:51 -05:00
Anuken	04b4321ea1	New font	2018-11-06 12:55:13 -05:00
Anuken	192814650d	less (less) terrible physics	2018-11-04 15:49:23 -05:00
Anuken	0391ed3e63	Icons of missions	2018-11-02 10:35:29 -04:00
Anuken	9f77c0c9b7	Added Graphics.begin/endClip()	2018-11-02 09:19:51 -04:00
Anuken	fbf614a8df	Removed html module	2018-10-30 19:15:12 -04:00
Anuken	c02329e4b1	Integrated thread implementation / Crash fix	2018-10-30 12:58:25 -04:00
Anuken	b39f25ed51	Fixed build error	2018-10-29 16:02:09 -04:00
Anuken	381b59acd4	Fixed irregularly scaled maps causing various bugs	2018-10-29 10:03:41 -04:00
Anuken	ac918c1a81	Warning fix	2018-10-28 18:34:18 -04:00
Anuken	968be8eb8f	Fixed server run error	2018-10-28 18:04:07 -04:00
Anuken	80aed31135	Broke and cleaned up server commands	2018-10-28 14:26:58 -04:00
Anuken	5993a596e8	Made bundle generator add spaces between =	2018-10-23 22:45:36 -04:00
Anuken	83a5c3af8a	Updated uCore with new threading changes	2018-10-20 11:41:10 -04:00
Anuken	64bd306c6d	Fixed crash	2018-10-20 09:02:29 -04:00
Anuken	8e952a550b	Fixed: map mirror / crashes / mech pads / player list / mobile placement	2018-10-17 10:20:58 -04:00
Anuken	a29f95194d	Various fixes / Placement visual improvements	2018-10-17 00:36:43 -04:00
Anuken	a2c29c0937	Removed tutorial ore post-generation / Updated uCore	2018-10-16 19:31:06 -04:00
Anuken	7e4e58fb78	Updated android build tools version	2018-10-15 16:31:01 -04:00
Anuken	5536ade389	Updated gradle to 4.10.2	2018-10-15 16:20:26 -04:00
Anuken	c7f5b7fca1	Minified gamemode table	2018-10-14 10:41:17 -04:00
Anuken	4eb2c1f646	PvP autohost	2018-10-13 23:30:05 -04:00
Anuken	05201d7012	Physics, pathfinding improvements	2018-10-10 11:29:34 -04:00
Anuken	60bb982450	Updated uCore	2018-10-09 20:13:31 -04:00
Anuken	69a7104286	Updated Android tool versions	2018-10-07 11:14:54 -04:00
Anuken	aba5afe32c	Updated uCore	2018-10-06 22:54:00 -04:00
Anuken	fd107ab5b8	Code cleanup	2018-10-06 11:56:39 -04:00
Anuken	35bc2c9803	Sector preset class / New missions	2018-10-05 16:36:50 -04:00
Anuken	7488a6d42b	Usage of ExtendedPreferences	2018-10-04 12:19:05 -04:00
Anuken	c82fd9ead5	Added unit tests	2018-10-03 20:58:35 -04:00
Anuken	f0870b3236	Created test module	2018-10-03 15:53:33 -04:00
Anuken	f0cacf6bd5	Final physics edit, ready to merge	2018-10-02 23:33:43 -04:00
Anuken	ce4031af74	Additional bugfixes	2018-10-02 21:44:32 -04:00
Anuken	dd7f91b8c2	Fixed many various physics bugs	2018-10-02 20:45:28 -04:00
Anuken	8523e5bf6b	Rectangles	2018-10-02 18:47:23 -04:00
Anuken	e7533232c0	Fixed custom game waves / Fixed Windows appdata being incorrect	2018-09-29 14:25:29 -11:00
Anuken	d062dffc13	Cleanup / Fixed unlock system in custom games	2018-09-29 02:50:21 -07:00
Anuken	1160a14f56	Fixed web errors / Fixed IPv4 crash	2018-09-25 23:27:19 -04:00
Anuken	b9eb8a750b	Removed useless hitbox rects	2018-09-25 17:37:01 -04:00
Anuken	a80c5a1efa	Fixed artillery bullet not respecting range properly	2018-09-16 22:30:06 -04:00
Anuken	2d25948c57	Revenant factory definition / Crash fix	2018-09-16 21:57:37 -04:00
Anuken	e4ea9d561e	Lightning shield absorption	2018-09-15 16:37:28 -04:00
Anuken	c1c1a3318c	Meltdown	2018-09-14 12:59:52 -04:00
Anuken	0776951018	Improved turret accuracy	2018-09-13 16:53:05 -04:00
Anuken	d65beea179	Removed debug menu / Crash fix / Ship speed warp fix / String locale fix	2018-09-12 10:07:10 -04:00
Anuken	d9eb4c1296	Server build fix / Debug hook	2018-09-10 19:33:12 -04:00
Anuken	2da0862cb2	Fill.polyTri replaced	2018-09-10 13:14:43 -04:00
Anuken	6ef2256bf2	Removed all reflection	2018-09-09 21:44:10 -04:00
Anuken	65f911909b	Pools replace with Pooling / Removed all core reflection	2018-09-09 17:44:10 -04:00
Anuken	2cb6e454c8	Auto-generated serialization code	2018-09-09 16:19:53 -04:00
Anuken	62f2c67321	Fixed some multithreading bugs / No more drift	2018-09-09 11:26:15 -04:00
Anuken	46a8edb781	LZ4 compression	2018-09-08 17:07:25 -04:00
Anuken	7dd487ccc5	Force projector implementation	2018-09-07 23:24:55 -04:00
Anuken	2c8962cf5f	pain and suffering of various kinds	2018-09-05 20:25:50 -04:00
Anuken	9c36026991	Data clearing / Bugfixes	2018-09-05 10:24:47 -04:00
Anuken	26ae4edd63	Added version type	2018-09-04 12:10:48 -04:00
Anuken	063893adee	Crash fixes	2018-09-04 09:00:37 -04:00
Anuken	8654f25a4f	Bugfixes for GWT	2018-09-03 13:48:16 -04:00
Anuken	019e22aff2	Fixed missile shield pierce	2018-09-03 09:07:59 -04:00
Anuken	5e29115c2e	Fixed ship flight targeting / Fixed unit weapon sprite offset	2018-09-02 16:23:39 -04:00
Anuken	1d21d36253	Fixed font line height / Bundles updated / Changelog date	2018-09-02 13:49:38 -04:00
Anuken	ada912c69b	Made group error message more specific	2018-09-02 13:20:51 -04:00
Anuken	56ae47cd8d	Fixed server build error / Possible crash fix	2018-09-02 11:00:14 -04:00
Anuken	d90d88c68b	Menu shader / Sprite fixes	2018-09-01 20:16:49 -04:00
Anuken	dcc061af3e	New seed-based AI bases	2018-09-01 14:44:06 -04:00
Anuken	5cb50d57ec	Reduced reflection usage / Improved event system	2018-08-31 16:14:14 -04:00
Anuken	dda3afe9fa	now with waifus	2018-08-30 21:39:27 -04:00
Anuken	9a41399178	Initial proof-of-concept for crash report server	2018-08-29 22:09:55 -04:00
Anuken	8c6ae2576d	Fuse shot implemented	2018-08-28 19:00:29 -04:00
Anuken	8d08d25f5b	Updated uCore	2018-08-28 09:02:38 -04:00
Anuken	6323c13704	Mech descriptions / Balancing / Crash fix / Physics fix	2018-08-27 09:52:33 -04:00
Anuken	8b0bbffe27	Merge remote-tracking branch 'origin/mechs-balance-altfire' into mechs-balance-altfire ... # Conflicts: # core/src/io/anuke/mindustry/content/Mechs.java	2018-08-24 13:58:32 -04:00
Anuken	94805259d7	Added alpha drone swarm ability	2018-08-24 13:54:53 -04:00
Anuken	e796d44f92	Tau idle regen / Fixed non-synced alts / Fixed units not retreating	2018-08-24 10:19:56 -04:00
Anuken	ee835f6514	Merge branch 'master' of https://github.com/Anuken/Mindustry into mechs-balance-altfire ... # Conflicts: # core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java	2018-08-24 08:57:19 -04:00
Anuken	60bf36613f	Merge remote-tracking branch 'origin/master'	2018-08-22 12:42:30 -04:00
Anuken	a75994cbbf	Updates to iOS build	2018-08-22 12:42:19 -04:00
Anuken	e1f7c7b03d	Omega mech implementation	2018-08-21 22:40:39 -04:00
Anuken	2e958d8d8f	New team system / Prototype dedicated PvP gamemode	2018-08-20 23:45:27 -04:00
Anuken	f8d6797fc2	Fixed android module being necessary to compile	2018-08-17 18:05:28 -04:00
Anuken	25051980ce	Fixed category bundle properties missing	2018-08-17 14:51:18 -04:00
Anuken	0f7799422e	Crashes fixed	2018-08-17 11:32:12 -04:00
Anuken	53d35e8c77	Bundles updated / Fixed some localization bugs	2018-08-16 17:43:43 -04:00
Anuken	4f72011cf7	Fixed markup crash / setsector command fixed / Drone crash fixed	2018-08-15 21:00:40 -04:00
Anuken	36c01fde94	Updated uCore / Minor server tweak	2018-08-15 17:46:33 -04:00
Anuken	2b23b7876a	Minor bugfix	2018-08-09 22:20:46 -04:00
Anuken	6349530fc5	Updated build.gradle	2018-08-08 14:42:10 -04:00
Anuken	ad83a7dcc3	Merge remote-tracking branch 'origin/master'	2018-08-08 12:37:46 -04:00
Anuken	cfc2239733	Minor iso changes	2018-08-08 12:37:29 -04:00
Anuken	4e3204bc6d	All known crashes fixed	2018-08-08 11:18:30 -04:00
Anuken	b27fefae88	Misc fixes	2018-08-08 01:09:57 -04:00
Anuken	e6c4c66199	All drill costs decreased / Fixed specific sector save errors	2018-08-06 23:32:43 -04:00
Anuken	f3b976bdd1	All web version bugs fixed	2018-07-31 12:57:34 -04:00
Anuken	43be3259c9	Removed all websocket code	2018-07-30 23:43:11 -04:00
Anuken	0454c4c25a	Added skin aliases	2018-07-28 09:44:38 -04:00
Anuken	0d4cf9f6c4	Mac crash fix	2018-07-27 14:26:34 -04:00
Anuken	ea6f88b7f6	Added basic command center logic	2018-07-26 15:17:23 -04:00
Anuken	2a6ee6d65b	Bundle cleanup	2018-07-26 14:19:58 -04:00
Anuken	81bf28e4ed	Fixed build error / Added per-type drone mine config	2018-07-24 10:15:25 -04:00
Anuken	52cc7d699a	Added translation guide / Added locale list autogen	2018-07-21 00:44:13 -04:00
Anuken	dbb2371801	Re-added block shadows / Block optimization	2018-07-20 18:41:08 -04:00
Anuken	3c83b88127	Multi-threaded generation previews	2018-07-20 09:26:41 -04:00
Anuken	71016f0d7c	Updated uCore / Added hidden sector saves	2018-07-17 12:47:11 -04:00
Anuken	c2c2551607	Implemented save time recording	2018-07-17 10:42:44 -04:00
Anuken	07f0be8d8d	Updated uCore / Sector deploying support	2018-07-16 20:53:35 -04:00
Anuken	37b9df3202	Removed all UI builders / Updated uCore and functional interfaces	2018-07-14 22:06:03 -04:00
Anuken	ab2f260a52	Fixed some crashes	2018-07-14 17:16:13 -04:00
player20033	a2f7d3e241	#142 Solution	2018-07-14 10:02:13 +08:00
Anuken	8e9adeb4b4	Fixed web version bugs	2018-07-12 14:06:50 -04:00
Anuken	1f18e7beed	Improved glitchy interpolation / Updated uCore	2018-07-12 11:38:09 -04:00
Anuken	d89feb2c75	Bugfixes, minor optimizations	2018-07-11 19:57:27 -04:00
Anuken	2b58bd5bd8	Optimizations	2018-07-11 12:19:21 -04:00
Anuken	cb58eb82fc	Added requirement display / Text fixes / Better crash reports	2018-07-10 16:53:35 -04:00
Anuken	dbee30a412	Updated uCore / Made splitter distribute properly	2018-07-09 18:14:55 -04:00
Anuken	4fa165bc6a	Updated uCore	2018-07-05 13:23:31 -04:00
Anuken	60deb9205b	uCore update / Kick packet priority / Custom client lock / Net fixes	2018-07-03 19:48:29 -04:00
Anuken	c9b77e4e23	Crash fixes	2018-07-03 12:27:37 -04:00
Anuken	e56d865416	Updated uCore	2018-07-03 11:21:53 -04:00
Anuken	ec127519aa	Many various bugfixes	2018-07-03 09:26:04 -04:00
Anuken	9130302c93	Fixed pyratite mixer glitchy animation / Fixed block select flashing	2018-07-02 21:35:21 -04:00
Anuken	e3bee43163	Portrait mode support / Mobile fixes	2018-07-02 15:49:01 -04:00
Anuken	fb2bb5a4bc	Start of work on portrait mode / Made fragments abstract classes	2018-07-02 13:54:22 -04:00
Anuken	e9436426b7	Gradle update / Block inventory improved / Crash fixes	2018-07-02 11:04:24 -04:00
Anuken	deadcd5339	Level selection improvements	2018-07-01 17:58:19 -04:00
Anuken	02b8e34242	Crash fixes / New ammo types / New turrets / Missiles added	2018-07-01 14:36:16 -04:00
Anuken	cb6090c773	Fixed various crashes, synchronization bugs	2018-06-30 11:20:25 -04:00
Anuken	b4151a256b	Extensive netcode changes, bugfixes	2018-06-29 14:13:31 -04:00
Anuken	499671a637	Fixed some snapshot bugs, net crashes	2018-06-28 21:04:01 -04:00
Anuken	5cefecced8	Fixed fog not clearing, movement bug, items stuck in blocks	2018-06-27 11:57:37 -04:00
Anuken	7a049d64d8	Many various bugfixes, more aggressive memory optimization	2018-06-26 11:15:23 -04:00
Anuken	482858e36b	Updated uCore version, should build now	2018-06-24 21:34:53 -04:00
Anuken	18a780147e	Updated uCore	2018-06-22 19:31:30 -04:00
Anuken	c24eb231ab	Added core miner drone, massive amount of balancing/setup	2018-06-22 15:07:48 -04:00
Anuken	28e44d33c4	Updated uCore	2018-06-21 16:03:07 -04:00
Anuken	13bb78ffa0	Added new conveyor animation	2018-06-21 12:41:33 -04:00
Anuken	354c6e17c0	Implemented smelting with flux	2018-06-18 17:20:23 -04:00
Anuken	9fbeeda1c6	Updated uCore	2018-06-16 19:45:45 -04:00
Anuken	6281826b92	Updated uCore	2018-06-15 21:54:26 -04:00
Anuken	11d2ada6b3	Added texture generation system	2018-06-15 18:06:05 -04:00
Anuken	fab3704dbd	Moved over Streamable inner classes, added test map	2018-06-14 17:11:38 -04:00
Anuken	1436e78305	Fixed extra space in uCore dependency	2018-06-13 23:49:25 -04:00
Anuken	63d5539427	Updated uCore	2018-06-13 21:18:52 -04:00
Anuken	c508f30d92	Synced puddles, updated uCore	2018-06-10 20:53:13 -04:00
Anuken	d5a58be440	Updated uCore, fixed GWT build, better client snapshot system	2018-06-09 17:05:47 -04:00
Anuken	0620c635e5	Updated uCore	2018-06-08 12:23:11 -04:00
Anuken	0bd0602655	Fixed build errors	2018-06-08 10:02:15 -04:00
Anuken	ccb97e34d5	Moved many block files; work on annotation processor	2018-06-06 14:51:25 -04:00
Anuken	917e2e40fb	Memory optimizations, multithreading fixes, uCore updated	2018-06-05 14:03:08 -04:00
Anuken	a6225962b0	Updated uCore	2018-06-04 13:02:07 -04:00
Anuken	12c746a4e4	Fixed build errors, AI improvements	2018-06-03 00:09:41 -04:00
Anuken	89d8aa99ac	Updated uCore	2018-06-02 00:23:08 -04:00
Anuken	863c159fbb	Fixed build errors	2018-06-01 13:24:11 -04:00
Anuken	5c120e532f	Added support for Mac file association; minor optimizations	2018-06-01 13:01:05 -04:00
Anuken	23d07600f7	Bugfixes, added saving/loading maps in editor for web version	2018-05-31 23:49:43 -04:00
Anuken	277d75016c	Updated uCore, added new respawn mechanics	2018-05-31 11:41:31 -04:00
Anuken	b434c37f01	Rewrite of all static initialization code	2018-05-29 15:24:47 -04:00
Anuken	57bcea56b5	Implemented block build animation and shaders	2018-05-15 20:03:03 -07:00
Anuken	a8900bb50e	Re-added discord RPC	2018-05-13 21:43:53 -07:00
Anuken	d1a3752b2d	Annotation processing done, more work on local multiplayer input	2018-05-13 16:41:50 -07:00
Anuken	00e70cbb6a	Massive amount of refactoring for local multiplayer, annotations	2018-05-12 07:30:23 -07:00
Anuken	cce35b4a6f	Fixed build.gradle	2018-05-09 16:46:25 -07:00
Anuken	ce2b73b737	Updated Bullet to use floats	2018-05-09 09:46:24 -07:00
Anuken	c931bbf107	Merged with master	2018-05-06 01:43:12 -04:00
Anuken	450fc456be	Fixed extra wave time counting down on tutorial	2018-05-05 14:13:21 -04:00
Anuken	1f439b4b0c	Made server write version on build	2018-05-03 13:04:30 -04:00
Anuken	1bf728359d	Fixed build errors	2018-05-01 16:02:42 -04:00
Anuken	e5f6b7f66c	Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0	2018-04-28 16:28:58 -04:00
Anuken	aa110ec9a6	Various iOS fixes	2018-04-28 12:27:43 -04:00
Anuken	8cc3a865e2	iOS fixes	2018-04-27 23:42:59 -04:00
Anuken	d8d8552176	Added iOS module	2018-04-27 16:01:37 -04:00
Anuken	4b71b30418	Fixed compile error with new effects system, update uCore	2018-04-25 20:55:20 -04:00
Anuken	ff6dc98bbe	Added spanish bundle	2018-04-23 21:47:39 -04:00
Anuken	1a9d701d32	Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 ... # Conflicts: # core/assets-raw/sprites/blocks/chainturret-icon.png # core/assets-raw/sprites/blocks/chainturret.png # core/assets-raw/sprites/blocks/titancannon-icon.png # core/assets-raw/sprites/blocks/titancannon.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/version.properties # core/src/io/anuke/mindustry/entities/effect/TeslaOrb.java # core/src/io/anuke/mindustry/graphics/BlockRenderer.java # core/src/io/anuke/mindustry/input/InputHandler.java # core/src/io/anuke/mindustry/input/PlaceMode.java	2018-04-21 18:47:43 -04:00
Anuken	9f4f107b6d	Changed version build	2018-04-21 18:39:49 -04:00
Anuken	496b4e77e8	Updated version	2018-04-21 18:28:38 -04:00
Anuken	8a965e56cd	Fixed not being able to pan with invalid recipe selected	2018-04-21 11:02:54 -04:00
Anuken	68bfd3017b	Updated uCore	2018-04-19 22:02:41 -04:00