mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-05 16:37:38 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,645 Commits 4 Branches 160 Tags 2.3 GiB
6c53aaf67f
Commit Graph

3983 Commits

Author SHA1 Message Date
Tunacan427
6c53aaf67f
Fork project and edit a bit 
Nothing too much
 2019-09-24 23:00:11 +03:00
Anuken
b6e97c4261 Added armored conveyors 2019-09-22 15:12:15 -04:00
Anuken
a2750c8aff Default linear filtering on desktop 2019-09-22 12:35:53 -04:00
Anuken
2c0372f680 Power graph capacity display 2019-09-22 11:38:13 -04:00
Anuken
2dceb8927c Votekick after being offline / Votekick button 2019-09-22 11:28:32 -04:00
Anuken
e5cf2161d4 spaghetti eradicated 2019-09-22 01:37:50 -04:00
Anuken
552dc254da spgashfetiti 2019-09-21 23:41:56 -04:00
Anuken
dc51afdc60 Fixed sprites 2019-09-21 20:24:07 -04:00
Anuken
3f293190cf Merge branch 'master' of https://github.com/Anuken/Mindustry into messages 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites5.png
 2019-09-21 18:59:49 -04:00
Synray
7f299869c5 Add ability to rotate each block in a line (#688) 
* Add ability to rotate each block in a line

* New behavior only when placing straight lines

* Code style
 2019-09-21 18:03:05 -04:00
Anuken
c45805e703 no 2019-09-21 17:51:44 -04:00
Anuken
d062d8081a Bugfixes 2019-09-21 16:44:47 -04:00
Anuken
5955ecefd3 Bugfixes 2019-09-21 15:54:34 -04:00
Anuken
0d25d83651 Better Android keyboard support 2019-09-21 15:35:59 -04:00
Anuken
1957b6aa12 Removed unused rally point block 2019-09-21 13:06:09 -04:00
Anuken
fed3bcd79d Cleanup 2019-09-20 23:21:43 -04:00
Anuken
dda1f18f67 Unit enemy spawnpoint camping 2019-09-20 23:09:11 -04:00
Anuken
025386af53 New pathfinding implementation on separate thread 2019-09-20 22:01:27 -04:00
Anuken
bd1ea41c0d Merge remote-tracking branch 'origin/master' 2019-09-19 23:46:34 -04:00
Anuken
5d729c1e8d Bugfixes 2019-09-19 23:46:27 -04:00
Anuken
1fac4c59a3 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/io/anuke/mindustry/editor/MapEditorDialog.java
 2019-09-19 23:00:42 -04:00
Anuken
0e9296913c Fixed iOS build issues 2019-09-19 22:59:44 -04:00
Anuken
50d379d94d Merge remote-tracking branch 'origin/master' 2019-09-19 19:02:05 -04:00
Anuken
d6a4149175 Testing iOS file chooser 2019-09-19 19:01:48 -04:00
Anuken
5a0669d437 SAF is terrible 2019-09-18 19:24:49 -04:00
Anuken
0d29d94800 Bugfixes 2019-09-18 15:18:59 -04:00
Anuken
1e667946b3 Bugfixes 2019-09-18 12:46:11 -04:00
Anuken
c6a4bf69ee Fixed turret cooling 2019-09-18 08:49:48 -04:00
Anuken
5d0cfc3599 Workshop tweaks 2019-09-17 22:39:58 -04:00
Anuken
2424afa1fb Workshop implementation progress 2019-09-17 21:55:57 -04:00
Anuken
69944a2b63 Crash fixes 2019-09-17 19:29:38 -04:00
Anuken
0ceb58a105 Bugfixes 2019-09-17 19:25:37 -04:00
Anuken
5e8da856e7 Conclusively fixed status effect null issue 2019-09-17 18:54:30 -04:00
Anuken
ee412e1994 passbackback 2019-09-17 17:39:20 -04:00
Anuken
02736524bd
Update Tutorial.java 2019-09-17 12:27:18 -04:00
Anuken
c357b97b3b
Update Control.java 2019-09-17 11:00:57 -04:00
Anuken
dbe7251c6b
Update Statuses.java 2019-09-17 10:59:40 -04:00
Anuken
7ae90f655c Merge remote-tracking branch 'origin/master' 2019-09-16 23:25:14 -04:00
Anuken
669ce6dfbb launch pad fix 2019-09-16 23:25:09 -04:00
David Held
4dc55e5594 Fixes bug which let phase conveyor operate with any non-zero power; now requires full power to work (#672) 
* Fixes bug which let phase conveyor operate with any non-zero power; now requires full power to work

* Fixed normal bridge, deprecated method
 2019-09-16 19:00:06 -04:00
Anuken
4b824f7a4c Crash fixes 2019-09-16 17:26:39 -04:00
Anuken
3435132e87 Status nullcheck 2019-09-16 08:38:49 -04:00
Anuken
d49b15b2a0 Fixed some things 2019-09-16 08:24:10 -04:00
Anuken
0c59553b3d Fixed dialog padding 2019-09-15 21:57:19 -04:00
Anuken
4a50192937 Docs 2019-09-15 21:30:42 -04:00
Anuken
f65ab00250 Merge remote-tracking branch 'origin/master' 2019-09-15 21:03:45 -04:00
Anuken
f71c3af2e1 Plugin config file creation 2019-09-15 21:03:41 -04:00
JopoJP
77fb9e3d3e Fixed translation (#627) 
The translation stated that storage is combined if placed beside each other but that isn't true.
 2019-09-15 20:40:34 -04:00
osoitz
c1d6674797 Create bundle_eu.properties (#629) 
Basque translation
 2019-09-15 20:40:20 -04:00
itskatt
659aaba0b9 Update the French translation (#631) 
* sync bundle and translate newest additions

* translate a few things

* Respect Capitalisaton & further the translation effort.

* Apply suggestions from code review

Apply review.

Co-Authored-By: itskatt <48765398+itskatt@users.noreply.github.com>

* Apply suggestions from code review

Revert changes to English version

Co-Authored-By: itskatt <48765398+itskatt@users.noreply.github.com>

* Add amrsoll to the contributors

* Update bundle_fr.properties.

* Add message.

* Sync with bundle.properties

* sync

* Translate newest additions
 2019-09-15 20:39:59 -04:00