Anuken
134cc34d74
Merge remote-tracking branch 'origin/master'
2018-12-02 12:03:41 -05:00
Anuken
3397d6c907
Misc bug/crash fixes
2018-12-02 12:03:18 -05:00
Timmeey86
f8cf185db9
Fixed display of solar panel power generation
2018-12-02 12:43:18 +01:00
Anuken
735935c0c4
Merge branch 'remove-tile-pack' of https://github.com/Anuken/Mindustry
2018-12-01 17:36:16 -05:00
Timmeey86
034fab480d
Most direct consumers now operate slower when not supplied with full power
2018-12-01 18:32:17 +01:00
VizardAlpha
17432d1f94
Update bundle_fr_BE.properties ( #361 )
...
* Update bundle_fr_BE.properties
* Updates bundle_fr_BE.properties
2018-12-01 11:22:28 -05:00
Timmeey86
62c6d8e42d
Fixed Arcs not firing
2018-12-01 16:49:30 +01:00
Timmeey86
14e057cf05
- Resolved all remaining TODOs
2018-12-01 16:13:03 +01:00
Timmeey86
982c9bf964
- Fixed double power production
...
- Buffered consumers no longer request power when full
2018-12-01 14:31:01 +01:00
Timmeey86
b4aba3d263
All power blocks now produce power as stated in v63 tool tips
2018-12-01 13:41:14 +01:00
Anuken
9f9d57b9a9
Merge remote-tracking branch 'origin/master'
2018-11-30 23:12:52 -05:00
Anuken
236e3c7e61
Added wet shocking
2018-11-30 23:12:48 -05:00
Anuken
2160844ad0
Merge remote-tracking branch 'origin/master'
2018-11-30 17:48:19 -05:00
Anuken
51475d600c
iOS fix
2018-11-30 17:48:09 -05:00
Timmeey86
149f7a1d9d
Merged current master into branch (with manual changes)
2018-11-30 21:33:09 +01:00
elmenda452
56ef7ae60c
Update bundle_es.properties ( #360 )
...
It was strangely hard to find the (Constructing) translation... (for block.constructing), but anyway I finally found it
2018-11-30 15:16:54 -05:00
Anuken
7ec6586c4a
Line power nodes
2018-11-30 15:14:27 -05:00
Timmeey86
074a6bfa87
Reverted accidental file push
2018-11-30 21:10:31 +01:00
Timmeey86
965fec5927
Continued work on power generators
2018-11-30 21:08:33 +01:00
Anuken
58b87aa999
Additional crash fixes
2018-11-30 13:49:43 -05:00
Anuken
b0b16b52ee
Merge remote-tracking branch 'origin/master'
2018-11-30 13:20:39 -05:00
Anuken
9ab3f7e5aa
Crash fix
2018-11-30 13:20:15 -05:00
Timmeey86
61210955bd
Optimized power distribution implementation for buffered consumers
2018-11-30 18:45:40 +01:00
Timmeey86
28f73d0a76
Merged ItemGenerator, LiquidGenerator and ItemLiquidGenerator into a single class.
...
Unit tests now test the ItemsOnly, LiquidsOnly and LiquidsAndItems cases
2018-11-30 18:37:51 +01:00
Anuken
99fb1a4c5f
Implemented null-items for sorters and item sources
2018-11-30 10:28:27 -05:00
Baltazár Radics
42cf80106f
Merge pull request #9 from Timmeey86/baltitenger
...
Resolved more TODOs
2018-11-30 05:46:35 +01:00
Timmeey86
bcb9cfd2fe
Synchronized Item/Liquid generator code
2018-11-30 00:03:53 +01:00
Timmeey86
1d57568322
All power distributors now update power graph
...
Replaced manual power graph update by base implementation call so future changes in base class get applied to all subclasses automatically. Added the call where missing.
2018-11-29 23:35:56 +01:00
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
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
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
