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

1314 Commits

Author SHA1 Message Date
Anuken
b1f5219b04 what on earth is wrong with jitpack this time 2022-09-19 10:59:41 -04:00
Anuken
cbd38003b1 Added initial campaign selection dialog 2022-09-18 23:33:47 -04:00
Anuken
a0535395eb Unlinked global items of Serpulo and Erekir 2022-09-15 17:06:35 -04:00
Anuken
a45c0f4a42 Added crystalline stone vent variant 2022-09-12 19:47:54 -04:00
Epowerj
f968a8689c Cleaning up caldera 2022-09-10 16:53:59 -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
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
08d5ca1912 Removed shield breaker block 2022-09-04 16:32:13 -04:00
Epowerj
5810e308d4 Fixed bundle names for caldera 2022-09-01 20:55:54 -04:00
Mythril382
e8ec1c51f4 shielded wall description (#7492) 2022-08-31 22:11:18 -04:00
Epowerj
72db5ff9f7 Added caldera to bundles 2022-08-31 18:56:00 -04:00
Anuken
8f4251db3a Merge remote-tracking branch 'origin/master' 2022-08-30 21:17:44 -04:00
Anuken
4cd78aad91 Fixed #7484 2022-08-30 21:17:39 -04:00
Epowerj
a0cc74891a Merge branch 'map1' 2022-08-30 15:53:09 -04:00
Cryofluid
4902c525fc Update bundle.properties (#7482) 2022-08-30 06:46:54 -04:00
Epowerj
76997f8d47 typo 2022-08-29 17:49:03 -04:00
Epowerj
697e6d503f Added ravine to campaign list 2022-08-29 17:44:19 -04:00
ThatOneBepis
424b0ed5d7 as per usual 2022-08-29 22:48:15 +02:00
Anuken
0d3c27dd59 Minor bundle tweaks 2022-08-29 14:26:29 -04:00
Anuken
07781f685d Heat wording changing 2022-08-29 13:37:49 -04:00
Anuken
74697a389c Updated bundles with new descriptions 2022-08-29 12:23:44 -04:00
Anuken
d7f4b15d3d WIP descriptions 2022-08-29 12:08:12 -04:00
Anuken
2f45bb596b Merge remote-tracking branch 'origin/master' 2022-08-27 19:46:00 -04:00
Anuken
ff3a1c23c2 Removed unmerged PR leftovers for now 2022-08-27 19:45:56 -04:00
MEEPofFaith
cf0c7ff2d8 "Arkycite Floor" -> "Arkycite" (#7462) 2022-08-27 19:44:33 -04:00
Anuken
8453c52353 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-27 19:39:58 -04:00
Anuken
2a062b96ec Changed internal name of sand 2022-08-27 19:39:53 -04:00
Epowerj
9fd340d219 Tweaks to basin description 2022-08-26 12:31:42 -04:00
Anuken
69a7354468 Names for hidden Neoplasm units 2022-08-24 13:47:42 -04:00
Anuken
eb01f0ed4a Unit descriptions + Cleanup (Based on #7066) 2022-08-24 10:38:15 -04:00
Phinner
4030acbd75 Allow servers to send openable links to players (#7351) 
* commitin'

* Update core/assets/bundles/bundle.properties

Co-authored-by: Anuken <arnukren@gmail.com>

* Update bundle_fr.properties

* s p a c e

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-13 13:52:46 -04:00
Anuken
06e08c1074 Compact player list 2022-08-11 12:06:14 -04:00
Luna
e28dbfad69 Community server search (#7305) 
* basic community server search

* normalise capitalisation

* localise "Search:"
 2022-08-11 11:36:10 -04:00
Anuken
a54907583b Neoplasia reactor 2022-08-02 21:26:15 -04:00
Anuken
2bc000f53c WIP flux reactor 2022-08-01 20:28:07 -04:00
Anuken
55edd53f84 WIP command order system 2022-07-30 21:01:07 -04:00
Catchears
224cc80b59 update heat source description to match other sources (#7230) 
* update heat source description to match other sources

* correct to large amounts of heat
 2022-07-28 09:39:30 -04:00
RTOmega
9a3a6c31b3 Adding Block: Heat Source (#6855) 
* Update Blocks.java

* ,

* Update Blocks.java

* Add files via upload

* Delete 5618F7BA-F0D0-4FFF-AE6A-185BFEA99F16.png

* Add files via upload

* Add files via upload

* Add files via upload

* Update Blocks.java

* Bundle

* 1m to 10k

* Update bundle.properties

* TR

* 10k to 1k

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-07-22 13:59:32 -04:00
Anuken
a6ae178b46 Misc minor fixes 2022-07-18 22:14:53 -04:00
Anuken
494440a591 Fixed incorrect 'command mode' hint on mobile 2022-07-17 20:35:49 -04:00
Anuken
2ec1f9f55d typo 2022-07-15 19:28:35 -04:00
Anuken
8d6cac39d0 Fixed #7178 / Maps renamed 2022-07-15 19:26:23 -04:00
GlennFolker
695c19d0b0 Tree-like objective node structure (#7152) 
* overall structure

* overall layout

* field interpreter

* less bloated UI

* scroll pan't

* strip off the 'Marker' suffix

* e

* all (hopefully all...) interpreters finished.

* onset

* two, four

* i don't understand how icon mappings work.

* separate remover and indexer

* some cleanups

* untested mobile support

* contrib

* ok anuke

* fix conflicts 2

* hidden
 2022-07-15 10:41:18 -04:00
Epowerj
6aa9623512 Added a temporary description for four 2022-07-14 15:44:32 -04:00
Epowerj
43416f90e5 Added description to split 2022-07-14 14:50:00 -04:00
Epowerj
4812ff47c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 18:39:06 -04:00
Anuken
72b36d97bd RTS max squad size 2022-07-11 18:18:22 -04:00
Epowerj
7aea85668b forgot period lol 2022-07-11 17:15:11 -04:00
Epowerj
9413a399cd Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 
 Conflicts:
	core/assets/bundles/bundle_fi.properties
	core/assets/bundles/bundle_th.properties
 2022-07-11 17:14:39 -04:00