 Anuken
|
aeae286273
|
Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config
# Conflicts:
# core/src/mindustry/entities/traits/BuilderTrait.java
# core/src/mindustry/entities/type/TileEntity.java
# core/src/mindustry/game/EventType.java
# core/src/mindustry/game/Schematics.java
# core/src/mindustry/input/InputHandler.java
# core/src/mindustry/io/TypeIO.java
# core/src/mindustry/world/Block.java
# core/src/mindustry/world/blocks/distribution/Sorter.java
|
2020-03-04 08:38:36 -05:00 |
|
|
Anuken
|
2581353c5e
|
Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config
# Conflicts:
# core/src/mindustry/entities/traits/BuilderTrait.java
# core/src/mindustry/entities/type/TileEntity.java
# core/src/mindustry/game/EventType.java
# core/src/mindustry/game/Schematics.java
# core/src/mindustry/input/InputHandler.java
# core/src/mindustry/io/TypeIO.java
# core/src/mindustry/world/Block.java
# core/src/mindustry/world/blocks/distribution/Sorter.java
|
2020-03-03 21:33:03 -05:00 |
|
|
Anuken
|
087f8129b9
|
Tile code cleanup
|
2020-03-03 19:29:41 -05:00 |
|
|
Anuken
|
bac1648d4b
|
Added support for changing cached floor/terrain
|
2020-03-03 17:01:09 -05:00 |
|
|
Anuken
|
f1aadd97a8
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0
# Conflicts:
# core/src/mindustry/core/Logic.java
# gradle.properties
|
2020-03-03 12:12:25 -05:00 |
|
|
Anuken
|
64c1800391
|
Merge remote-tracking branch 'origin/master'
|
2020-03-03 12:11:49 -05:00 |
|
|
Anuken
|
2a191a45be
|
Cleanup
|
2020-03-03 12:11:47 -05:00 |
|
|
Anuken
|
e8823fab36
|
More concise stream class
|
2020-03-03 12:11:35 -05:00 |
|
|
Anuken
|
3858cdd4c5
|
Added map region class
|
2020-03-03 12:08:31 -05:00 |
|
|
Anuken
|
ceac809c1d
|
Cleanup
|
2020-03-02 10:44:56 -05:00 |
|
|
Anuken
|
f88fe898ff
|
Updated bundle
|
2020-03-01 21:23:50 -05:00 |
|
|
Anuken
|
182a8837be
|
Save satellite presence
|
2020-03-01 20:58:33 -05:00 |
|
|
Anuken
|
c3a790bfd2
|
2
|
2020-03-01 16:29:04 -05:00 |
|
|
Anuken
|
7d84300c31
|
Updated arc
|
2020-03-01 16:22:38 -05:00 |
|
|
Anuken
|
ab7e840eee
|
Cleanup
|
2020-03-01 16:20:42 -05:00 |
|
|
Anuken
|
a31de609ce
|
BufferUtils -> Buffers
|
2020-03-01 16:19:04 -05:00 |
|
|
Anuken
|
9ddd76d6cb
|
Cleanup
|
2020-03-01 15:41:10 -05:00 |
|
|
Anuken
|
c6fc103bff
|
Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
|
2020-03-01 12:55:51 -05:00 |
|
|
Anuken
|
6f5815abc8
|
Merge remote-tracking branch 'origin/master'
|
2020-03-01 12:34:07 -05:00 |
|
|
Anuken
|
c59a3116ad
|
Better JNI error checking (**needs recompilation**)
|
2020-03-01 12:34:01 -05:00 |
|
|
Anuken
|
3ed5282e14
|
Better sector null checks
|
2020-03-01 12:15:38 -05:00 |
|
|
Anuken
|
51cec64118
|
Merge remote-tracking branch 'origin/6.0' into 6.0
|
2020-03-01 00:09:07 -05:00 |
|
|
Anuken
|
a2a9cffdee
|
Moved some methods around
|
2020-03-01 00:09:03 -05:00 |
|
|
Anuken
|
4b36a6d5bd
|
Bugfixes
|
2020-02-29 19:37:14 -05:00 |
|
|
Anuken
|
26c328ae34
|
Bugfixes and cleanup
|
2020-02-29 12:43:37 -05:00 |
|
|
Anuken
|
7a01719816
|
Real-time lighting + solar system rendering
|
2020-02-29 11:58:10 -05:00 |
|
|
Anuken
|
f0857fa22d
|
Universe time + Progress on solar system framework
|
2020-02-28 20:21:00 -05:00 |
|
|
Anuken
|
38ab1473f2
|
Backport of fixed lighting + overflow crash fix
|
2020-02-28 13:46:16 -05:00 |
|
|
Anuken
|
04f8282821
|
Better lighting
|
2020-02-28 13:44:03 -05:00 |
|
|
Anuken
|
120d96c775
|
Sun + dynamic lighting
|
2020-02-28 13:18:06 -05:00 |
|
|
Anuken
|
21bd7a75f0
|
Added icosphere generator
|
2020-02-27 20:39:41 -05:00 |
|
|
Anuken
|
bc7671b08d
|
Merge remote-tracking branch 'origin/master'
|
2020-02-27 10:08:19 -05:00 |
|
|
Anuken
|
709bd4952f
|
Added PC hardware flag
|
2020-02-27 10:08:09 -05:00 |
|
|
Anuken
|
dcf75222d9
|
Cleanup
|
2020-02-27 10:04:56 -05:00 |
|
|
Anuken
|
1e53ea50b0
|
Added support for export/import of all basic terrain as image
|
2020-02-26 19:37:22 -05:00 |
|
|
Anuken
|
fdaac290ac
|
Better previews
|
2020-02-26 14:44:06 -05:00 |
|
|
Anuken
|
a1fd621eb6
|
Fast sector save access, structural changes
|
2020-02-25 23:40:26 -05:00 |
|
|
Anuken
|
5f8a0ec12e
|
Tweaks
|
2020-02-25 10:04:37 -05:00 |
|
|
Anuken
|
8b7f439ef5
|
Unfinished sector selection
|
2020-02-24 23:03:33 -05:00 |
|
|
Anuken
|
3211b5da01
|
Added plane batch
|
2020-02-24 15:58:36 -05:00 |
|
|
Anuken
|
cfbe631e66
|
Merge
|
2020-02-23 20:14:38 -05:00 |
|
|
Anuken
|
7f53328f52
|
Refactored planet rendering to different classes
|
2020-02-23 19:05:25 -05:00 |
|
|
Anuken
|
9af93dc44d
|
Slightly larger sectors
|
2020-02-22 22:40:16 -05:00 |
|
|
Anuken
|
91f2eaf53a
|
Bugfixes
|
2020-02-22 20:02:41 -05:00 |
|
|
Anuken
|
c8a762df42
|
Minor assignment tweak
|
2020-02-22 19:53:14 -05:00 |
|
 AnukenandGitHub
|
66bcb294fb
|
Update issue templates
|
2020-02-22 19:35:14 -05:00 |
|
|
Anuken
|
501e909039
|
Merge remote-tracking branch 'origin/master'
|
2020-02-22 19:32:10 -05:00 |
|
|
Anuken
|
2cd69230e0
|
Changed feathub link
|
2020-02-22 19:32:01 -05:00 |
|
|
Anuken
|
68b9bfe907
|
Cleanup
|
2020-02-22 19:30:39 -05:00 |
|
|
AnukenandGitHub
|
ae66ca468d
|
Update README.md
|
2020-02-22 19:30:02 -05:00 |
|
|
AnukenandGitHub
|
0846198721
|
Updated issue templates
|
2020-02-22 19:25:05 -05:00 |
|
|
Anuken
|
966fff70ed
|
2
|
2020-02-22 17:28:48 -05:00 |
|
|
Anuken
|
9788f9b981
|
Tweaks
|
2020-02-22 17:28:13 -05:00 |
|
|
Anuken
|
6e4b02db5a
|
Correctly seeded sectors
|
2020-02-22 15:28:56 -05:00 |
|
|
Anuken
|
2afb175560
|
Generation tweaks
|
2020-02-22 12:05:31 -05:00 |
|
|
Anuken
|
4a40172782
|
Cleaned up bullet sprites
|
2020-02-22 00:28:03 -05:00 |
|
|
Anuken
|
baa0eb1149
|
Added cliffs as separate block
|
2020-02-21 23:45:25 -05:00 |
|
|
Anuken
|
6871db7155
|
Visual tweaks
|
2020-02-21 22:58:18 -05:00 |
|
|
Anuken
|
a5e469e96c
|
Complete planet panning
|
2020-02-21 13:48:50 -05:00 |
|
|
Anuken
|
99d3e9ae7c
|
Generator cleanup
|
2020-02-20 20:28:23 -05:00 |
|
|
AnukenandGitHub
|
abec83a3e1
|
Merge pull request #1611 from Dexapnow/patch-1
Update bundle_pl.properties
|
2020-02-20 10:46:37 -05:00 |
|
|
Anuken
|
97f342aceb
|
.
|
2020-02-20 10:34:17 -05:00 |
|
|
AnukenandGitHub
|
32dcae8fd3
|
Update bundle.properties
|
2020-02-19 13:49:40 -05:00 |
|
|
Anuken
|
1d1c73fd6f
|
Merge
|
2020-02-19 13:10:25 -05:00 |
|
|
Anuken
|
e8ca5fe211
|
More iOS stuff
|
2020-02-19 11:03:12 -05:00 |
|
|
Anuken
|
b2dd2c8441
|
Cleanup
|
2020-02-19 10:31:15 -05:00 |
|
|
Anuken
|
73995c7764
|
Merge remote-tracking branch 'origin/master'
|
2020-02-19 10:21:42 -05:00 |
|
|
Anuken
|
a866af40cb
|
iOS fixes
|
2020-02-19 10:21:35 -05:00 |
|
|
Anuken
|
71f1fb5d66
|
Cleanup
|
2020-02-19 10:17:56 -05:00 |
|
|
Anuken
|
65800a51c6
|
Sector darkness boundaries
|
2020-02-19 00:29:48 -05:00 |
|
|
AnukenandGitHub
|
6317e0816a
|
Merge pull request #1607 from hellomouse/name-change-fix
Reset local player name on disconnect
|
2020-02-18 23:52:05 -05:00 |
|
|
Anuken
|
48c04bda8c
|
Map tweaks
|
2020-02-18 20:07:07 -05:00 |
|
|
Anuken
|
4a55dde5ee
|
Bugfixes
|
2020-02-18 19:54:35 -05:00 |
|
|
Anuken
|
afd31c2b42
|
Merge remote-tracking branch 'origin/6.0' into 6.0
|
2020-02-18 19:34:17 -05:00 |
|
|
Anuken
|
53996d8a8d
|
Circular sector maps
|
2020-02-18 19:34:07 -05:00 |
|
|
Anuken
|
378a5d5239
|
Removed bloom on iOS
|
2020-02-18 12:40:53 -05:00 |
|
|
Anuken
|
62330d6c99
|
Merge remote-tracking branch 'origin/master'
|
2020-02-18 12:23:07 -05:00 |
|
|
Anuken
|
10f3c722b6
|
iOS fixes
|
2020-02-18 12:23:04 -05:00 |
|
|
AnukenandGitHub
|
711faa6e2a
|
Merge pull request #1597 from GioIacca9/patch-3
Update block.pyratite-mixer.description
|
2020-02-18 11:51:37 -05:00 |
|
|
AnukenandGitHub
|
48124bc731
|
Merge pull request #1603 from indielm/patch-4
Update servers.json
|
2020-02-18 11:45:12 -05:00 |
|
|
Anuken
|
0f43690aaf
|
More unlocks?
|
2020-02-18 11:43:06 -05:00 |
|
|
Anuken
|
a655e18b87
|
Merge remote-tracking branch 'origin/master'
|
2020-02-18 11:35:36 -05:00 |
|
|
Anuken
|
2038409283
|
Removed schematic replacement dialog
|
2020-02-18 11:35:28 -05:00 |
|
|
AnukenandGitHub
|
8b14219bab
|
Merge pull request #1583 from Prosta4okua/patch-9
6.0
|
2020-02-18 10:39:22 -05:00 |
|
|
AnukenandGitHub
|
d9ae8e5a28
|
Merge pull request #1571 from artur309/master
Added new lines and some small translation.s
|
2020-02-18 10:32:30 -05:00 |
|
|
AnukenandGitHub
|
507f553295
|
Merge pull request #1592 from QmelZ/patch-1
Translation to Turkish
|
2020-02-18 10:32:08 -05:00 |
|
|
AnukenandGitHub
|
08509dafb1
|
Merge pull request #1573 from soytheLB/patch-2
Update bundle_es to version #149465
|
2020-02-18 10:31:46 -05:00 |
|
|
Anuken
|
da2cc292c3
|
Wall generation
|
2020-02-17 20:33:01 -05:00 |
|
|
Anuken
|
e215772f30
|
Added backwards compatibility for legacy saves
|
2020-02-17 11:13:46 -05:00 |
|
|
Anuken
|
18d4efa315
|
Merge
|
2020-02-17 09:30:36 -05:00 |
|
|
Anuken
|
b96d5c417f
|
Fixed #1601
|
2020-02-17 09:27:51 -05:00 |
|
|
Anuken
|
6d68e10804
|
Bugfixes, cleanup
|
2020-02-16 22:22:10 -05:00 |
|
|
Anuken
|
e71230755d
|
Fixed omnidirectional shooting with ignored rotation
|
2020-02-16 13:49:29 -05:00 |
|
|
Anuken
|
7a8bd82f8e
|
Improved controls / Re-added engine sprite
|
2020-02-16 13:16:18 -05:00 |
|
|
Anuken
|
e677538c53
|
Fixed a crash
|
2020-02-15 15:55:37 -05:00 |
|
|
Anuken
|
8b4fcf99a6
|
Building / Fixed some tests
|
2020-02-15 14:51:31 -05:00 |
|
|
Anuken
|
1fe0a7d81e
|
Fixed mock audio package
|
2020-02-15 12:41:57 -05:00 |
|
|
Anuken
|
03d0f54083
|
class IDs
|
2020-02-15 12:39:22 -05:00 |
|
|
Anuken
|
1f65ba185a
|
Fixed unit drowning effects
|
2020-02-15 12:39:13 -05:00 |
|
|
Anuken
|
024f2d62e2
|
Planet sector metadata
|
2020-02-14 20:08:07 -05:00 |
|