Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,075 Commits 4 Branches 180 Tags
8f0ca13aceacc365e75855cac394367debffa67d
Commit Graph

1590 Commits

Author SHA1 Message Date
SomeonesShade
30c65f8f3c Merge branch 'Anuken:master' into balancing_burst-drill-optional-multiplier 2024-07-29 19:14:38 +08:00
Anuken
0021f98335 Merge branch 'master' into do-you-hear-the-voices-too 2024-07-07 11:31:09 -04:00
TripleToxic
82bcf5966e Sensors, SetProp, and SetRule (#9943) 
* some fun things for world proc only

* fix the format artifact

* SetProp and reformating

* Wildcard imports

* Wildcard imports

* velocity conversion

* compacting description

Co-authored-by: Anuken <arnukren@gmail.com>

* Update core/src/mindustry/world/blocks/defense/turrets/Turret.java

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2024-07-07 11:28:19 -04:00
Mythril382
51dc58379b Merge branch 'master' into do-you-hear-the-voices-too 2024-07-06 12:12:51 +08:00
Anuken
04ec2c0603 Added toggle for always playing music 2024-07-05 21:42:23 -04:00
Anuken
400db1b1e8 In-game rule edit dialog 2024-06-24 14:11:56 -04:00
Mythril382
f4882d6615 Merge branch 'master' into do-you-hear-the-voices-too 2024-06-17 02:06:46 +08:00
SITUVNgcd
7db512d2af Remove duplicate space (#9954) 
Idk where it come from in orginal `bundle.properties` file.
 2024-06-16 09:28:25 -04:00
Anuken
56b0deb910 Removed @solid variable 2024-06-16 01:35:48 -04:00
Jason
f26b03dc6c Map rule for air spawns (#9922) 
* air use spawns

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* add the rule

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* add rule in ui

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* bundle

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* tie it to rules.waves

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* :)

Contributing.md says yes

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* indent

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

---------

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>
 2024-06-16 00:34:47 -04:00
Mythril382
41e2183793 Merge branch 'master' into do-you-hear-the-voices-too 2024-05-28 00:40:31 +08:00
Anuken
b4b6b9fa44 World processor list in editor 2024-05-24 21:46:15 -04:00
Shade
ec7a8f886d bundles - impact and eruption 2024-05-04 16:01:58 +08:00
Andrey Andreyevich Bienkowski
08429b5492 Add turret ammo capacity to the in-game help (#9777) 
* Add turret ammo capacity to the in-game help

* Rename max shots to ammo capacity

* Rename ammo multipier to ammo per item
 2024-05-03 14:11:23 -04:00
BlackDeluxeCat
bac6f7cfa9 Add logic filter (#7251) 
* logic filter

* bundles

* available in map editor

* @this = null

* generating only

* ensure not using net

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2024-04-25 10:23:13 -04:00
MEEPofFaith
6862e18cef Fix UI 2024-04-22 14:29:47 -07:00
MEEPofFaith
d21cab42a7 Mention soft dependencies on install but not startup 2024-04-22 14:13:55 -07:00
MEEPofFaith
b167bcfbef Check for dependencies when importing a mod 2024-04-22 09:17:28 -07:00
MEEPofFaith
e6b7d3f82e Fun fact: This bundle entry is unused 2024-04-18 21:56:11 -07:00
MEEPofFaith
250fb79fa3 "Auto-Import" instead of "Download"? 2024-04-16 17:57:05 -07:00
MEEPofFaith
e155bf7101 Cleaner feedback dialog 2024-04-16 17:55:55 -07:00
MEEPofFaith
5ac8abec0f Display feedback to user 2024-04-16 17:09:23 -07:00
MEEPofFaith
331fd2e803 Unmet dependencies dialog + auto import 2024-04-16 11:36:59 -07:00
Mythril382
64986a58e1 tooltip 2024-04-12 21:55:47 +08:00
ApsZoldat
a8135aa042 Custom rules dialog enhancement, small fixes (#9665) 
* Rule categories and search in custom rules dialog

* Fix wrong info about format placeholders in all unfinished locales

* Rule search fix, rule info system, some stuff for easier rules dialog modding

* Why not to fix what i can?
 2024-04-11 17:56:34 -04:00
Anuken
11c1211d65 Fixed #9722 2024-04-07 20:54:01 -04:00
Anuken
7bec60de12 Fixed snow name 2024-04-05 21:00:37 -04:00
Anuken
a8588c38b4 Fixed #9687 2024-03-30 14:22:22 -04:00
MEEPofFaith
2fb5bc56c6 Better Ability Stats (#9654) 
* Fix armor plate multiplier + change Math.round to Strings.autoFixed

* Missing ability name bundles

* Center ability name

* SuppressionFieldAbility stats

* Is two per row is acceptable?

I can revert this commit if not.

* LiquidExplodeAbility stat display

* MoveLightningAbility stat display

* Better SpawnDeathAbility display

* Fix multiplier coloring inconsistencies

Some had [lightgray] before %/x, some had it after

* Consistent content name display

Match with bullet status effects

* Consistent stat formatting

Convert from some being "stat: #" and some being "# stat" to all being "# stat"

* Re-order stats

* Optimize Imports

* Add ability descriptions

* Apparently I forgot LiquidRegenAbility

* Mention healing allies if displayHeal = true
 2024-03-30 00:11:39 -04:00
MEEPofFaith
1cd3b49539 Remove unused bundle 2024-03-29 17:48:15 -07:00
MEEPofFaith
d8c1ea17e1 Make payload blocks run onDestroyed() of the block payload it carries when destroyed. (#8253) 
* Payloads go boom.

* When a payload unit dies too

* Keep the functionality, but limit it to a rule
 2024-03-29 15:17:19 -04:00
MEEPofFaith
24b845e8b1 Notice of explosiveness 
I feel like my changes are getting a *bit* intrusive.
 2024-03-15 09:25:10 -07:00
MEEPofFaith
e96e312693 Merge branch 'master' into power-gen-stats 2024-03-15 08:36:13 -07:00
MEEPofFaith
60c6e03d32 Weather with World Logic (#9621) 
* Weather sense

Honestly, doesn't seem game changing enough to warrant privileged restriction.

* Weather set

* Rename "snow" to "snowing"

Fix conflict with the snow floor block, though I don't know if this'll have negative repercussions on saves.

* Don't last forever

* Cleanup and bundle

* add space
 2024-03-14 14:25:03 -04:00
MEEPofFaith
3e68285940 Better display for efficiency multiplier consumes 2024-03-10 12:59:00 -07:00
Anuken
9bedc0bcd4 Added world switch to bundle 2024-03-02 22:49:54 -05:00
Anuken
d8a66b7b25 Bundle change for #9591 2024-02-24 12:31:06 -05:00
SITUVNgcd
d79a306970 Gammar & context fix (#9559) 
- `lglobal.@clientMobile = True is ...` => `lglobal.@clientMobile = True if ...`
- `lenum.colori = Indexed position, ...` => `lenum.colori = Indexed color, ...`
 2024-02-16 09:52:41 -05:00
Anuken
2fd92b8c80 Processor global variable dialog 2024-02-09 18:09:41 -05:00
ApsZoldat
999a63c5f4 Minor fixes (#9467) 
* Minor fixes

* Change javadoc for statusSpeed()

* 🧠🔨
 2024-01-31 16:12:49 -05:00
Redstonneur1256
6a429184aa update markers (#9506) 
* update markers

* update markers & minimap rendering
 2024-01-30 19:35:39 -05:00
Anuken
1d894bdacd Objective marker cleanup & optimization 2024-01-14 12:41:20 -05:00
Anuken
84add050a9 Merge branch 'markers-update' of https://github.com/ApsZoldat/Mindustry into ApsZoldat-markers-update 2024-01-14 11:41:36 -05:00
Anuken
a4c137b6b8 Fixed #9452 2024-01-13 12:20:14 -05:00
Anuken
2191c89fe3 Fixed #9438 2024-01-07 08:52:35 -05:00
Anuken
61945e5ce7 Clearer sector capture notification 2024-01-05 08:22:12 -05:00
Anuken
33178c1635 Added launch hint for Erekir 2023-12-29 09:48:05 -05:00
ApsZoldat
5830259e41 Markers draw code refactor, minor text marker control changes 2023-12-12 22:40:33 +03:00
ApsZoldat
4802076bf8 WIP marker changes, fix server name not appearing for saved hosts in join dialog 2023-12-10 22:44:30 +03:00
ApsZoldat
2b0a6a6f97 Merge branch 'master' of https://github.com/Anuken/Mindustry into markers-update 2023-12-07 18:26:55 +03:00