mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-06 07:30:35 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,470 Commits 4 Branches 160 Tags 2.3 GiB
67f6ca3d5d
Commit Graph

12215 Commits

Author SHA1 Message Date
buthed010203
99eee2e738
Fix crash in rtsai (#6932) 
Fixes #6862
 2022-06-08 08:26:07 -04:00
buthed010203
7139ecab42
A build "weapon" is not a weapon (#6918) 
* A build "weapon" is not a weapon

https://www.youtube.com/watch?v=a89ChTdUFrc

* whoops
 2022-06-08 08:24:55 -04:00
buthed010203
ef0eb7ddcf
Fix sublimate crashes when Team.infiniteResources is true (#6931) 2022-06-08 08:24:42 -04:00
buthed010203
d6acfadab9
No more free core upgrades (#6936) 2022-06-08 08:24:22 -04:00
Anuken
1c0eff0871 Made IndexedRenderer shader static 2022-06-08 07:52:51 -04:00
Anuken
49d859f6bb Android build fixes 2022-06-06 11:31:38 -04:00
Anuken
0177902010 Turrets should consume 1 ammo/shot by default 2022-06-05 10:12:52 -04:00
Anuken
56cc88f582 Fully fixed weapon part bug 2022-06-03 21:42:26 -04:00
Anuken
152a5b5c94 Minor bugfixes 2022-06-03 21:06:14 -04:00
Anuken
29e086f23b Removed some unnecessary uniform setting 2022-05-30 12:05:10 -04:00
Anuken
55a219fc03 Misc minor fixes 2022-05-28 07:48:43 -04:00
Anuken
0e4903910b Block placement method changes (will break some mods) 2022-05-26 11:19:36 -04:00
Anuken
e2bd6571b1 Chat message sound + minor JSOn fix 2022-05-25 23:15:09 -04:00
Anuken
6d9029fb23 some JSON fixes 2022-05-22 22:27:53 -04:00
Anuken
2236771b22 Misc cleanup + some JSON stuff 2022-05-22 22:16:03 -04:00
Anuken
e62c2f9d8e UnitType type -> class 2022-05-22 09:00:32 -04:00
Anuken
b8dac1e408 JSON UnitType type: support 2022-05-21 12:40:16 -04:00
Anuken
b010e9d720 recoil as part progress 2022-05-20 19:46:18 -04:00
Anuken
39f32af500 might as well uncomment this hidden unit 2022-05-20 10:53:07 -04:00
Anuken
07ff2de2a2 Misc tech tree & block stuff 2022-05-16 17:53:09 -04:00
Anuken
13e57ba89e Re-added xRand 2022-05-16 13:50:40 -04:00
Anuken
2641404f46 Fixed black atlas bug 2022-05-16 13:25:48 -04:00
Anuken
9212c178fc Weapon utility handleBullet method 2022-05-16 11:06:50 -04:00
Anuken
bf91676fea Laser damage intersect fix 2022-05-16 01:53:44 -04:00
Anuken
67344ffd7d Turret instant reload fix 2022-05-14 23:28:15 -04:00
Anuken
bc65e63654 Beter payload updating system 2022-05-14 17:20:49 -04:00
Anuken
69a32c5ac9 Cleanup/Outline utility methods 2022-05-14 12:16:44 -04:00
Anuken
e9290af4d2 Misc fixes for mods (2) 2022-05-14 01:42:49 -04:00
Anuken
b66283fbd0 Misc fixes for mods 2022-05-13 22:23:50 -04:00
Anuken
ad5e4f2556 disabled gl30 2022-05-13 20:55:49 -04:00
Anuken
4b86d4cf6d typo fix 2022-05-13 09:53:13 -04:00
Lucky Clover
38e71e5aa4
Fix burstdrill lastDrillSpeed (#6854) 
fix BurstDrill drillspeed bar always showing max drillspeed
 2022-05-12 11:40:11 -04:00
Yuri Polyakov
1d8d0f4a36
[RU] Big bundle update (#6849) 
* [RU] Big bundle update

r.i.p. my last pr

* Update bundle_ru.properties

* роутер
 2022-05-12 11:26:42 -04:00
澄みわたる朝色
fb8434322c
Update bundle_zh_TW.properties (#6851) 
* zh_TW translation for erekir

* zh_TW translation for erekir

* zh_TW translation for erekir

* zh_TW translation for erekir

Co-authored-by: weiliang1503 <weiliang1503@163.com>
 2022-05-12 10:51:02 -04:00
Anuken
ec50ea62d5 Fixed #6852 2022-05-12 10:49:32 -04:00
Anuken
8e9d0d5c29 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-05-12 10:10:14 -04:00
Anuken
cd78fd6340 Misc bugfixes 2022-05-12 10:10:11 -04:00
dead inside
ac7c9898b4
Fix handleBullet receiving incorrect angle offset (#6839) 2022-05-12 10:06:26 -04:00
Anuken
f64a45f78d Fixed elude place check 2022-05-12 09:40:03 -04:00
Anuken
d1c1455565 Don't sense hidden items/liquids 2022-05-12 00:38:32 -04:00
Anuken
e83e402612 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-12 00:19:14 -04:00
Github Actions
48b19751a3 Automatic bundle update 2022-05-12 04:07:42 +00:00
Anuken
9b9a1dd332 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-12 00:06:55 -04:00
xem8k5
699a8929e4
Fix bundle_zh_CN.properties (#6844) 
* Fix bundle_zh_CN.properties

block.tank-refabricator.name = 坦克重构厂
block.mech-refabricator.name = 爬虫重构厂
block.ship-refabricator.name = 飞艇重构厂

Now is "refabricator"？

* Update bundle_zh_CN.properties
 2022-05-12 00:06:47 -04:00
Anuken
9edab6e742 Merge remote-tracking branch 'origin/master' 2022-05-11 23:28:41 -04:00
Anuken
263f129c8b Fixed #6843 2022-05-11 23:28:37 -04:00
hortiSquash
7914a187e5
Unloader fix 4 - New Load Priority (#6840) 
* should solve the MD bug and some others

* skill issue
 2022-05-11 22:39:50 -04:00
Anuken
6e79f22734 Merge remote-tracking branch 'origin/master' 2022-05-11 22:20:17 -04:00
Anuken
eae371854b Zenith item capacity revert (for now) 2022-05-11 22:20:13 -04:00
Somka000
1944ffe1a5
Translated everything bundle_pl.properties (#6838) 2022-05-11 21:57:26 -04:00
Anuken
ac4d5b66b3 Enabled gl30 by default, will likely crash on certain devices... 2022-05-11 21:38:30 -04:00
Anuken
de909b2ad3 Merge remote-tracking branch 'origin/master' 2022-05-11 20:18:29 -04:00
Anuken
d4b0c9da1b Hide command mode popup on mobile 2022-05-11 20:18:25 -04:00
Rex
19d5170137
Update contributors (#6836) 2022-05-11 20:13:47 -04:00
Github Actions
eff4e91207 Automatic bundle update 2022-05-11 23:28:53 +00:00
xem8k5
37a46282f2
Update bundle_zh_CN.properties the third time (#6834) 
* Update bundle_zh_CN.properties the third time

Fixed various grammar issues

* Update bundle_zh_CN.properties
 2022-05-11 19:27:58 -04:00
buthed010203
d4681f2c94
No. (#6833) 2022-05-11 19:27:47 -04:00
Anuken
650b67365b Fixed #6829 2022-05-11 16:58:18 -04:00
Anuken
c1e98a1406 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-11 14:40:39 -04:00
Anuken
3554d64573 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-05-11 14:36:36 -04:00
Anuken
be9b7da892 Automatic consumeCoolant 2022-05-11 14:36:34 -04:00
JniTrRny
849d0b6223
newline for those unfortunate mobile players (#6828) 2022-05-11 14:28:04 -04:00
Rex
2da60c4efc
Update bundle_es.properties (#6826) 
I just realized that they are turrets and not blocks
 2022-05-11 14:04:32 -04:00
dead inside
4d12ac8ed6
A better way to do this (#6827) 2022-05-11 14:01:10 -04:00
Anuken
f54116425d Bugfixes 2022-05-11 12:33:10 -04:00
Anuken
25cc53625c Merge remote-tracking branch 'origin/master' 2022-05-11 12:02:25 -04:00
Anuken
2beca30b0c Spore press craft time fix 2022-05-11 12:02:19 -04:00
Github Actions
4ac87ec61a Automatic bundle update 2022-05-11 14:15:24 +00:00
Rex
beae0662ce
Update bundle_es.properties (#6825) 2022-05-11 10:14:12 -04:00
snusunny
72f4d67a3b
[KO] Fix incorrect translations (#6823) 
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- Fixed condensers being translated into *electric* condensers
- Fixed incorrect core names
- Made team names (derelict, sharded, crux ectc.) be proper nouns (고유명사) like you asked
- Fixed blast doors being translated as blast *compound* doors
- some other small fixes
 2022-05-11 10:02:00 -04:00
Anuken
60cb4a2a73 Merge remote-tracking branch 'origin/master' 2022-05-11 09:42:21 -04:00
Anuken
35f07150f2 aaa 2022-05-11 09:42:17 -04:00
Lucky Clover
c9ee471b34
Fix show wrong output liquid icon (#6819) 
Fix show output liquid icon if rotate non-specified output liquids factory like melter.
 2022-05-11 09:41:53 -04:00
Anuken
debf940973 Fixed preview render crash 2022-05-11 09:39:43 -04:00
Anuken
9b33ab3c0a Fixed #6815 2022-05-11 00:44:15 -04:00
Anuken
24a6ef2bc3 Correct team usage 2022-05-10 23:13:59 -04:00
Anuken
afe02bf3a0 Misc fixes 2022-05-10 22:55:28 -04:00
Anuken
aa3bf50731 Merge remote-tracking branch 'origin/master' 2022-05-10 21:56:41 -04:00
Anuken
8c98f8f9bf Mass driver reloadTime -> reload 2022-05-10 21:56:34 -04:00
Somka000
64e5561b5a
Translate things from Erekir and some other (#6812) 2022-05-10 21:16:32 -04:00
Anuken
2e4037451f Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-10 21:07:48 -04:00
Yuri Polyakov
99f98cc761
Update bundle_ru.properties (#6760) 
* Update bundle_ru.properties

* Update bundle_ru.properties

упс

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-05-10 21:07:33 -04:00
Yuri Polyakov
05cbc8a477
Update bundle_ru.properties (#6762) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2022-05-10 21:07:13 -04:00
Anuken
e15ed4403c Unignore icons.properties 2022-05-10 20:38:05 -04:00
Anuken
60d3a51ebc What a horrible waste of time 2022-05-10 20:08:48 -04:00
Anuken
8f31faa98e Merge remote-tracking branch 'origin/master' 2022-05-10 19:19:38 -04:00
Anuken
6a129371d2 Fixed #6811 2022-05-10 19:19:21 -04:00
Github Actions
05578fe8b7 Automatic bundle update 2022-05-10 23:02:41 +00:00
Anuken
6bda5546a6 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-10 19:01:40 -04:00
Anuken
0c6c9620a7 lang 2022-05-10 19:01:33 -04:00
end-me-please
9b8a09892a
Update bundle_de.properties (#6768) 
aHR0cHM6Ly9pLmltZ3VyLmNvbS9NSG1kV0plLnBuZw==
 2022-05-10 18:58:36 -04:00
Github Actions
fbf70224e4 Automatic bundle update 2022-05-10 22:58:02 +00:00
Nunting
3db6637e9f
Update bundle_ko.properties (#6763) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-05-10 18:56:56 -04:00
Anuken
a089afc626 Merge branch 'master' of https://github.com/Anuken/Mindustry into erekir 
 Conflicts:
	core/assets/bundles/bundle_zh_TW.properties
 2022-05-10 18:15:43 -04:00
Epowerj
6c39249899 Fixed waves on level three not working right with new map changes 2022-05-10 18:14:56 -04:00
Epowerj
b7eeec243e Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-10 17:37:25 -04:00
Epowerj
15fa120eeb Fixed an issue with three 2022-05-10 17:37:19 -04:00
Anuken
01ba06ddef Faster erekir mining speed 2022-05-10 17:35:43 -04:00
Epowerj
1eba814e68 adjusted levels three and four for new tech changes 2022-05-10 16:44:19 -04:00
Anuken
eb8395fa19 Requirement swapbac 2022-05-10 16:25:06 -04:00