Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,469 Commits 4 Branches 180 Tags
876d193379b0a02b41c039fd418f63b79f80ad48
Commit Graph

6469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
876d193379 Bugfixes 2020-03-09 11:16:57 -04:00
Anuken
1dc4fd0800 FX cleanup and installation 2020-03-08 22:45:32 -04:00
Anuken
0ff3c1ee78 Cleanup 2020-03-08 21:53:19 -04:00
Anuken
863c7ae2bc Removed unit factory limit 2020-03-08 17:49:19 -04:00
Anuken
7ae0192a09 Crash fix 2020-03-08 12:12:06 -04:00
Anuken
12c4395508 Added basic respawning 2020-03-07 23:24:22 -05:00
Anuken
7b144cbec6 Attribute tweaks 2020-03-07 13:56:57 -05:00
Anuken
1e0067d64b Bugfixes 2020-03-07 10:27:29 -05:00
Anuken
7655b65363 Bugfixes / Fixed #1680 2020-03-06 17:06:21 -05:00
Anuken
ae0b84cef0 Increased max block size 2020-03-06 16:31:09 -05:00
Anuken
a02c7989b4 Bugfixes 2020-03-06 16:10:13 -05:00
Anuken
60d28fb01b Bugfixes 2020-03-06 16:07:07 -05:00
Anuken
f8b554aff8 Fixed some basic crashes 2020-03-06 15:30:51 -05:00
Anuken
77f406e9b8 Fixed core errors 2020-03-06 15:22:13 -05:00
Anuken
4358658889 Down to less than 100 errors 2020-03-06 14:55:06 -05:00
Anuken
73c0ebb75f Fixed most errors in block package 2020-03-06 14:41:38 -05:00
Anuken
4744465986 More cleanup, nearing completion of block refactor 2020-03-06 12:19:26 -05:00
Anuken
1c48c1a43e Cleanup 2020-03-05 23:23:10 -05:00
Anuken
2e19504b65 it begins 2020-03-05 20:27:42 -05:00
Anuken
5a0d079a78 oh no 2020-03-05 18:05:59 -05:00
Anuken
89a5c957fd add mod name to js print() (#1677) 
* add mod name to js print()

* add mod name to errors
 2020-03-05 15:58:10 -05:00
Anuken
2dfbbdfd5b Beginning work on respawning 2020-03-05 12:12:03 -05:00
Anuken
39ee31d748 Fixed #1673 2020-03-05 08:45:14 -05:00
Anuken
882076030d Added back tapping 2020-03-04 19:58:48 -05:00
Anuken
c02c00cdfb Schematic tweaks and improvements 2020-03-04 19:21:40 -05:00
Anuken
0534a4da45 Update bundle_zh_TW.properties (#1665) 2020-03-04 13:53:54 -05:00
Anuken
31c9b61358 Updated join.info (#1666) 2020-03-04 13:53:47 -05:00
Anuken
ff44b0ca85 Small RU fix (#1670) 2020-03-04 13:53:27 -05:00
Anuken
a36a0cad53 RU updates to Android description (#1663) 2020-03-04 13:53:19 -05:00
Anuken
0dfb3b1c1b Update achievements.vdf (#1668) 
* Update achievements.vdf

* Update achievements.vdf

* Update achievements.vdf

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-03-04 13:53:12 -05:00
Anuken
c7112a706a Update bundle_uk_UA.properties (#1636) 
* Update bundle_uk_UA.properties

* Update uk metadata

* Update uk bundles

* Update achievemnts
 2020-03-04 13:52:20 -05:00
Anuken
2684a960fa Create 104.4 (#1671) 
* Create 104.4

* Update 104.4
 2020-03-04 13:52:02 -05:00
Anuken
a5e07bfd29 Created fastlane/metadata/android/ru-RU/changelogs (#1669) 
* Created fastlane/metadata/android/ru-RU/changelogs

104.4.txt

* Update 104.4.txt
 2020-03-04 13:51:56 -05:00
Anuken
3eea0ea065 Bugfixes, tweaks 2020-03-04 13:48:00 -05:00
Anuken
fbbec816e8 Merged in object configuration 2020-03-04 13:33:14 -05:00
Anuken
cf31293d7b Many internal changes 2020-03-04 13:32:31 -05:00
Patrick 'Quezler' Mounier
3b2b7be72a Remove nested app.post (#1667) 2020-03-04 11:58:16 -05:00
Anuken
c96427c722 Bugfixes 2020-03-04 09:01:41 -05:00
Anuken
503607e36a Fixed #1661 2020-03-04 08:39:48 -05:00
Anuken
aeae286273 Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config 
# Conflicts:
#	core/src/mindustry/entities/traits/BuilderTrait.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/game/EventType.java
#	core/src/mindustry/game/Schematics.java
#	core/src/mindustry/input/InputHandler.java
#	core/src/mindustry/io/TypeIO.java
#	core/src/mindustry/world/Block.java
#	core/src/mindustry/world/blocks/distribution/Sorter.java
 2020-03-04 08:38:36 -05:00
Anuken
2581353c5e Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config 
# Conflicts:
#	core/src/mindustry/entities/traits/BuilderTrait.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/game/EventType.java
#	core/src/mindustry/game/Schematics.java
#	core/src/mindustry/input/InputHandler.java
#	core/src/mindustry/io/TypeIO.java
#	core/src/mindustry/world/Block.java
#	core/src/mindustry/world/blocks/distribution/Sorter.java
 2020-03-03 21:33:03 -05:00
Anuken
087f8129b9 Tile code cleanup 2020-03-03 19:29:41 -05:00
Anuken
bac1648d4b Added support for changing cached floor/terrain 2020-03-03 17:01:09 -05:00
Anuken
f1aadd97a8 Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/core/Logic.java
#	gradle.properties
 2020-03-03 12:12:25 -05:00
Anuken
64c1800391 Merge remote-tracking branch 'origin/master' 2020-03-03 12:11:49 -05:00
Anuken
2a191a45be Cleanup 2020-03-03 12:11:47 -05:00
Anuken
e8823fab36 More concise stream class 2020-03-03 12:11:35 -05:00
Anuken
3858cdd4c5 Added map region class 2020-03-03 12:08:31 -05:00
Aldas
cdb8682d43 Updated data.import.confirm lane (#1658) 
Updated data.import.confirm lane
 2020-03-03 10:36:34 -05:00
fuzzbuck
8e9dabb350 Add "pardon" command for votekicks (#1570) 
* Add "pardon" command

Allows players who have been incorrectly votekicked to join again

* isn't hasn't

* getInfoOptional & space

* pardon me

no pun intended

* Update ServerControl.java
 2020-03-02 13:37:04 -05:00