mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-03 12:53:48 +07:00
Code Issues Packages Projects Releases Wiki Activity
8,010 Commits 4 Branches 160 Tags 2.3 GiB
188171ec03
Commit Graph

6872 Commits

Author SHA1 Message Date
Anuken
23e1d0998a
Merge pull request #2093 from zethnest/map-center 
[QOL] Center Map to Player Implementation
 2020-07-14 20:41:03 -04:00
Anuken
6e08b67817
Merge pull request #2164 from Cyberman-42/patch-1 
Update bundle_nl.properties
 2020-07-14 15:30:33 -04:00
Anuken
7a60339c5d
Update bundle_nl.properties 2020-07-14 15:30:16 -04:00
Anuken
7f6026bd52 Implemented #2153 2020-07-14 15:27:58 -04:00
Anuken
e0f1242ca7 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-07-14 15:04:04 -04:00
Anuken
bd95d81b40 nah 2020-07-14 15:03:59 -04:00
Anuken
d5b71e2773
Merge pull request #2210 from xerus2000/patch-1 
Unify tower terminology in german translation of tutorial
 2020-07-14 15:03:08 -04:00
Anuken
c21b02b1ec
Merge pull request #2187 from Catchears/patch-1 
Improved german translation.
 2020-07-14 15:02:33 -04:00
Anuken
c1cd84593d
Merge pull request #2194 from driver1748/patch-1 
Corrected some translations
 2020-07-14 14:58:35 -04:00
Anuken
85d67db1ed
Merge pull request #2175 from AlbertCerfeda/patch-2 
Minor changes
 2020-07-14 14:58:13 -04:00
Anuken
fe0d3cfe22
Merge pull request #2140 from soytheLB/patch-5 
Update bundle_es.properties
 2020-07-14 14:56:30 -04:00
Anuken
1661905d9b
Merge pull request #2106 from PetrGasparik/v105 
Czech translation - up to date!
 2020-07-14 14:56:09 -04:00
Anuken
ca1e43d79c
Merge branch 'master' into patch-2 2020-07-14 14:52:28 -04:00
Anuken
43676b68bf
Merge pull request #2105 from TheJaaju/patch-4 
Update bundle_fi.properties
 2020-07-14 14:49:27 -04:00
Anuken
752cccb588
Merge pull request #2062 from GioIacca9/patch-11 
Minor changes
 2020-07-14 14:45:51 -04:00
Anuken
3eca6b770e <added missing sprites IntelliJ missed> 2020-07-14 14:39:11 -04:00
Anuken
a1a72ee713 <added missing sprites IntelliJ missed> 2020-07-14 13:21:12 -04:00
Anuken
9dc49743e8 Implemented #1335 2020-07-14 13:20:50 -04:00
Anuken
fb08a3638b NetClient cleanup 2020-07-14 13:04:22 -04:00
Anuken
f9b6b8e5b7 recieve -> receive 2020-07-14 11:16:32 -04:00
Anuken
da577a0db2 Merge remote-tracking branch 'origin/master' 2020-07-14 11:11:56 -04:00
Anuken
fbd55a341e Implemented server autosave config (#1296) 2020-07-14 11:11:49 -04:00
Anuken
064a0545a8
Merge pull request #1941 from bluet-it/master 
add bundle_hu
 2020-07-14 10:41:34 -04:00
Anuken
a33ac30a01
Merge pull request #1595 from andreasgamborg/patch-1 
Create bundle_da.properties
 2020-07-14 10:41:28 -04:00
Anuken
6d7d4bcba1
Merge pull request #2028 from burunduk/patch-2 
Update bundle_uk_UA.properties
 2020-07-14 10:40:34 -04:00
Anuken
b541cfcc75
Update bundle_zh_TW.properties (#2081) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-07-14 10:37:54 -04:00
Ali-C-Ila
6c52812a0d
Update bundle_zh_TW.properties (#2054) 2020-07-14 10:37:41 -04:00
Lapis
360494af50
Update bundle_ja.properties (#2046) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix

* fix typo

* bundle_ja.properties

* Small fix

* Small fix

* Update bundle_ja.properties

* Update bundle_ja.properties

* add waves.guardian

* Fixed setting.atmosphere.name translation

* translation of waves.shields

* Update bundle_ja.properties
 2020-07-14 10:37:22 -04:00
Anuken
b48e6d0e2f Illuminator tweaks 2020-07-14 10:25:56 -04:00
Felix Corvus
83d334582b
Update bundle_ru.properties 
Changes from https://github.com/Anuken/Mindustry/pull/2225
 2020-07-14 07:24:40 +03:00
Anuken
250d982d99 Internal unit name finalizations 2020-07-13 20:39:43 -04:00
Ubuntu8406
982b7f33bc
A small update of the finnish translation 2020-07-13 19:10:40 +03:00
Anuken
103ebc009d Fixed #2224 2020-07-13 08:50:19 -04:00
Petr Gašparík
a0ef83fb62 Czech translation - small improvement 2020-07-13 10:43:31 +02:00
Petr Gašparík
682bfcc8e8 Merge branch 'master' of https://github.com/Anuken/Mindustry into v105 2020-07-13 10:42:30 +02:00
Anuken
d31a530d6e Minor unit production balancing 2020-07-12 23:25:36 -04:00
Anuken
f5f495b9b8 Leg unit movement fixes 2020-07-12 11:34:19 -04:00
Anuken
dad5b186db Bugfixes / Negative knockback / Unit progress 2020-07-11 23:35:58 -04:00
Anuken
430eef02e2 Multi-legged unit implementations 2020-07-11 22:41:26 -04:00
Anuken
0555e4dfa7 Various palette changes 2020-07-11 14:44:50 -04:00
Anuken
6188250605 Unit tweaks 2020-07-11 13:20:23 -04:00
Anuken
064172e1f1 Bugfixes 2020-07-11 10:26:27 -04:00
Anuken
0752076bf2 Bullet cleanup 2020-07-11 09:08:17 -04:00
Anuken
a8d5198ca6 IntelliJ still refusing to add new files 2020-07-10 20:05:10 -04:00
Anuken
9cb4645b11 More unit progress 2020-07-10 20:04:45 -04:00
T1NT4
b81de5ebe4
Update bundle_pt_BR.properties 
changed the revenant factory description to match the revenant unit description on the database, and also fixed the revenant factory description so it no longer says that revenant are ground units
 2020-07-10 18:00:12 -03:00
Anuken
d7e432f730 Unit name changes 2020-07-10 16:38:19 -04:00
Anuken
d1485e3e65 IntelliJ has failed to commit this file 3 times 
It's been checked in my version control UI for my last 3 commits, and was invisible in my first commit despite me refreshing the list
 2020-07-10 13:26:05 -04:00
Anuken
21170634bd More unit abilities 2020-07-10 13:22:45 -04:00
Anuken
baa9f22a0b Ground support unit implementations 2020-07-10 12:14:24 -04:00
Anuken
f39702e1cc Core unit balance 2020-07-10 09:43:59 -04:00
Anuken
b94f883f39 More multiplayer fixes 2020-07-09 20:58:49 -04:00
Anuken
7c5f3762dd Bugfixes 2020-07-09 16:48:36 -04:00
Anuken
938ae6e80a Merge remote-tracking branch 'origin/master' 2020-07-09 13:14:05 -04:00
Anuken
2584197a02 Multiplayer bugfixes 2020-07-09 13:13:57 -04:00
zethnest
2a81370c66
fix power produce & consumption (#2217) 2020-07-09 09:23:49 -04:00
Anuken
29e9d064df Unit wreck visuals 2020-07-08 23:48:12 -04:00
Anuken
b0f69263c7 Bugfixes 2020-07-08 19:17:08 -04:00
Anuken
c15aec641a Environmental lights / Bugfixes 2020-07-08 12:40:17 -04:00
Anuken
a9333baa78 Research tweaks 2020-07-08 12:11:27 -04:00
Anuken
26e70fa585 Many various campaign mechanic changes 2020-07-07 21:13:03 -04:00
Anuken
b95206cf87 Support for jar mods on desktop 2020-07-07 09:34:52 -04:00
Anuken
56ffe5aea8 Campaign mechanics 2020-07-06 21:53:34 -04:00
Anuken
a6523630bf Unit sprite cleanup 2020-07-06 11:05:37 -04:00
Catchears
8a5f19e4f9 Changes from stuffAI 2020-07-06 13:08:48 +02:00
Janek
14f975bde7
Unify Tutorial terminology in german translation 
A friend of mine was playing through the tutorial and was confused by the term "Turm", since the duo is translated as "Geschütz", so he didn't quite know what the tutorial wanted. This unifies the terminology, since in the beginning you only have one "Geschütz" choice anyways.
 2020-07-05 17:54:48 +02:00
Anuken
9b285e6b21 Removed references to "phantom" 2020-07-05 11:15:46 -04:00
Anuken
403597f860 Unit cleanup 2020-07-05 10:39:54 -04:00
Anuken
add0d0cd86 Unit naming / Fixed #2209 2020-07-04 23:53:22 -04:00
Anuken
8576d535bd Removed "on" prefix from all remote methods 2020-07-03 18:48:31 -04:00
Anuken
7ff2e98420 Cleanup 2020-07-03 16:41:06 -04:00
Anuken
843a8c3e56 Fixed crashes with team IDs above 127 2020-07-03 12:36:12 -04:00
Anuken
3772b04c6b Miner unit fixes 2020-07-03 09:30:08 -04:00
Anuken
fb7633cb07 Cyclone hits ground targets again 2020-07-02 23:35:36 -04:00
Anuken
efa8d8a0d7 Minor weapon fixes 2020-07-02 23:19:44 -04:00
Anuken
f4a7108382 Weapon system refactoring 2020-07-02 22:48:37 -04:00
Anuken
d59aab1a7d Air/ground bullet cleanup 2020-07-02 15:52:21 -04:00
Anuken
ee3aedc75f Implemented core item display (WIP) 2020-07-02 15:27:02 -04:00
Anuken
cecb5cf4b4 Added tractor beam turret 2020-07-02 14:02:33 -04:00
Anuken
0a7e40bd23 Merged wall classes 2020-07-02 10:44:31 -04:00
Anuken
fd2deb0a82 Moved pref saving to specific locations 2020-07-02 10:20:16 -04:00
Anuken
5f6c71b9d3 Replaced concept of "turns" with raw seconds 2020-07-01 11:50:33 -04:00
Anuken
3cf5adc278 Merge remote-tracking branch 'origin/master' 2020-06-30 19:14:40 -04:00
Anuken
e907c2045c Cleanup 2020-06-30 19:14:32 -04:00
Katsute
5740c2b6d0
hideme (#2201) 
Co-authored-by: Katsute <Katsute@users.noreply.github.com>
 2020-06-30 11:53:14 -04:00
Anuken
c2c0c3fd08 Fixed #2197 2020-06-29 21:22:12 -04:00
Anuken
df4278a646 Removed item core restrictions 2020-06-29 19:32:15 -04:00
Anuken
810a59f146 Mass driver resprite 2020-06-29 16:23:25 -04:00
Anuken
bf5dd7386e Reduced garbage allocation 2020-06-29 15:58:48 -04:00
Anuken
d58e3ac235 Implemented more sector launch mechanics 2020-06-29 11:58:43 -04:00
WinterUnderTheSnow
679aab18ee
*Phantom is now Phenom too 
XD
 2020-06-29 10:07:53 +08:00
Anuken
fb032eb763 Enforce sector core capacity 2020-06-28 20:16:36 -04:00
Anuken
0d6657a1e8 Idle sector resource production 2020-06-28 18:55:42 -04:00
Anuken
fceac4c1a1 Don't show launch animation for existing bases 2020-06-28 13:35:08 -04:00
Anuken
b3f29f100d Custom launch items 2020-06-28 13:33:53 -04:00
Prosta4okua
24071ed23b
Merge branch 'master' into master 2020-06-28 19:41:37 +03:00
Prosta4okua
e1e9b28bf1
Ненужная большая буква + обновление с master. 
1. Вы -> вы
2. Ваш -> ваш
«Вы» используется только в деловом общении.
 2020-06-28 19:34:12 +03:00
Anuken
6386cae19a Launching dialog bugfixes & requirement display 2020-06-28 11:40:03 -04:00
WinterUnderTheSnow
b12d3ae0ba
Corrected some translations 
4,5 Noticed that using discord in China need some unusual ways.
19 ‘Gameover’ not ‘Your core has been destroyed!’
105 Mod guide is actually guiding you how to make a mod 
116 ‘dependences’refers to ‘mods needed’,not ‘condition needed’
126 ‘import mod from GitHub’sounds better than’import github mod’
151 I think ‘Your are not invited to play on this server’ sounds better than ‘You are not in the whitelist’.This will stop noobs spamming everywhere.
155 ‘Server admin’ but not ‘Room owner’
156,193,203,206 ‘ban’ is better than ‘blacklist’
195 added one this server’
1000 phantom?Why not Phenom(Yes that CPU) XD (In fact ‘神魂修理机’ is a joke too)
 2020-06-28 21:40:17 +08:00
Anuken
bd274f804a Loadout selection + custom loadout schematics 2020-06-27 23:04:38 -04:00
Anuken
63356e96ec Merge remote-tracking branch 'origin/master' 2020-06-27 19:16:47 -04:00
Anuken
80332e37d5 Upgradeable cores 2020-06-27 19:16:39 -04:00
Summet
63717bdf51
Small Colored Shields Improvement. (#2193) 
When a player places a force projector, the color of its edges will be the color of the player.
 2020-06-27 11:06:13 -04:00
Anuken
313cadb763 Minor cleanup / Trail experiment 2020-06-27 09:20:52 -04:00
Anuken
0847b20401 Cleanup 2020-06-26 18:50:30 -04:00
Anuken
7401c16ded Team-colored shields 2020-06-26 18:42:29 -04:00
Anuken
0df4e26736 Cleanup 2020-06-26 15:59:54 -04:00
Anuken
fdf7c88083 argh 2020-06-26 14:27:26 -04:00
Anuken
eabc5c15c7 Codegen for an inheritance tree 2020-06-26 11:58:35 -04:00
Catchears
bec394abbc Fix translations 2020-06-26 08:43:39 +01:00
Anuken
96f41b0cf3 Cleanup 2020-06-25 22:34:38 -04:00
Anuken
c12865eabc Removed reload, forced mandatory mod restart 2020-06-25 22:31:47 -04:00
Anuken
ecfac00c30 Arc 2020-06-25 12:54:55 -04:00
Anuken
d90807b29c Bugfixes 2020-06-25 12:51:30 -04:00
Catchears
f4f5658fee Revert "Revert "Small comma fix"" 
This reverts commit 62399d0f2b.
 2020-06-25 13:22:50 +01:00
Catchears
62399d0f2b Revert "Small comma fix" 
This reverts commit 47ec565316.
 2020-06-25 13:22:39 +01:00
Catchears
47ec565316 Small comma fix 2020-06-25 11:06:28 +01:00
Catchears
0f224c7780 Add / improve translations again 2020-06-25 11:02:48 +01:00
Catchears
946ac8eefb Change capitalisation due to a mistake 2020-06-25 09:45:21 +01:00
Anuken
19cb144cdb Minor GL fixes 2020-06-24 20:37:49 -04:00
Anuken
b204074690 More multiplayer fixes 2020-06-24 10:07:05 -04:00
Anuken
d5c758c18a arc 2020-06-23 22:47:40 -04:00
Anuken
843be42568 More multiplayer bugfixes 2020-06-23 22:46:28 -04:00
Anuken
db2f61ec29 less instant disconnect, more broken multiplayer 2020-06-23 21:07:20 -04:00
Anuken
d095008e7c Some initial multiplayer bugfixes 2020-06-23 20:01:55 -04:00
Anuken
fc8e1d5b6d Bugfixes 2020-06-23 16:27:32 -04:00
Anuken
ba78eab30a Proper player icons 2020-06-23 15:40:24 -04:00
Anuken
7b7e803011 Cleanup 2020-06-22 23:08:59 -04:00
Anuken
7dfd20d020 Core launch cost 2020-06-22 21:02:53 -04:00
Petr Gašparík
f0882d8d5e Czech translation - up to date 2020-06-22 23:19:57 +02:00
Petr Gašparík
e3735ffa9c Merge branch 'master' of https://github.com/Anuken/Mindustry into v105 2020-06-22 22:54:57 +02:00
Math2128
185e4334f6
Update bundle_fr.properties 
Update to the main bundle
 2020-06-22 13:52:06 -04:00
Anuken
58d8e22b40 Added smooth camera option 2020-06-22 13:40:04 -04:00
Anuken
47b06d0eac Added sandstorm weather 2020-06-22 11:10:12 -04:00
Anuken
42c323365a Removed CoreLauncher 2020-06-21 20:22:20 -04:00
Anuken
9c69e3a1a0 Bugfixes / Sector preset cleanup 2020-06-21 16:00:26 -04:00
Catchears
af7b7ef2b1
Improved german translation. 2020-06-21 20:03:46 +01:00
Anuken
4a8be42258 Lowercase enums 2020-06-21 12:38:59 -04:00
Anuken
6f1a64db78 Updated atlas with correct enum names 2020-06-21 12:25:11 -04:00
Anuken
934db24d3b Renamed Texture enums with correct case 2020-06-21 12:20:02 -04:00
Anuken
93ae73abb6 Sprite cleanup 2020-06-21 10:38:13 -04:00
Anuken
71ea9b3bd9 (IntelliJ refuses to add new files after refresh) 2020-06-21 10:34:00 -04:00
Anuken
6517eaf62f Implemented #2177 2020-06-21 10:33:08 -04:00
Anuken
a0f0640729 Testing liquids/items in tech tree 2020-06-20 22:21:43 -04:00
Anuken
2082976783 Merge remote-tracking branch 'origin/master' 2020-06-20 12:28:31 -04:00
Anuken
25338ff1cf Removed CampaignData.java/GlobalData.java 2020-06-20 12:28:24 -04:00
Patrick 'Quezler' Mounier
e41d2d66c5
Make room for a space (#2179) 2020-06-20 11:35:26 -04:00
Anuken
ec4a5880b7 Fixed #2178 2020-06-20 09:07:35 -04:00
Anuken
f419de0fad Fixed some tech tree layout issues 2020-06-19 23:36:21 -04:00
Anuken
6bcc103cf7 Research system progress 2020-06-19 19:31:14 -04:00
Anuken
08ac91359b Sprite cleanup 2020-06-19 12:26:58 -04:00
Anuken
63eee99aba Merge remote-tracking branch 'origin/master' 2020-06-19 12:26:48 -04:00
Anuken
2280ed6071 Research block tweaks / Merged in #1927 2020-06-19 12:26:41 -04:00
Albert Cerfeda
5a1c9ce785
Minor changes 2020-06-19 15:53:21 +02:00
Albert Cerfeda
2ee518c9fc
Uppercase initial of 'Trello' (#2174) 2020-06-19 08:06:31 -04:00
Anuken
15623fbe5c Support for local server discovery on Steam 2020-06-18 19:23:42 -04:00
Anuken
31708b9af7 Exception parsing cleanup 2020-06-18 18:47:34 -04:00
Anuken
fa2df57021 Sector preset shadow fixes 2020-06-18 14:43:53 -04:00
Anuken
d38abe95f9 Editor bugfixes / Arbitrary map resizing 2020-06-18 14:24:22 -04:00
Anuken
ae47f37b27 Added campaign target wave 2020-06-17 21:41:39 -04:00
Anuken
e88ff1a358 Minor UI tweaks 2020-06-17 15:07:20 -04:00
Anuken
bce8a61390 Switched to ES6 language level 2020-06-17 14:35:47 -04:00
Anuken
2bfe0c30ec Cleanup 2020-06-17 12:17:29 -04:00
Anuken
3c02234a3b Ammo resupply point implementation 2020-06-17 10:41:26 -04:00
Anuken
de16c95dd6 Some simplification 2020-06-16 23:01:58 -04:00
Anuken
5da0267df9 Hover unit display 2020-06-16 22:56:51 -04:00
zethnest
0aa313e37c
fixed-hotkey implementation (#2170) 2020-06-16 16:29:44 -04:00
Anuken
a7ca632c09 AI in custom game attack mode 2020-06-16 16:04:25 -04:00
Anuken
2e42526e90 Fixed up Discord RPC 2020-06-16 14:13:43 -04:00
Anuken
918c9492df Changing discord RPC system 2020-06-16 13:43:00 -04:00
Anuken
6e162d91e5 Fixed #2169 2020-06-16 10:08:33 -04:00
Anuken
1eaa1a05ac Switched to rhino fork 2020-06-15 23:22:14 -04:00
Anuken
caea5c7df2 Cleanup 2020-06-15 21:52:51 -04:00
Anuken
b789394efc TextField fixes 2020-06-15 19:26:03 -04:00
Anuken
89aec3ac51 Cleanup 2020-06-15 18:35:21 -04:00
Anuken
405d6cf33f Per-team infinite building resources 2020-06-15 15:33:14 -04:00
Math2128
cecfe77e95
Update bundle_fr.properties 
Translated new stuffs + fixed two mistakes.
 2020-06-15 15:06:42 -04:00
Anuken
7001ad09cb Support for team-only lighting 2020-06-15 13:54:02 -04:00
Anuken
b5660a50ca Certain team-specific rules 2020-06-15 12:00:32 -04:00
Anuken
90b0650af9 Merge remote-tracking branch 'origin/master' 2020-06-15 09:58:54 -04:00
Anuken
d04ce2a750 Block damage multiplier rule 2020-06-15 09:58:46 -04:00
Cyberman
3dfad51e93
Update bundle_nl.properties 
Just a few things I had time for.
 2020-06-15 15:49:10 +02:00
ILiekMelons
dbe482d494
Fixed disassembler and overdrive projector (#2163) 
I misspelt disassembler and forgot to put a .name somewhere 😅
 2020-06-15 09:44:38 -04:00
Math2128
db77cfa3b5
Update bundle_fr.properties 
added the new stuff from the main bundle + fixed a typo
 2020-06-15 02:02:04 -04:00
Math2128
ac14f43107
Update bundle_fr.properties 
1125
 2020-06-14 20:45:10 -04:00
ILiekMelons
2a7da8c80e
Add names for new drones and machines (#2162) 
* Add in names for drone-related things

* Various machines added

* extra newline that i removed
 2020-06-14 20:43:25 -04:00
Math2128
baa0d5a951
Update bundle_fr.properties 
1030
 2020-06-14 18:46:32 -04:00
Anuken
5f79040faa Testing doc script 2020-06-14 18:41:42 -04:00
Anuken
126b54b981 Better built-in shuffle 2020-06-14 14:50:04 -04:00
Math2128
9e105dbce5
Update bundle_fr.properties 
971
 2020-06-14 14:13:15 -04:00
Anuken
5370874686 Client debug info 2020-06-14 11:21:50 -04:00
Anuken
1823bc8f15 Support for compiling on Java 14 2020-06-14 11:10:54 -04:00
Math2128
a7a31f6c35
Update bundle_fr.properties 
837
 2020-06-14 00:33:57 -04:00
Anuken
b4573861a8 h i g h precision shaders 
(I shouldn't need to do this)
 2020-06-13 20:58:41 -04:00
Anuken
1f48daa4ed arc 2020-06-13 18:20:37 -04:00
Anuken
f365d8519b Reconstructor fixes 2020-06-13 18:20:10 -04:00
Anuken
c74d2f8cf2 Merge remote-tracking branch 'origin/master' 2020-06-13 16:27:22 -04:00
Anuken
b48736e771 Reconstructor sprites / Bugfixes 2020-06-13 16:27:15 -04:00
Summet
26f0a627d5
Unnecessary Draw.z (#2160) 2020-06-13 15:19:27 -04:00
Anuken
f55fb48ea7 Slightly higher contrast black palette 2020-06-13 12:24:50 -04:00
Anuken
186ae4e2a2 why 2020-06-13 12:13:57 -04:00
Anuken
fef4882c15 Turbine generator tweaks 2020-06-13 12:08:03 -04:00
Anuken
8769b9bf0e CI test 2020-06-13 10:41:59 -04:00
Anuken
bb7da46301 Merge remote-tracking branch 'origin/master' 2020-06-13 10:33:26 -04:00
Anuken
3b3a1dd496 Editor map fix / Crafter renderer system 2020-06-13 10:33:19 -04:00
DeltaNedas
e025f94200
make FPS/Ping and position untouchable (#2159) 2020-06-12 21:32:19 -04:00
Anuken
27522ae494 Icon generation improvements 2020-06-12 19:41:06 -04:00
Anuken
2bd3bc0e13 Reconstructor fixes 2020-06-12 18:41:35 -04:00
Anuken
d85a7338ea Batch cleanup 2020-06-12 17:20:50 -04:00
Anuken
a47e300297 Cleanup 2020-06-12 14:57:57 -04:00
Anuken
a76cb3cb1a Scrapped reaper segments 2020-06-12 13:32:00 -04:00
Anuken
ce9f515543 Fallback atlas / Bugfixes / Cleanup 2020-06-11 15:25:46 -04:00
Anuken
1e954dc2be Cleanup 2020-06-11 14:09:06 -04:00
Anuken
e247b092dc cleaning up mistakes 2020-06-11 13:42:22 -04:00
Anuken
732769524c 🔥🔥🔥 2020-06-11 12:03:27 -04:00
Math2128
917db20e76
Update bundle_fr.properties 2020-06-10 23:10:00 -04:00
Anuken
2a9008f042 Transition to Framebuffer#blit 2020-06-10 21:07:21 -04:00
Math2128
c5df9aa814
Update bundle_fr.properties 
Ligne 644: Le jeu ne se met pas en pause pendant que l'on construit, même avec cette option de cocher. En fait, cela met la construction sur pause et attend que l'on appuie sur la touche E (par défaut) pour confirmer la construction. Je trouvais l'ancien nom assez trompeur, et je l'ai donc changer comme cela. 

I'm at line 762
 2020-06-10 19:20:31 -04:00
Anuken
6648a9ff1a Cleanup 2020-06-10 19:19:19 -04:00
Anuken
c66c3590b1 Batch cleanup 2020-06-10 17:42:45 -04:00
Anuken
a7bdd6c856 Improved shader preprocessing 2020-06-10 16:58:56 -04:00
Anuken
2b1bd90dfa Out of atlas space / GL30 progress 2020-06-10 12:55:01 -04:00
Math2128
61d212128a
Update bundle_fr.properties 
line 709
 2020-06-09 23:47:13 -04:00
Anuken
a51a8d7473 Added cool new reconstructors™️ 2020-06-09 23:11:02 -04:00
Anuken
9fbe421905 Sprites 2020-06-09 17:04:38 -04:00
Math2128
778b61914a
Update bundle_fr.properties 
Correction de quelques fautes de frappe lors des modifications des descriptions des tourelles.
Fixed some typos about turret descriptions.
 2020-06-09 14:04:00 -04:00
Anuken
d0565420ef Sprites 2020-06-09 11:08:22 -04:00
Anuken
b346b9114a Updated Gradle 2020-06-09 08:46:28 -04:00
Anuken
99518f4e1d Functioning 5x5 reconstructor 2020-06-08 21:34:08 -04:00
Anuken
6501071510 Cleanup, renaming 2020-06-08 21:03:29 -04:00
Anuken
6dd9369066 Cleanup 2020-06-08 17:31:02 -04:00
Anuken
8ea28e1ced Seq. 2020-06-08 17:19:47 -04:00
Anuken
87ab895253 Sprites moved 2020-06-08 17:10:55 -04:00
Anuken
43762e82a8 Unit tweaks 2020-06-08 16:33:21 -04:00
Math2128
758b327639
Update bundle_fr.properties 
Quelques changements aux descriptions des tourelles pour s'ajuster aux définitions anglaises et dans le but d'homogénéiser les descriptions. Je ne suis pas sur au niveau du Cyclone.
Some changes about the turret descriptions to fit more the english description.
 2020-06-08 15:07:50 -04:00
Anuken
bb9855e830 Merge remote-tracking branch 'origin/master' 2020-06-08 11:52:27 -04:00
Anuken
cac6041583 tweaks 2020-06-08 11:52:14 -04:00
Anuken
1f905790e7 kinematic lerp 2020-06-08 11:45:48 -04:00
Anuken
427cf8e594 cleanup 2 2020-06-08 11:06:04 -04:00
Anuken
5c6a155d75 cleanup 2020-06-08 10:57:52 -04:00
EyeOfDarkness
b9ccc528e9
Updated Chaos Array and Eradicator sprites (#2155) 
* updated sprite

* lich

* Add files via upload

* Add files via upload

* ground

* Add files via upload
 2020-06-08 10:57:02 -04:00
Anuken
4537c4ea57 no IK 2020-06-08 10:46:19 -04:00
Summet
af3423d94a
Add newline to contributors file (#2156) 2020-06-08 10:20:59 -04:00
Anuken
5869b7d27e leg 1 2020-06-08 10:03:46 -04:00
Math2128
be50ededcd
Update bundle_fr.properties 
Because I made typos translating the tutorial
 2020-06-07 21:35:00 -04:00
Math2128
f7a7521120
Update bundle_fr.properties 
Worked on the « may be subject to a lot of changes» tutorial.
 2020-06-07 21:09:40 -04:00
Math2128
5ca1d66755
Update bundle_fr.properties 2020-06-07 20:01:36 -04:00
Anuken
36ce04e8f0 fuse fix 2020-06-07 18:26:45 -04:00
Petr Gašparík
cd1918e337 Czech translation - update with cleanups 2020-06-08 00:00:56 +02:00
Petr Gašparík
269a92a723 Merge branch 'master' of https://github.com/Anuken/Mindustry into v105 2020-06-07 23:56:42 +02:00