PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-23 12:58:01 +01:00
Code Issues Projects Releases Packages Wiki Activity
712 commits 33 branches 183 tags 24 MiB
Commit graph

656 commits

Author SHA1 Message Date
Sollace
f7debac354 Fixed a horrible mistake 2018-08-20 13:49:06 +02:00
Sollace
869f4b6b5f Don't skip if/when deleting assets folders fails 2018-08-20 12:51:11 +02:00
Sollace
304f521e51 Simplify callback handling 2018-08-20 12:46:45 +02:00
Sollace
e26e21b160 Removed baby witches. Killjoy 2018-08-20 10:38:31 +02:00
Sollace
993078ec40 Remove deprecated code 2018-08-20 10:37:43 +02:00
Matthew Messinger
f8e54dfd90 Remove pointless instance field from GuiSkins 2018-08-19 18:09:39 -04:00
Matthew Messinger
99eed8570d GuiSkins no longer has a concept of a gateway server. 
Servers are now selectable by clicking the "?" button.
 2018-08-19 17:55:38 -04:00
Matthew Messinger
95107ddeed Fix error when downloading new skins. 2018-08-19 16:52:47 -04:00
Matthew Messinger
fbd7528993 Rewrite a bulk of ThreadDownloadImageETag to be more modern. 2018-08-19 14:52:24 -04:00
Matthew Messinger
1b8333e130 Delete unused Later class 2018-08-19 13:40:17 -04:00
Matthew Messinger
cf132b8bcc Fix build errors. 2018-08-19 00:03:40 -04:00
Matthew Messinger
af398e6d85 Revert "Refactors for AvatarAPI Won't compile yet because AvatarAPI isn't on maven yet." 
This reverts commit a24b6a1
 2018-08-18 23:44:32 -04:00
Matthew Messinger
a24b6a108c Refactors for AvatarAPI 
Won't compile yet because AvatarAPI isn't on maven yet.
 2018-08-18 23:41:30 -04:00
Sollace
c95d540923 Remove debug code and add deadmous5 ears 2018-08-18 17:35:18 +02:00
Sollace
57902a7e62 Witches have a 1/300 chance of spawning as a foal. If you find one there is a 142% chance that it will be adorable 2018-08-18 16:17:21 +02:00
Sollace
50c7b373fc Fixed witch hats being in the wrong position when riding 2018-08-18 16:16:11 +02:00
Sollace
9c446122b8 Adjust neck placement on foals 2018-08-18 15:21:37 +02:00
Sollace
dafe85b358 Adjust neck and head placement on alicorns 2018-08-18 15:21:18 +02:00
Sollace
240345f29a Fixed armour leg placement when riding 2018-08-18 15:15:11 +02:00
Sollace
dca3cad2cd Fixed magic rendering of items that have permanent enchantment effects AND items with a dark tint 2018-08-18 14:15:05 +02:00
Sollace
ad18186382 Adjust positioning of held items 2018-08-18 13:33:29 +02:00
Sollace
8c15d46f68 Best of both worlds: Add the neck on both layers 2018-08-18 00:27:40 +02:00
Sollace
e18db6bb19 Normalize constant names 2018-08-18 00:24:58 +02:00
Sollace
d71aa20ced Remove unused constants 2018-08-17 23:23:50 +02:00
Sollace
6c50f40881 Admittedly his was a better way of doing it. Especially not that models are more hierarchical in nature 2018-08-17 23:18:54 +02:00
Sollace
be96ffd894 More interface 2018-08-17 23:13:58 +02:00
Sollace
2c9175b83a Turn PMAPI into an interface 2018-08-17 23:12:40 +02:00
Sollace
8527792dba No more reflection 2018-08-17 23:12:02 +02:00
Sollace
cea9419fb6 Some spring cleaning 2018-08-17 22:49:32 +02:00
Sollace
da26aef533 Fixed plane renderer not accounting for scaling on the z axes 2018-08-17 18:09:46 +02:00
Sollace
0ca03dbfa6 Pigmen should use the zombie model 2018-08-17 17:41:19 +02:00
Sollace
85622b335d Skeletons have a 1/3 chance of spawning without a horn 2018-08-17 16:37:22 +02:00
Sollace
f49d8bcadf Zombies have a 1/30 chance of spawning with wings 2018-08-17 16:36:55 +02:00
Sollace
1a80f768eb Move neck to the outer layer 2018-08-17 16:35:20 +02:00
Sollace
9d5d204535 Fix shadow scale on child mobs 2018-08-17 16:34:08 +02:00
Sollace
943019ba2e Fixed unicorn horns not rendering 2018-08-17 16:00:37 +02:00
Sollace
6a55833fb8 Derp. Actually have to do it like this. 2018-08-17 15:55:13 +02:00
Sollace
fabb66a5b2 Show necks as part of armour 2018-08-17 15:50:59 +02:00
Sollace
9ffb62d335 Reduce the probability of enderstallions having horns 2018-08-17 15:38:10 +02:00
Sollace
09f8a99066 Rotate player arms to put the front up 2018-08-17 15:33:19 +02:00
Sollace
d59ec9514f Properly detect old human textures 2018-08-17 15:09:20 +02:00
Sollace
ada764f946 Move the armour texture resolver to a class and interface 2018-08-17 15:08:37 +02:00
Sollace
2752bdcc4c Fix arm positioning (final) 2018-08-17 14:12:25 +02:00
Sollace
3f99784f4f rename flankguard -> chestpiece 2018-08-17 12:02:23 +02:00
Sollace
cf34174ac1 Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony 2018-08-17 08:48:42 +02:00
Matthew Messinger
ca94bfa860 Quick fix for weird first person fist. Fixes #90 2018-08-16 16:51:16 -04:00
Sollace
96c8034636 Bleep 2018-08-16 21:34:28 +02:00
Sollace
23f2151eed Skeletons don't need two armour layers, do they? 2018-08-16 21:32:09 +02:00
Sollace
4bea2e77a3 Rewrite armour AGAIN 2018-08-16 21:31:24 +02:00
Matthew Messinger
c53d2a12f6 Fix modded armor not having a helmet 2018-08-15 21:14:49 -04:00
PolyacovYury
13a37de5a1 Update ru_ru.lang (#89) 
Inaccuracies. :)
 2018-08-15 19:13:11 -04:00
Matthew Messinger
26e1d7b3d6 Re-add armor layer which was removed in 7f12104e 2018-08-15 18:34:22 -04:00
Sollace
902571198b Remove more unused imports 2018-08-15 17:45:43 +02:00
Sollace
b9ea6ad28a Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony 2018-08-15 17:33:19 +02:00
Sollace
1694edebe5 Update translation strings for russian and french 2018-08-15 17:32:57 +02:00
Sollace
22bb316f2d Clear warnings and fix imports 2018-08-15 17:28:58 +02:00
Sollace
d2b0577eaa Add translation strings for the endermen 2018-08-15 17:19:13 +02:00
Sollace
6ea3ed2d75 Pony endermen 2018-08-15 17:14:40 +02:00
Sollace
3c53d3e4ff Fixed a derp with pony tails not hiding 2018-08-15 17:12:19 +02:00
Sollace
f0453844a0 Add missing @Override annotations 2018-08-15 17:12:06 +02:00
Matthew Messinger
38a2fcd7c0 Fix mappings (forgot to build) 2018-08-14 20:00:16 -04:00
Sollace
57206213c5 Adjust yearling dimensions to be big headed :3 2018-08-15 00:26:24 +02:00
Sollace
79f7de8f51 Properly render tooltips inside litepanes and add a warning label to the experimental skin drop 2018-08-14 23:46:27 +02:00
Sollace
640cf8ef03 Finalize the seapony colour code 2018-08-14 22:58:53 +02:00
Sollace
3225d727fd Add yearlings (teenage) ponies 2018-08-14 22:55:42 +02:00
Sollace
36015ba384 Fixed the Proxy renderer not including layers. (Guardians can have arrows now! :D) 2018-08-14 19:06:46 +02:00
Sollace
bf8025bdaf Guard as best we can against shenanigans. Should fix rendering errors, or at least replace them with a clearer message that something or someone is misbehaving 2018-08-14 19:05:54 +02:00
Sollace
73ff4bdec1 Fix compile errors due to rebase (Killjoy) 2018-08-13 08:23:58 +02:00
Sollace
45282b147a Fix rebase errors (Killjoy) 2018-08-13 08:14:39 +02:00
Sollace
d5efe0d3f6 (reported by Poly) Fix head position and vertical alignment issues when sneaking 2018-08-13 08:14:38 +02:00
Sollace
20cec41037 Store last chosen file in the config 2018-08-13 08:14:38 +02:00
Sollace
9dbd80ca8e Added jumping and sneaking when previewing a skin 2018-08-13 08:14:37 +02:00
Sollace
fe06800823 Fixed lighting and rendering shenanigans 2018-08-13 08:14:37 +02:00
Sollace
78a756f9c3 Move the GuiItemStackButton to live with the rest of the gui classes and improved error message handling 2018-08-13 08:14:36 +02:00
Sollace
29c72f654c Split the elytra button into its own toggle 2018-08-13 08:14:36 +02:00
Sollace
24934638fd (requested by Poly) Use translation strings for all the options! 2018-08-13 08:14:35 +02:00
Sollace
25230a384c Fix layering of tooltips and make buttons more hmmmhmmmhmmm 2018-08-13 08:14:35 +02:00
Sollace
063d9bfbd0 Arrange buttons 2018-08-13 08:14:35 +02:00
Sollace
73f0eddf01 Rewrite SkinsGui using the new-age gui classes 2018-08-13 08:14:34 +02:00
Sollace
485ef8e3fc Add some colour to the skin server info window 2018-08-13 08:14:33 +02:00
Sollace
01bdac7ed8 Split duplicated code out to LocalTexture 2018-08-13 08:14:33 +02:00
­Sollace
b485f07d17
Merge pull request #87 from TheWeatherPony/master 
Friendlier Modifiers for external mod access
 2018-08-10 22:36:06 +02:00
Sollace
ba429c300b Fix compilation errors 2018-08-10 20:40:01 +02:00
Sollace
33296e336c Center the preview models so rotating isn't as janked 2018-08-10 20:19:08 +02:00
Sollace
40866cc22b Fixed remote preview player not being scaled correctly 2018-08-10 20:18:28 +02:00
Sollace
377cda5481 Remove the c/p to prevent future errors 2018-08-10 20:00:53 +02:00
Sollace
8b5d2b33cb Fixed Elytras not appearing in the correct place on skin previews. 2018-08-10 19:59:10 +02:00
Sollace
4770585685 Make the reflections slightly more reflection-y 2018-08-10 19:57:58 +02:00
Sollace
9780379a9e Check for empty-ish strings, not just null 2018-08-10 19:54:11 +02:00
Sollace
d19b649d6d Fix and update error handling for bethlehem 2018-08-10 19:54:11 +02:00
TheWeatherPony
3268e768c1 Friendlier Access Modifiers 
Added support for potential external usage without going through Pony.class and potential swapping of models without swapping renders. Usages/Implementations not included.
 2018-08-09 23:32:09 -07:00
Matthew Messinger
6f1837a46f MoreHttpResponses : use getReader() more 2018-08-07 22:03:12 -04:00
Matthew Messinger
f8ee05ca11
SkinServer updates (#83) 
SkinServer update:
 * loadProfileData was unwrapped from Optional. Now it throws an exception.
 * getPreviewTextures is now a CompletableFuture so it won't lag GuiSkins
 * arguments for uploadSkin were condensed into a single object
 * Added a class wrapper for getting different http response types
 * HttpClient is now a singleton which lives in SkinServer.httpClient
 2018-08-05 18:35:13 -04:00
Matthew Messinger
1369665fd6 Elytra flying is different from regular flying 2018-07-29 23:49:45 -04:00
Matthew Messinger
21ea56d134 Add valhalla skin server as a default one. 2018-07-28 15:35:41 -04:00
Matthew Messinger
74fef1a240 Re-authorize if token has expired. 2018-07-28 01:47:16 -04:00
Matthew Messinger
c60cd9dae6 Show the root cause on upload failed. 2018-07-28 01:22:36 -04:00
Matthew Messinger
4db140c973 Content encoding might be null. It doesn't really matter anyway. 2018-07-28 01:22:21 -04:00
Sollace
b86403ae65 Use the model's head position rather than the entities for determining if it's submerged 2018-07-27 00:17:23 +02:00
Sollace
028b86d749 Fix derped swimming animation 2018-07-27 00:10:35 +02:00
Sollace
7f12104ec5 Clean up some dank around the IRenderPony(s) 2018-07-27 00:10:18 +02:00
Sollace
302a8a22ad Fixed mobs not heeding the scale of their skins 2018-07-26 18:45:22 +02:00
Sollace
14f98369e8 Foals were _slightly_ too small 2018-07-26 17:53:26 +02:00
Sollace
7b5f99028b Correct typo 2018-07-25 17:32:19 +02:00
Matthew Messinger
a72fdfdf7f
Fix other logic error in legacy 2018-07-23 18:18:20 -04:00
Matthew Messinger
ea3971dd50 fix logic error in legacy 2018-07-22 16:52:06 -04:00
Matthew Messinger
5b837150aa Fix error in legacy skin uploads 2018-07-22 16:02:27 -04:00
Matthew Messinger
8c03c42a3a Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony 
# Conflicts:
#	src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java
 2018-07-22 15:52:09 -04:00
Matthew Messinger
7af8fa50e1 Better error handling for valhalla 2018-07-22 15:47:34 -04:00
Matthew Messinger
c5fca4c977 Hide the file dropper on exit. 2018-07-22 15:45:29 -04:00
­Sollace
0d9b599c56 Bethlehem (#77) 2018-07-22 15:25:55 -04:00
Sollace
f48080a755 Move GLWindow creation to onInitComplete() instead of init(). Now THERE'S yer problem 2018-07-22 17:33:11 +02:00
Sollace
10f44f9326 Fixed shadows rendering on sleeping players 2018-07-22 17:26:15 +02:00
Sollace
137371f394 Fixed derpy foal scaling 2018-07-22 17:24:11 +02:00
Sollace
76a3f30f32 Correct pony scaling 2018-07-22 16:31:38 +02:00
Matthew Messinger
8e663c81d3
Merge pull request #74 from MineLittlePony/valhalla 
Valhalla Implementation
 2018-07-14 10:54:30 -04:00
Matthew Messinger
540ed43178 Make SkinServer json serializable and add a button go skins menu to show current gateway server. 2018-07-13 23:05:21 -04:00
Sollace
25e68bb2c4 These ended up not being needed 2018-07-13 20:03:01 +02:00
Sollace
0798fa88d3 Combine PonyArmour and IEquestrianArmor 2018-07-13 20:01:35 +02:00
Sollace
6839105881 Move everything to main so gradles doesn't choke 2018-07-12 13:17:31 +02:00
Sollace
fe6c51c75a Add IEquestrianArmor 2018-07-12 13:17:30 +02:00
Sollace
f8084c2975 Add armour apis 2018-07-12 13:17:30 +02:00
Sollace
910dbd43c0 Move DWorld -> DummyWorld 2018-07-11 20:53:26 +02:00
Sollace
ff690af493 Default to normal for unknown pony sizes 2018-07-11 20:51:04 +02:00
Sollace
534f1642ab I Identify as a client world! 2018-07-11 20:49:42 +02:00
Sollace
11ce47f3de Fixed crash due to the preview entity's world being null 2018-07-11 10:50:33 +02:00
Sollace
808efacfbe Reimplement the old file dropper as a fallback and dispose all window frames when the GLWindow is disposed 2018-07-10 19:41:03 +02:00
Sollace
2b1ef25f96 Fixed file select sppearing behind the window when experimental skin drop is disabled 2018-07-10 18:30:18 +02:00
Matthew Messinger
a34cfed3bf Prevent preview textures from calling the skin server multiple times for each skin time. 2018-07-09 11:53:22 -04:00
Matthew Messinger
d802e5335d Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony into valhalla 2018-07-08 18:05:44 -04:00
Sollace
bb16e157df Fixed elytra floating off of foal's backs 2018-07-08 12:21:57 +02:00
Sollace
13b1f3385f Correct typo (again) and scale down panorama images 2018-07-08 11:56:18 +02:00
Matthew Messinger
77b8357f03 Add Valhalla implementation 2018-07-08 03:35:11 -04:00
Matthew Messinger
89ecc9f916 Update SkinServer to be more extensible. 2018-07-08 03:34:35 -04:00
Sollace
5aafc83fd9 Synchronize the create/destroy and instance access to GLWindow... -_- 2018-07-07 18:41:36 +02:00
Sollace
4ee7d2d88e Only blank skins and skins that support seapony mode should render as a seapony in seapony skin mode 2018-07-07 14:29:09 +02:00
Sollace
62a0be23ad Fixed preview players acting like they were holding an item after entering and leaving a world 2018-07-07 14:28:13 +02:00
Matthew Messinger
a92a121a5b Revert "Fix spelling mistake and apply custom panoramas to the title screen" 
This reverts commit a5b0e187a0.
 2018-07-05 22:49:28 -04:00
Sollace
b7d17d594c Synchronize access to GlWindow. This seems to help with freezing 2018-07-03 19:14:30 +02:00
Sollace
a5b0e187a0 Fix spelling mistake and apply custom panoramas to the title screen 2018-07-03 19:07:36 +02:00
Sollace
5e371b2037 Fixed various bugs with skin uploading 2018-07-03 19:06:14 +02:00
Sollace
ec8efcaa76 Remember the last opened location between picking files 2018-07-03 19:04:26 +02:00
Sollace
6cc8e95991 Added seapony support to the skins gui, and some mlp-themed panoramas 2018-07-01 17:33:30 +02:00
Sollace
ef76ae8034 Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony 2018-06-30 22:28:13 +02:00
Sollace
2a1078f486 Fixed the skins gui panorama looking like trash 2018-06-30 22:27:02 +02:00
PolyacovYury
8852f80171 Updated and fixed ru_ru.lang files (#73) 2018-06-30 11:54:39 +02:00
Sollace
cc92fe33bb Slim, not thin 2018-06-30 00:13:38 +02:00
Sollace
1e52830c91 Added proper alex model support to HDSkins. Skin servers should remember what the "model" parameter was when saving a skin and include it in their responses. 2018-06-29 23:33:05 +02:00
Sollace
8a31d6c48f Fixed preview pony not having a tail 2018-06-29 19:39:12 +02:00
Sollace
2acb8e6555 Preserve tool orientation so it doesn't look like you're mining with the blunt edge 2018-06-29 19:25:08 +02:00