Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,704 Commits 4 Branches 180 Tags
8be7e9a13fc79dec149356da446f3a06debf404c
Commit Graph

1454 Commits

Author SHA1 Message Date
Anuken
ef399d349c # Conflicts: 
#	core/src/mindustry/content/Blocks.java
 2021-10-14 19:17:50 -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
Anuken
ad1c75d050 WIP branch merging 2021-10-14 19:15:03 -04:00
Anuken
5e8a3137c1 FX cast cleanup 2021-10-12 18:25:37 -04:00
Anuken
90d589939a PR cleanup 2021-10-12 14:15:28 -04:00
Ilya246
21549d2518 Add new fx (#6136) 
* Update Fx.java

* Update Fx.java

* Update Fx.java

* Update NetClient.java

* Update Fx.java
 2021-10-12 14:14:51 -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
f5d6313399 Redundant effect paren cleanup 2021-10-09 12:54:20 -04:00
Anuken
19b881561f slurp 2021-10-05 21:46:41 -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
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
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
d226ffe633 Fixed #6071 2021-09-28 11:28:53 -04:00
Anuken
61a28aca91 Cryofluid floor tweaks 2021-09-27 15:07:10 -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
Anuken
a21942e401 Map dialog margin cleanup 2021-09-27 11:36:03 -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
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
Anuken
01f06cd0f7 NeoplasmUnitType 2021-09-22 18:04:21 -04:00
Anuken
61fa72dcd3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/graphics/g3d/PlanetRenderer.java
 2021-09-17 21:33:01 -04:00
Anuken
84935e1bb0 Fixed #6008 2021-09-16 21:25:31 -04:00
Anuken
76b0ca53c5 Fixed wall assignment 2021-09-16 15:48:08 -04:00
Anuken
c9fa7356c2 Asteroid background improvements 2021-09-16 12:40:35 -04:00
Anuken
ad425f322c Proper asteroid albedo 2021-09-16 10:33:15 -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
845b64945e "Realistic" specular planet lighting 2021-09-16 10:20:32 -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
Matthew Peng
4cb3bef1a7 Parentize Vela and Corvus shoot effects (#5997) 2021-09-14 14:24:19 -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
Anuken
35ffbef557 #5932 2021-09-12 11:07:18 -04:00
Anuken
2f7c5994a7 Fixed #5978 2021-09-11 15:43:24 -04:00
Anuken
caa34c959e More campaign map progress 2021-09-10 17:07:06 -04:00
Anuken
7c028ffcb8 Experimental positional spawn support / WIP map 2021-09-10 13:56:12 -04:00
Anuken
b2a634e5e7 Untested/WIP naval campaign map 2021-09-10 09:17:25 -04:00
itcannotbe
671098cc28 Add Build Cost Multiplier to Distributor (#5967) 
It just makes sense.
 2021-09-09 11:16:47 -04:00
Anuken
00eca00f11 space payloads 2021-09-05 19:04:04 -04:00
Anuken
dedfd8efd3 Cloud improvements 2021-09-05 11:10:36 -04:00
Anuken
9feedabf07 Serpulo clouds, now with 2 layers 2021-09-05 01:18:50 -04:00
Anuken
ed86f50a2f Serpulo clouds 2021-09-05 00:42:47 -04:00
Anuken
393d3a19a3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/world/meta/StatValues.java
 2021-09-04 23:12:28 -04:00
SoMall-dumpling
f20b9c828c Update Blocks.java (#5939) 
simplest integer ratio
 2021-09-04 22:30:07 -04:00
Anuken
23d0dfe6bf Deprecated DoubleOverlayFloor 2021-09-04 16:29:14 -04:00
Anuken
24b0f445b8 Added rivers on Serpulo / Added deep tainted water 2021-09-04 15:23:47 -04:00
Anuken
dddb282ce3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2021-09-04 12:26:07 -04:00
Matthew Peng
b004146015 Input liquid drawing for DrawLiquid and DrawMixer (#5906) 2021-09-04 10:18:44 -04:00
Anuken
c6873a72f6 a 2021-08-28 20:46:54 -04:00