Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,159 Commits 4 Branches 180 Tags
8c5f6bf171e194310cbd1b63d245a789b3be8059
Commit Graph
15159 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken f88ff59d49 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-21 20:44:12 -04:00
Anuken 2c28b206b8 Erekir turret SFX (of varying quality) 2022-08-21 20:44:07 -04:00
MEEPofFaithandGitHub 9811aa03ec Stay warmed up while charging (#7410) 
* Stay warmed up while charging

* Same with unit weapons

also add lenearWarmup
 2022-08-21 17:11:13 -04:00
MEEPofFaithandGitHub 1c3538321b acceptsPayload = true (PayloadAmmoTurret) (#7409) 2022-08-21 17:10:39 -04:00
MEEPofFaithandGitHub 11e3f85242 Fix more things that hit non-hittable units (#7408) 
* hittable check for EMP

* hittable check for Damage#status

* why push if don't get hit
 2022-08-21 17:09:47 -04:00
zenonetGitHubAnuken
 		dde9f895cf Added autoPause config for servers (#7405) 
* Extracted the method ServerControl.setPauseState()

* Added a comment to EventType.PlayerLeave

* Added the `pauseWithoutPlayers` config

* Revert "Extracted the method ServerControl.setPauseState()"

This reverts commit 45f5b01547.

* Renamed pauseWithoutPlayers to autoPause,
fixed manual- and automatic pausing to interfere
and made the server pause when hosting a new game

* Added a dot to the config description of `autoPause` and added my name to the contributors list

* Refactoring

* Merged remote-tracking changed I guess

* More refactoring

* More refactoring

* Removed logging about autoPause

* Removed another log I forgot in the last commit

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-21 10:32:58 -04:00
Rex AliisandGitHub 62a3f30755 Update contributors (#7406) 2022-08-21 10:31:41 -04:00
Anuken ae83779253 Merge remote-tracking branch 'origin/master' 2022-08-20 11:54:54 -04:00
Anuken c97a6b2f39 Fixed #7403 2022-08-20 11:54:49 -04:00
MEEPofFaithandGitHub 6ca54d4f6a Fix units that can't be hit being hit by some things. (#7391) 
* Hittable check in checkTarget

* Remove hittable() and checkTarget() overlap

* Make PointBulletType abide collision types

There should probably be a thing for jsonable `buildingFilter`s, in the case that you want something that doesn't target blocks.

* PointBulletTypes should not be reflectable

* oop

* Use targettable instead of hittable

* targetable check for Damage#linecast

* targetable check for defenderAI

* I shot, and then I hit something, but it was some invisible thing in the way, so I guess I missed
 2022-08-19 22:05:11 -04:00
Anuken b9e633a10e Merge remote-tracking branch 'origin/master' 2022-08-19 20:08:12 -04:00
Anuken a8900d28f9 Fixed #7401 2022-08-19 20:08:08 -04:00
Volas171andGitHub bec3de9d67 Omega Hub ServerList Change (#7398) 
* Update servers_v6.json

* Update servers_v7.json
 2022-08-19 16:51:58 -04:00
MEEPofFaithandGitHub 35923329a1 ParticleEffect line cap option (#7392) 2022-08-18 23:07:13 -04:00
Anuken 34674f2297 Merge remote-tracking branch 'origin/master' 2022-08-18 12:25:57 -04:00
Anuken 153b00fe40 Fixed #7390 2022-08-18 12:25:52 -04:00
BlackDeluxeCatandGitHub cc3f14100d Fixed reactor light (#7385) 
* Fixed nuclear reactor light

* .
 2022-08-17 21:05:01 -04:00
RTOmegaandGitHub 4630517d2d OmegaHub Event/Gamemode test server added (#7384) 2022-08-17 14:17:06 -04:00
Anuken ddc637eee6 Merge remote-tracking branch 'origin/master' 2022-08-17 10:34:39 -04:00
Anuken 43fae3b9e3 Fixed #7382 2022-08-17 10:34:34 -04:00
ManuWar73andGitHub 5a2ba71198 Spanish translation for v7: 2 try (#7378) 
Translated everything that isn't and should be translated
 2022-08-16 17:22:23 -04:00
Anuken b29b1bbda6 Merge remote-tracking branch 'origin/master' 2022-08-16 09:13:27 -04:00
Anuken a7f939de4c Misc balance 2022-08-16 09:13:22 -04:00
RTOmegaandGitHub 91f99572ed AAS Moved to V7 (#7377) 
* AAS Moved to v7

* Update servers_v7.json
 2022-08-16 07:40:08 -04:00
Anuken f9ba1c3e04 Merge remote-tracking branch 'origin/master' 2022-08-16 07:24:00 -04:00
Anuken a8b8028835 Hide Erekir resources on Serpulo loadout 2022-08-16 07:23:55 -04:00
Github Actions b312459b6f Automatic bundle update 2022-08-16 02:35:09 +00:00
Angel-24GitHubAnuken
 		dff0a8294e Update bundle_es.properties (#7191) 
* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

I just realized the line which said "Don't translate them yet!"

* Update bundle_es.properties

* Update bundle_es.properties

* typo

* "Blast drill" => "Taladro de voladura"

@Vdoble's reported an issue related to a duplicated block name.

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-15 22:33:31 -04:00
Github Actions 03accce8f2 Automatic bundle update 2022-08-15 21:43:21 +00:00
彭瑞暄andGitHub 1f57332091 Update bundle_zh_TW.properties (#7360) 
lcategory pending
 2022-08-15 17:41:46 -04:00
Thomas WidyantokoandGitHub 287ccf7e84 Update bundle_id_ID.properties (#7361) 
openable links, search function, viewing player
 2022-08-15 17:41:37 -04:00
Joan JosepandGitHub fd70598476 Update bundle_ca.properties (#7375) 2022-08-15 17:41:14 -04:00
Anuken ec8e48f3f5 Metaglass cyclone buff 2022-08-15 17:14:14 -04:00
SkatandGitHub 9e9ef56fdc Exclude player caller from packet's fields (#7368) 2022-08-15 07:25:12 -04:00
K0baUandGitHub fe1d81b4d5 Update bundle_ja.properties (#7369) 
* Update bundle_ja.properties

* Update bundle_ja.properties
 2022-08-15 06:59:37 -04:00
BlackDeluxeCatandGitHub 6842daf8fb Fixed duct unloader works with core-linked storage (#7367) 2022-08-15 06:59:11 -04:00
Anuken b88b5fa32a Merge remote-tracking branch 'origin/master' 2022-08-14 15:40:01 -04:00
Anuken f15a620c45 Allow neoplasm on water/arkycite/etc 2022-08-14 15:39:56 -04:00
rodas80andGitHub 166fcce13d Update servers_v7.json (#7365) 2022-08-14 13:02:46 -04:00
rodas80andGitHub 185bfcd57f Update servers_v6.json (#7364) 2022-08-14 13:02:39 -04:00
Github Actions 522070be4b Automatic bundle update 2022-08-13 17:54:18 +00:00
PhinnerGitHubAnuken
 		4030acbd75 Allow servers to send openable links to players (#7351) 
* commitin'

* Update core/assets/bundles/bundle.properties

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

* Update bundle_fr.properties

* s p a c e

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-13 13:52:46 -04:00
Anuken 1f318306a7 Merge remote-tracking branch 'origin/master' 2022-08-13 10:56:24 -04:00
Anuken dbabb07528 Gradle 7.5.1 2022-08-13 10:56:19 -04:00
MEEPofFaithandGitHub 25388ffe5f Better Duplicate Op Support (json/hjson) + 1 more op (#7355) 
* Better support for duplicate ops

* 'Mathf.curve' op
 2022-08-13 06:52:46 -04:00
Volas171andGitHub f9748b2d69 V6 (#7354) 2022-08-13 06:52:20 -04:00
Volas171andGitHub e0dcd420c0 V7 (#7353) 2022-08-13 06:51:58 -04:00
Joan JosepandGitHub 8132e1f3aa Update bundle_ca.properties. Change verbal periphrases and apostrophe symbol. (#7332) 2022-08-12 10:46:08 -04:00
Github Actions 1d43e16261 Automatic bundle update 2022-08-12 11:44:46 +00:00
PhinnerandGitHub 935d096b26 French Translation: The return (#7086) 
* yes

* yes 2

* hortisquash and the seven translations

* smol fixes

* y e s
 2022-08-12 07:43:38 -04:00