mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-21 01:37:13 +07:00
Code Issues Packages Projects Releases Wiki Activity
12,852 Commits 4 Branches 160 Tags 2.3 GiB
705c85281c
Commit Graph

12852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
60fe1e5570 arc 2021-10-01 12:10:50 -04:00
Anuken
67ed6ddd18 arc 2021-10-01 09:44:45 -04:00
Anuken
b2cd4e8ec0 resizeCheck fix 2021-10-01 09:43:20 -04:00
Anuken
10b8a6e4a5 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/type/UnitType.java
 2021-10-01 09:41:33 -04:00
Anuken
b265ddac03 Don't suggest changing the mod disable option 2021-10-01 09:28:23 -04:00
Anuken
ee26f51d7a Cleanup 2021-09-30 18:32:31 -04:00
Anuken
0483e3f900 Serpulo naval wave support 2021-09-30 18:22:50 -04:00
Anuken
9939d6065a Merge remote-tracking branch 'origin/master' 2021-09-30 17:33:23 -04:00
Anuken
c226127648 Display jump statement destination 2021-09-30 17:33:17 -04:00
Matthew Peng
e0b1c49e0b
Fix weapon recoiling (#6083) 
Weapons recoil when the begin charging
 2021-09-30 17:01:24 -04:00
Yuri Polyakov
558fb26dcb
Update bundle_ru.properties (#6078) 
б
 2021-09-30 13:03:28 -04:00
buthed010203
78a4572388
Add "infotable" name to hudfrag (#6082) 
In another attempt to make my client more compatible with mods, I am adding this so it can be found by name rather than by index
 2021-09-30 13:01:52 -04:00
Anuken
6f6590d5bb chargeShootEffect / Effect startDelay 2021-09-29 22:39:33 -04:00
EyeOfDarkness
efb9df7b1b
Recoil Time and Improved Alternating (#6073) 
* Revamped recoil, and improved alternating

* i might have to make this more complicated later

* hhhhhhhhh

* proper description.
 2021-09-29 19:35:47 -04:00
Matthew Peng
a04b385f56
Fix spread + burst turrets (#6069) 
* Fix spread + burst turrets

* spread is 4 by default

set salvo spread to 0

* damnit
 2021-09-29 08:38:51 -04:00
Fernando
01d6aee754
Add MindustryBR network (#6074) 
Come to Brazil
 2021-09-28 20:43:40 -04:00
Anuken
603c871e6e apparently the --illegal-access flag is still needed 2021-09-28 18:52:48 -04:00
Anuken
5f3cef251b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/logicids.dat
	core/src/mindustry/content/Blocks.java
	gradle.properties
 2021-09-28 18:45:09 -04:00
Anuken
71543f2ab2 Improved Serpulo water edge generation 2021-09-28 17:20:20 -04:00
Anuken
7f415588f4 Cleaned up duplicate SettingsMenuDialog code 2021-09-28 14:41:35 -04:00
Anuken
c6c374f672 Merge remote-tracking branch 'origin/master' 2021-09-28 11:28:58 -04:00
Anuken
d226ffe633 Fixed #6071 2021-09-28 11:28:53 -04:00
Matthew Peng
182dfc5f38
delta in reload for a LaserTurret isn't properly calculated (#6068) 2021-09-28 08:41:40 -04:00
TranquillyUnpleasant
366822e4d1
Remove unused variable (#6063) 
This got leftover from some other shader testing I did.
 2021-09-27 22:25:22 -04:00
Anuken
8f53822a6e Merge remote-tracking branch 'origin/master' 2021-09-27 21:11:25 -04:00
Anuken
c814ef0012 Slightly increased item charge damage 2021-09-27 21:11:21 -04:00
SoMall-dumpling
30e6bb2625
Retusa Description Change (#6061) 
Now that Retusa has been remaked, the description needs to be changed too.
 2021-09-27 19:11:48 -04:00
Anuken
f5a0528c73 Merge remote-tracking branch 'origin/master' 2021-09-27 19:02:10 -04:00
Anuken
f5a2ed900d Make hint.presetLaunch more likely to show up 2021-09-27 19:02:06 -04:00
Matthew Peng
2f9bf6e13f
collideTerrain (#6059) 
* collideTerrain

* Combine code
 2021-09-27 15:11:36 -04:00
Anuken
13b92519f1 Added missing revision 2021-09-27 15:07:34 -04:00
Anuken
61a28aca91 Cryofluid floor tweaks 2021-09-27 15:07:10 -04:00
Anuken
7c00b54191 hgdf 2021-09-27 14:51:50 -04:00
TranquillyUnpleasant
dbd31b9031
Cryo tiles (#6054) 
* Cryo tile

* tile name

* Shader

* Icon and property
 2021-09-27 14:46:28 -04:00
Matthew Peng
083c21ea3f
Effect Rotate With Parent (#5999) 
* Effect Rotate With Parent

* Use Rotc

* Wording

* Base Rotation

* Rotate effect rotation with parent.
 2021-09-27 11:55:56 -04:00
buthed010203
6fb7f4fe26
At least add a fastAA property (#6058) 
Since my other pr will never get merged, i will at least add this so i can use it myself
 2021-09-27 11:55:34 -04:00
Anuken
a21942e401 Map dialog margin cleanup 2021-09-27 11:36:03 -04:00
TranquillyUnpleasant
bf89ef1e5e
Map search (#6004) 
* Map search

* Fix format

* check and continue

* icons and style

* grow pane so search bar doesnt move

* Inline focusing

* Use boolean instead of checking size
 2021-09-27 11:33:12 -04:00
Anuken
2d2052e39f "ok" 2021-09-27 11:00:33 -04:00
Anuken
7bf85d9f84 Merge remote-tracking branch 'origin/master' 2021-09-27 09:18:53 -04:00
Anuken
ed1557b5ac Implemented Anuken/Mindustry-Suggestions/issues/3026 2021-09-27 09:18:46 -04:00
Anuken
8a3d46b4a7 a 2021-09-27 08:58:22 -04:00
Pietro
5e0f404602
row mod content dialog in mobile (#6051) 
* Row mod content dialog in mobile

It's as simple as `Math.floor()`

* type casting

(int)
 2021-09-26 11:40:15 -04:00
Misaka
0185f8bc5a
shizashizashiza epic comeback (#6050) 
No description provided.
 2021-09-26 08:33:05 -04:00
Matthew Peng
94d9ca4727
Pull creating and dumping products out into their own methods (#6047) 2021-09-26 08:31:21 -04:00
Anuken
d13c7a959f Added LiquidExplodeAbility 2021-09-25 09:31:03 -04:00
Darkness#3729
d79ab3ec3e
Make thruster cost some scrap (#6045) 2021-09-25 08:50:20 -04:00
Matthew Peng
50cc340b20
Customizable Block Place Sound (#6043) 2021-09-24 21:28:20 -04:00
Anuken
096826a36f Ability death listener 2021-09-24 21:27:21 -04:00
Anuken
dac17aa2b7 Merge remote-tracking branch 'origin/master' 2021-09-23 19:44:46 -04:00