mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 03:08:38 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,574 Commits 4 Branches 160 Tags 2.3 GiB
86df70a839
Commit Graph

5574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vanguard
86df70a839
1 new line 
load.scripts
 2019-12-08 15:34:43 +03:00
Vanguard
044dac6a9e
Merge branch 'master' into master 2019-12-06 18:20:05 +03:00
Vanguard
7f3f27a91e
1 new line, 1 changed line 
New:
mod.item.remove

Changed:
mode.attack.description
 2019-12-06 18:00:20 +03:00
Anuken
ef24e5ecad Merge remote-tracking branch 'origin/master' 2019-12-05 22:06:57 -05:00
Anuken
6f146c6cad Added support for mod map/schematic packs 2019-12-05 21:15:28 -05:00
Ali-C-Ila
db5bd7eea8 Update bundle.properties (#1164) 2019-12-05 10:01:47 -05:00
iczero
2e315e5516 Fix builderID remaining -1 for Call.onDeconstructFinish (#1162) 
BuildEntity.deconstruct is missing code to set builderID,
so the builderID parameter is always set to -1 in
Call.onDeconstructFinish. The same code exists in
BuildEntity.construct.
 2019-12-04 21:54:50 -05:00
iczero
7dd7ccf698 Add gradle property jvmArgs (#1161) 
Allows specifying additional arguments for the vm, which would
make using tools such as HotSwapAgent and dcevm easier
Example: run -PjvmArgs='["-XXaltjvm=dcevm"]'
 2019-12-04 20:05:01 -05:00
Anuken
a087df0771 Added experimental server block syncing 2019-12-04 17:03:49 -05:00
Anuken
5c30f4bc9c Fixed nothing 2019-12-02 17:52:49 -05:00
Anuken
5a9957c578 Merge remote-tracking branch 'origin/master' 2019-12-01 17:36:30 -05:00
Anuken
42687fb47e Fixed crash caused by missing sounds 2019-12-01 17:35:47 -05:00
Emlyn Bolton
1db444b070 Present the file sharing on iPad in a popover - and prevent the crash. (#1145) 
* Present the file sharing on iPad in a popover - and prevent the crash.

* Update gradle.properties
 2019-12-01 00:25:15 -05:00
Ali-C-Ila
ae981053b2 Update bundle_zh_TW.properties (#1133) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2019-12-01 00:10:51 -05:00
PlayerBrasil13
23f90fcaf4 Update bundle_pt_BR.properties (#1128) 
Translated the last PR's added lines, fixed some portuguese errors.
 2019-12-01 00:08:40 -05:00
Maron [RUNO]
d5b50c038c Added polish translation for google play (#1142) 2019-12-01 00:04:43 -05:00
Prosta4okua
765d9703f5 Ukrainian translation (#1144) 
* :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

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2019-12-01 00:04:35 -05:00
Anuken
f784e893dd Merge remote-tracking branch 'origin/master' 2019-11-29 22:17:45 -05:00
Anuken
7e993c15dc Moved documentation 2019-11-29 21:56:53 -05:00
valtsu41
5411ae777e Starting bundle_fi.properties (#900) 2019-11-28 22:04:58 -05:00
Anuken
e733b4be1b Added msch handling definition 2019-11-27 17:46:15 -05:00
Anuken
1e1b84a201 Merge branches 'master' and 'mod-spritepack-refactor' of https://github.com/Anuken/Mindustry 2019-11-25 23:55:18 -05:00
Anuken
e6753ace87 Cleanup 2019-11-25 23:43:58 -05:00
Felix Corvus
932c32ad8f
byte-logic draft translations 
Зная скорость Анюка
 2019-11-26 06:40:59 +03:00
Anuken
a5fbc07561 Texture overrides / Potential mod texture binding optimizations 2019-11-25 20:50:32 -05:00
Felix Corvus
2631c4f7af adding millions & thousands localisation (#1132) 
* "mil" / "k" localisation adding

* "mil" / "k" localisation adding

* Update bundle.properties

* Update bundle_ru.properties
 2019-11-25 20:48:53 -05:00
Anuken
01304bf734 Fixed bizzare crash 2019-11-25 18:41:09 -05:00
Ali-C-Ila
c2c5836752 Update bundle_zh_TW.properties (#1131) 2019-11-25 14:48:24 -05:00
Vanguard
6a15328854
1 new line added 
item.corestorable
 2019-11-25 16:42:40 +03:00
matheod
dabdd094f9 Add storable indication in core database (#1124) 
* Add storable in core indication in core database

* Add corestorable text

* French translation of corestorable
 2019-11-24 01:35:16 -05:00
Anuken
0dd8267e21 Merge remote-tracking branch 'origin/master' 2019-11-23 21:27:58 -05:00
Anuken
7b69310f1b Deployment tweak 2019-11-23 21:27:52 -05:00
PlayerBrasil13
6f48e7a5ed Update bundle_pt_BR.properties (#1122) 
Added some lines that are in bundle.properties and was missing in bundle_pt_BR.properties
 2019-11-23 20:43:00 -05:00
Ali-C-Ila
98bca1740c Update bundle_zh_TW.properties (#1118) 
* 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
 2019-11-23 15:16:49 -05:00
CinExPL
51842a61a8 Update bundle_pl.properties (#1119) 
Improvements based on comparison with original bundle file + small fixes
 2019-11-23 15:16:32 -05:00
Anuken
78fefdacca Merge remote-tracking branch 'origin/master' 2019-11-22 23:12:44 -05:00
Anuken
a1fb3e27ab Fixed launched items not saving 2019-11-22 23:10:50 -05:00
YFdyh000
686b892ea9 Update bundle_zh_CN.properties (#1113) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2019-11-22 21:00:11 -05:00
osoitz
ffcfaf1610 Update bundle_eu.properties (#1114) 2019-11-22 20:59:42 -05:00
blackassasin1234
80c46bb5a2 Added some Events (#1096) 
* Added PlayerBanEvent, PlayerUnbanEvent, PlayerIpBanEvent, and PlayerIpUnbanEvent.

* Removed Unecessary import (oops)

* Formatted code

* Fixed a little oopsie

* Prevent NPE

* add another line..
 2019-11-22 20:56:00 -05:00
Anuken
cb29bee8f5 Remove js mod ext support 2019-11-22 18:42:10 -05:00
Anuken
2d42704062 Switched to hjson extension 2019-11-22 18:19:18 -05:00
Vanguard
2136ae03a5
1 new line, 1 changed line 
New:
settings.resetKey

Changed:
mech.dart-ship.description
 2019-11-23 02:18:58 +03:00
Anuken
fbe58bec04 Merge remote-tracking branch 'origin/master' 2019-11-22 17:54:25 -05:00
Anuken
5f81a0c7f3 Bugfixes 2019-11-22 17:51:29 -05:00
DeltaNedas
38804462a9 add reset keybind to english locale (#1116) 
* updated english locale for "reset key".

* Update bundle.properties

* Update bundle.properties
 2019-11-22 16:17:11 -05:00
Anuken
f28eb4027c Log # of fetched servers; cleanup 2019-11-22 16:13:09 -05:00
Anuken
c324dce034 Added potential global server list 2019-11-22 16:00:53 -05:00
Anuken
0efced4fd8 Merge remote-tracking branch 'origin/master' 2019-11-22 15:33:22 -05:00
Anuken
6d6fac00d7 Less hacky support for atrocious json 2019-11-22 15:33:01 -05:00