Commit Graph

5445 Commits

Author SHA1 Message Date
Anuken
6edcbb9120 Bugfixes 2019-12-29 14:38:03 -05:00
Patrick 'Quezler' Mounier
6b091b4d31
Make craters affected by overdrive projectors 2019-12-29 20:31:11 +01:00
Patrick 'Quezler' Mounier
326f75cbda
Merge branch 'master' into crater 2019-12-29 19:09:27 +01:00
Anuken
566052cabf Fixed #1272 2019-12-29 12:24:51 -05:00
Anuken
730d30ef98 Added core schematic selection setting 2019-12-29 11:40:52 -05:00
Anuken
e04c592f9e Bugfixes 2019-12-29 00:40:25 -05:00
Anuken
77b89d45d6 Cleanup / Desktop dead camera panning 2019-12-29 00:09:46 -05:00
Anuken
df4a0dd5e4 Added openServer method 2019-12-28 22:18:16 -05:00
Anuken
8c941c7165 Added update trigger / Server moddability tweaks 2019-12-28 21:34:20 -05:00
Anuken
b01d56aae8 Bugfixes 2019-12-28 18:22:20 -05:00
Anuken
497ae740aa Removed pointless "> " 2019-12-28 18:12:34 -05:00
Anuken
7543d92473 Added startup commands to server 2019-12-28 18:05:45 -05:00
Anuken
60d83751e8 Fixed server port not being parsed 2019-12-28 17:55:00 -05:00
Anuken
d3c559fa00 Moved server run scripts 2019-12-28 17:33:17 -05:00
Anuken
179bf4d525 Added BE-specific server list 2019-12-28 16:34:35 -05:00
Anuken
e1bf8bdab1 Added BE auto-updater / Server config / Fixed #1266 2019-12-28 16:30:40 -05:00
Anuken
c250b1d24a Fixes 2019-12-28 11:16:35 -05:00
Patrick 'Quezler' Mounier
5d62b1b318
Merge branch 'master' into crater 2019-12-28 09:39:21 +01:00
Patrick 'Quezler' Mounier
e0cfbc7609
All hail the cuteness of this crater roomba critter 2019-12-27 20:45:27 +01:00
Anuken
186a2aaa45 Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/ai/BlockIndexer.java
#	core/src/mindustry/core/World.java
#	core/src/mindustry/entities/traits/Entity.java
#	core/src/mindustry/entities/type/BaseEntity.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/world/blocks/defense/MendProjector.java
#	core/src/mindustry/world/blocks/defense/OverdriveProjector.java
#	core/src/mindustry/world/blocks/production/Drill.java
#	gradle.properties
2019-12-27 01:41:06 -05:00
Anuken
c0c0ffa682 Bugfixes 2019-12-27 01:22:50 -05:00
Anuken
98f8a1732e Renamed Calls -> Call 2019-12-26 23:00:26 -05:00
Anuken
d6d6dc29dc More plugin customization / Renamed Rectangle 2019-12-26 22:44:15 -05:00
Anuken
6080a7e4bc Possibly fixed tests / Added support for mod icons 2019-12-26 20:53:53 -05:00
Anuken
c339a0ecdf Merge 2019-12-26 20:44:05 -05:00
Anuken
684f3075cb Team#toString() 2019-12-26 20:20:12 -05:00
Anuken
954e26fc14 Method cleanup 2019-12-26 20:08:53 -05:00
Anuken
c449302d28 Fixed tests 2019-12-26 19:57:24 -05:00
Anuken
d8629100db Functionality fixes 2019-12-26 19:48:45 -05:00
Anuken
4858e602ed Fixed compilation 2019-12-26 19:40:54 -05:00
Anuken
de5979f4ee Many various internal changes 2019-12-26 17:46:01 -05:00
Anuken
36ec88e2e2 Team cleanup 2019-12-26 14:20:36 -05:00
Anuken
a5978b6163 Updated Arc 2019-12-26 08:08:16 -05:00
Anuken
1d6f769e3d Debug fixes 2019-12-26 08:01:24 -05:00
Anuken
2b22b7e7e4 Condensed unit group array 2019-12-25 22:26:51 -05:00
Anuken
9016c12d16 Made team a separate class 2019-12-25 19:07:04 -05:00
Anuken
8ac0949ddf Added default liquid turret liquid display 2019-12-25 14:38:43 -05:00
Anuken
c307fc02cf Full merge 2019-12-25 13:34:27 -05:00
Anuken
c681cc5cf8 Compile fixes 2019-12-25 13:25:44 -05:00
Anuken
1e7c83f0c9 Partial merge 2019-12-25 13:22:36 -05:00
Anuken
c7ea4e85c9 Serialize fixes 2019-12-25 12:47:14 -05:00
Anuken
c0f14185a8 More fixes 2019-12-25 12:35:23 -05:00
Anuken
ec4c2c7adb Fixed compilation 2019-12-25 12:22:12 -05:00
Anuken
475794640d More cleanup 2019-12-25 11:16:54 -05:00
Anuken
514d4817c8 it is done 2019-12-25 01:39:38 -05:00