mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-04-11 00:11:10 -07:00
Code Issues Projects Releases Wiki Activity
9277 commits 5 branches 184 tags 2.4 GiB
Commit graph

9277 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anuken
d56c041c4a Fixed ground units always spawning in (-1, -1) 2018-11-29 16:58:11 -05:00
Anuken
be48ed5589 Fixed another boring layout issue 2018-11-29 16:37:22 -05:00
Anuken
897c296fbe Fixed server crash 2018-11-29 16:30:41 -05:00
Anuken
d25fe028b8 Fixed mobile recipe switching 2018-11-29 16:23:11 -05:00
Anuken
d9ade96fad Compile fix 2018-11-29 14:47:39 -05:00
Anuken
7fd05b7ca6 Added mobile copy/paste 2018-11-29 13:04:34 -05:00
Anuken
0eec5383ed UI fixes / Better ghost connection fix 2018-11-29 12:07:43 -05:00
Anuken
f474d2c834 Fixed ghost connections 2018-11-29 09:32:36 -05:00
Anuken
e40e5e6a99 UI fix 2018-11-29 09:22:39 -05:00
Baltazár Radics
82d20efa8d
Merge pull request #8 from Timmeey86/baltitenger 
Fixed test names / Continued work on generators
 2018-11-29 08:47:11 +01:00
Anuken
8c7716428d Logo update 2018-11-28 22:38:01 -05:00
Anuken
9ac8a4211e Merge 2018-11-28 22:37:49 -05:00
Anuken
23750bab55 Layout fixes 2018-11-28 22:05:34 -05:00
Anuken
22aeddc655 Fixed screenshot key firing when chat open 2018-11-28 20:30:34 -05:00
Anuken
ab69cd8027 Initial crafting rework changes 2018-11-28 19:00:59 -05:00
Anuken
f3d35e9537 Crash fixes 2018-11-28 18:43:35 -05:00
Timmeey86
4cb72c1998 Resolved some of the power-related TODOs 2018-11-29 00:38:53 +01:00
Timmeey86
12ccc10e83 Restored SolarGenerator and adapted to new power system. 2018-11-28 23:56:11 +01:00
Timmeey86
ec631f3499 Changed test naming conventions as requested by Anuke 2018-11-28 23:54:26 +01:00
Anuken
75d2ea1519 Added build revision 2018-11-28 17:42:12 -05:00
Anuken
14e9a94061 Merge remote-tracking branch 'origin/master' 2018-11-28 17:24:26 -05:00
Anuken
d3284ab9f6 Chained block inventory scaling 2018-11-28 17:24:21 -05:00
Anuken
775df43470 Merge remote-tracking branch 'origin/master' 2018-11-28 14:00:57 -05:00
Anuken
e2e6024e8f Pan tweak 2018-11-28 14:00:51 -05:00
elmenda452
d89b51f17d Update bundle_es.properties (#359) 
Just making another revision.
 2018-11-28 13:22:36 -05:00
Anuken
aa626947ed HUD cleanup 2018-11-28 13:14:54 -05:00
Baltazár Radics
630693d64e
Merge pull request #7 from Timmeey86/baltitenger 
Adapted ItemLiquidGenerator to new power system
 2018-11-28 17:14:19 +01:00
Anuken
f2be23274e Crash fixes 2018-11-28 08:53:03 -05:00
Timmeey86
2972780bed Initial Efficiency is now zero. Blocks display efficiency. 2018-11-28 13:19:52 +01:00
Timmeey86
cf3d2c3def Fixed handling of item duration 2018-11-28 11:59:58 +01:00
Timmeey86
1f8751054c Tested/fixed delta calculations 
Tests now use a fixed delta of 0.5 to make sure calculations work with deltas different from 1.0
 2018-11-28 11:04:08 +01:00
Anuken
cc90e6d479 b a l a n c i n g 2018-11-27 21:07:29 -05:00
Anuken
76dd3c86f2 Removed redundant sector mission display 2018-11-27 20:36:23 -05:00
Anuken
91468fa2f9 Style changes 2018-11-27 20:12:49 -05:00
Timmeey86
739219c57b Finished first draft of ItemLiquidGenerator through TDD 2018-11-27 22:28:41 +01:00
Timmeey86
f56e1933a6 Fixed occassional crashes of Power Tests and continued TDD 2018-11-27 21:27:35 +01:00
Anuken
8e4aec9c4d Merge remote-tracking branch 'origin/master' 2018-11-27 13:19:48 -05:00
Anuken
e6e29aaf1e Team button layout fix 2018-11-27 13:19:44 -05:00
Prosta4okua
1ac5f54e9e [СOMPLETE]Update Uk_ua bundle (#328) 
* [WIP]Update Uk_ua bundle

* 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
 2018-11-27 13:10:51 -05:00
Prosta4okua
bf983658c8 [COMPLETE]Close before 62 build (#345) 
* [wip]Some changes from Xzimur

* Update bundle_ru.properties

Mine

* Update bundle_ru.properties

New UI / 8c437eb815

* Update bundle_ru.properties

* Update bundle_ru.properties

Разблокированные->разблоки\nрованные

* Update bundle_ru.properties

* Update bundle_ru.properties

Присоеди\nниться

* Update bundle_ru.properties

владелец

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-11-27 13:08:07 -05:00
Anuken
e17286eb9f Player list fixes with teams 2018-11-27 13:00:34 -05:00
Anuken
19c17e96de Mobile UI fixes 2018-11-27 12:31:45 -05:00
Anuken
b45368342d Block config UI fixes 2018-11-27 09:29:28 -05:00
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 Radics
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 Radics
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