mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-31 01:44:22 +07:00
Code Issues Packages Projects Releases Wiki Activity
2,696 Commits 4 Branches 160 Tags 2.3 GiB
ba01ed0153
Commit Graph

2332 Commits

Author SHA1 Message Date
Anuken
f9b70a37aa Correct storage graphs 2018-10-21 17:20:08 -04:00
Anuken
d4047e1413 Fixed crash 2018-10-21 17:03:51 -04:00
Anuken
80f5b4c3b7 Crashy storage graph implementation 2018-10-21 17:02:37 -04:00
Anuken
4668a6d8c0 Implemented sector state network sync 2018-10-20 18:41:05 -04:00
Anuken
e6f076306f Merge branch 'rework-sectors' of https://github.com/Anuken/Mindustry 2018-10-20 17:36:56 -04:00
Anuken
b73dc127a3 Fixed enemy base generation 2018-10-20 17:36:07 -04:00
Anuken
8c8a2311d6 Fixed sector clear not resetting 0,0 2018-10-20 16:04:13 -04:00
Anuken
0555fb22ca Fixed pump crash 2018-10-20 14:09:00 -04:00
Anuken
85cde62039 Fixed phase weaver blink / Fixed item image offset (again) 2018-10-20 13:53:25 -04:00
Anuken
46a2648d15 Merge branch 'master' of https://github.com/Anuken/Mindustry into rework-sectors 2018-10-20 13:50:30 -04:00
Anuken
e55f6ecd6b Fixes to power system 2018-10-20 13:49:58 -04:00
Anuken
c71fee3fed Merge branch 'master' of https://github.com/Anuken/Mindustry into rework-sectors 2018-10-20 13:21:05 -04:00
Anuken
4d6c25c9d3 Fixed flying units blocking construction 2018-10-20 13:20:35 -04:00
Anuken
6ed4e2d946 Improved random recipe selection 2018-10-20 13:19:47 -04:00
Anuken
6b4242478f Merge branch 'master' of https://github.com/Anuken/Mindustry into rework-sectors 2018-10-20 11:52:02 -04:00
Anuken
ef5478279b Fixed 2 crashes 2018-10-20 11:48:59 -04:00
Anuken
62bb8bce1c Added missing imports 2018-10-20 11:44:19 -04:00
Anuken
f78abd61d4 Merge remote-tracking branch 'origin/master' 2018-10-20 11:39:05 -04:00
Anuken
209c6fa1c1 Merged in better multithreading 2018-10-20 11:39:00 -04:00
Anuken
6e3c600a49 Crash fix 2018-10-20 11:36:05 -04:00
Anuken
b1cda57174 Massively improved thread safety 2018-10-20 11:25:58 -04:00
키에르
412d92e782 Update bundle_ko.properties (#255) 2018-10-20 09:33:43 -04:00
Niko
c0703a6a5e Add german translations (#256) 
* Replace some English Text with german translations in bundle_de

* Replace some English Text with german translations in bundle_de, renamed map to karte

* Replace some English Text about Units and Fluids with german translations in bundle_de

* Replace some English Text with german translations in bundle_de, renamed map to karte

* Replace some mech and drone definitions with german translations in bundle_de

* Replace almost all definitions with german translations in bundle_de

* Merge branch 'master' into add_german_translations

# Conflicts:
#	core/assets/bundles/bundle_de.properties

* fix some typos in bundle_de
 2018-10-20 09:33:35 -04:00
Anuken
6be49f898c Removed onFirstBegin() 2018-10-19 23:20:04 -04:00
Anuken
59bc73656f Save file refactor / Changed sector size 2018-10-19 22:46:53 -04:00
Anuken
bed22f51b4 Updated sector unlocking 2018-10-19 16:23:01 -04:00
Anuken
c1362a02f3 Removed all references to size 2018-10-19 13:48:08 -04:00
Anuken
859a3cbe6e Fixed Java 10-related crash 2018-10-19 12:58:53 -04:00
Anuken
a6d82f44b3 Initial (broken) commit 2018-10-19 12:57:24 -04:00
키에르
e66e17a41a Fix font height (#253) 2018-10-19 10:01:09 -04:00
Anuken
cfa6d7080c Fixed font 2018-10-19 09:56:50 -04:00
Anuken
01ceedccd5 Updated bundles / Decreased water extractor power usage 2018-10-19 09:32:23 -04:00
Anuken
ed28af7c73 Changed 'max power' to 'base power', re-scaled display stats of fuel 2018-10-19 09:31:33 -04:00
Anuken
74cf91f99e Fixed increased router storage / Fixed instant building after reload 2018-10-19 08:47:19 -04:00
Anuken
44479930df Fixed mobile mechs configuration / Block selection / Crash 2018-10-19 08:30:37 -04:00
Anuken
d68d2e9f30 Moved paused text details into bundle 2018-10-18 22:33:11 -04:00
Anuken
948c48ea23 Merge remote-tracking branch 'origin/master' 2018-10-18 21:57:19 -04:00
Anuken
a9ccf6ca42 Updated travis config / Fixed flying mech land effect 2018-10-18 21:57:13 -04:00
Baramos666
fd7b829e70 Update bundle_fr.properties (#249) 2018-10-18 21:56:44 -04:00
LQ
87a7cc6289 add liquid out speed display (#250) 2018-10-18 21:56:35 -04:00
VizardAlpha
2f8b5e53bb Updates bundle_fr_be.properties (#251) 
Recast of the French translation (Belgium)
 2018-10-18 21:56:09 -04:00
Prosta4okua
8b7fa3b646 [WIP]Update bundle_ru.properties (#243) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-10-18 21:56:00 -04:00
Anuken
dd2c71fe61 Removed sandbox from shuffle list / duplicate maps / mobile mech pickup 2018-10-18 18:20:07 -04:00
Anuken
3b58d57e5c Fixed unlocks not clearing / Fixed map editor not updating 2018-10-18 16:58:57 -04:00
Anuken
cecf32e52e Fixed RTG generator not using items 2018-10-18 16:33:39 -04:00
Anuken
91a2dfab36 Fixed build block repair / Sectors in random maps / Editor unlocks 2018-10-18 16:31:15 -04:00
Anuken
5e5838a8c1 let me make this PAINFULLY CLEAR 2018-10-18 16:04:40 -04:00
Skybbles // L5474
0fffbc06dd Spelling correction (#252) 
*maybe you mean CLI board.*
 2018-10-18 14:35:33 -04:00
Anuken
4d360bfb73 Bugfixes 2018-10-18 09:19:29 -04:00
Anuken
e3001b614e Fixed pathfinding through liquids / Switched overlay render layer 2018-10-18 00:02:12 -04:00
Anuken
6ecdef02ab Block break visual cleanup 2018-10-17 22:10:56 -04:00
Anuken
36903eb749 Fixed mission onBegin() being called many times 2018-10-17 17:35:33 -04:00
Anuken
f530c9514f Changed placement controls / Fixed complete sectors not resetting 2018-10-17 17:28:24 -04:00
Anuken
fdffa77bc5 Fixed mobile targeting / Removed 'transfer speed' / Buffed large nodes 2018-10-17 17:09:26 -04:00
Anuken
245dd39a60 Potentially fixed targeting issues 2018-10-17 14:01:18 -04:00
Anuken
4614aacc02 Fixed chat not clearing 2018-10-17 13:54:34 -04:00
Anuken
64ccdab90c Removed extra trace info (for now) 2018-10-17 13:41:25 -04:00
Anuken
02286b0c4e Fixed player build indicators, power void 2018-10-17 10:31:59 -04:00
Anuken
8e952a550b Fixed: map mirror / crashes / mech pads / player list / mobile placement 2018-10-17 10:20:58 -04:00
Anuken
a29f95194d Various fixes / Placement visual improvements 2018-10-17 00:36:43 -04:00
Anuken
0e5db49b93 Fixed missing blocks causing invalid map data error 2018-10-16 20:03:35 -04:00
Anuken
a2c29c0937 Removed tutorial ore post-generation / Updated uCore 2018-10-16 19:31:06 -04:00
Anuken
c318f05cfd Minor lightning visual change / Hid PvP mode on web 2018-10-16 17:46:44 -04:00
Anuken
789d200c24 Fixed typo in tutorial missions 2018-10-16 16:58:18 -04:00
Anuken
2dc4a9e044 Fixed abandoning sector not updating texture 2018-10-16 16:35:43 -04:00
Anuken
82577b91d5 2-column sector button layout 2018-10-16 13:10:06 -04:00
Anuken
8fd08a1574 Fixed infinite graph traversal for power blocks 2018-10-16 11:52:17 -04:00
LQ
7a41fc8ec8 update pad mission (#247) 
add MechMission as same as the UpgradeBlocks type
 2018-10-16 09:08:53 -04:00
Anuken
798ca929d6 Improved sector mission display 2018-10-15 23:20:47 -03:00
LQ
21bc195213 make sure new sector include target sector (#244) 
if shiftx, shifty calc from total width,height, the result sector did not include the target sector
 2018-10-15 10:17:52 -04:00
Anuken
b6beacf053 Input cleanup 2018-10-15 02:05:25 -03:00
Anuken
94b6c133f4 Various resprites 2018-10-14 18:39:24 -04:00
Anuken
949d7bed89 Fixed item images having incorrect underlines 2018-10-14 16:05:39 -04:00
Anuken
81ce12a38c Added random PvP/Waves map generation 2018-10-14 13:24:32 -04:00
Anuken
eba65b2934 Fixed units pathfinding to nonexistent cores 2018-10-14 11:57:37 -04:00
Anuken
c7f5b7fca1 Minified gamemode table 2018-10-14 10:41:17 -04:00
Anuken
f670d522bf PvP merge 2018-10-14 10:01:50 -04:00
Anuken
a02f7f46c3 Merge remote-tracking branch 'origin/master' 2018-10-14 09:57:31 -04:00
Anuken
4b7f254e17 Added 2x2 container storage block 2018-10-14 09:57:28 -04:00
Anuken
9b42be560d Fixed bugs with team assignment 2018-10-14 09:41:19 -04:00
VizardAlpha
31b39231a2 Updates bundle_fr_be.properties (#242) 2018-10-13 23:32:08 -04:00
Anuken
4eb2c1f646 PvP autohost 2018-10-13 23:30:05 -04:00
Anuken
5f89d8588d Added 'abandon sector' button 2018-10-13 23:07:57 -04:00
Anuken
404cbf9b4a Removed menu setting 2018-10-13 22:52:58 -04:00
Anuken
0aabc09b82 Made game-overs remote events 2018-10-13 21:58:17 -04:00
Anuken
a5ebeadd95 Merge remote-tracking branch 'origin/master' 2018-10-13 17:48:04 -04:00
Anuken
9e188aaf03 Fixed place area being deselected near map edges 2018-10-13 17:47:58 -04:00
Anuken
870f5caca9 PvP game over condition 2018-10-13 17:33:23 -04:00
Anuken
28b4ddfc72 PvP game over condition and message 2018-10-13 17:31:38 -04:00
Prosta4okua
13a4a26e97 Update bundle_ru.properties (#241) 2018-10-13 17:29:09 -04:00
Anuken
81c7e63994 Added 'waiting for players' message 2018-10-13 16:03:21 -04:00
Gureumi
7f234ab5bc Fix font (#240) 2018-10-13 15:53:42 -04:00
Anuken
f8d0682810 Added warnings for missing enemy cores 2018-10-13 15:49:18 -04:00
Anuken
175d6b1fc5 Improved difficulty balance 2018-10-13 12:39:07 -04:00
Anuken
1cd8e8a097 Improved server discovery 2018-10-13 12:21:11 -04:00
Anuken
ed95e38257 Fixed breakable cores / Fixed sector sandbox / Fixed ship warp speed 2018-10-13 11:33:49 -04:00
Anuken
cab585225d Removed unused 'pad' recipe modifier 2018-10-13 10:54:05 -04:00
Anuken
3688dde5e5 Merged mobile mechs 2018-10-13 10:52:48 -04:00
Anuken
ae6a5b2512 Made PvP a selectable mode 2018-10-13 10:50:22 -04:00
LQ
6f87611d67 keep the saved width and height of sector (#236) 
* keep the saved width and height of sector

width,height changed after expandSector mission, It will reset to original value in initSector()

* keep x,y of sector

sector X and Y may be shifted after loading as well.
 2018-10-13 10:44:07 -04:00
Anuken
6a5e31c908 Crash fix 2018-10-13 09:43:31 -04:00
Anuken
8bda5e16cd Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_fr.properties
 2018-10-13 08:59:15 -04:00
Anuken
d70d3d95f0 Bundles updated 2018-10-13 08:58:41 -04:00
Baramos666
554b7d2ec4 Update bundle_fr.properties (#239) 2018-10-13 08:58:04 -04:00
Anuken
c526997aba Fixed coal in core / Fixed build events not triggering 2018-10-13 08:49:54 -04:00
Anuken
c0e3a1f3ef Fixed minor TPS display / block breakage bugs 2018-10-12 22:41:48 -04:00
Anuken
7dc0a7a5c3 Sector generation fix 2018-10-12 17:01:20 -04:00
Anuken
2943b6ed04 Fixed HUD errors 2018-10-12 12:40:30 -04:00
Anuken
5feb212df7 Merge remote-tracking branch 'origin/master' 2018-10-12 09:57:48 -04:00
Anuken
327edcd347 Fixed map crash 2018-10-12 09:57:44 -04:00
LQ
94cbf4cddf fix displayString for CommandMission (#235) 2018-10-12 09:48:39 -04:00
Anuken
08cc87affb nothing again 2018-10-11 23:14:59 -04:00
Baramos666
18020d64cc Update bundle_fr.properties (#234) 2018-10-11 22:58:05 -04:00
Anuken
48b7ceac06 Small rendering fix 2018-10-11 18:46:45 -04:00
Anuken
dbcce9663c Improved base generation 2018-10-11 12:18:23 -04:00
Anuken
6ee7dd56fe Fixed wave spawn crash 2018-10-11 10:01:59 -04:00
Anuken
22328772ca "Fixed" some bugs 2018-10-11 10:01:19 -04:00
Anuken
99418e6b88 Mass driver power fix 2018-10-10 23:51:48 -04:00
Anuken
52bd079c0a Multithreading cleanup 2018-10-10 23:43:48 -04:00
Anuken
67db5e9dfc Nothing 2018-10-10 17:34:36 -04:00
Anuken
5f1bc6c6c2 Custom spawn locations 2018-10-10 13:02:00 -04:00
Anuken
05201d7012 Physics, pathfinding improvements 2018-10-10 11:29:34 -04:00
Anuken
6b4983537e Fixed puddles not appearing / Oil extractors not working 2018-10-10 08:57:07 -04:00
Anuken
87c8293c78 Various bugfixes 2018-10-10 08:39:25 -04:00
Anuken
54488564f3 Added sector complete event / Patched up server sector completion 2018-10-09 23:24:27 -04:00
Anuken
f2ac9ed385 Disabled core recipe 2018-10-09 23:10:04 -04:00
Anuken
38f2f1e30a Added legacy map importer 2018-10-09 22:52:28 -04:00
Anuken
02004011ec Update order swap 2018-10-09 20:50:49 -04:00
Anuken
60bb982450 Updated uCore 2018-10-09 20:13:31 -04:00
Anuken
67389c0bac Arc balancing 2018-10-09 19:52:36 -04:00
Anuken
faa1fee1c0 New lightning mechanics 2018-10-09 19:49:46 -04:00
Anuken
0bae421fbc it begins 2018-10-09 18:26:40 -04:00
Anuken
b29d81bf0f Improved lightning effects 2018-10-09 14:02:25 -04:00
Anuken
4792828da1 Missions now displayed as number / Improved mission gen 2018-10-09 09:22:06 -04:00
Anuken
6171e887a8 Sector growth 2018-10-08 23:56:47 -03:00
Anuken
f28fa93f40 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/io/anuke/mindustry/core/Renderer.java
 2018-10-08 19:55:51 -04:00
Anuken
940ad84493 Random sector sizes / Cleanup 2018-10-08 19:55:10 -04:00
Anuken
0b168376ed Fixed build errors 2018-10-08 17:02:16 -04:00
Anuken
f7bd376499 More public modules 2018-10-08 16:09:31 -04:00
VizardAlpha
9566155bdb Created bundle_fr_be.properties (#233) 
For Belgian player
 2018-10-08 14:14:16 -04:00
Anuken
9994ddb31b Implemented public submodules 2018-10-08 09:41:01 -04:00
Anuken
fadfdaa673 Fixed missing ores 2018-10-08 09:31:47 -04:00
Anuken
4ca546f44a Test cleanup / Artillery fixes 2018-10-07 23:22:54 -04:00
Anuken
42adc38720 Merge remote-tracking branch 'origin/master' 2018-10-07 19:22:18 -03:00
Anuken
c1d9dee46c Added content mission / Working implementation of preset sectors 2018-10-07 19:21:53 -03:00
Anuken
69a7104286 Updated Android tool versions 2018-10-07 11:14:54 -04:00
Anuken
c1ccf4fceb Fixed sector pref clearing 2018-10-06 22:53:12 -04:00
Anuken
fd107ab5b8 Code cleanup 2018-10-06 11:56:39 -04:00
Anuken
5fa6fccf7b Automatic boost 2018-10-05 23:10:04 -04:00
Anuken
0ce226d0c9 Fixed crash 2018-10-05 23:04:34 -04:00
Anuken
14e0b471d3 Mobile mechs implemented 2018-10-05 22:58:46 -04:00
Anuken
ed0df64cf9 Fixed compile errors / Refactored sector presets 2018-10-05 22:16:40 -04:00
Anuken
35bc2c9803 Sector preset class / New missions 2018-10-05 16:36:50 -04:00
Anuken
a771dc8787 Sector tint / Sector preset system 2018-10-04 20:59:58 -04:00
Anuken
244eb91dfb Added new test 2018-10-04 17:59:16 -04:00
Anuken
7488a6d42b Usage of ExtendedPreferences 2018-10-04 12:19:05 -04:00
Anuken
696a59f1b9 Updated revenant factory sprite 2018-10-04 09:31:52 -04:00
Anuken
c82fd9ead5 Added unit tests 2018-10-03 20:58:35 -04:00
Anuken
9a286800d6 Ammo type for revenants 2018-10-03 13:44:18 -04:00
Anuken
59832b1777 Added revenant factory sprites 2018-10-03 10:26:37 -04:00
Anuken
561f566506 Merge branch 'circle-physics' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/src/io/anuke/mindustry/content/UnitTypes.java
 2018-10-02 23:35:56 -04:00
Anuken
ce4031af74 Additional bugfixes 2018-10-02 21:44:32 -04:00
Anuken
dd7f91b8c2 Fixed many various physics bugs 2018-10-02 20:45:28 -04:00
Anuken
8523e5bf6b Rectangles 2018-10-02 18:47:23 -04:00
Anuken
860727d27a Revenant laser 2018-10-02 12:49:27 -04:00
Anuken
f175bf2c82 circles were a mistake 2018-10-01 22:49:53 -04:00
Anuken
40008f44ac Circle collision initial commit 2018-10-01 13:28:35 -04:00
Anuken
3f93b5c63b Revenant stat changes 2018-10-01 12:45:24 -04:00
Anuken
d2ce051c4a Implemented Fortress unit / Made artillery ignore air 2018-10-01 09:51:12 -04:00
Anuken
d5d90bde9a Removed mech ability key 2018-09-30 19:22:19 -04:00
Anuken
fc8d9febf6 Mass driver fixes 2018-09-29 22:53:24 -04:00
Anuken
b43c542213 Auto-target configuration 2018-09-29 20:49:19 -04:00
Anuken
e7533232c0 Fixed custom game waves / Fixed Windows appdata being incorrect 2018-09-29 14:25:29 -11:00
Anuken
5e1aaf11a7 Fixed copper/water not getting unlocked immediately 2018-09-29 10:31:17 -11:00
Anuken
d062dffc13 Cleanup / Fixed unlock system in custom games 2018-09-29 02:50:21 -07:00
Anuken
4810bbbbd9 Fixed loading / Freebuild unlocks 2018-09-28 14:23:56 -04:00
Anuken
967998273f Partially implemented specific unlock databases 2018-09-28 14:17:44 -04:00
Jae
24decf8abc Update bundle_zh_CN.properties (#230) 
* Added translations

* Update bundle_fr.properties

* Update bundle_fr.properties

* Added zh_CN translations

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2018-09-27 17:46:17 -04:00
Anuken
b74ae302ec Ground unit retreat attacking / Patrol attacking 2018-09-27 17:40:08 -04:00
DinoWattz
db3dac261a Update bundle_pt_BR.properties (#231) 
Fixed some words and translated some words
 2018-09-27 13:09:09 -04:00
Anuken
87b47b3042 Even less wall hugging 2018-09-26 18:15:16 -04:00
Jae
720e1a038e French translations added (#228) 
* Added translations

* Update bundle_fr.properties

* Update bundle_fr.properties
 2018-09-26 13:42:20 -04:00
Baramos666
1753c54e88 Update bundle_fr.properties (#229) 2018-09-26 13:28:18 -04:00
Anuken
2d42de83de Slightly less wall hugging 2018-09-26 13:22:30 -04:00
Anuken
c4e6af455d Wall-hugging ground patrol / Core storage changed to set 2018-09-26 10:23:06 -04:00
Anuken
1160a14f56 Fixed web errors / Fixed IPv4 crash 2018-09-25 23:27:19 -04:00
Anuken
57fce0ddbc Flying unit patrol 2018-09-25 19:44:10 -04:00
Anuken
b9eb8a750b Removed useless hitbox rects 2018-09-25 17:37:01 -04:00
Anuken
3ce16e0ed1 Changed annotations retention / Mobile block bugfix 2018-09-25 17:18:50 -04:00
Anuken
554d9b4047 Updated bundles 2018-09-25 16:41:18 -04:00
Prosta4okua
02d565ce58 [COMPLETE]Rare update bundle_ru.properties (#223) 
* Update bundle_ru.properties

Added the same thing as in bundle.properties. Also added 9 descriptions. Because of this PL, a PL from xga is old.

* 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

* Update bundle_ru.properties
 2018-09-25 16:39:52 -04:00
Anuken
795bc1276b Cleanup 2018-09-25 12:45:04 -04:00
Anuken
499b7b2e67 Crash fix 2018-09-25 08:41:40 -04:00
Anuken
b6c0fe8bf7 Build fix / Improved map contour 2018-09-24 23:12:13 -04:00
Anuken
d5bb1b72b9 Merge branch 'continuous-sectors' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/assets/bundles/bundle.properties
 2018-09-24 22:57:49 -04:00
Anuken
af86564adc Final tutorial fixes 2018-09-24 22:56:48 -04:00
Anuken
5354e02b6f Finally a somewhat functional tutorial / Many bugfixes 2018-09-24 20:24:51 -04:00
Prosta4okua
4ee17a656f Update bundle.properties (#226) 2018-09-24 14:14:23 -04:00
Anuken
32c59b66f6 Changed tutorial ore gen 2018-09-24 10:19:27 -04:00
Anuken
20732f04ff Block position starting missions 2018-09-23 23:45:35 -04:00
Anuken
06763b34c3 Bugfixes / Better topological map 2018-09-23 18:41:08 -04:00
Anuken
6bab6c57f2 Fixed waves not appearing / Fixed ore tile blending 2018-09-23 12:45:22 -04:00
Anuken
4eab89d73e Per-sector ore gen 2018-09-23 10:10:05 -04:00
Anuken
8d20c46228 Basic tutorial text 2018-09-22 16:41:55 -04:00
Anuken
f5c4586bb7 Merge remote-tracking branch 'origin/master' 2018-09-22 12:29:30 -04:00
Anuken
bc6bbdbbe0 Fixed not being able to move units on conveyors 2018-09-22 12:29:27 -04:00
Anuken
b77caed0ba Added sample tutorial text / Refactoring 2018-09-22 12:20:04 -04:00
Baramos666
df976f1212 Update bundle_fr.properties (#225) 2018-09-22 11:17:07 -04:00
Anuken
999dd5eb6f Better mission display / Improved tutorial item amounts 2018-09-21 23:29:17 -04:00
Anuken
a1a6a3ab81 Tutorial sector prototype / New mission display 2018-09-21 23:14:26 -04:00
Anuken
d067bbfa65 New mission classes 2018-09-21 19:36:19 -04:00
Anuken
3bd40eeb27 Merge remote-tracking branch 'origin/continuous-sectors' into continuous-sectors 
# Conflicts:
#	core/src/io/anuke/mindustry/maps/Sectors.java
 2018-09-21 16:33:00 -04:00
Anuken
b124d54055 Merge 2018-09-21 16:32:38 -04:00
Anuken
90691de457 Fog persistence in sector expansion 2018-09-21 16:11:40 -04:00
Anuken
bee83a3a3e Sector expansion functional 2018-09-21 14:01:00 -04:00
Anuken
fd8f2438fa New world generation methods 2018-09-21 13:50:39 -04:00
Anuken
7937d99a73 Fixed buggy mobile zoom 2018-09-21 09:02:25 -04:00
Anuken
569afb5535 expandSector implementation 2018-09-21 08:49:35 -04:00
Anuken
fc5a45e113 Merge remote-tracking branch 'origin/continuous-sectors' into continuous-sectors 2018-09-21 08:47:41 -04:00
Anuken
950f4a9f1a Added expandSector method 2018-09-21 08:47:37 -04:00
Anuken
6a6e80b6d8 Fixed multiblock erase bug 2018-09-20 18:25:55 -04:00
Anuken
083c9792a6 Fixes to conveyor transmission visuals 2018-09-20 18:22:29 -04:00
Anuken
893bfce767 Incorrect conveyor movement transitions 2018-09-20 17:14:03 -04:00
Anuken
f61f3df732 Build fix 2018-09-20 12:32:12 -04:00
Anuken
a3be5e332e Fill.polyTri replaced 2018-09-20 12:31:53 -04:00
Anuken
33d65a8593 Fixed unit drop crash 2018-09-20 11:18:57 -04:00
Anuken
ebbf01c6e5 Synchronization 2018-09-20 09:29:16 -04:00
Anuken
acb8496352 Fixed node connection bug 2018-09-20 09:24:31 -04:00
Anuken
ecad5772d2 Fixed power debug blocks not working / Moved debug recipes 2018-09-20 08:47:58 -04:00
Anuken
6e6f5714dd Merge remote-tracking branch 'origin/master' 2018-09-20 08:34:07 -04:00
Anuken
50ae15aa4f Power crash fix 2018-09-20 08:33:57 -04:00
iczero
4e2c3049a0 Don't add unit drops to core if the core is full (#222) 2018-09-19 22:47:32 -04:00
Anuken
3a785c166e Removed NodeEntity 2018-09-19 22:39:43 -04:00
Anuken
5248a4eb9c Name refactor / Fixed crash / Power transfer fix 2018-09-19 22:17:58 -04:00
Anuken
c9a53aed7b Fixed crash, transmission bug 2018-09-19 17:36:58 -04:00
Anuken
bafe5dc784 Fixed block break crash 2018-09-19 12:41:33 -04:00
Anuken
5325488099 Changed enum to two booleans 2018-09-19 10:32:06 -04:00
Anuken
737ad5c8b7 Implemented node linking, graph reflow 2018-09-19 10:26:27 -04:00
Anuken
17cea4e274 Added PowerType enum 2018-09-19 10:07:33 -04:00
Anuken
af5b579a2f Power graph loading / merging 2018-09-19 09:41:30 -04:00
Anuken
c87eaaa928 Graph removal 2018-09-18 20:48:48 -04:00
Anuken
33418397f8 Power graph removal 2018-09-18 17:04:43 -04:00
Anuken
8c7258e839 Merge 2018-09-18 17:04:24 -04:00
Anuken
98fff9b81d Sector width/height 2018-09-18 11:54:08 -04:00
Anuken
0c63b27eea Removed old korean font / Fixed targeting going through UI 2018-09-18 09:17:50 -04:00
Anuken
0968981aef Removed unused graph classes 2018-09-17 21:43:19 -04:00
Anuken
8db4abdf43 Comment removed 2018-09-17 10:13:15 -04:00
Anuken
9aa4219bf0 Fixed core deconstruction crash 2018-09-17 09:57:58 -04:00
Anuken
6c32ab4711 Fixed visual glitch 2018-09-17 09:09:48 -04:00
Anuken
a80c5a1efa Fixed artillery bullet not respecting range properly 2018-09-16 22:30:06 -04:00