mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-06 08:57:45 +07:00
Code Issues Packages Projects Releases Wiki Activity
824 Commits 4 Branches 160 Tags 2.3 GiB
6a11f0dd8d
Commit Graph

824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
6a11f0dd8d Fixed improper drill time display 2018-03-10 13:30:33 -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
689794cab5 Merge remote-tracking branch 'origin/master' 2018-03-09 17:11:10 -05:00
Anuken
8743a60d02 Added in-game changelogs 2018-03-09 17:11:01 -05:00
Epowerj
2dc0a79263 Changed Wiki page text 2018-03-09 15:58:28 -05:00
Epowerj
387e912f6a Fixed typo 2018-03-09 15:01:16 -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
1038f35883 Moved TODO to Trello board 2018-03-05 17:00:02 -05:00
Anuken
a25b6a9952 Added biomatter extractor, sulfuric acid 2018-03-05 16:38:13 -05:00
Anuken
b1263262de Fixed erratic turret movement 2018-03-05 14:12:06 -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
6d0a0a0109 Random cleanup 2018-03-03 23:54:15 -05:00
Anuken
9b3c9aaea2 Storage blocks, organized sprites, liquid tunnel implementation 2018-03-03 23:46:51 -05:00
Anuken
7e75416519 Removed block sync 2018-03-03 18:09:35 -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