mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-22 02:07:20 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,418 Commits 4 Branches 160 Tags 2.3 GiB
5bcaed54c6
Commit Graph

186 Commits

Author SHA1 Message Date
Anuken
32d28a4070 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/io/anuke/mindustry/ctype/ContentType.java
#	core/src/io/anuke/mindustry/ctype/UnlockableContent.java
#	core/src/io/anuke/mindustry/io/LegacyMapIO.java
#	core/src/io/anuke/mindustry/type/WeatherEvent.java
#	gradle.properties
 2019-12-24 12:40:23 -05:00
Anuken
1c1db3990f Fully implemented safe content loading 2019-12-15 13:54:51 -05:00
Anuken
8fde8695d0 Fixed tests 2019-12-12 16:33:24 -05:00
Anuken
74dc31b10a Removed unnecessary unit types 2019-12-09 11:27:09 -05:00
Anuken
1aca302518 Many changes to improve scripting 2019-12-08 18:34:23 -05:00
Anuken
dd5e3b2aba JS console / Scripting tweaks 2019-12-07 14:10:39 -05:00
Anuken
78f146fbcf Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/io/anuke/mindustry/graphics/Shaders.java
#	gradle.properties
 2019-12-01 17:42:56 -05:00
Anuken
73b6cc73ff Fixed tests 2019-11-17 11:30:03 -05:00
Anuken
629999a1cd More unit tests / Lighting improvements 2019-11-16 23:45:31 -05:00
Anuken
94cf054312 Fixed unit tests 2019-11-16 12:40:26 -05:00
Anuken
edfe58cb38 Refactoring of tile storage, filters 2019-11-16 12:34:29 -05:00
Anuken
8798fa101a Merge 2019-11-16 00:15:45 -05:00
Anuken
30ea285ca0 Change power "satisfaction" -> "status", use efficiency() in blocks 2019-11-14 14:59:04 -05:00
Anuken
8952dd7f56 Begin work on 6.0 2019-11-10 14:05:29 -05:00
Anuken
6f19685255 Fixed #971 2019-11-01 12:48:42 -04:00
Anuken
0722ad2f4c Refactoring of functional package 2019-10-29 15:57:25 -04:00
Anuken
e103d62b75 Bugfixes / Rework of save discovery system 2019-10-27 14:58:26 -04:00
Anuken
d7ebbbf2b6 Better organization 2019-10-21 21:22:35 -04:00
Anuken
01f6fff823 Correct liquid boost display for turrets 2019-10-21 17:50:26 -04:00
Anuken
f17766c8ce Fixed tests 2019-10-15 08:51:48 -04:00
Anuken
3f3a03c227 ???? 2019-10-11 09:32:58 -04:00
Anuken
36cec98082 ??? 2019-10-11 09:26:49 -04:00
Anuken
21b7a0235b Attempting to fix github CI 2019-10-11 09:14:43 -04:00
Anuken
20462b91d4 Major refactoring of building input in progress 2019-10-06 16:56:31 -04:00
Anuken
a51216d7a6 Test fix 2019-10-05 16:06:36 -04:00
Anuken
89db08f4ed Fixed unit tests, server 2019-10-02 21:29:35 -04:00
Anuken
e0ec9a047c Modded consumers 2019-10-02 14:44:18 -04:00
Anuken
55e43761e9 Auto-tag Arc commits at release time 2019-09-13 13:53:15 -04:00
Anuken
bd96ae5a48 Nestable array iterators + unit tests 2019-09-12 12:17:28 -04:00
Anuken
e90c8c4d3e Extensive network refactor 2019-09-07 14:11:50 -04:00
Anuken
a575284bfe Fixed unit tests 2019-08-28 14:12:11 -04:00
Anuken
9d214a77d7 Test fixes 2019-08-27 19:37:13 -04:00
Anuken
bd15287420 Better loading screen / Fixed unit tests 2019-08-27 17:44:25 -04:00
Anuken
1e80bdf19f Functional loading 2019-08-27 09:27:09 -04:00
Anuken
76cd7ba8d1 non-functional loading screen 2019-08-26 22:53:11 -04:00
Anuken
73149123b4 Fullscreen key / Bugfixes 2019-08-25 12:02:51 -04:00
Anuken
04c8ecf4af New team colors 2019-08-02 10:10:37 -04:00
Anuken
122f43ddb9 Fixed unit tests 2019-06-14 15:07:39 -04:00
Anuken
5cfab33ada Fixed unit tests / Fixed zones having incorrect waves 2019-06-12 18:42:12 -04:00
Anuken
18328320c1 Fixed black blocks/units after quit / Fixed intense wave spawn lag 2019-06-12 18:07:19 -04:00
Anuken
73c48afc99 Save loading regression tests 2019-06-12 15:52:47 -04:00
Anuken
62bd0442df Testing loading of old saves 2019-06-12 15:29:41 -04:00
Anuken
ea0788f56c Better wave timer / Sprite tweaks / Core wave spawns 2019-06-09 21:09:29 -04:00
Anuken
79a2f31056 Fixed unit tests 2019-05-13 11:32:57 -04:00
Anuken
9f4a430412 Fixed tests 2019-05-09 14:39:52 -04:00
Anuken
bf073a84c8 a bit less broken but still broken 2019-05-05 19:05:46 -04:00
Anuken
5ee26fc3f4 Fixed power tests 2019-05-03 22:26:37 -04:00
Anuken
93ffb66e59 Fixed all known issues with power system 2019-05-03 21:19:41 -04:00
Anuken
e7ad797d4e Fixed unit tests 2019-04-26 11:23:41 -04:00
Anuken
9f5dc7f091 Fixed obscure zone test bug 2019-04-25 12:25:45 -04:00
Anuken
9ebb4c7d12 Removed link byte, replaced with rotation 2019-04-12 15:30:34 -04:00
Anuken
5783b61631 Bugfixes 2019-04-10 17:47:22 -04:00
Anuken
b40beb0d1d Source reformat 2019-04-08 09:03:18 -04:00
Anuken
7dfb0a81e3 Test fixes 2019-04-07 14:53:53 -04:00
Anuken
9699d9467a New tests / Bugfixes 2019-04-07 14:09:34 -04:00
Anuken
0a8f2edb05 Block update unit tests 2019-04-01 11:57:43 -04:00
Anuken
41b08f38c5 Fixed tests 2019-04-01 11:34:10 -04:00
Anuken
a83c0b2e9a "fixes" 2019-03-31 22:27:11 -04:00
Anuken
b4071f6dcb Merge 2019-03-31 18:24:25 -04:00
Anuken
de0235ad94 Sweeping rework 2019-03-31 17:49:15 -04:00
Anuken
b419a96d69 Mech balance / Re-added map screenshot 2019-03-30 00:17:29 -04:00
Anuken
97f5bf3cc4 Code cleanup 2019-03-24 19:58:51 -04:00
Anuken
ee06e620c6 Zone wave bugfix / New tests / More "encouragement" 2019-03-21 19:19:12 -04:00
Andreas Heiskanen
609565af5f Tests: Add tests for addDarkness() in World.java (#412) 
* Tests: Add tests for addDarkness() in World.java

Add Junit tests for the addDarkness found in core/src/io/anuke/mindustry/core/World.java

* Refactor: Remove code duplication

Remove code duplication in WorldTests. Invoke launchApplication directly from ApplicationTests.

* BugFix: Assign Tiles[][] tiles used for testing. 

Add assignment of Tiles[][] tiles separately when invoking ApplicationTests.launchApplication.
 2019-03-12 13:08:35 -06:00
Anuken
6c8d80777c Removed useless name mapping / Cleanup 2019-03-11 11:43:23 -04:00
Anuken
3530ca8989 Fixed more tests 2019-03-10 00:21:21 -05:00
Anuken
6b074ed4b2 Fixed some tests failing 2019-03-10 00:10:33 -05:00
Anuken
0a9b78f013 Bugfixes / Renamed biomatter / Cleaned up conveyor sprites 2019-02-25 22:26:51 -05:00
Anuken
976b39414f Fixed: missing spawns / incorrect ranks / jittery movement / tests 2019-02-23 15:08:07 -05:00
Anuken
d74887eaa1 More bugfixes 2019-02-22 23:16:50 -05:00
Anuken
f591403b7d Zone wave correctness checks 2019-02-20 17:54:23 -05:00
Anuken
66766b43c7 Bugfixes 2019-02-14 10:00:17 -05:00
Anuken
6d01d893f7 Fixed unit tests 2019-02-11 23:31:50 -05:00
Anuken
a87e2a56d2 Bugfixes / Possibly fixed unit tests 2019-02-08 17:05:09 -05:00
Anuken
adf5189541 TODO cleanup / Test fixes 2019-02-08 16:29:10 -05:00
Anuken
56bcabedf7 Balancing / Bugfixes / Badly antialiased turret outlines 2019-02-07 23:06:43 -05:00
Anuken
67940476af Fixed refactoring errors 2019-02-02 15:59:07 -05:00
Anuken
0dd9d2b460 Moved entity package from Arc / Entity code cleanup 2019-02-02 15:53:35 -05:00
Anuken
564c258c86 Core tiers 2019-01-31 15:33:07 -05:00
Anuken
da9278ad8d Added recorder module 2019-01-27 12:31:14 -05:00
Anuken
6723157ca5 Power tweaks 2019-01-26 17:33:20 -05:00
Anuken
956448a1a5 Fixed tests again, locally 2019-01-26 13:20:07 -05:00
Anuken
4be675f977 Thermal generator now based on floor / Power restructuring 2019-01-26 12:48:15 -05:00
Anuken
c3883cdad0 Slight improvements to editor rendering / Renamed blockpart -> part 2019-01-23 08:51:21 -05:00
Anuken
6229f99a2e Fixed tests / Various build tools updated 2019-01-22 15:01:30 -05:00
Anuken
0478af2564 Recipe class removed completely 2019-01-20 13:49:53 -05:00
Anuken
22a6c4e8af Glass 2019-01-17 19:28:25 -05:00
Anuken
8aa1509f47 Gamemodes removed 2019-01-12 16:55:24 -05:00
Anuken
28fa0b070d Merge branch 'unsector' 
# Conflicts:
#	core/src/io/anuke/mindustry/maps/SectorPresets.java
#	core/src/io/anuke/mindustry/maps/Sectors.java
#	core/src/io/anuke/mindustry/maps/TutorialSector.java
#	core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
#	core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java
#	core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
 2019-01-08 22:28:13 -05:00
Anuken
ee9f65d4a3 Block class merge 2019-01-07 18:39:06 -05:00
Anuken
153e6c5f1b Re-structuring 2019-01-03 19:46:25 -05:00
Anuken
b8e6e5df61 Power PR merged / Various bugfixes 
Closes #288
 2019-01-03 18:22:13 -05:00
Anuken
734d4a912b Fixed failing tests 2018-12-29 12:05:29 -05:00
Anuken
db546412f1 Arc compatibility update 2018-12-27 15:47:17 -05:00
Anuken
8879593381 hhhhhhh 2018-12-26 13:22:31 -05:00
Anuken
94908bc599 🔥🔥🔥🔥🔥🔥maximum breakage 2018-12-20 12:38:27 -05:00
Timmeey86
828661e9de More efficient way of retrieving ConsumePower subclasses 2018-12-15 23:49:46 +01:00
Timmeey86
e50ff6b0a5 Merged current master and fixed conflicts 2018-12-09 22:40:33 +01:00
Anuken
35b16c7292 New placement unit tests / Placing bugfix 2018-12-09 14:42:22 -05:00
Timmeey86
0a76647175 ForceProjector should now work properly 2018-12-07 19:38:14 +01:00