Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,289 Commits 4 Branches 180 Tags
9e9cd213f371a0c3fb559dc70c4e474412acf78b
Commit Graph

420 Commits

Author SHA1 Message Date
Anuken
f3cacb9e99 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-18 15:04:30 -04:00
Anuken
356c2cfa80 Fixed #5797 2021-08-18 11:41:38 -04:00
Anuken
f0c0900770 Lambda memory allocation optimizations 2021-08-17 11:38:57 -04:00
Anuken
0c5f781702 Sector wave spawning fixes 2021-08-16 13:15:14 -04:00
Anuken
2200a44653 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-13 10:08:34 -04:00
Anuken
0cac972061 Support for team-specific multipliers (no UI) 2021-08-11 21:18:48 -04:00
Anuken
e6bd259c0e Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/assets/logicids.dat
	core/src/mindustry/ui/dialogs/PlanetDialog.java
	core/src/mindustry/world/blocks/distribution/ItemBridge.java
	core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
	core/src/mindustry/world/blocks/storage/StorageBlock.java
	gradle.properties
 2021-08-10 15:15:07 -04:00
JrTRinny
6c963a2de7 comment fix (#5730) 
* there is no mech pads

* factories
 2021-08-10 09:38:46 -04:00
Anuken
01f759a992 Fixed #5722 2021-08-08 20:42:48 -04:00
Anuken
4fa04b9e23 Bannable units / Show tech tree icon for unresearched units 2021-08-05 23:01:58 -04:00
Anuken
6fdbe1d5f0 Fixed minimap not updating when build team changes 2021-08-05 14:20:23 -04:00
Arik
2f57705f13 Fix saving tags of overwritten schematic (#5696) 2021-08-04 09:27:01 -04:00
Anuken
f820121e08 Sector bugfixes / More sector info 2021-08-03 16:01:27 -04:00
Anuken
fc80c23dde Auto-generate block paletted team regions for mods 2021-07-31 21:31:36 -04:00
Anuken
84b69a683a PvP team color palettes 2021-07-31 18:50:55 -04:00
Anuken
79bf77f4be WIP team icons 2021-07-31 18:23:22 -04:00
Anuken
bdb4ae2f85 Typo fix 2021-07-28 17:28:01 -04:00
Anuken
c19a7e8452 New core landing animation 2021-07-26 19:29:14 -04:00
Anuken
c14532ecae Fixed #5645 2021-07-25 12:04:17 -04:00
Anuken
f77c32cbb2 New flying unit targeting system 2021-07-24 21:10:39 -04:00
Anuken
385f493f36 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/net/CrashSender.java
	core/src/mindustry/ui/Links.java
	core/src/mindustry/ui/dialogs/SchematicsDialog.java
	core/src/mindustry/world/blocks/power/LightBlock.java
	gradle.properties
 2021-07-23 17:58:02 -04:00
Anuken
02c03e9c67 Cleanup & minor layout bugfixes 2021-07-20 17:38:09 -04:00
Anuken
0f199fa4b4 Partial impl of #2923 2021-07-20 13:17:18 -04:00
Anuken
b28aff4a7b Sector items display fixes 2021-07-20 12:05:10 -04:00
Anuken
ba227d64fb #5224 2021-07-20 11:42:11 -04:00
Anuken
6973ed7d55 PvP defeated team cleanup 2021-07-17 08:52:24 -04:00
Anuken
b0d4607798 Fixed #5588 2021-07-15 20:08:05 -04:00
Anuken
ebf0c71db6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/mod/ClassMap.java
 2021-07-04 09:52:57 -04:00
Anuken
0b3dddcc9e Minor reformatting 2021-07-01 17:06:35 -04:00
Anuken
6c18634b0d Minor logic unit rotation fix / Core capture unit derelict tareting 2021-06-29 16:26:02 -04:00
Anuken
3ea3df5c73 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-06-28 18:57:27 -04:00
Anuken
2613ff6796 Fixed #5448 2021-06-23 08:46:50 -04:00
Anuken
afe963ca5d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/editor/MapInfoDialog.java
	core/src/mindustry/maps/filters/ClearFilter.java
	core/src/mindustry/mod/ClassMap.java
	gradle.properties
 2021-06-17 10:44:51 -04:00
Anuken
9088d9eb39 Polygonal protection bugfixes 2021-06-16 15:07:14 -04:00
Anuken
865ee952c9 WIP polygonal core protection 2021-06-16 13:26:18 -04:00
Anuken
ecbf0dcf31 Planet lighting parameters 2021-06-12 11:07:40 -04:00
Anuken
31ebb1d156 Planet progress 2021-06-10 20:46:10 -04:00
Anuken
82742339a3 Implementation of #5280 2021-06-07 10:47:53 -04:00
Anuken
28b235ef07 Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
Anuken
ae8833e679 Fixed rare schematic crash 2021-03-29 15:06:06 -04:00
Anuken
db931bace2 Cleanup 2021-03-28 10:56:19 -04:00
키에르
a40731624a Add uuid return to PlayerBanEvent (#4982) 
* Update EventType.java

* Update Administration.java
 2021-03-24 10:02:21 -04:00
Anuken
9384d661c1 Removed unnecessary dispose() 2021-03-18 16:14:53 -04:00
Anuken
bfa9d65314 Ban player ID before IP 2021-03-18 12:57:27 -04:00
Anuken
cc65feb392 Added ConnectionEvent 2021-03-04 18:39:47 -05:00
Anuken
0672878920 Fixed #4781 2021-02-24 15:27:22 -05:00
Anuken
61d9dea487 Logic config replication / logicUnitBuild rule / Copy-able ConstructBlocks 2021-02-21 10:23:46 -05:00
TranquillyUnpleasant
631e4d9eef Unit cap (#4689) 
* Add unit caps as a map setting.

* Use int and add maximum and minimum handling.

* Put a lower limit of 0 for unit cap
 2021-02-15 20:15:56 -05:00
Anuken
2e6b90d4d5 Serializable -> JsonSerializable 2021-02-12 15:41:28 -05:00
buthed010203
852b0a97fe 60 * 60 > Time.toMinutes (#4634) 
It already exists in other places in the code, doesn't make sense to not use it.
 2021-02-08 16:49:14 -05:00