mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 12:23:47 +07:00
Code Issues Packages Projects Releases Wiki Activity
881 Commits 4 Branches 160 Tags 2.3 GiB
e5656896e7
Commit Graph

389 Commits

Author SHA1 Message Date
Anuken
c9342d60d7 Fixed invalid FR bundle format 2018-03-10 14:03:23 -05:00
Anuken
6a11f0dd8d Fixed improper drill time display 2018-03-10 13:30:33 -05:00
Anuken
3fa9d5ed10 Updated FR bundle 2018-03-10 12:14:10 -05:00
Anuken
83452b1e36 Fixed many crashes, refactored block bars 2018-03-10 12:13:42 -05:00
Anuken
d88a908e29 Changed plasma drill stats 2018-03-09 23:08:27 -05:00
Anuken
9c05ddbd7d Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/version.properties
 2018-03-09 20:58:21 -05:00
Anuken
89ca9ad213 Added generic drill class, cleanup of other subclasses 2018-03-09 20:57:12 -05:00
Anuken
0310614392 Formatting 2018-03-09 19:32:33 -05:00
Anuken
460496339b Un-broke multiblock breaking, tweaked build script 2018-03-09 17:51:01 -05:00
Anuken
1c8b451ec8 Updated buildscript 2018-03-09 17:17:01 -05:00
Anuken
8743a60d02 Added in-game changelogs 2018-03-09 17:11:01 -05:00
Anuken
c46f1ec590 Added LiquidDrill 2018-03-09 10:09:32 -05:00
Anuken
1d83e94ad6 Changed android UUID flow, again 2018-03-08 22:36:22 -05:00
Anuken
3131e8c7e9 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-08 22:34:26 -05:00
Anuken
7d8b0f9941 Version modification 2018-03-08 22:32:34 -05:00
Anuken
2a306d70be Fixed invalid web servers, teleporter clearing, desktop input misplace 2018-03-08 21:56:20 -05:00
Anuken
b0086082d0 Fixed server crashes, android client error, ping system rewrite 2018-03-08 18:59:11 -05:00
Anuken
d3313d6438 Fixed outstanding block type crashes 2018-03-08 16:59:39 -05:00
Anuken
c611066791 Completely borked liquid/power/inventory system 2018-03-07 22:54:12 -05:00
Anuken
a7096720d6 Updated uCore 2018-03-07 16:22:04 -05:00
Anuken
4be5752b69 Version update 2018-03-07 15:26:28 -05:00
Anuken
7425b5e367 Fixed bullets being able to hit their own players 2018-03-07 00:08:24 -05:00
Anuken
565c3ed12f Updated to build 32, UI layout fixes 2018-03-07 00:04:37 -05:00
Anuken
594c49ac91 Fixed server freezing on dispose(), socket in use exception 2018-03-06 23:34:33 -05:00
Anuken
a8ce961268 Added server version display and compatibility checking 2018-03-06 23:18:34 -05:00
Anuken
cd038ba5ad Fixed label font contamination 2018-03-06 22:28:54 -05:00
Anuken
049cfa06c8 Changed system for UUID retrieval (desktop) 2018-03-06 22:25:48 -05:00
Anuken
686e526e8c Added UUID banning 2018-03-06 19:22:50 -05:00
Anuken
1e456d6560 Changed biomatter extractor texture 2018-03-06 17:46:24 -05:00
Anuken
6a564f6693 Fixed some generator bugs, implemented laser drill properly 2018-03-05 23:26:53 -05:00
Anuken
45a3be7642 Refactoring of generators, added solar panel, power drills 2018-03-05 22:12:33 -05:00
Anuken
a25b6a9952 Added biomatter extractor, sulfuric acid 2018-03-05 16:38:13 -05:00
Anuken
25063ed1f0 Added new turret sprites 2018-03-05 14:10:52 -05:00
Anuken
292dbf101b More reorganization, implemented multiblock drills, API changes 2018-03-04 22:00:32 -05:00
Anuken
099d88ba7b Retexturing, changed mega repair turret size 2018-03-04 16:29:54 -05:00
Anuken
992fcc73b8 Added liquid tunnel recipe, fixed crashes/bugs 2018-03-04 00:17:30 -05:00
Anuken
9b3c9aaea2 Storage blocks, organized sprites, liquid tunnel implementation 2018-03-03 23:46:51 -05:00
Anuken
41e4f87e06 Merge fixes 2018-03-03 18:08:35 -05:00
Anuken
6de48b4535 Merge branches '4.0' and 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/core/NetClient.java
#	core/src/io/anuke/mindustry/world/Tile.java
 2018-03-03 18:06:57 -05:00
Anuken
70b104c936 Cleanup of Tile 2018-03-03 18:03:15 -05:00
Anuken
3653135bb0 Fixed bugs with web version connections 2018-03-03 17:43:50 -05:00
Anuken
8c53cf4150 Updated to build 30 2018-03-03 11:48:30 -05:00
Anuken
2a41453bc8 Crash fixes 2018-03-03 11:31:17 -05:00
Anuken
ba46dacfdc Removed servtesting code 2018-03-03 10:44:32 -05:00
Anuken
2122d04f78 Completely new continuous collision system to prevent piercing 2018-03-03 01:14:14 -05:00
Anuken
94f6c1b902 More debugging changes 2018-03-02 15:01:49 -05:00
Anuken
e37cdf6040 Updated uCore 2018-03-02 09:11:02 -05:00
Anuken
827f72f595 Added canDump for vaults, better vault icon 2018-03-02 09:04:44 -05:00
Anuken
5faff6260e Implemented multiblock output, broke router chaining 2018-03-01 23:36:48 -05:00
Anuken
278d80a627 A variety of crash and bugfixes 2018-03-01 22:19:04 -05:00
Anuken
41ee817d18 More server debugging changes. 2018-03-01 17:57:42 -05:00
Anuken
59e8a85c7e Added Edges class, broke tiles and saving 2018-02-28 23:16:35 -05:00
Anuken
7e20b493ea Fixed high-FPS slow water/no block sounds 2018-02-28 15:11:35 -05:00
Anuken
b67a4f3c14 Fixed dedicated server crashes 2018-02-27 20:30:55 -05:00
Anuken
d3ec50825e Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java
 2018-02-27 19:58:34 -05:00
Anuken
1195b6c541 Updated uCore 2018-02-27 19:36:25 -05:00
Anuken
f72fd01050 More bugfixes 2018-02-27 19:13:08 -05:00
Anuken
828dd78611 Fixed some GWT bugs and errors 2018-02-26 23:31:29 -05:00
Anuken
bbe3115186 Updated to 3.4 2018-02-26 22:13:36 -05:00
Anuken
17b17222b6 Fixed some admin bugs 2018-02-26 22:05:07 -05:00
Anuken
00c204b589 Made break mode get set to 'none' when collapsing 2018-02-26 19:10:15 -05:00
Anuken
13e592a758 Cleanup 2018-02-26 18:42:06 -05:00
Anuken
32791b4baa Added player tracing tools, fixed some bugs 2018-02-26 17:20:05 -05:00
Anuken
c90395ee2b Fixed placement teleporter crash, invalid packet handling 2018-02-26 10:06:36 -05:00
Anuken
7429d029f3 Added admins with in-game icons and permissions; untested 2018-02-25 23:44:35 -05:00
Anuken
9f5f6ae382 Security changes: placement verification, banning, unfinished admins 2018-02-25 22:32:12 -05:00
Anuken
9985a19e6a Better net error messages, bugfixes, new command handler 2018-02-23 21:42:05 -05:00
Anuken
de340255fe Updated to build 28 2018-02-23 15:11:42 -05:00
Anuken
a6737c5a54 Added german language 2018-02-23 14:49:33 -05:00
Anuken
07aab732b7 Better tunnel debugging, improved keybind dialog controller info 2018-02-23 13:59:21 -05:00
Anuken
2518564f92 Added Vault block 2018-02-23 10:26:47 -05:00
Anuken
81de9875d3 New resources, blocks, core no longer accepts fuel materials 2018-02-22 20:12:20 -05:00
Anuken
eae07c15a7 Added pulverizer, new temporary laser graphics, debug power blocks 2018-02-21 23:28:02 -05:00
Anuken
1fdffa8be5 Added splitter, power smelter, new sections 2018-02-21 22:29:15 -05:00
Anuken
7ee01f19fe Updated uCore 2018-02-21 19:50:27 -05:00
Anuken
04865350e1 Added LiquidTurret class 2018-02-21 19:23:36 -05:00
Anuken
621ec4ee0f A few minor bugfixes, updated version to 3.3 release 2018-02-21 15:07:49 -05:00
Anuken
26a472d31d Updated version 2018-02-21 14:43:51 -05:00
Anuken
f2a952fcfe Possible build upload script fix 2018-02-20 19:40:19 -05:00
Anuken
d52d9bec81 Added warning message for upgrading users of the game 2018-02-19 20:44:14 -05:00
Anuken
1397ed2d06 Possible junction clog fix 2018-02-19 20:13:45 -05:00
Anuken
2208198aa8 "Fixed" items quantities jumping around due to lag 2018-02-19 15:08:05 -05:00
Anuken
5cc092f58c Fixed some more synchronization bugs 2018-02-19 14:57:43 -05:00
Anuken
ffabdba119 Fixed incorrect discord presence updating 2018-02-19 14:45:18 -05:00
Anuken
edc124c90d Added better block debugging 2018-02-19 14:31:35 -05:00
Anuken
03079e9611 Updated uCore, recorder fix 2018-02-19 12:47:57 -05:00
Anuken
cba42d2f19 Fixed 32-bit version not working due to Discord integration 2018-02-19 11:31:43 -05:00
Anuken
6f55870a1f Updated version, teleporter tweaks 2018-02-18 12:49:59 -05:00
Anuken
fb97d00756 Fixed teleporter loop crash 2018-02-18 12:26:18 -05:00
Anuken
39db04872c Minor cleanup 2018-02-18 11:33:38 -05:00
Anuken
1c3bad0aca Fixed StackOverFlow exception thrown with certain block designs 2018-02-18 11:31:09 -05:00
Anuken
dbd84103cb Added variable to control block syncing 2018-02-17 23:39:31 -05:00
Anuken
a79dfe29ef Synchronized tile modification with updating 2018-02-17 16:04:09 -05:00
Anuken
30d0d7715a Version update 2018-02-17 14:21:32 -05:00
Anuken
05f7bc256b Made server send wave and map data on websocket ping 2018-02-17 13:21:22 -05:00
Anuken
26fc1c1fb0 Many crashes fixed, added server run script 2018-02-17 12:06:57 -05:00
Anuken
fe3eb356fa Partial teleporter item stacking fix. 2018-02-16 11:32:01 -05:00
Anuken
b70f5b82ee Changed teleporter validity system 2018-02-15 19:22:39 -05:00
Anuken
71ce6d0bec Version update, GWT error fix 2018-02-15 18:15:25 -05:00
Anuken
d117225877 Made server log stop command, partial teleporter fix 2018-02-15 17:00:59 -05:00