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

12766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darkness#3729
4ed471f77b Change server port (#6105) 
:-/
 2021-10-05 13:42:06 -04:00
maxutka99
373c73f492 Update servers_v7.json (#6079) 
* Update servers_v7.json

* Update servers_v7.json

* Update servers_v7.json
 2021-10-05 13:00:11 -04:00
Matthew Peng
bc3da30d45 Allow for dynamic laser absorption and insulation (#5047) 
* Allow for dynamic laser absorption

* Might as well do insulated as well

* null checks are important
 2021-10-05 12:36:29 -04:00
Anuken
56fe1bfa68 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-10-05 12:08:58 -04:00
Fatonndev
77736f227f New domain name (#6076) 
* new domain name

* moved to new domain
 2021-10-04 14:39:55 -04:00
way-zer
6d49bd39be Fix #5702 (#6098) 2021-10-04 09:21:02 -04:00
Anuken
0d0fe394d3 Serpulo water tweaks 2021-10-03 13:12:20 -04:00
Anuken
aed57aaac3 Added InputHandler lock system 2021-10-03 11:21:53 -04:00
Anuken
b20cdb97c5 Reset chat font cache color 2021-10-02 13:01:54 -04:00
Anuken
d95662233c Fixed #6090 2021-10-02 12:05:02 -04:00
Anuken
ce7e91f17b Merge remote-tracking branch 'origin/master' 2021-10-02 08:42:12 -04:00
Anuken
db6b8abce6 Fixed #6089 2021-10-02 08:42:07 -04:00
Anuken
8c685eaedb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-10-01 19:01:52 -04:00
Vajda Simon
3e2da3595f Update servers_v6.json (#6084) 2021-10-01 13:47:32 -04:00
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