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 |
|
Anuken
|
32d28a4070
|
Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
# Conflicts:
# core/assets/sprites/block_colors.png
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites2.png
# core/assets/sprites/sprites3.png
# core/assets/sprites/sprites5.png
# core/src/io/anuke/mindustry/ctype/ContentType.java
# core/src/io/anuke/mindustry/ctype/UnlockableContent.java
# core/src/io/anuke/mindustry/io/LegacyMapIO.java
# core/src/io/anuke/mindustry/type/WeatherEvent.java
# gradle.properties
|
2019-12-24 12:40:23 -05:00 |
|
TsjipTsjip
|
ff3165f5d2
|
Formatting
|
2019-12-23 11:35:12 +01:00 |
|
Anuken
|
adb12dcbb8
|
Bugfix
|
2019-12-19 21:58:43 -05:00 |
|
Anuken
|
7a1f467f27
|
obligatory daily commit
|
2019-12-19 21:49:40 -05:00 |
|
ado1928
|
5e568eac0d
|
Added Feathub to the "About" tab (#1234)
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* Update Links.java
|
2019-12-19 19:33:24 -05:00 |
|
Joshua Fan
|
0f6cd5242c
|
Fix chat scroll (#1236)
|
2019-12-19 19:23:32 -05:00 |
|
Anuken
|
e91151213a
|
Extra mod fields
|
2019-12-18 09:27:24 -05:00 |
|
Anuken
|
8b4c266d49
|
Bugfixes
|
2019-12-18 08:43:31 -05:00 |
|
Anuken
|
1c816be5ce
|
Fixed crash occuring with block overload
|
2019-12-17 18:15:24 -05:00 |
|
Anuken
|
f504dd2b5a
|
Minor tweaks
|
2019-12-17 17:10:29 -05:00 |
|
Anuken
|
26881fbdb9
|
Added server mod error check
|
2019-12-17 10:58:43 -05:00 |
|
Anuken
|
8d921199fb
|
Merge remote-tracking branch 'origin/master'
|
2019-12-16 18:37:18 -05:00 |
|
Anuken
|
4ffe233321
|
Added repair point range display
|
2019-12-16 18:37:11 -05:00 |
|
Anuken
|
e076de9dcd
|
Merge pull request #1221 from TsjipTsjip/typoFixes
'arilleryPlastic' -> 'artilleryPlastic'
|
2019-12-16 13:58:59 -05:00 |
|
TsjipTsjip
|
5ce66b0dbb
|
'arilleryPlastic' -> 'artilleryPlastic'
|
2019-12-16 19:55:10 +01:00 |
|
Anuken
|
d47f86cc21
|
Cleanup
|
2019-12-16 10:12:39 -05:00 |
|
Anuken
|
e9ed0512f7
|
Removed Path API usage
|
2019-12-15 21:12:41 -05:00 |
|
Anuken
|
0cf39bf5c3
|
Eliminated 8 characters
|
2019-12-15 20:01:06 -05:00 |
|
Anuken
|
95a1474b9a
|
Merge remote-tracking branch 'origin/master'
|
2019-12-15 19:36:38 -05:00 |
|
Anuken
|
53aedcee2c
|
Cleanup
|
2019-12-15 19:35:04 -05:00 |
|
joshuaptfan
|
18bb7ba936
|
Prevent right-click from deconstructing when schematic is selected; allow deconstruct cancel with left-click
|
2019-12-15 14:26:13 -08:00 |
|
Anuken
|
9f3dcdf727
|
Fixed #1215 - made all valid floors show up in drill mine list
|
2019-12-15 16:29:11 -05:00 |
|
Anuken
|
7d2354a653
|
Mod path resolving fixes
|
2019-12-15 16:00:50 -05:00 |
|
Anuken
|
ab21b88001
|
Mod sort fix
|
2019-12-15 15:22:19 -05:00 |
|
Anuken
|
a560978dcf
|
Sync fixes / Fixed linear filtering resetting on mod load
|
2019-12-15 14:30:28 -05:00 |
|
Anuken
|
d78d3daaf9
|
Updated script stub
|
2019-12-15 13:56:01 -05:00 |
|
Anuken
|
976d0f54b3
|
Merge branches 'master' and 'safe-mod-loading' of https://github.com/Anuken/Mindustry
# Conflicts:
# core/src/io/anuke/mindustry/mod/Mods.java
|
2019-12-15 13:55:30 -05:00 |
|
Anuken
|
1c1db3990f
|
Fully implemented safe content loading
|
2019-12-15 13:54:51 -05:00 |
|
Anuken
|
bcc8f65ac8
|
More cleanup
|
2019-12-14 20:49:55 -05:00 |
|
Anuken
|
e043f4bb66
|
API cleanup
|
2019-12-14 18:19:02 -05:00 |
|
Anuken
|
9d3dda035c
|
Compile fixes
|
2019-12-14 12:53:37 -05:00 |
|
Anuken
|
6e16aab794
|
Merge remote-tracking branch 'origin/master'
|
2019-12-14 11:05:32 -05:00 |
|
Anuken
|
c1cf3183ac
|
Fixed some Android-related script issues
|
2019-12-14 11:04:22 -05:00 |
|