Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,084 Commits 4 Branches 180 Tags
v119
Commit Graph
10084 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Timmeey86 11e071289b Reorganized power tests ... 
... and changed creation of fake tiles so update() implementations have all required dependencies
 2018-11-27 08:51:19 +01:00
Anuken dcea8ae64f New UI 2018-11-26 22:47:54 -05:00
Baltazár RadicsandGitHub c9480ef17d Merge pull request #6 from Timmeey86/baltitenger 
Merged most recent Anuken master into branch and fixed conflicts
 2018-11-26 23:28:52 +01:00
Timmeey86 a9517096f9 Merged current Anuke master into branch 2018-11-26 23:25:24 +01:00
Timmeey86 fc3f03425e Merge branch 'master' of https://github.com/baltitenger/Mindustry into baltitenger 2018-11-26 23:12:55 +01:00
Baltazár RadicsandGitHub 8d43046f13 Merge pull request #5 from Timmeey86/baltitenger 
Fixed batteries / Added Tests / Fixed delta
 2018-11-26 22:18:29 +01:00
Timmeey86 cd6880aff4 Merge branch 'master' of https://github.com/baltitenger/Mindustry into baltitenger 2018-11-26 21:59:25 +01:00
Anuken ccefa45fb0 Atlas update 2018-11-26 13:23:56 -05:00
Anuken b721d7a10f Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/src/io/anuke/mindustry/core/Renderer.java
#	core/src/io/anuke/mindustry/entities/units/types/Drone.java
#	core/src/io/anuke/mindustry/graphics/CacheLayer.java
#	core/src/io/anuke/mindustry/world/blocks/Floor.java
 2018-11-26 13:23:38 -05:00
Anuken ef85d1d83e Merge remote-tracking branch 'origin/master' 2018-11-26 12:40:28 -05:00
Anuken d03ceb2a23 Bugfixes / Sorter item memory 2018-11-26 12:40:24 -05:00
VizardAlphaandAnuken 90198be1cb Updates bundle_fr_BE.properties (#358) 
* Updates bundle_fr_BE.properties

* Updates bundle_fr_BE.properties

* Update bundle_fr_BE.properties

* Update bundle_fr_BE.properties

* Update bundle_fr_BE.properties
 2018-11-26 12:34:01 -05:00
Timmeey86 f640494c1f PowerGraph now handles delta 
Also power bars are displayed for non-buffered consumers as well
 2018-11-26 10:26:49 +01:00
Timmeey86 77b9feb765 More Tests and fixes 
- Batteries will now get charged with no consumers
- Fixed stat display of power generators
 2018-11-26 09:24:08 +01:00
Timmeey86 99139dfcca Added unit tests for batteries... 
...and fixed battery distribution until all tests passed
 2018-11-26 08:58:16 +01:00
Anuken a241f63ddc Merge remote-tracking branch 'origin/master' 2018-11-25 22:55:18 -05:00
Anuken 70507258ae Cleanup 2018-11-25 22:55:13 -05:00
beitoandAnuken 51a8144f49 Update Japanese translations (#357) 
* Add new japanese translation

It translated on commit 66810c8.
so it don't apply changes from commit 17e0489.

* Update Japanese translation

Applies commit 7a51693. and small changes.

* Upadte Japanese translations

* Update Japanese

* Update Japanese

* Update Japanese translations

Improve and update for new changes

* Update Japanese

* Update Japanese translations
 2018-11-25 22:54:46 -05:00
Anuken 54ad9ba243 Added fullscreen map screenshot 2018-11-25 20:43:45 -05:00
Anuken a7f7a09418 Drone repair cleanup / Percentage-based repair 2018-11-25 16:34:31 -05:00
Anuken 44897fb371 Mobile chat fix / Turret balance / UI disable variable 2018-11-25 13:58:19 -05:00
Anuken bb6a748167 Various bugfixes 2018-11-25 10:29:38 -05:00
beito123 a3ee43b31c Update Japanese translations 2018-11-25 23:49:40 +09:00
beito123 12dd16d4bf Update Japanese 2018-11-25 23:40:33 +09:00
beito123 a5b9e57576 Update Japanese translations 
Improve and update for new changes
 2018-11-25 23:33:00 +09:00
beito123 6c194d257c merge from master 2018-11-25 22:39:04 +09:00
DaGamerFilesandGitHub 21f61d46da Update bundle_in_ID.properties [INCOMPLETE] 
Some fixes and translations from line 2 to line 130.
 2018-11-25 17:47:22 +07:00
JustYannsandGitHub 6ac8a9d440 Update bundle_fr.properties 
Some improvement on the text (capital letters, plurals, ...)
More later !
 2018-11-25 10:29:12 +01:00
Anuken c321402414 Various bugfixes v61 2018-11-24 20:04:20 -05:00
Anuken ec80fc9f3f Android build update 2018-11-24 19:39:35 -05:00
Anuken 6bfd57097f Cleanup of TODOs 2018-11-24 08:21:22 -05:00
Anuken 6f5df6a671 Added list of contributors to credits 2018-11-23 14:30:58 -05:00
Anuken 1baf3190cd Host dialog name selection 2018-11-23 13:35:16 -05:00
Anuken 66c29c49e5 Wave spawner moved / Bundle tweaks / Blank name 2018-11-23 13:32:17 -05:00
Anuken e5d6740555 Additional tests, inventory fixes 2018-11-23 12:40:36 -05:00
Anuken 30b5dd63e4 Build tag fix 2018-11-23 10:21:47 -05:00
Anuken f0aa8d73ea Merge remote-tracking branch 'origin/master' 2018-11-23 09:23:48 -05:00
Anuken 8a0761cad8 Bugfixes 2018-11-23 09:23:42 -05:00
키에르andAnuken 322d76b713 Update bundle_ko.properties (#354) 
* Update bundle_ko.properties

* Update bundle_ko.properties
 2018-11-23 08:41:55 -05:00
Anuken 4f56bf3c3e Consume icon fix / Liquid mixer fix 2018-11-23 08:32:56 -05:00
Anuken 942eed402a uCore update 2018-11-22 23:38:59 -05:00
Anuken 24c72650fb Bundles update 2018-11-22 19:10:31 -05:00
Anuken f5959c8829 Optional display section 2018-11-22 19:09:51 -05:00
Baltazár RadicsandGitHub 4a8299d9dc Merge pull request #4 from Timmeey86/baltitenger 
Baltitenger
 2018-11-22 23:59:15 +01:00
Timmeey86 560d388df4 Added Tests, fixed detected bugs and updated JUnit 2018-11-22 23:30:49 +01:00
Anuken 7621ebed42 Merge remote-tracking branch 'origin/master' 2018-11-22 08:39:15 -05:00
Anuken 5447c71790 Removed junction item voiding 2018-11-22 08:39:05 -05:00
Anuken c5241eaaf6 Encoding tests 2018-11-21 23:12:27 -05:00
Anuken 9266b55ddf Fixed charset issues 2018-11-21 23:05:33 -05:00
VizardAlphaandAnuken 1bc1f66613 Updates bundle_fr_BE.properties (#351) 
I had not seen the last line to translate.
 2018-11-21 22:02:28 -05:00