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

1061 Commits

Author SHA1 Message Date
Anuken
a04e8f87a9 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-15 17:10:30 -04:00
Anuken
7a94af5e82 drag multiplier 2021-10-15 17:10:24 -04:00
Anuken
f683496440 cleanup 2021-10-15 17:04:34 -04:00
Anuken
176343e862 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-15 14:24:48 -04:00
Anuken
816ab161df Make Unit type default to Alpha 2021-10-15 12:07:07 -04:00
Anuken
6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
Anuken
082edbff6f Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	tools/src/mindustry/tools/Generators.java
 2021-10-14 19:15:59 -04:00
Ilya246
095cc27ea6 Add shootOnDeath to weapons (#6149) 
* Update Weapon.java

* Add files via upload
 2021-10-14 09:50:57 -04:00
Anuken
4a4b336814 Added logic payEnter command 2021-10-13 10:18:34 -04:00
Anuken
44c47586a7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-12 12:36:20 -04:00
Anuken
c60bd6f0dc Customizable chat formatting (Closes #5387) 2021-10-10 12:37:07 -04:00
Anuken
19b881561f slurp 2021-10-05 21:46:41 -04:00
Anuken
785ba7910d Merge remote-tracking branch 'origin/master' 2021-10-05 17:06:17 -04:00
Anuken
3030308f09 Make naval units only slow down on "shallow" water 2021-10-05 17:06:09 -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
way-zer
6d49bd39be Fix #5702 (#6098) 2021-10-04 09:21:02 -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
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
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
c814ef0012 Slightly increased item charge damage 2021-09-27 21:11:21 -04:00
Matthew Peng
2f9bf6e13f collideTerrain (#6059) 
* collideTerrain

* Combine code
 2021-09-27 15:11:36 -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
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
Anuken
d13c7a959f Added LiquidExplodeAbility 2021-09-25 09:31:03 -04:00
Anuken
096826a36f Ability death listener 2021-09-24 21:27:21 -04:00
Anuken
de7dfc75f9 Neoplasm regen ability 2021-09-23 17:34:19 -04:00
Matthew Peng
4886ee35e9 Status Field Effect X/Y (#6009) 
* Status Field Effect X/Y

* h

* aaaaaaaaaaaaaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 2021-09-20 09:32:30 -04:00
Anuken
bd8b0c985a Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-20 09:19:16 -04:00
Anuken
9dfb5888ec Fixed shields not capping properly 2021-09-18 20:39:43 -04:00
Anuken
3f996cf294 Better bullet range calc 2021-09-18 14:32:57 -04:00
Anuken
c9fa7356c2 Asteroid background improvements 2021-09-16 12:40:35 -04:00
Anuken
a8fd047cd6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-16 10:23:31 -04:00
Anuken
e3cceea1af Re-trying JITPack 2021-09-15 22:30:53 -04:00
Anuken
e86171e3c7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-15 20:51:57 -04:00
Anuken
95c3476144 Fixed #6001 2021-09-14 21:28:34 -04:00
Anuken
ba0892fdcb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-13 20:52:41 -04:00
JrTRinny
d33a4f9f87 More Target varieties for energy field ability (#5828) 
* more targets for energy field ability

* group booleans
 2021-09-12 14:55:26 -04:00
Anuken
a1b9f7d1b3 Fixed #5979 2021-09-12 09:05:18 -04:00
Anuken
08d7390775 Merge remote-tracking branch 'origin/master' 2021-09-09 17:05:00 -04:00
Anuken
cbe188abab Map editor bugfixes / Re-added build noise 2021-09-09 17:04:55 -04:00
Matthew Peng
abbc25798d Pull trail updating out into its own method (#5964) 2021-09-09 15:47:08 -04:00
Anuken
c98eb2edd7 Fixed #5958 2021-09-08 08:42:23 -04:00
Anuken
dd7062f0f7 ParticleEffect#sizeInterp / Log usable RAM 2021-09-07 22:32:27 -04:00
Anuken
227fb388b8 Update building consume module before main update 2021-09-05 11:18:31 -04:00
Anuken
259d0baeb6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-28 16:30:07 -04:00
Anuken
48d568978b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/mindustry/entities/Damage.java
 2021-08-28 14:17:29 -04:00
Anuken
9a7324ce54 Fixed #5887 2021-08-28 14:17:01 -04:00