 Anuken
|
b721d7a10f
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations
# Conflicts:
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/src/io/anuke/mindustry/core/Renderer.java
# core/src/io/anuke/mindustry/entities/units/types/Drone.java
# core/src/io/anuke/mindustry/graphics/CacheLayer.java
# core/src/io/anuke/mindustry/world/blocks/Floor.java
|
2018-11-26 13:23:38 -05:00 |
|
|
Anuken
|
ef85d1d83e
|
Merge remote-tracking branch 'origin/master'
|
2018-11-26 12:40:28 -05:00 |
|
|
Anuken
|
d03ceb2a23
|
Bugfixes / Sorter item memory
|
2018-11-26 12:40:24 -05:00 |
|
|
Anuken
|
a241f63ddc
|
Merge remote-tracking branch 'origin/master'
|
2018-11-25 22:55:18 -05:00 |
|
|
Anuken
|
70507258ae
|
Cleanup
|
2018-11-25 22:55:13 -05:00 |
|
|
Anuken
|
54ad9ba243
|
Added fullscreen map screenshot
|
2018-11-25 20:43:45 -05:00 |
|
|
Anuken
|
a7f7a09418
|
Drone repair cleanup / Percentage-based repair
|
2018-11-25 16:34:31 -05:00 |
|
|
Anuken
|
44897fb371
|
Mobile chat fix / Turret balance / UI disable variable
|
2018-11-25 13:58:19 -05:00 |
|
|
Anuken
|
bb6a748167
|
Various bugfixes
|
2018-11-25 10:29:38 -05:00 |
|
|
Anuken
|
c321402414
|
Various bugfixes
|
2018-11-24 20:04:20 -05:00 |
|
|
Anuken
|
ec80fc9f3f
|
Android build update
|
2018-11-24 19:39:35 -05:00 |
|
|
Anuken
|
6bfd57097f
|
Cleanup of TODOs
|
2018-11-24 08:21:22 -05:00 |
|
|
Anuken
|
6f5df6a671
|
Added list of contributors to credits
|
2018-11-23 14:30:58 -05:00 |
|
|
Anuken
|
1baf3190cd
|
Host dialog name selection
|
2018-11-23 13:35:16 -05:00 |
|
|
Anuken
|
66c29c49e5
|
Wave spawner moved / Bundle tweaks / Blank name
|
2018-11-23 13:32:17 -05:00 |
|
|
Anuken
|
e5d6740555
|
Additional tests, inventory fixes
|
2018-11-23 12:40:36 -05:00 |
|
|
Anuken
|
30b5dd63e4
|
Build tag fix
|
2018-11-23 10:21:47 -05:00 |
|
|
Anuken
|
f0aa8d73ea
|
Merge remote-tracking branch 'origin/master'
|
2018-11-23 09:23:48 -05:00 |
|
|
Anuken
|
8a0761cad8
|
Bugfixes
|
2018-11-23 09:23:42 -05:00 |
|
|
Anuken
|
4f56bf3c3e
|
Consume icon fix / Liquid mixer fix
|
2018-11-23 08:32:56 -05:00 |
|
|
Anuken
|
942eed402a
|
uCore update
|
2018-11-22 23:38:59 -05:00 |
|
|
Anuken
|
24c72650fb
|
Bundles update
|
2018-11-22 19:10:31 -05:00 |
|
|
Anuken
|
f5959c8829
|
Optional display section
|
2018-11-22 19:09:51 -05:00 |
|
|
Anuken
|
7621ebed42
|
Merge remote-tracking branch 'origin/master'
|
2018-11-22 08:39:15 -05:00 |
|
|
Anuken
|
5447c71790
|
Removed junction item voiding
|
2018-11-22 08:39:05 -05:00 |
|
|
Anuken
|
c5241eaaf6
|
Encoding tests
|
2018-11-21 23:12:27 -05:00 |
|
|
Anuken
|
9266b55ddf
|
Fixed charset issues
|
2018-11-21 23:05:33 -05:00 |
|
|
Anuken
|
7795a690ed
|
Fixed fillitems command
|
2018-11-21 21:17:45 -05:00 |
|
|
Anuken
|
d498ac89f2
|
Mining bugfix
|
2018-11-21 21:13:30 -05:00 |
|
|
Anuken
|
2842018c2f
|
Ignored robovm.properties
|
2018-11-21 11:01:16 -05:00 |
|
|
Anuken
|
51641cc704
|
Merge remote-tracking branch 'origin/master'
|
2018-11-21 11:00:58 -05:00 |
|
|
Anuken
|
729f5ed5e4
|
New version format / Updated bundles / ConnectPacket encoding fix
|
2018-11-21 11:00:50 -05:00 |
|
|
Anuken
|
46c6b2168c
|
Added automatic build incrementing
|
2018-11-21 10:04:38 -05:00 |
|
|
Anuken
|
1f955904a4
|
Merge
|
2018-11-21 10:04:17 -05:00 |
|
|
Anuken
|
46035e76cc
|
Build increment
|
2018-11-21 09:59:56 -05:00 |
|
|
Anuken
|
7c073f76ae
|
Added automatic build incrementing
|
2018-11-20 19:28:26 -05:00 |
|
|
Anuken
|
5ced5ce253
|
Fixed some bugs/crashes
|
2018-11-20 10:00:13 -05:00 |
|
|
Anuken
|
55781e911e
|
Merge remote-tracking branch 'origin/master'
|
2018-11-20 00:26:18 -05:00 |
|
|
Anuken
|
ee3c4a4124
|
Mass driver buff
|
2018-11-20 00:26:14 -05:00 |
|
|
Anuken
|
6c744443fb
|
Item list value fix
|
2018-11-19 20:52:31 -05:00 |
|
|
Anuken
|
3c37047afb
|
Misc bugfixes
|
2018-11-19 17:56:26 -05:00 |
|
|
Anuken
|
f31f09d77a
|
Visual fix
|
2018-11-19 16:40:33 -05:00 |
|
|
Anuken
|
de508ee68f
|
"Legacy" unlock loading
|
2018-11-19 15:08:18 -05:00 |
|
|
Anuken
|
a932111040
|
Removed ContentUnlockSet
|
2018-11-19 14:38:46 -05:00 |
|
|
Anuken
|
8c437eb815
|
New UI
|
2018-11-19 14:30:40 -05:00 |
|
|
Anuken
|
1ad4815983
|
Added all placement controls
|
2018-11-19 14:20:57 -05:00 |
|
|
Anuken
|
c75cdc6d28
|
Placement toggle support
|
2018-11-19 12:27:42 -05:00 |
|
|
Anuken
|
b9fae7fb7d
|
Bundle update
|
2018-11-19 10:47:18 -05:00 |
|
|
Anuken
|
e74a3da5cd
|
Merge remote-tracking branch 'origin/master'
|
2018-11-19 10:20:46 -05:00 |
|
|
Anuken
|
08cf986cae
|
Fixed destruction of broken blocks leading to neutral team block
|
2018-11-19 10:20:41 -05:00 |
|
|
Anuken
|
ba01ed0153
|
Flipped place menu
|
2018-11-18 23:19:39 -05:00 |
|
|
Anuken
|
19ac8bd9b2
|
Info menu
|
2018-11-18 20:50:12 -05:00 |
|
|
Anuken
|
ab79ccb02b
|
Implemented unlocks for placement
|
2018-11-18 20:04:15 -05:00 |
|
|
Anuken
|
d862498516
|
Replaced tooltips with names
|
2018-11-18 15:17:19 -05:00 |
|
|
Anuken
|
0efaa11553
|
2 new categories, less space used
|
2018-11-18 14:10:02 -05:00 |
|
|
Anuken
|
ff62f075d0
|
New place menu
|
2018-11-18 00:07:25 -05:00 |
|
|
Anuken
|
348744086d
|
Broken BlocksFragment
|
2018-11-17 18:30:13 -05:00 |
|
|
Anuken
|
d1d4f79973
|
Fixed ores appearing as 'air'
|
2018-11-17 18:01:08 -05:00 |
|
|
Anuken
|
2a3f7f8cb3
|
Bundle update
|
2018-11-17 17:08:31 -05:00 |
|
|
Anuken
|
7eaef11a84
|
Improved hover block system
|
2018-11-17 17:04:16 -05:00 |
|
|
Anuken
|
efe93d0117
|
Added tile selection view
|
2018-11-17 14:45:29 -05:00 |
|
|
Anuken
|
7d12e18b98
|
Merge remote-tracking branch 'origin/master'
|
2018-11-17 13:04:39 -05:00 |
|
|
Anuken
|
de6bca424f
|
Re-added hacky power graph fix
|
2018-11-17 13:04:34 -05:00 |
|
|
Anuken
|
f8d55ba837
|
Better scaling algorithm
|
2018-11-17 12:51:06 -05:00 |
|
|
Anuken
|
bab8120814
|
Crash reporting fixes
|
2018-11-17 12:25:38 -05:00 |
|
|
Anuken
|
c6f1f19866
|
Removed shadow sprites
|
2018-11-17 11:33:56 -05:00 |
|
|
Anuken
|
745592f507
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations
|
2018-11-17 11:24:37 -05:00 |
|
|
Anuken
|
afec65eb56
|
New mobile text dialog / Cleanup / Minimap fix / Collision optimization
|
2018-11-17 11:13:59 -05:00 |
|
|
Anuken
|
d6661da0a7
|
Syncing enemy display
|
2018-11-17 00:04:11 -05:00 |
|
|
Anuken
|
dcc4732748
|
Updated to libGDX 1.9.9
|
2018-11-16 23:36:11 -05:00 |
|
|
Anuken
|
6a5bf08d55
|
Implemented local server configs
|
2018-11-16 22:28:27 -05:00 |
|
|
Anuken
|
d52f5e6e03
|
Shadow tweaks
|
2018-11-16 21:33:10 -05:00 |
|
|
Anuken
|
eb62356313
|
Merge remote-tracking branch 'origin/rendering-optimizations' into rendering-optimizations
|
2018-11-16 21:20:08 -05:00 |
|
|
Anuken
|
919dc248e3
|
Less terrible shadows
|
2018-11-16 21:20:03 -05:00 |
|
|
Anuken
|
ca5db2bff8
|
Fixed bugs with waiting for players, world border
|
2018-11-16 18:17:24 -05:00 |
|
|
Anuken
|
658698ed2f
|
Merge remote-tracking branch 'origin/master'
|
2018-11-16 17:28:47 -05:00 |
|
|
Anuken
|
7f391dacbd
|
Fixed low-FPS movement getting broken
|
2018-11-16 17:28:42 -05:00 |
|
|
Anuken
|
930bfb26f4
|
Merge remote-tracking branch 'origin/master'
|
2018-11-15 12:40:29 -05:00 |
|
|
Anuken
|
7e788f212a
|
Additional fixes
|
2018-11-15 12:38:36 -05:00 |
|
|
Anuken
|
8f99530795
|
Fix for off-screen players and laggy interpolation
|
2018-11-15 12:37:07 -05:00 |
|
|
Anuken
|
a011728cc9
|
Build shader update
|
2018-11-15 10:01:03 -05:00 |
|
|
Anuken
|
e584139b6d
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations
|
2018-11-15 09:56:09 -05:00 |
|
|
Anuken
|
a7c8526f3e
|
Merge remote-tracking branch 'origin/master'
|
2018-11-14 23:46:37 -05:00 |
|
|
Anuken
|
459256e83a
|
Slower unloader
|
2018-11-14 23:46:33 -05:00 |
|
|
Anuken
|
21f3f52c7b
|
Fixed minimap / Improved ore shadows
|
2018-11-14 18:15:47 -05:00 |
|
|
Anuken
|
568e43cf3d
|
Script fixes, padding improvements
|
2018-11-14 17:14:22 -05:00 |
|
|
Anuken
|
e004e540d7
|
Correct tile edges
|
2018-11-14 17:05:51 -05:00 |
|
|
Anuken
|
cac6172344
|
Incomplete point shaders
|
2018-11-14 16:28:59 -05:00 |
|
|
Anuken
|
d8cbc7ddd8
|
"point shader"
|
2018-11-14 10:39:43 -05:00 |
|
|
Anuken
|
bdf3a2dfe8
|
Merge remote-tracking branch 'origin/rendering-optimizations' into rendering-optimizations
|
2018-11-14 10:12:12 -05:00 |
|
|
Anuken
|
693b82e47d
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations
|
2018-11-14 10:12:12 -05:00 |
|
|
Anuken
|
888be0fd5e
|
Completely cleaned FloorRenderer class
|
2018-11-14 10:12:03 -05:00 |
|
|
Anuken
|
9f97ed331b
|
Various bugfixes / Updated uCore
|
2018-11-14 09:55:54 -05:00 |
|
|
Anuken
|
785c2e36c6
|
Fixed some things
|
2018-11-13 23:24:59 -05:00 |
|
|
Anuken
|
ee043e67a4
|
Probable crash fix
|
2018-11-13 22:43:10 -05:00 |
|
|
Anuken
|
d824b41bbb
|
Added replacement sprites
|
2018-11-13 22:11:29 -05:00 |
|
|
Anuken
|
a9df64f861
|
Semi-usable sprites
|
2018-11-13 22:10:41 -05:00 |
|
|
Anuken
|
6c3b449f74
|
Merge remote-tracking branch 'origin/master'
|
2018-11-13 18:51:38 -05:00 |
|
|
Anuken
|
536c6a7b2c
|
Various bugfixes
|
2018-11-13 18:51:34 -05:00 |
|
|
Anuken
|
5e0886d744
|
Compile fix
|
2018-11-13 15:53:01 -05:00 |
|