Commit Graph

10103 Commits

Author SHA1 Message Date
Ngọc Lam
66b540988b
happy birthday to me :) 2020-11-29 11:02:00 +07:00
Anuken
3c51d82a1a Fixed #3648 2020-11-28 22:45:36 -05:00
Anuken
b63501b1c7 Core overfill bugfix 2020-11-28 21:51:26 -05:00
EzLam
c2d808b921 happy birthday to me ._. 2020-11-29 08:51:55 +07:00
Anuken
810238d0f9 Cleanup 2020-11-28 20:30:43 -05:00
Anuken
bb16d1c613 Removed Abstract block classes for better code inspection 2020-11-28 19:12:27 -05:00
Anuken
b8cb17c0c5 Campaign production fixes 2020-11-28 15:08:53 -05:00
Anuken
9ca3cd49b8 Merge remote-tracking branch 'origin/master' 2020-11-28 13:57:23 -05:00
Anuken
e6544b73db Switching modifier from beta to release 2020-11-28 13:57:19 -05:00
Anuken
2e30cd31c2
Merge pull request #3646 from Slava0135/unit-payload
Unit Payload spawning units on block removing/destruction
2020-11-28 13:56:45 -05:00
slava0135
e6078bd4f6 oopsie x4 2020-11-28 21:49:59 +03:00
slava0135
b0477394e6 oopsie x3 2020-11-28 21:45:42 +03:00
slava0135
699750762f removing unnecessary stuff 2020-11-28 21:38:50 +03:00
slava0135
ee3348d160 oopsie x2 2020-11-28 21:10:12 +03:00
slava0135
6dc2486ce0 oopsie 2020-11-28 21:06:20 +03:00
slava0135
724a0018b8 unit payload improvements 2020-11-28 20:39:09 +03:00
slava0135
3b20c68a6f Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-11-28 19:53:04 +03:00
Anuken
98206446e6 Merge remote-tracking branch 'origin/master' 2020-11-28 11:31:14 -05:00
Anuken
6e62859d0e Fixed #3644 2020-11-28 11:31:07 -05:00
Anuken
1f1701f1d6
Update README.md 2020-11-28 10:44:14 -05:00
Anuken
e6c99e0c6d
Update README.md 2020-11-28 10:42:50 -05:00
Anuken
e6c15b526a
Merge pull request #3620 from AydenRennaker/patch-8
Update servers_v6.json
2020-11-28 09:50:22 -05:00
Anuken
4de516b527
Merge pull request #3639 from LeoSko/patch-2
Update servers_v6.json
2020-11-28 09:50:02 -05:00
slava0135
815a483d2c typo in Fires:
/** Start a fire on the tile. If there already is a file there, refreshes its lifetime. */
2020-11-28 17:49:39 +03:00
Anuken
2816aeb6e9
Merge pull request #3451 from Angel-24/patch-2
[Bundle][ES] Translation update
2020-11-28 09:46:30 -05:00
Anuken
f40e523764
Merge pull request #3567 from CPXMC/patch-6
Update bundle_zh_CN.properties
2020-11-28 09:46:23 -05:00
Anuken
8a424111f0 Fixed #3633 2020-11-28 09:43:35 -05:00
Leonid Skorospelov
47922834f9
Update servers_v6.json
Ranked 1v1 gradually moving to v6
2020-11-28 14:16:30 +02:00
EzLam
69960017d3 wwwhat ? 2020-11-28 17:28:31 +07:00
EzLam
b1a4d51210 That why english is hard. 2020-11-28 17:07:00 +07:00
EzLam
9c54792341 bruh 2020-11-28 12:10:33 +07:00
NgLamVN
56b947fb9e
... 2020-11-28 11:30:35 +07:00
Anuken
2a6b0fd0ce Fixed vaults not counting withdrawn items 2020-11-27 18:09:47 -05:00
Anuken
47e622dee3 (more) Campaign balancing 2020-11-27 18:07:10 -05:00
Anuken
99125e9218 Merge remote-tracking branch 'origin/master' 2020-11-27 17:37:28 -05:00
Anuken
66918f0322 Campaign balancing 2020-11-27 17:37:22 -05:00
Anuken
b8a2c609cb
Merge pull request #3629 from Catchears/typo
typo
2020-11-27 16:19:16 -05:00
Wiki Updater
968277477a typo 2020-11-27 22:18:08 +01:00
Anuken
d06b32c20b Added boss to sector damage calculations 2020-11-27 14:18:09 -05:00
Anuken
525dc0cd7e Added bosses for sectors missing them 2020-11-27 12:35:20 -05:00
Anuken
8b6fc7f3ac Fixed #3628 2020-11-27 12:27:56 -05:00
Anuken
8dd66fb942 Campaign tweaks 2020-11-27 11:56:01 -05:00
Angel_24
7e5c69a107
Update bundle_es.properties 2020-11-27 13:07:38 +01:00
EzLam
f7170dc39a Fix some typos. 2020-11-27 17:41:49 +07:00
Angel_24
e4a95ab4c4
Merge pull request #2 from Angel-24/master
Master
2020-11-27 10:21:25 +01:00
Angel_24
40dd3d5677
Update bundle_es.properties 2020-11-27 10:07:38 +01:00
NgLamVN
3aabfaf14b
60% Complete. 2020-11-27 15:28:21 +07:00
EzLam
2cc0ae3d81 What "unit" mean ?? 2020-11-27 15:24:55 +07:00
Anuken
e39eceee28 Allow research even if sector was attacked after capture 2020-11-26 21:48:45 -05:00
AydenRennaker
ca29909bec
Update servers_v6.json
Add Atanner Gaming server back to list. 

Updates are looking good :)
2020-11-26 18:32:31 -08:00