1
0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-11-11 03:31:19 +03:00
Commit Graph

250 Commits

Author SHA1 Message Date
Anuken
5169e197b6 Bugfixes 2020-02-08 16:00:54 -05:00
Anuken
8814dbe29a Sprite cleanup / Bullets 2020-02-08 14:48:04 -05:00
Anuken
f46be924b9 Effects, collisions, method overrides 2020-02-08 13:14:23 -05:00
Anuken
861b3ac3f4 Tweaks 2020-02-07 11:46:10 -05:00
Anuken
007a1bd1d2 Unit definitions 2020-02-07 11:04:58 -05:00
Anuken
b9841f9cfa a mess 2020-02-07 10:47:58 -05:00
Anuken
33e818a757 Entity name mapping 2020-02-07 09:36:51 -05:00
Anuken
eeae5149a1 Basic unit rendering 2020-02-06 22:08:31 -05:00
Anuken
e9f37ea68e Removed entity processor files 2020-02-06 20:25:10 -05:00
Anuken
f83b6728cf ? 2020-02-06 20:24:30 -05:00
Anuken
ddecb2d831 Actual updating and rendering 2020-02-06 13:40:07 -05:00
Anuken
6fe5663f79 Autogenerated render layer groups 2020-02-06 13:20:03 -05:00
Anuken
6a99a3922e Cleanup 2020-02-06 11:37:22 -05:00
Anuken
a11f6efe0a Rudimentary rendering 2020-02-05 23:04:48 -05:00
Anuken
8172e69f8c it launches 2020-02-05 22:08:57 -05:00
Anuken
65857d77c4 .... 2020-02-05 21:14:53 -05:00
Anuken
dfecfa3964 . 2020-02-05 20:11:49 -05:00
Anuken
f6b1420103 c l e a n u p 2020-02-05 18:28:19 -05:00
Anuken
84748afc55 the errors are back 2020-02-05 15:00:35 -05:00
Anuken
da97aee8e4 it never ends 2020-02-05 13:03:22 -05:00
Anuken
a7b39e56bd Cleanup continues 2020-02-04 18:00:32 -05:00
Anuken
012421afcb Class ID mapping 2020-02-04 13:57:42 -05:00
Anuken
36b9451e01 Read-only component fields / Removed get/set prefix 2020-02-04 12:14:09 -05:00
Anuken
1d0cfd4435 UnitType cleanup 2020-02-04 11:40:56 -05:00
Anuken
a07e275e11 Entity groups 2020-02-04 01:03:34 -05:00
Anuken
a942ed2cad More cleanup 2020-02-03 20:24:49 -05:00
Anuken
88d2ec5be8 Cleanup 2020-02-03 15:59:54 -05:00
Anuken
141cf518a2 Refactoring 2020-02-03 14:07:06 -05:00
Anuken
f937cb30f0 More components, less entities 2020-02-02 23:38:16 -05:00
Anuken
f2f31120a0 Gradual component conversion 2020-02-02 20:17:22 -05:00
Anuken
63fa50d111 Implementation begins 2020-02-02 18:33:59 -05:00
Anuken
ad84329688 Abstract component method support 2020-02-02 17:21:35 -05:00
Anuken
ae6d33cad1 Bugfixes 2020-02-02 16:44:51 -05:00
Anuken
ad9dd83032 Better entity code generation + minor refactoring 2020-02-02 16:13:25 -05:00
Anuken
c978410cb3 Scale cleanup / Name cleanup 2020-02-02 13:59:24 -05:00
Anuken
5eb3f0f3de Interface + base component support 2020-02-02 12:25:46 -05:00
Anuken
acb3438cc8 More entity processor features 2020-02-02 11:51:58 -05:00
Anuken
7ddfcbfabd Utility method copying 2020-02-02 00:39:29 -05:00
Anuken
da2aee7d31 Entity components based on code generation - experiment 2020-02-01 23:54:41 -05:00
Anuken
9f20ff151c Shortened annotation processors 2020-02-01 17:27:24 -05:00
Anuken
ad6e0bcd0f Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework
# Conflicts:
#	android/src/mindustry/android/AndroidLauncher.java
#	annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java
#	annotations/src/main/java/mindustry/annotations/impl/AssetsAnnotationProcessor.java
#	build.gradle
#	core/assets-raw/fontgen/config.json
#	core/assets/bundles/bundle_cs.properties
#	core/assets/bundles/bundle_it.properties
#	core/assets/fonts/font.ttf
#	core/assets/fonts/icon.ttf
#	core/assets/icons/icons.properties
#	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/content/UnitTypes.java
#	core/src/mindustry/core/NetClient.java
#	core/src/mindustry/core/NetServer.java
#	core/src/mindustry/entities/bullet/BulletType.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/maps/filters/FilterOption.java
#	core/src/mindustry/mod/Scripts.java
#	core/src/mindustry/ui/Fonts.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/ui/fragments/HudFragment.java
#	core/src/mindustry/ui/fragments/MenuFragment.java
#	core/src/mindustry/world/blocks/production/Cultivator.java
#	core/src/mindustry/world/blocks/units/CommandCenter.java
#	gradle.properties
#	tools/src/mindustry/tools/FontGenerator.java
2020-01-27 15:51:02 -05:00
Anuken
93cada6a16 Conveyor benchmark test 2020-01-26 11:40:09 -05:00
Anuken
081edde1f2 Fixed double client commands 2020-01-24 22:48:05 -05:00
Anuken
aefc4ed83c Better annotation processing 2020-01-24 18:31:54 -05:00
Anuken
78b2fe64a3 Fixed annotation source version warnings 2020-01-22 15:59:02 -05:00
Anuken
5e977312a7 Annotation processor cleanup 2020-01-22 12:24:00 -05:00
Anuken
85cf7e9d5c Added previously-missing icons 2020-01-19 18:45:25 -05:00
Anuken
a797618f6c Fixed #1397 2020-01-19 14:56:12 -05:00
Anuken
c0844304a6 Merge 2020-01-19 11:10:14 -05:00
Anuken
8d61ddbbd4 Added chat icons for in-game items and blocks 2020-01-17 18:08:23 -05:00
Anuken
c3d2351b2d Various icon changes 2020-01-17 13:57:04 -05:00
Anuken
4f29c80814 Single-texture font+UI packing 2020-01-16 22:25:57 -05:00
Anuken
f7c4ea3e58 Weapon mount cleanup 2020-01-16 10:52:20 -05:00
Anuken
15f5f2fad9 Cleanup 2020-01-11 14:08:03 -05:00
Anuken
647ae27020 Fixes 2020-01-10 15:20:48 -05:00
Anuken
ec4c2c7adb Fixed compilation 2019-12-25 12:22:12 -05:00
Anuken
03342dc2f5 Android fixes 2019-12-25 12:06:19 -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
675e15ddca Minor refactor of class names 2019-12-11 14:23:53 -05:00
Anuken
d2fda57f2c Revert merge 2019-10-21 19:32:46 -04:00
Anuken
982483f178 Merged #812 2019-10-20 17:05:23 -04:00
Anuken
204332a76a Mobile input fixes 2019-10-10 22:13:45 -04:00
Anuken
cce0040eaf why does this work 2019-10-02 23:17:06 -04:00
Anuken
e0ec9a047c Modded consumers 2019-10-02 14:44:18 -04:00
Anuken
33416aadef Parsing fixes / Moved annotations to Arc 2019-09-29 16:09:43 -04:00
Anuken
bbaaa91575 Fixed black styles on game reload (Android) 2019-09-12 09:06:25 -04:00
Anuken
7aa71a7201 Steam workshop publishing 2019-09-10 14:25:34 -04:00
Anuken
c4c0f45228 cleaning up what remains 2019-09-08 22:55:36 -04:00
Anuken
d981bb95b9 it is gone 2019-09-08 22:32:47 -04:00
Anuken
4fb7430fb7 More cleanup, removed connection IDs 2019-09-07 15:23:13 -04:00
Anuken
e90c8c4d3e Extensive network refactor 2019-09-07 14:11:50 -04:00
Anuken
316f4d471f Fixed iOS crash 2019-09-02 20:58:15 -04:00
Anuken
34df9cca2c Fixed Java 8+ compatibility 2019-08-31 16:54:29 -04:00
Anuken
1e80bdf19f Functional loading 2019-08-27 09:27:09 -04:00
Anuken
76cd7ba8d1 non-functional loading screen 2019-08-26 22:53:11 -04:00
Anuken
1fc9c82aaf Attempts to improve the loading system 2019-08-26 13:15:53 -04:00
Anuken
dc435d88f4 Fixed massive music files on iOS, now using MP3 2019-08-16 14:49:35 -04:00
Anuken
b68734d679 iOS-specific format loading 2019-08-14 11:03:36 -04:00
Anuken
0770574f17 Sound things 2019-08-11 16:55:32 -04:00
Anuken
2341da995e Random in-game music, untested 2019-08-10 18:56:20 -04:00
Anuken
2d504521b1 Bugfixes 2019-08-07 08:39:59 -04:00
Anuken
dafbba0907 Fixed more things 2019-07-31 22:49:41 -04:00
Anuken
28ab2b3917 Fixed crashes not saving or displaying 2019-08-01 02:28:01 -06:00
Anuken
d8085d88a8 Re-added classic sound effects for testing 2019-07-31 16:25:25 -04:00
Anuken
d6b023709d Initial menu music test 2019-07-30 22:50:15 -04:00
Anuken
a00a208ff8 Annotation processor for sound asset generation 2019-07-30 12:05:59 -04:00
Anuken
7a2234cd25 Tweaks to improve in-game editing 2019-05-11 00:37:29 -04:00
Anuken
486e3ffc0a Actual map conversion, loading of saves 2019-05-09 10:53:52 -04:00
Anuken
8127e5a66f Made save format actually functional, many things still broken 2019-05-08 23:16:08 -04:00
Anuken
51f9ad5a2c many things 2019-05-06 14:34:21 -04:00
Anuken
20fbe2fbbe even less broken 2019-05-05 22:09:02 -04:00
Anuken
35b158dba7 everything is borked 2019-05-05 14:16:34 -04:00
Anuken
af67690e75 WIP save refactoring 2019-05-05 11:36:38 -04:00
Anuken
b40beb0d1d Source reformat 2019-04-08 09:03:18 -04:00
Anuken
6de4af727b JSON read/write generation 2019-04-03 22:24:14 -04:00
Anuken
10c999a4a2 Bugfixes / Mender block / Extra stats / Balancing 2019-03-26 11:05:47 -04:00
Anuken
97f5bf3cc4 Code cleanup 2019-03-24 19:58:51 -04:00
Anuken
f7aa58e385 Many small tweaks / Custom rules / Server run files / Balance 2019-03-24 16:29:25 -04:00
Anuken
adf5189541 TODO cleanup / Test fixes 2019-02-08 16:29:10 -05:00
Anuken
0dd9d2b460 Moved entity package from Arc / Entity code cleanup 2019-02-02 15:53:35 -05:00
Anuken
76af3e3077 Customizable edge stencil / Reduced redundant sprites 2019-01-28 23:30:11 -05:00
Anuken
54bade668e New tile edge algorithms / Struct value type generation 2019-01-28 22:11:23 -05:00
Anuken
5a3ec8f407 Fixed server crash / Struct annotation begins 2019-01-28 15:43:33 -05:00
Anuken
8aa1509f47 Gamemodes removed 2019-01-12 16:55:24 -05:00
Anuken
397da91ab4 Fixed all code generation errors 2019-01-06 09:42:08 -05:00
Anuken
3b42b604e1 Successful desktop compilation 2018-12-26 17:38:40 -05:00
Anuken
94908bc599 🔥🔥🔥🔥🔥🔥maximum breakage 2018-12-20 12:38:27 -05:00
Anuken
0b837925a2 Build script reformatting / 'Fixed' all unchecked warnings 2018-12-13 18:01:51 -05:00
Anuken
80aed31135 Broke and cleaned up server commands 2018-10-28 14:26:58 -04:00
Anuken
08cc87affb nothing again 2018-10-11 23:14:59 -04:00
Anuken
3ce16e0ed1 Changed annotations retention / Mobile block bugfix 2018-09-25 17:18:50 -04:00
Anuken
32c59b66f6 Changed tutorial ore gen 2018-09-24 10:19:27 -04:00
Anuken
65f911909b Pools replace with Pooling / Removed all core reflection 2018-09-09 17:44:10 -04:00
Anuken
2cb6e454c8 Auto-generated serialization code 2018-09-09 16:19:53 -04:00
Anuken
c1c82b451d Removed multi-class call generation 2018-07-26 15:24:48 -04:00
Anuken
baaeb229cf Formatting 2018-07-12 20:37:15 -04:00
Anuken
f3cc881930 Status bar cleanup / Fixed power distribution / Fixed adjacency updates 2018-07-09 14:25:52 -04:00
Anuken
b7e28a73ba Bugfixes / Added tool to re-format bundles with missing text 2018-07-09 11:02:30 -04:00
Anuken
64f1fbe400 Fixed many various crashes 2018-07-06 12:04:33 -04:00
Anuken
5fdf7e3a12 Updated annotations module 2018-07-03 19:58:24 -04:00
Anuken
3898602f0e Improved error logging of remote reading/writing 2018-06-29 09:22:29 -04:00
Anuken
f61f8a36f8 Typo fix 2018-06-25 18:48:01 -04:00
Anuken
b9b34eea37 Fixed some important crashes and multithreading issues 2018-06-25 18:46:04 -04:00
Anuken
1a8cd2e24c Added reconstructor blocks 2018-06-16 19:41:54 -04:00
Anuken
ffbb6bb40b Sprite reorganization, new power and tier-based pumps 2018-06-15 15:53:43 -04:00
Anuken
4ca9a26bdd Added name validation 2018-06-13 11:38:12 -04:00
Anuken
cbd83b5e39 Fixed many various bugs with syncing things 2018-06-10 23:33:37 -04:00
Anuken
aca1001f9a Fixed player dupes, new breaking system, multiplayer block edits 2018-06-09 23:23:14 -04:00
Anuken
d5a58be440 Updated uCore, fixed GWT build, better client snapshot system 2018-06-09 17:05:47 -04:00
Anuken
b33dd7e91c Fixed ammo resupply and shooting not working clientside 2018-06-09 14:20:08 -04:00
Anuken
be2fa1dfad Fixed interpolation, made death and damage serverside 2018-06-09 11:58:15 -04:00
Anuken
bc7b584001 Local forwarding fixes, remote building 2018-06-09 01:12:49 -04:00
Anuken
690571eec0 Massive amount of fixes and changes with multiplayer/annotations 2018-06-08 22:43:23 -04:00
Anuken
e451cdd519 More codegen fixes, fixed (one) multiplayer connect crash 2018-06-07 00:01:08 -04:00
Anuken
ab9cdf5610 Increased max packet size to 1024 2018-06-06 21:07:53 -04:00
Anuken
c443eee15d Annotation system bugs fixed 2018-06-06 20:56:59 -04:00
Anuken
9e136bad94 Core annotation system finished 2018-06-06 20:23:19 -04:00
Anuken
ccb97e34d5 Moved many block files; work on annotation processor 2018-06-06 14:51:25 -04:00
Anuken
01f4a9b23b Changed too many things to fit in commit log 2018-06-04 12:47:08 -04:00
Anuken
468a6c1dca
Delete MANIFEST.MF 2018-05-21 11:07:54 -04:00
Anuken
f9597569ba
Delete annotations-release.jar 2018-05-21 11:07:47 -04:00
Anuken
93353ff900 Removed action-based item transfer animation 2018-05-21 11:05:10 -04:00
Anuken
c1a5482ad2 Major refactoring of building, sound, inventory 2018-05-20 17:59:52 -04:00
Anuken
de40df7f7b Fixed place mode not overwriting old queue 2018-05-20 13:05:25 -04:00
Anuken
e8305d1245 Updated map editor with better placement preview 2018-05-19 11:53:01 -07:00
Anuken
b3e188a5f4 Improvements to annotation code generation system, client RMI 2018-05-18 17:21:18 -07:00
Anuken
afed54b217 Fixed a few bugs with new placement system 2018-05-18 09:22:40 -07:00
Anuken
d1a3752b2d Annotation processing done, more work on local multiplayer input 2018-05-13 16:41:50 -07:00
Anuken
00e70cbb6a Massive amount of refactoring for local multiplayer, annotations 2018-05-12 07:30:23 -07:00