 Patrick 'Quezler' Mounier
|
00249f62b6
|
Cleanup if chains
|
2020-03-05 10:28:10 +01:00 |
|
|
Patrick 'Quezler' Mounier
|
9df875354a
|
Revert "Repurpose branch to be played"
This reverts commit ff578c8540.
# Conflicts:
# tools/crater-deploy.sh
|
2020-03-05 10:10:00 +01:00 |
|
|
Patrick 'Quezler' Mounier
|
9bc340ba17
|
Fix end ¬ rendering
|
2020-03-05 10:08:22 +01:00 |
|
|
Patrick 'Quezler' Mounier
|
79c965bf8d
|
Move sleep detector to renderer
|
2020-03-05 10:08:15 +01:00 |
|
|
Patrick 'Quezler' Mounier
|
e5e4884448
|
Merge branch 'master' into crater
# 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/world/modules/ItemModule.java
|
2020-03-05 10:00:02 +01:00 |
|
 Anuken
|
882076030d
|
Added back tapping
|
2020-03-04 19:58:48 -05:00 |
|
|
Anuken
|
c02c00cdfb
|
Schematic tweaks and improvements
|
2020-03-04 19:21:40 -05:00 |
|
|
Anuken
|
3eea0ea065
|
Bugfixes, tweaks
|
2020-03-04 13:48:00 -05:00 |
|
|
Anuken
|
cf31293d7b
|
Many internal changes
|
2020-03-04 13:32:31 -05:00 |
|
 Patrick 'Quezler' MounierandGitHub
|
3b2b7be72a
|
Remove nested app.post (#1667)
|
2020-03-04 11:58:16 -05:00 |
|
|
Anuken
|
c96427c722
|
Bugfixes
|
2020-03-04 09:01:41 -05:00 |
|
|
Anuken
|
503607e36a
|
Fixed #1661
|
2020-03-04 08:39:48 -05:00 |
|
|
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
|
2a191a45be
|
Cleanup
|
2020-03-03 12:11:47 -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
|
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
|
3ed5282e14
|
Better sector null checks
|
2020-03-01 12:15:38 -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
|
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 |
|
|
Patrick 'Quezler' MounierandGitHub
|
8bbd8489e0
|
Remember scroll position when a new message gets added (#1638)
|
2020-02-25 12:06:18 -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 |
|
|
Patrick 'Quezler' MounierandGitHub
|
ce1884512d
|
Null the block as well? (#1630)
|
2020-02-24 11:44:39 -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
|
c8a762df42
|
Minor assignment tweak
|
2020-02-22 19:53:14 -05:00 |
|
|
Anuken
|
501e909039
|
Merge remote-tracking branch 'origin/master'
|
2020-02-22 19:32:10 -05:00 |
|