mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-11 07:39:39 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,457 Commits 4 Branches 160 Tags 2.1 GiB
83a3195e34
Commit Graph

4669 Commits

Author SHA1 Message Date
Anuken
cc7aaae52c Fixed inverted sorter chains 2019-11-19 19:16:35 -05:00
Anuken
4ce494cc22 Merge remote-tracking branch 'origin/master' 2019-11-19 19:08:52 -05:00
Anuken
9461d7a360 Hjson unit tests 2019-11-19 19:08:41 -05:00
Prosta4okua
50854a55f0 Pr/10 (#1095) 
* :flag_ua:

* 🇺🇦

* ЇїЇ

* 30.10.2019

* Упс.

* 1

* 06.11.2019

* lol

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2019-11-19 17:35:37 -05:00
Patrick 'Quezler' Mounier
d03ec3122c Add toggle_power_lines entry to the bundle (#1099) 2019-11-19 12:45:27 -05:00
Patrick 'Quezler' Mounier
dd13c305e7 Make offline force projector use no boost (#1092) 
Mimiced check in the mending & overdrive projector.
 2019-11-19 09:03:42 -05:00
Patrick 'Quezler' Mounier
48911005aa Fix placing a diode on the world border (#1094) 
* Fix placing a diode on the world border

* 〃
 2019-11-19 08:40:44 -05:00
Patrick 'Quezler' Mounier
7955b82b1e Add weave layer to phase 〃 icon (#1091) 
Makes the block more recognizable in the build menu.
 2019-11-19 08:13:43 -05:00
Arkanic
9bfaecf760 slightly reduced cooldown between votekick (#1056) 2019-11-18 20:08:56 -05:00
Anuken
39939f8a51 Merge https://github.com/joshuaptfan/Mindustry 
# Conflicts:
#	core/assets/bundles/bundle.properties
#	core/src/io/anuke/mindustry/content/Blocks.java
#	core/src/io/anuke/mindustry/input/Binding.java
 2019-11-18 19:40:45 -05:00
Anuken
7e5c276e7f
Update PlacementFragment.java 2019-11-18 19:21:43 -05:00
Anuken
7e8503cde7 Merge remote-tracking branch 'origin/master' 2019-11-18 18:56:54 -05:00
Anuken
134fea445c Custom map providers / Added next map specification command 2019-11-18 18:56:49 -05:00
YFdyh000
3a3548dd63 Update bundle_zh_CN.properties (#1081) 2019-11-18 17:30:56 -05:00
Ali-C-Ila
0ef27354be Update bundle_zh_TW.properties (#1085) 
plated conduit
 2019-11-18 17:01:02 -05:00
Anuken
ad25cd8074 Illuminator description 2019-11-18 17:00:52 -05:00
Anuken
6bc98bbe67 Configurable lights 2019-11-18 16:58:39 -05:00
Anuken
5e2dd89d3b Entity type cleanup 2019-11-18 16:24:57 -05:00
Patrick 'Quezler' Mounier
7830372477 Beep boop add f-droid (#1087) 
Full credit to @ZacBytes for the initial implementation.
 2019-11-18 15:52:44 -05:00
Anuken
425f63c673
Update Blocks.java 2019-11-18 12:43:04 -05:00
Anuken
7523f20d85
Update BuildVisibility.java 2019-11-18 12:40:03 -05:00
Anuken
dcb1f0b00a Merge remote-tracking branch 'origin/master' 2019-11-18 00:55:49 -05:00
Anuken
9b732017a9 Added contribution guide 2019-11-18 00:55:33 -05:00
Ali-C-Ila
fd94f8f24b Update bundle_zh_TW.properties (#1066) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

Illuminati and nuke donkey!

* Update bundle_zh_TW.properties
 2019-11-17 15:51:52 -05:00
Clauskem
814b7458ec Added some extra translations (#1078) 2019-11-17 15:51:45 -05:00
Anuken
dc1b073882 Revert #961 2019-11-17 15:45:47 -05:00
Anuken
fad6fe9a2a Added armored conduit / Lighting improvements / Moved liquid package 2019-11-17 13:51:36 -05:00
Anuken
c8eee3b825 Made solar panels less efficient in darkness 2019-11-17 11:35:32 -05:00
Anuken
2593e96999 Bugfixes 2019-11-17 11:20:36 -05:00
Anuken
629999a1cd More unit tests / Lighting improvements 2019-11-16 23:45:31 -05:00
Anuken
4d3e268972 Merge branches 'lights' and 'master' of https://github.com/Anuken/Mindustry 2019-11-16 23:29:33 -05:00
Anuken
84968c9f73 Added color picker / Customizable lighting rules 2019-11-16 23:27:42 -05:00
Anuken
d73b99945f Minor light optimization 2019-11-16 22:49:36 -05:00
Anuken
1d15316cbb Configurable ambient light, darkness 2019-11-16 20:18:00 -05:00
Anuken
913a703d41 Illuminator textures 2019-11-16 20:06:11 -05:00
Anuken
5d949f6bc0 Correct reactor consumption display 2019-11-16 20:05:52 -05:00
Anuken
faf64f11f2 More lights 2019-11-16 19:57:33 -05:00
Anuken
430c4fa1d0 Fixed #1077 2019-11-16 16:54:51 -05:00
Anuken
a90f2545d9 Disable reactor explosions on servers by default 2019-11-16 16:43:31 -05:00
Anuken
eba0a96b6d Merge remote-tracking branch 'origin/master' 2019-11-16 15:51:51 -05:00
Anuken
f9ffb78b33 Added configurable global server rules 2019-11-16 15:51:35 -05:00
Anuken
083f2e38d4
Update BuilderTrait.java 2019-11-16 09:37:09 -05:00
Zachary
7feed8828c Increase time taken for reactor to explode (#1067) 
yes
 2019-11-16 00:16:09 -05:00
Anuken
1f6ef9d9ae Merge remote-tracking branch 'origin/master' 2019-11-15 21:12:12 -05:00
Anuken
e6afe584e5 Fixed 'underwater' ores 2019-11-15 21:12:08 -05:00
Fayti1703
76c63443af Deduplicate requirements assignment for Tar Fields (#1065) 2019-11-15 20:02:27 -05:00
Joshua Fan
cafd95859f Clean up text capitalization, misc UI (#1072) 2019-11-15 20:01:59 -05:00
Anuken
016823d446 Bridge cleanup 2019-11-14 18:53:24 -05:00
Anuken
0cf9ef66fa Merge remote-tracking branch 'origin/master' 2019-11-14 18:48:21 -05:00
Anuken
1f583dc7a2 Bugfixes 2019-11-14 18:48:12 -05:00
Patrick 'Quezler' Mounier
74212771dc
Might as well add a tech tree entry 2019-11-14 21:36:58 +01:00
Patrick 'Quezler' Mounier
6bcea7af66
Pressurize identically as the pulse conduit 2019-11-14 21:33:36 +01:00
Patrick 'Quezler' Mounier
3ec7e40213
Merge branch 'master' into armored-conduit 2019-11-14 21:32:15 +01:00
Patrick 'Quezler' Mounier
836e72119c 🗜 Pressure conduit (#949) 
* Suggest pressure conduit

* Revert "Suggest pressure conduit"

This reverts commit 721dd9255e.

* Increase pulse conduit output pressure

* Remove `tile.block().`
 2019-11-14 15:21:29 -05:00
Maximilian
f81f7e1d2a update DE translation (#914) 2019-11-14 15:11:51 -05:00
Anuken
618a050414 Fix getProgressIncrease 2019-11-14 15:02:09 -05:00
Anuken
ec7f49c94b Merge remote-tracking branch 'origin/master' 2019-11-14 14:59:10 -05:00
Anuken
30ea285ca0 Change power "satisfaction" -> "status", use efficiency() in blocks 2019-11-14 14:59:04 -05:00
Prosta4okua
32a5c7b769 Ukrainian translation. You probably forgot about it, right? I remind:) (#1016) 
* :flag_ua:

* 🇺🇦

* ЇїЇ

* 30.10.2019

* Упс.

* 1

* 06.11.2019

* lol

* Update bundle_uk_UA.properties
 2019-11-14 14:44:28 -05:00
Ali-C-Ila
581749a29f Update bundle_zh_TW.propertie (#1060) 
* Update bundle_zh_TW.propertie

diode update

* Update bundle_zh_TW.properties
 2019-11-14 14:43:42 -05:00
Adam Witkowski
d83d26598c Update bundle_pl.properties (#1041) 
Added missing properties for Polish bundle, improved most of the embarrassing translations and modified a few awkward ones.
 2019-11-14 14:42:15 -05:00
Eler
d653f1441d Update bundle_pt_BR.properties (#1051) 
HUGE PORTUGUESE UPDATE
Changelog in English (em português logo abaixo)
•99% translated to Portuguese
•Minor correction of translation errors
•Added caps lock on unique items like Workshop and Copper(i will speak why this soon)
•Set the word Wall (house) to Wall (Wall), in Portuguese Wall has two meanings, I put the closest meaning

Changelog em Português
•99% Traduzido para o Português
•Pequena correção nos erros de tradução
•Correção nos erros do menu /n (finalmente!!!)
•Caps Lock adicionado no meio de frase para itens únicos como Oficina e Cobre(Explicarei o porquê em breve)
• Ajuste nas palavras Parede para Muro, pois a segunda tem mais sentido com o objetivo da construção, ex: Muros do Castelo
 2019-11-14 14:41:32 -05:00
Joshua Fan
a9b822089f Make Esc mirror back button behavior in settings (#1061) 2019-11-14 14:41:15 -05:00
Anuken
c5a4d7331f Switched to using core attack events 2019-11-14 14:40:42 -05:00
Anuken
230428f2e0
Update CoreBlock.java 2019-11-14 12:35:59 -05:00
Anuken
1a26a1bf63
Update CoreBlock.java 2019-11-14 12:28:35 -05:00
Anuken
77001324e9
Update EventType.java 2019-11-14 09:59:33 -05:00
Anuken
0fd6207689 Cleanup 2019-11-14 08:51:12 -05:00
Anuken
dd175747ab Permissive extensions 2019-11-13 19:40:03 -05:00
Anuken
3106389f6a Switched to HJson content parsing 2019-11-13 19:12:12 -05:00
Anuken
d8c997b355 Methods renamed / Better build request handling 2019-11-12 23:40:45 -05:00
Anuken
103f655fa4 Removed boolean usage 2019-11-12 15:59:44 -05:00
Anuken
1dfaf3897c Proper node intersect 2019-11-12 08:23:23 -05:00
Patrick 'Quezler' Mounier
8a089ba3c9
Resolve conflicts 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
 2019-11-12 08:44:26 +01:00
Anuken
56917483d6 Cleaned up diode 2019-11-11 23:32:49 -05:00
Patrick 'Quezler' Mounier
f5c1eb74af 🔩 Add (plastanium) diode (#964) 
* Add plastanium diode

* Only rotate the arrow part

* Use the sum of graph batteries from both sides

* Make diode send power overflow

Diode keeps one-way equalizing while the sending graph has batteries that are ¬ yet fully filled.

* Remove redundant block != null check

* Remove free power

* Stash

* Revert "Stash"

This reverts commit 0c14854519.

* Equalize graph storage percentage

* Update sprite

* Move nearby link check

* DRY

* Fire deathstar at extra spaces

* 〃

* Fix ghost rotation

* Please overlord anuke

* Mild cleanup

* Konami code

* 〃

* Lowercase float

* Newline begone

* Fix overclocking issue

* Fix rotation and name
 2019-11-11 23:29:03 -05:00
Joshua Fan
dcdec7f55f Add mouse-based movement (#1037) 
* Add mouse-based movement

* Rename keybind to 'Follow Mouse'
 2019-11-11 14:00:35 -05:00
itskatt
8d19c8b7af Update overflow gate description (#1040) 2019-11-11 14:00:06 -05:00
Anuken
52f592a357 Lighting improvements 2019-11-10 16:18:47 -05:00
Anuken
39a0dde1f4 Merge branch 'master' of https://github.com/Anuken/Mindustry into lights 
# Conflicts:
#	core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java
 2019-11-10 14:12:43 -05:00
iczero
fbb1f012e2 Add item and amount properties to DepositEvent (#1025) 2019-11-10 10:15:52 -05:00
Patrick 'Quezler' Mounier
6141b135fe
Fix style 2019-11-10 09:25:23 +01:00
Patrick 'Quezler' Mounier
e827bb17e7
Move blend check to autotiler 2019-11-10 09:24:24 +01:00
Anuken
4c0607aba8 Bugfixes 2019-11-09 17:19:29 -05:00
Anuken
2af13a31dc Bugfixes 2019-11-09 16:36:28 -05:00
Anuken
2dec6af231 Merge remote-tracking branch 'origin/master' 2019-11-09 15:30:12 -05:00
Anuken
c70fb5940f Display document import errors on iOS 2019-11-09 15:30:02 -05:00
Joshua Fan
4a987677ac Add 'Show Block Select Keys' graphics option, implement requested changes 2019-11-09 07:59:00 -05:00
danmw3
ee88cd33b1 Allow for toggling the visibility of power line lasers (#1022) 
* Allow for toggling the visibility of power line lasers

Configurable key-bind in controls and obeys the power line opacity setting.

* Last power opacity is saved after being toggled off.

* Moved key-bind into the View category.
 2019-11-09 00:00:02 -05:00
Anuken
fb15c44383 Fix links in a hacky way 2019-11-08 21:11:49 -05:00
Anuken
4f4113d3d1 Merge remote-tracking branch 'origin/master' 2019-11-08 19:09:45 -05:00
Anuken
52355de1c0 use // for comments 2019-11-08 19:08:07 -05:00
iczero
ebee4fa5da Implement build autopausing (#1017) 
Automatically pause building after current build queue is empty
 2019-11-08 16:56:06 -05:00
키에르
796241b40a Add TapEvent/TapConfigEvent (#1018) 
* Update EventType.java

* Update InputHandler.java
 2019-11-08 14:58:24 -05:00
Anuken
505f802e20 Use ## for comments, just in case 2019-11-08 14:55:32 -05:00
Anuken
e9f9194f73 Added json comments 2019-11-08 14:40:15 -05:00
Anuken
effd4e959a Power cleanup 2019-11-08 13:04:24 -05:00
Patrick 'Quezler' Mounier
f58eb75639 🐬 Factorio flavoured powerlines (#997) 
* Stash initial prototype

* Fix 〃to connect the chain

* Add comments

* Hook onto convejor pathfinding

* Cleanup remnant discovered via pull request diff

* Toggle placement between diagonal and pathfinding

* Stash questionable prototype

* 〃

* Attempt to rewrite away the skip array

* Revert "Attempt to rewrite away the skip array"

This reverts commit 12753a9b5c.

* Slight cleanup

* Subtract conveyor placement

* Refractor each to for

* Apply @anuke’s coding stype
 2019-11-08 12:28:49 -05:00
Anuken
8b2934c60e
Update ForceProjector.java 2019-11-07 19:05:15 -05:00
Anuken
d05f56c5b1 Cleanup 2019-11-07 17:16:09 -05:00
Anuken
d1196f8e85 Fixed #745 2019-11-07 16:55:26 -05:00
joshuaptfan
8a6d39d5d0 Revert changes to localization files 2019-11-07 07:20:43 -08:00
Anuken
1e7c21c1ae Bugfixes 2019-11-06 13:59:35 -05:00
Anuken
82ae378edc Fixed mech pads not working 2019-11-05 21:51:58 -05:00
joshuaptfan
dbb64f1d87 Add hotkey tutorial to tutorial mission 2019-11-05 17:25:21 -08:00
Anuken
ccac67ced6 Fixed unit tests, power problems 2019-11-05 19:20:23 -05:00
Anuken
ce6f3ddb5a Updated bundles 2019-11-05 19:03:14 -05:00
12358abc
d86997e388 Add files via upload (#979) 2019-11-05 18:55:31 -05:00
Ali-C-Ila
60717bdaad Update bundle_zh_TW.properties (#972 and #945 included) (#1002) 
This includes the contents in the previous two pull requests.(#945 and #972 )
Also improved another few translations.
 2019-11-05 18:54:15 -05:00
Anuken
0738a7dbf0 Merge remote-tracking branch 'origin/master' 2019-11-05 18:09:49 -05:00
Anuken
a539bb8e57 Better oil bar color 2019-11-05 17:58:30 -05:00
Patrick 'Quezler' Mounier
b2d417f207 Display pump output during placement (#1003) 2019-11-05 17:58:19 -05:00
kirina
4352ab92f1 fix Japanese translation for Mods (#991) 2019-11-05 17:42:28 -05:00
ElerTheMagnanimous
5c522069b1 Update bundle_pt_BR.properties (#1007) 
a few more fixes at translation
 2019-11-05 17:39:57 -05:00
Patrick 'Quezler' Mounier
49d12f36b9 Power productivity & Drone pad standby (#998) 
* Introduce power productivity

Allows power consumers to scale down their intake.

* Make drone pads only use power when constructing

* Implement requested changes

* Begone
 2019-11-05 17:31:32 -05:00
Anuken
e4697bae27 Merge remote-tracking branch 'origin/master' 2019-11-05 17:29:33 -05:00
Anuken
3691ab7f8f Remove canProduce as a method 2019-11-05 17:29:19 -05:00
Joshua Fan
a47e03de0a Fix key hints to display string names instead of internal names (#1004) 2019-11-05 16:08:45 -05:00
Anuken
21b7016fb5 Bugfixes 2019-11-05 15:32:13 -05:00
joshuaptfan
33da381892 Add hover info key combo hint 2019-11-05 10:48:49 -08:00
Patrick 'Quezler' Mounier
69f2a77779
F 2019-11-05 17:58:02 +01:00
Patrick 'Quezler' Mounier
2bfa304d97
Or better yet 2019-11-05 17:57:55 +01:00
Patrick 'Quezler' Mounier
c2e450add0
I suppose this makes more sense 2019-11-05 15:11:59 +01:00
Patrick 'Quezler' Mounier
8f9a9ec3e5
Rename leak rate to leak resistance 
Since the higher the number is the slower it leaks.
 2019-11-05 14:55:14 +01:00
Patrick 'Quezler' Mounier
e04b756d36
〃 2019-11-05 14:53:04 +01:00
Patrick 'Quezler' Mounier
e066034e9f
Remove duplicate blend check for armored 2019-11-05 14:52:57 +01:00
Patrick 'Quezler' Mounier
a48baa1356
Rename class to whats logical 2019-11-05 14:48:10 +01:00
Patrick 'Quezler' Mounier
c6a75891d3
Add bundle entry 2019-11-05 14:41:08 +01:00
Patrick 'Quezler' Mounier
7d7eb53cd6
Only accept liquids from conduits or behind 2019-11-05 14:36:50 +01:00
Patrick 'Quezler' Mounier
8e2c12848c
Add a cap against leaking 
Doesn’t fully prevent leaking, there are intentional gaps, but its significantly slower.
 2019-11-05 14:30:46 +01:00
Patrick 'Quezler' Mounier
521da56e70
Add plated conduits 
Went with “plated” instead of “armored” since the titanium one wasn’t named like the conveyors as well.
 2019-11-05 14:00:50 +01:00
Anuken
3e43f5577e Bugfixes 2019-11-04 23:47:51 -05:00
Anuken
f1f8130718 arc, again 2019-11-04 22:55:04 -05:00
Anuken
f38bf9262d Arc update 2 2019-11-04 22:35:32 -05:00
Anuken
be6af55616 Arc update 2019-11-04 22:28:11 -05:00
Anuken
53d004d91e Merge remote-tracking branch 'origin/master' 2019-11-04 22:18:39 -05:00
Anuken
6153764c0d Bugfixes for Steam 2019-11-04 22:18:34 -05:00
AmateurPotion
a6fd244be2 Update bundle_ko.properties (#995) 2019-11-04 19:52:25 -05:00
Paulao17
a54d72d00c Update bundle_fr.properties (#947) 
* Update bundle_fr.properties

Added new keys from new updates.
Also paralleled large wall names.

* Large Thorium wall syntax correction

* Add max connections for power nodes french

Updated for [#988](https://github.com/Anuken/Mindustry/pull/988) (merged at this time)
 2019-11-04 19:52:14 -05:00
ElerTheMagnanimous
b3eacd841f Update bundle_pt_BR.properties (#993) 
Translation error at the thorium, they translated it as uranium
 2019-11-04 17:37:34 -05:00
Anuken
08b730a349 Replaced 'loadout' class with schematics / Small sound tweaks 2019-11-03 22:15:05 -05:00
Anuken
08d0a7ada7 Bugfixes / Better power link priority 2019-11-03 21:27:58 -05:00
Anuken
b542b6651e Merge remote-tracking branch 'origin/master' 2019-11-03 13:04:32 -05:00
Anuken
c249485a4f Mobile schematic fixes 2019-11-03 13:04:27 -05:00
Joshua Fan
988c424e45 Add max connections stat to power nodes (#988) 2019-11-03 13:00:32 -05:00
Anuken
48c062f7af HUD fixes 2019-11-03 12:16:28 -05:00
Anuken
cf6d2c7593 Added schematics dialog to desktop menu 2019-11-03 08:59:51 -05:00
joshuaptfan
3392138972 Add settings slider steps 2019-11-03 01:34:32 -07:00
joshuaptfan
abd76fe89f Checking unlocked status of blocks from getByCategory() is no longer necessary 2019-11-03 00:04:15 -07:00
joshuaptfan
258670e0b5 Clean up 2019-11-02 22:37:06 -07:00