mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-19 16:57:15 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,253 Commits 4 Branches 160 Tags 2.3 GiB
6a8ae5c24e
Commit Graph

12896 Commits

Author SHA1 Message Date
Epowerj
6a8ae5c24e Progress on stronghold 2022-09-16 12:46:29 -04:00
Epowerj
ef4038c63c Progress on stronghold 2022-09-14 20:31:30 -04:00
Epowerj
89ad8c1ea6 Progress on stronghold 2022-09-14 20:16:00 -04:00
Epowerj
cafe006860 Added stronghold WiP 2022-09-14 19:51:49 -04:00
Anuken
ad858c74ad Merge remote-tracking branch 'origin/master' 2022-09-14 19:39:14 -04:00
Anuken
bbb612d3cc Added missing Erekir tech to tree 2022-09-14 19:39:09 -04:00
Даркнесс#3729
8a50aa931b
Why it uses name instead of id? (#7562) 2022-09-14 18:26:15 -04:00
MEEPofFaith
918eb1bafe
Fix ContinuousLiquidTurret not changing bullets when changing liquids. (#7561) 
* Wrong liquid, don't keep bullet alive.

* Better transition

* Annihilate unnecessary code duplication

* Further reduce duplicated code

* Unnecessary imports
 2022-09-14 10:50:23 -04:00
Anuken
38d96a26f3 Random attempts to fix Android game freeze 2022-09-14 10:28:18 -04:00
Anuken
9e2b7a060f Merge remote-tracking branch 'origin/master' 2022-09-14 07:56:55 -04:00
Anuken
8c0b03b17a Fixed wrapping issue 2022-09-14 07:56:49 -04:00
NotFinboror
662e9c5dbb
Translations and fixes of grammatical errors (#7568) 2022-09-14 07:30:27 -04:00
Anuken
bf8ebb773e Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-09-12 19:47:58 -04:00
Anuken
a45c0f4a42 Added crystalline stone vent variant 2022-09-12 19:47:54 -04:00
MEEPofFaith
cd6332900b
Fix things being detached from mech sway. (#7480) 2022-09-12 09:59:18 -04:00
MEEPofFaith
7189be69b0
killShooter + shootOnDeath Causes Double Firing (#7524) 
* Store building pos instead of start pos

Fix an explosion hitting the same building multiple times if it's larger than 1x1.

* Increment total shots before spawning bullet

Fixes `killShooter` triggering the `shootOnDeath` shot.

* Revert "Store building pos instead of start pos"

This reverts commit bfd04e2683.
 2022-09-12 09:41:43 -04:00
Epowerj
f968a8689c Cleaning up caldera 2022-09-10 16:53:59 -04:00
Anuken
77ddbd027a Misc bugfixes and tweaks 2022-09-10 15:49:58 -04:00
Anuken
b2e960a038 Minor smooth movement tweak 2022-09-10 15:06:20 -04:00
Anuken
421d27c50c Merge remote-tracking branch 'origin/master' 2022-09-10 15:02:59 -04:00
Anuken
abb92350c0 Fixed strange smooth movement of fast ground units 2022-09-10 15:02:55 -04:00
Github Actions
e279ac269b Automatic bundle update 2022-09-09 22:09:40 +00:00
AB
6c9108f370
Update bundle_pt_BR.properties (#7535) 
* Update bundle_pt_BR.properties

[Portuguese] Avisos: Evitei a tradução da parte de logic, nomes de unidades e torretas. Muitas das traduções foram adaptadas, pois de forma literal ficava estranho e "feio". 
Tradução feita e revisada durante uns 5 ou 6 dias.
Caso você encontre erros, me avise no discord: ABÊ#8931
[English] Disclaimer: I avoided translating the logic part, unit and turrets names. Many of the translations were adapted, because the literal way was strange and "ugly". 
Translation done and revised during 5 or 6 days.
If you find errors, let me know at discord: ABÊ#8931

* Update bundle_pt_BR.properties
 2022-09-09 18:08:36 -04:00
Anuken
3acb449205 #7521 with len checks 2022-09-09 18:07:52 -04:00
Anuken
979509acce Merge remote-tracking branch 'origin/master' 2022-09-09 14:28:45 -04:00
Anuken
f3002ef7c1 Fixed #7536 2022-09-09 14:28:36 -04:00
MEEPofFaith
2f5f984416
Make missile units not be affected by map border. (#7530) 
* Unbounded units

* Unbound missiles
 2022-09-08 12:58:29 -04:00
MEEPofFaith
b7e8c211f7
Countdowns on other objectives. (#7528) 
* Destroy units objective countdown

* Countdown on other objectives
 2022-09-07 22:50:06 -04:00
Github Actions
4410e90b9e Automatic bundle update 2022-09-07 22:55:23 +00:00
MEEPofFaith
31149c08ea
More control over wave sending (#7442) 
* Wave send rule

* Send natural wave command

* Use a boolean

* boolean selection

* Revert "boolean selection"

This reverts commit 01e7a8f0e0.

* Natural wave last

* I don't see why it wouldn't
 2022-09-07 18:54:26 -04:00
Anuken
687bc11e54 Merge remote-tracking branch 'origin/master' 2022-09-07 08:56:45 -04:00
Anuken
51d4853351 Fixed #7525 2022-09-07 08:56:41 -04:00
WayZer
5c1e3a2862
Add WorldBeforeLoadEvent and WorldEndLoadEvent (#7523) 
* Add `WorldBeforeLoadEvent` and `WorldEndLoadEvent`

* rename
 2022-09-07 08:24:31 -04:00
Anuken
67552add78 Fixed #7526 2022-09-07 08:09:04 -04:00
Anuken
6d2251c52d Merge remote-tracking branch 'origin/master' 2022-09-06 00:05:56 -04:00
Anuken
90fe7b75d1 CommandAI counter-attack timer 2022-09-06 00:05:49 -04:00
JniTrRny
ffb3535f56
Generation quick copy & paste (#7520) 
* several UI changes

* block ID bad
 2022-09-05 14:59:21 -04:00
Epowerj
aa9ff44a61 Tweaks to caldera 2022-09-05 14:13:35 -04:00
xStaBUx
c437a98b40
Copied. (#7519) 2022-09-05 13:38:05 -04:00
Epowerj
b93be10e43 Tweaks to caldera 2022-09-04 22:00:58 -04:00
Epowerj
48e5846587 Tweaked research costs 2022-09-04 21:19:09 -04:00
Github Actions
13ff9a035a Automatic bundle update 2022-09-04 20:33:05 +00:00
Anuken
6a79421040 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-09-04 16:32:16 -04:00
Anuken
08d5ca1912 Removed shield breaker block 2022-09-04 16:32:13 -04:00
Joan Josep
f8580d29fc
Update bundle_ca.properties (#7514) 2022-09-04 11:52:52 -04:00
Anuken
1f4372ebc7 Don't allow mixtech in new maps 2022-09-03 11:00:01 -04:00
Anuken
b48053cda4 ClassMap update 2022-09-03 07:57:06 -04:00
Anuken
1748753a20 Fixed #7508 2022-09-03 07:46:18 -04:00
Anuken
ed1819fda1 Merge remote-tracking branch 'origin/master' 2022-09-02 17:15:24 -04:00
Anuken
80774820dc More unit cargo loader capacity 2022-09-02 17:15:20 -04:00