mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-26 23:50:18 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,547 Commits 4 Branches 160 Tags 2.3 GiB
d611dd107a
Commit Graph

5560 Commits

Author SHA1 Message Date
DeltaNedas
0c01554a6b
add floatf/p and func to global.js (#1633) 2020-02-24 15:06:33 -05:00
Ali-C-Ila
251877f561
Update bundle_zh_TW.properties (#1579) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-02-24 11:46:20 -05:00
Patrick 'Quezler' Mounier
ce1884512d
Null the block as well? (#1630) 2020-02-24 11:44:39 -05:00
Anuken
cfbe631e66 Merge 2020-02-23 20:14:38 -05:00
Anuken
7f53328f52 Refactored planet rendering to different classes 2020-02-23 19:05:25 -05:00
soytheLB
c989504bf6
Update bundle_es.properties (#1624) 
Corrected some misspellings.
Added warning text in router.
Changed description of alloy smelter to keep with the translated name of surge alloy.
Added a missed dot from my previous translation.
 2020-02-23 10:44:09 -05:00
Anuken
9af93dc44d Slightly larger sectors 2020-02-22 22:40:16 -05:00
Anuken
c8a762df42 Minor assignment tweak 2020-02-22 19:53:14 -05:00
Anuken
501e909039 Merge remote-tracking branch 'origin/master' 2020-02-22 19:32:10 -05:00
Anuken
2cd69230e0 Changed feathub link 2020-02-22 19:32:01 -05:00
Anuken
68b9bfe907 Cleanup 2020-02-22 19:30:39 -05:00
Anuken
9788f9b981 Tweaks 2020-02-22 17:28:13 -05:00
Anuken
6e4b02db5a Correctly seeded sectors 2020-02-22 15:28:56 -05:00
Anuken
2afb175560 Generation tweaks 2020-02-22 12:05:31 -05:00
GioIacca9
47618ac21f
Translated #1593 (#1621) 2020-02-22 10:33:22 -05:00
Patrick 'Quezler' Mounier
f891c42847
Remove bundle key space (#1619) 2020-02-22 08:43:54 -05:00
Anuken
4a40172782 Cleaned up bullet sprites 2020-02-22 00:28:03 -05:00
Anuken
baa0eb1149 Added cliffs as separate block 2020-02-21 23:45:25 -05:00
Anuken
6871db7155 Visual tweaks 2020-02-21 22:58:18 -05:00
Petr Gašparík
0a98597ad0
Czech translation - sync with v104 (#1612) 
* Czech translation - sync with changes

* Czech translation - sync with updates

* Czech translation - small fix
 2020-02-21 16:27:05 -05:00
Patrick 'Quezler' Mounier
b7a8fa4191
Fix typo in banned comment (#1617) 2020-02-21 13:49:15 -05:00
Anuken
a5e469e96c Complete planet panning 2020-02-21 13:48:50 -05:00
DeltaNedas
fe22d334dc
Separate ambient light and solar panel efficiency (#1593) 
* new branch

* Separate ambient light and solar panel efficiency

* Made ambient light -> solar efficiency default
 2020-02-21 11:38:56 -05:00
bobthebadguy
de560ac6f8
Fixed small typo (#1613) 
Now there are 70 pull requests.
 2020-02-21 09:58:11 -05:00
Patrick 'Quezler' Mounier
ff652f2515
+1 technical correctness (#1615) 2020-02-21 09:57:48 -05:00
Anuken
99d3e9ae7c Generator cleanup 2020-02-20 20:28:23 -05:00
Anuken
97f342aceb . 2020-02-20 10:34:17 -05:00
Dexapnow
23e4d1dd84
Update bundle_pl.properties 2020-02-20 14:05:38 +01:00
Dexapnow
3bb4820e79
Update bundle_pl.properties 
Some things just were confusing
 2020-02-20 09:46:37 +01:00
Anuken
32dcae8fd3
Update bundle.properties 2020-02-19 13:49:40 -05:00
Anuken
1d1c73fd6f Merge 2020-02-19 13:10:25 -05:00
Anuken
e8ca5fe211 More iOS stuff 2020-02-19 11:03:12 -05:00
Anuken
73995c7764 Merge remote-tracking branch 'origin/master' 2020-02-19 10:21:42 -05:00
Anuken
71f1fb5d66 Cleanup 2020-02-19 10:17:56 -05:00
Anuken
65800a51c6 Sector darkness boundaries 2020-02-19 00:29:48 -05:00
iczero
b3e9e12279
Reset local player name on disconnect 2020-02-18 21:52:42 -05:00
Anuken
48c04bda8c Map tweaks 2020-02-18 20:07:07 -05:00
Anuken
4a55dde5ee Bugfixes 2020-02-18 19:54:35 -05:00
Anuken
afd31c2b42 Merge remote-tracking branch 'origin/6.0' into 6.0 2020-02-18 19:34:17 -05:00
Anuken
53996d8a8d Circular sector maps 2020-02-18 19:34:07 -05:00
Anuken
378a5d5239 Removed bloom on iOS 2020-02-18 12:40:53 -05:00
Anuken
62330d6c99 Merge remote-tracking branch 'origin/master' 2020-02-18 12:23:07 -05:00
Anuken
711faa6e2a
Merge pull request #1597 from GioIacca9/patch-3 
Update block.pyratite-mixer.description
 2020-02-18 11:51:37 -05:00
Anuken
0f43690aaf More unlocks? 2020-02-18 11:43:06 -05:00
Anuken
a655e18b87 Merge remote-tracking branch 'origin/master' 2020-02-18 11:35:36 -05:00
Anuken
2038409283 Removed schematic replacement dialog 2020-02-18 11:35:28 -05:00
Anuken
8b14219bab
Merge pull request #1583 from Prosta4okua/patch-9 
6.0
 2020-02-18 10:39:22 -05:00
Anuken
d9ae8e5a28
Merge pull request #1571 from artur309/master 
Added new lines and some small translation.s
 2020-02-18 10:32:30 -05:00
Anuken
507f553295
Merge pull request #1592 from QmelZ/patch-1 
Translation to Turkish
 2020-02-18 10:32:08 -05:00
Anuken
08509dafb1
Merge pull request #1573 from soytheLB/patch-2 
Update bundle_es to version #149465
 2020-02-18 10:31:46 -05:00
Anuken
da2cc292c3 Wall generation 2020-02-17 20:33:01 -05:00
Anuken
e215772f30 Added backwards compatibility for legacy saves 2020-02-17 11:13:46 -05:00
Anuken
18d4efa315 Merge 2020-02-17 09:30:36 -05:00
Anuken
b96d5c417f Fixed #1601 2020-02-17 09:27:51 -05:00
Anuken
6d68e10804 Bugfixes, cleanup 2020-02-16 22:22:10 -05:00
Anuken
e71230755d Fixed omnidirectional shooting with ignored rotation 2020-02-16 13:49:29 -05:00
Anuken
7a8bd82f8e Improved controls / Re-added engine sprite 2020-02-16 13:16:18 -05:00
GioIacca9
f650963cf4
Update block.pyratite-mixer.description 2020-02-16 19:06:50 +01:00
Anuken
e677538c53 Fixed a crash 2020-02-15 15:55:37 -05:00
Anuken
8b4fcf99a6 Building / Fixed some tests 2020-02-15 14:51:31 -05:00
Anuken
1fe0a7d81e Fixed mock audio package 2020-02-15 12:41:57 -05:00
Anuken
1f65ba185a Fixed unit drowning effects 2020-02-15 12:39:13 -05:00
QmelZ
47f63dd006
Translation to Turkish 
I translated all the default ones left, fully finished.
 2020-02-15 15:15:27 +02:00
Anuken
024f2d62e2 Planet sector metadata 2020-02-14 20:08:07 -05:00
Anuken
7f56cdc1e9 Better planet terrain 2020-02-14 14:12:22 -05:00
Anuken
abaa462645 Added entity revisions 2020-02-14 12:54:44 -05:00
Anuken
d37886b2cd Fixed #1585 2020-02-14 09:51:09 -05:00
Prosta4okua
ff74a212c5
Update bundle_uk_UA.properties 2020-02-14 12:38:58 +02:00
Prosta4okua
a4d42ea22c
6.0 2020-02-14 12:35:17 +02:00
Anuken
c4d4dcb9db TypeIO resolution 2020-02-13 23:10:18 -05:00
Anuken
c4464e67fd Fixed IO issues 2020-02-13 22:26:24 -05:00
Anuken
09c57c32d6 Better IO 2020-02-13 22:11:59 -05:00
Anuken
e3621f44da Barely functional IO 2020-02-13 19:26:36 -05:00
Anuken
ad248e2e20 Autogeneration of some IO code 2020-02-13 13:30:30 -05:00
Anuken
47f075133f Merge 2020-02-13 11:22:29 -05:00
Anuken
0678f54e25 Fixed bloom darkening sprites / Changed pixelate desc 2020-02-13 10:17:43 -05:00
Anuken
c45dd74404 Merge remote-tracking branch 'origin/master' 2020-02-13 10:04:50 -05:00
Anuken
58b31bd799 Added support for animations w/ pixelation + map screenshots 2020-02-13 10:04:45 -05:00
Anuken
c067be2add Added client creation event 2020-02-13 09:11:35 -05:00
laohuaji233
93de060ad5
Update bundle_zh_CN.properties 2020-02-13 14:56:46 +08:00
soytheLB
c5fcc30422
Update bundle_es to version #149465 
Added translation to the following:
 Line 62 stat.playtime
Line 108 mod. display
Line 176 servers.local
Line 177 servers.remote
Line 178 servers.global
line 261 data.open.folder
Line 542 block.tiles
Line 543 block.afinities
Line 678 Player.limit
Line 681 bridge.opacity
Changed cancel building from "impiar" to "limpiar"
Changed Lich unit name to "Exánime".
Translated name for scatter turret.
Changed wave name from "Horda" to "Ola". (Horda reffers to enemy waves while ola means sea waves)
Changed name swarmer from "enjambredor" to "enjambre".
changed turrets description to be closer to the english version.
Changed factories descriptions to be closer to english version
 2020-02-12 23:46:27 -03:00
Artur Quaresma
97355263df Added new lines and some small translation.s 
I added new lines and some small transaltions that was missing.
 2020-02-12 21:09:58 +00:00
DeltaNedas
948d184c40
:) 2020-02-12 19:28:54 +00:00
Anuken
031b6e0bf8 Fixed #1565 2020-02-12 13:26:29 -05:00
Anuken
258945a45a Team validation 2020-02-12 12:47:02 -05:00
Anuken
e798619679 Bugfixes 2020-02-12 11:25:00 -05:00
Anuken
5c48ae2158 Fixed #1558 / Fixed #1556 2020-02-12 10:16:43 -05:00
Anuken
bb380f7feb Fixed #1555 2020-02-11 23:15:51 -05:00
Anuken
6fd0205495 Merge 2020-02-11 19:55:02 -05:00
Alexander H
68e403557a
translated; spelling errors, odd phrases removed 
I've gone through the German translation file looking for missing translations, which I provided, as well as spelling errors and odd phrases, which I continued to remove. I also replaced every [LIGHT_GRAY] tag with [lightgray] for uniformity.
 2020-02-12 01:46:13 +01:00
Anuken
3102931cb4 Removed script wrapper 2020-02-11 17:50:16 -05:00
Anuken
fb302d49c7 Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
Anuken
a4a3e7fc48
Merge pull request #1514 from Arkanic/patch-7 
make batteries glow based on power contents (a redo that works)
 2020-02-11 16:31:14 -05:00
Anuken
eb87e5f265 Single-script mod case 2020-02-11 16:14:01 -05:00
Anuken
9c2569d4f5
Merge pull request #1477 from DeltaNedas/patch-5 
controlled script loading
 2020-02-11 16:03:38 -05:00
Anuken
ce3f4ed0fb Merge remote-tracking branch 'origin/master' 2020-02-11 15:54:23 -05:00
Anuken
1b94eed9d3 Fixed conveyors blending with enemy teams 2020-02-11 15:54:16 -05:00
Anuken
aafecfebbb
Merge pull request #1468 from Prosta4okua/patch-7 
Update bundle_uk_UA.properties
 2020-02-11 15:45:12 -05:00
Anuken
de9a14c903
Czech translation for 103.x changelog (#1455) 
* Czech translation for 103.x changelog

* Czech translation - mod display

* Czech translation - fix typos

* Czech: added Time played + small format corr.

* Czech for server categories!
 2020-02-11 15:40:33 -05:00
Ali-C-Ila
5ab47f4fe0
Update bundle_zh_TW.properties (#1454) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-02-11 15:40:24 -05:00
Vanguard
435860eda4
RU updates (#1442) 
* 1 changed line, 1 removed line

Changed:
keybind.zoom.name

Removed:
keybind.zoom_hold.name

Moved some lines around to keep them in the same order with bundle.properties

* 1 changed line

tutorial.intro

* 3 new lines, 3 changed lines

New:
mod.erroredcontent
mod.errors
mod.noerrorplay

Changed:
mod.requiresversion
mod.remove.confirm
details

* 2 changed lines

mods.guide
mod.import.github

* 1 new line

link.feathub.description

* 1 changed line

item.graphite.description

* 1 changed line

block.mass-driver.description

* 9 new lines, 1 changed line

New:
be.update
be.update.confirm
be.updating
be.ignore
be.noupdates
be.check
server.kicked.serverRestarting
setting.coreselect.name
rules.blockhealthmultiplier

Changed:
wave.enemy

* 3 changed lines

quit.confirm.tutorial
setting.coreselect.name
public.confirm

* 22 changed lines

mod.missing
item.plastanium.name
block.plastanium-wall.name
block.plastanium-wall-large.name
block.plastanium-compressor.name
item.scrap.description
item.spore-pod.description
item.blast-compound.description
liquid.oil.description
unit.revenant.description
block.multi-press.description
block.plastanium-compressor.description
block.spore-press.description
block.power-source.description
block.force-projector.description
block.conveyor.description
block.mass-driver.description
block.liquid-junction.description
block.phase-conduit.description
block.thorium-reactor.description
block.blast-drill.description
block.cyclone.description

* 3 new lines, 2 removed lines

New:
setting.bridgeopacity.name
block.liquid-void.name
block.liquid-void.description

Removed:
block.signal
block.editsignal

* 1 new line

data.openfolder

* 1 changed line

block.cryofluidmixer.description

* 2 new lines

block.underflow-gate.name
block.underflow-gate.description

* 2 changed lines

unit.thousands
unit.millions

* 3 new lines

blocks.tiles
blocks.affinities
setting.playerlimit.name

* 1 changed line

block.underflow-gate.name

* 1 changed line

unit.thousands

* 1 changed line

blocks.affinities

* 1 changed line (reverted)

unit.thousands

* Update bundle_ru.properties

* 1 new line

mod.display

* 1 changed line

techtree

* 1 changed line (new approach)

techtree

* 1 changed line

editor.generate

* 1 new line

stat.playtime

* 3 new lines

servers.local
servers.remote
servers.global

* 3 changed lines

servers.local
servers.remote
servers.global

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
 2020-02-11 15:40:17 -05:00
AmateurPotion
5611a8684c
Update bundle_ko.properties (#1490) 
* Update bundle_ko.properties

Finish! yeeeee!

* Update bundle_ko.properties
 2020-02-11 15:33:25 -05:00
LauweJoster
f06550fc3c
Update bundle_nl.properties (#1501) 
Grammar and sentence improvements. Also added translations
 2020-02-11 15:32:18 -05:00
Ali-C-Ila
652c143ff6
Update bundle_zh_TW.properties (#1519) 2020-02-11 15:25:53 -05:00
Rasangus
64ade54336
Update bundle_pt_BR.properties (#1525) 2020-02-11 15:25:38 -05:00
Anuken
5aa1e30006 Bugfix 2020-02-11 13:08:42 -05:00
Anuken
ad7c72015c Better admin management 2020-02-11 13:06:52 -05:00
Anuken
d99f9740e8 USID fixes 2020-02-11 12:36:28 -05:00
Anuken
d1840e7c2a Item selection scrolling 2020-02-11 11:55:38 -05:00
Anuken
d6b5f6a311 buildTable improvements 2020-02-11 11:30:22 -05:00
fuzzbuck
f14df52490
Allow admins to bypass the playerlimit [server] (#1549) 2020-02-11 11:10:50 -05:00
Petr Gašparík
29a6b1a8da Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-11 11:18:54 +01:00
Anuken
b15a40fcbd Cleanup / Fixed desktop IDs resetting 2020-02-10 23:26:22 -05:00
Anuken
9da2d1ee9a Merge remote-tracking branch 'origin/master' 2020-02-10 20:22:09 -05:00
Anuken
6882a9a355 Added persistent message server function 2020-02-10 20:22:03 -05:00
Anuken
47023af3d5 cleanup 2020-02-10 15:51:01 -05:00
Anuken
86d5842868 Testing new quadtree 2020-02-10 11:29:58 -05:00
Anuken
81990cf16c Optimizations 2020-02-10 11:07:10 -05:00
Anuken
6c6861a97a Cleanup 2020-02-10 10:47:21 -05:00
Anuken
0ad8408ba9 Collisions, lots of bugfixes 2020-02-10 09:58:00 -05:00
Anuken
fbadb9f4aa Group collisions 2020-02-10 09:22:19 -05:00
Anuken
e9b066b866 Fires, puddles, feature reimplementations 2020-02-09 23:43:08 -05:00
Anuken
3feca9bbf8 Minor tweaks 2020-02-09 22:27:16 -05:00
GioIacca9
941449c502 Updated "Full implementation of #1494" (#1541) 2020-02-09 22:26:47 -05:00
Anuken
d89189debd Fixed server 2020-02-09 15:40:03 -05:00
Anuken
ae7a8e1f65 Minor tweaks 2020-02-09 14:35:22 -05:00
Anuken
c23e923ffb Merged with master 2020-02-09 12:32:29 -05:00
Anuken
a2706a80b1 Merged with master 2020-02-09 12:27:44 -05:00
Anuken
d2ab316072 ?? 2020-02-09 12:25:13 -05:00
Anuken
f9bc4a30f0 Merge 2020-02-09 12:16:12 -05:00
Anuken
d45d7f21b6 Procedural scorch marks / Bugfixes 2020-02-09 12:07:36 -05:00
Anuken
8e976c20a1 Hitbox fixes 2020-02-08 23:00:26 -05:00
Anuken
e23119e330 Feature re-implementations 2020-02-08 21:54:41 -05:00
Daniel Jennings
baab36bfc5
Trim schematic string before calling Base64Decoder (#1537) 
This fixes getting the "Length of Base64 encoded input string is not a multiple of 4." error when importing schematics that have whitespace at the start/end of them, which is easy to accidentally have without knowing by when copying the schematic codes from random different web pages.
 2020-02-08 16:41:33 -05:00
Anuken
5169e197b6 Bugfixes 2020-02-08 16:00:54 -05:00
Anuken
ba1f59aa71 Better physics 2020-02-08 15:39:27 -05:00
Anuken
8814dbe29a Sprite cleanup / Bullets 2020-02-08 14:48:04 -05:00
Anuken
f46be924b9 Effects, collisions, method overrides 2020-02-08 13:14:23 -05:00
Anuken
f3893533a4 Cleanup 2020-02-08 11:08:31 -05:00
Prosta4okua
0a53c4c1be Update bundle_uk_UA.properties 2020-02-08 12:26:09 +02:00
Prosta4okua
d7eb0d3ba3 Update bundle_uk_UA.properties 2020-02-08 12:23:50 +02:00
Anuken
659bfea8cf Cleanup 2020-02-07 23:12:39 -05:00
Anuken
c8455ddbc8 Added message for non-building units 2020-02-07 21:56:55 -05:00
Anuken
3a2fef3bd7 Merge remote-tracking branch 'origin/master' 2020-02-07 20:52:03 -05:00
Anuken
9ccf95971e Fixed small launch items button 2020-02-07 20:51:59 -05:00
valtsu41
9b36125b0c
Finnish translation & grammar update (#1473) 
* Finnish translation & grammar update

* More grammar correcting and making things more native

* Just a little more fine-tuning

* Fixes
 2020-02-07 20:42:14 -05:00
Anuken
0ffcd0b94c Fixed #1507 / Fixed #1504 2020-02-07 20:21:45 -05:00
Anuken
5a5945cc52 Merge remote-tracking branch 'origin/master' 2020-02-07 20:09:45 -05:00
Anuken
e5fd3dec4c Fixed #1526 2020-02-07 20:09:37 -05:00
Anuken
8a9c92227d More movement 2020-02-07 18:55:53 -05:00
Anuken
4265d40024 Movement 2020-02-07 13:02:24 -05:00
Anuken
861b3ac3f4 Tweaks 2020-02-07 11:46:10 -05:00
Anuken
007a1bd1d2 Unit definitions 2020-02-07 11:04:58 -05:00
Anuken
b9841f9cfa a mess 2020-02-07 10:47:58 -05:00
Anuken
33e818a757 Entity name mapping 2020-02-07 09:36:51 -05:00
扩散性百万甜面包
7b586ea043
Fix a typo (#1528) 
* Fix a typo

* Update core/src/mindustry/mod/Mods.java

Co-Authored-By: Patrick 'Quezler' Mounier <Quezler@me.com>

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
 2020-02-07 08:25:26 -05:00
Petr Gašparík
e98808bc46 Czech for server categories! 2020-02-07 12:35:09 +01:00
Petr Gašparík
bc37415a10 Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-07 12:32:33 +01:00
Prosta4okua
619b2ba897
Update bundle_uk_UA.properties 2020-02-07 12:42:59 +02:00
Anuken
eeae5149a1 Basic unit rendering 2020-02-06 22:08:31 -05:00
Anuken
37a9311202 Merge remote-tracking branch 'origin/master' 2020-02-06 20:25:17 -05:00
Anuken
e9f37ea68e Removed entity processor files 2020-02-06 20:25:10 -05:00
Anuken
f83b6728cf ? 2020-02-06 20:24:30 -05:00
Prosta4okua
59431b223b
Update bundle_uk_UA.properties 2020-02-06 23:38:45 +02:00
Anuken
e3136e9e09 more rendering 2020-02-06 14:58:12 -05:00
MEEP of Faith
da5755b7c1
For consistancy (#1517) 
Swap "liquids" with "liquid." Also proposing because the category for liquid blocks is "liquid" and not "liquids" when modding.
 2020-02-06 14:46:33 -05:00
Anuken
ddecb2d831 Actual updating and rendering 2020-02-06 13:40:07 -05:00
Anuken
6fe5663f79 Autogenerated render layer groups 2020-02-06 13:20:03 -05:00
Anuken
70c06b58ef Conveyor cleanup 2020-02-06 11:38:36 -05:00
Anuken
6a99a3922e Cleanup 2020-02-06 11:37:22 -05:00
Anuken
a11f6efe0a Rudimentary rendering 2020-02-05 23:04:48 -05:00
Anuken
8172e69f8c it launches 2020-02-05 22:08:57 -05:00
Anuken
dfecfa3964 . 2020-02-05 20:11:49 -05:00
Anuken
4a2c6c571f Merge remote-tracking branch 'origin/master' 2020-02-05 19:02:02 -05:00
Anuken
a5fd881f8d Full implementation of #1494 2020-02-05 19:01:53 -05:00
martin-mfg
d59b23b835
bundle_de.properties: merge PRs + further improvements (#1482) 
* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* add minor missing changes from discussion in #799

* fix duplicated text in german translation (configure.locked)

* apply German translation suggestions from PR comment

This commit applies suggestions from the comment at https://github.com/Anuken/Mindustry/pull/783#pullrequestreview-299643677

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Silvério Santos <ssantos@web.de>
 2020-02-05 18:37:21 -05:00
Patrick 'Quezler' Mounier
e06d8eabec
[formatting] add newline to file(s) (#1508) 
* Trail appropriate files with a new line

* For some ironic reason it ignored itself

Probably because it wasn’t tracked/commited yet.

* Rename newlines to server executable naming pattern
 2020-02-05 18:36:56 -05:00
Anuken
f6b1420103 c l e a n u p 2020-02-05 18:28:19 -05:00
Anuken
84748afc55 the errors are back 2020-02-05 15:00:35 -05:00
Arkanic
ce7eccf524 i forgot -base 2020-02-05 18:10:57 +00:00
Anuken
eb0ea9030b ? 2020-02-05 13:08:48 -05:00
Anuken
da97aee8e4 it never ends 2020-02-05 13:03:22 -05:00
Petr Gašparík
39b35dd9cb Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-05 08:34:59 +01:00
Arkanic
ff06a005a0 become exist 2020-02-05 00:53:15 +00:00
Arkanic
fd500f5405
heh make branch 2020-02-05 13:27:36 +13:00
Anuken
a7b39e56bd Cleanup continues 2020-02-04 18:00:32 -05:00
Anuken
012421afcb Class ID mapping 2020-02-04 13:57:42 -05:00
Anuken
be50997f94 Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl 
# 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
#	core/src/mindustry/Vars.java
#	core/src/mindustry/entities/traits/SaveTrait.java
#	core/src/mindustry/maps/generators/MapGenerator.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/world/blocks/Floor.java
#	desktop/src/mindustry/desktop/DesktopLauncher.java
#	gradle.properties
 2020-02-04 12:25:18 -05:00
Anuken
878f570472 Cleanup 2020-02-04 12:23:38 -05:00
Anuken
36b9451e01 Read-only component fields / Removed get/set prefix 2020-02-04 12:14:09 -05:00
Anuken
1d0cfd4435 UnitType cleanup 2020-02-04 11:40:56 -05:00
Anuken
006004fd70 Decal cleanup 2020-02-04 09:39:12 -05:00
Anuken
a07e275e11 Entity groups 2020-02-04 01:03:34 -05:00
Anuken
67106abb9b Updated arc 2020-02-03 20:30:18 -05:00
InvalidError404
ea6490cf9f
Improved ItemModule::take() behavior (#1495) 
* Improved ItemModule::take() behavior

The original take() behavior spams items in whatever order they appear in the items list until each index is depleted, which is problematic when non-specific unloaders are competing against dedicated unloaders for a low-index resources.

My modification makes the take() loop persistent so take() will do complete laps around the item list starting from wherever the previous call returned from, never repeating the same item twice in a row unless there is nothing else to return. A significant improvement IMO.

How is this an improvement? With the original behavior, if you converge a bunch of belts on a storage block or launcher, want to unload a few belts of specific resources (ex.: copper, lead, silicon and titanium for surge alloy) and pass everything else including overflows along using non-specific unloaders, you are out of luck when the resources you want are at the top of the list since most of those will get swept away by non-specific unloaders. With the rotating take(), non-specific unloaders are equal-opportunity across all available resources, which gives single-resource unloaders that many more chances to unload more of their resources before non-specific unloaders get to them. It also reduces the rate at which items further down the list that may hardly ever get touched by the existing implementation will race toward the storage block's cap. The even drain across all items will help prevent things like mass driver stalls due to receivers filling up with an excess resource that isn't getting cleared.

It would be even nicer if dedicated unloaders had priority over non-specific ones (non-specific unloaders don't touch resources with dedicated unloaders unless the dedicated unloaders are overflowing), though that would require a rework beyond my current "getting the stupid IDE and tool chains to work" level of familiarity with Java development.

To sum it up: trivial change, big impact for people who like mixing belts and sorting them out with unloaders.

* Update core/src/mindustry/world/modules/ItemModule.java

Co-Authored-By: Patrick 'Quezler' Mounier <Quezler@me.com>

* Update core/src/mindustry/world/modules/ItemModule.java

Co-Authored-By: Patrick 'Quezler' Mounier <Quezler@me.com>

* Formatting

* Anuken's take() rotator.

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
 2020-02-03 20:27:25 -05:00
Anuken
a942ed2cad More cleanup 2020-02-03 20:24:49 -05:00
Anuken
88d2ec5be8 Cleanup 2020-02-03 15:59:54 -05:00
Anuken
141cf518a2 Refactoring 2020-02-03 14:07:06 -05:00
DeltaNedas
fea9f51513
!dir.exists() and new line 2020-02-03 18:36:17 +00:00
DeltaNedas
4709b5dddc
remove old mainScript, it is always main.js 2020-02-03 18:35:24 +00:00