Commit graph

559 commits

Author SHA1 Message Date
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
Sollace
58b24d07b7 Fixed snouts not rendering 2018-06-29 19:14:11 +02:00
Sollace
849301ae9c Handle HDSkins' skin type 2018-06-29 19:01:04 +02:00
Sollace
9096a015c5 Removed the "InternalDialog" 2018-06-29 18:52:19 +02:00
Sollace
f520998365 SHOOO BE DOO! https://www.youtube.com/watch?v=iakTl9SZTTY 2018-06-29 18:36:03 +02:00
Sollace
04b852ce7e Fixed seapony's arms not being positioned correctly 2018-06-26 21:57:34 +02:00
Sollace
f9dba78570 Remove unused constants 2018-06-22 17:58:18 +02:00
Sollace
16634d9957 Clean up these old human fields 2018-06-22 01:46:10 +02:00
Sollace
8e173fc859 Change packages and use enums 2018-06-22 01:23:52 +02:00
Sollace
658a48fe83 Move all the transformations out into their own classes 2018-06-22 01:23:02 +02:00
Sollace
cea593e68e Fixed unicorn arms rotating into the ground when sneaking 2018-06-22 01:21:20 +02:00
Sollace
e657865305 Move normal transforms into its own method 2018-06-21 23:53:32 +02:00
Sollace
aed1dbd8d3 Clean up and get rid of this weird split between textures and positions 2018-06-21 23:49:11 +02:00
Sollace
b14a6cb233 Pony snouts will no longer bust through player's skulls. ... That's likely less violent than it sounds. 2018-06-21 19:28:22 +02:00
Sollace
7ddb747b28 Add a translation string for the new pony heads option 2018-06-20 23:58:51 +02:00
Sollace
d08c43ffba Fixed skulls not always rendering with magic effects 2018-06-20 23:54:41 +02:00
Sollace
232089bfad Sort out problems when the pony skulls are off 2018-06-20 23:41:08 +02:00
Sollace
00d4009a76 Fix rebase conflict 2018-06-20 23:28:29 +02:00
Sollace
2c121d2960 Finish ponyskulls, add the deadmou5 ears, and ad an option to toggle skulls on and off 2018-06-20 23:27:17 +02:00
Sollace
31ce31a109 Hey, they work! :D (v1) 2018-06-20 23:27:15 +02:00
Sollace
4b6c49f6fa Pony skulls, pony skulls, what 'chu gonna do when they come for you! 2018-06-20 23:27:13 +02:00
Sollace
224fe4b7ab Add pony features to skulls (WIP) 2018-06-20 23:27:12 +02:00
Sollace
a637a213c4 Correct neck placement whilst sneaking 2018-06-20 23:24:14 +02:00
Sollace
caee032cb2 Reimplement the in-game options menu (oops) 2018-06-20 23:24:14 +02:00
PolyacovYury
9d73895f1e Commented out the line that causes Forge to whine 2018-06-12 20:33:45 +03:00
Sollace
1642614eb4 I completely forgot that this was why I added an interpolator in the first place 2018-06-11 20:11:21 +02:00
Sollace
a9abab820e Don't try to strafe at angles of NaN 2018-06-11 20:10:21 +02:00
Sollace
2a32b74b5b Implement proper tweening for certain animations 2018-06-11 19:59:51 +02:00
PolyacovYury
845f3536ad Merging together @PolyacovYury and @Sollace's visions on saddlebags. (#69) 2018-06-11 17:51:38 +02:00
Sollace
8be2f2fa39 Fix texture alignment issues with wings and make pegasus available during render 2018-06-10 23:04:58 +02:00
Sollace
803e79343d Rename PonyRenderer.flipX -> PonyRenderer.flip to better reflect its meaning 2018-06-10 19:49:28 +02:00
Sollace
cf1a2bf058
Merge pull request #68 from PolyacovYury/player_strafing
Implemented player strafing calculation from change in model rotation angle
2018-06-10 18:56:22 +02:00
Sollace
7b9eaffdbf Fixed the double gui bug 2018-06-10 18:54:50 +02:00
Sollace
334e768166 Added an option to toggle first-person magic 2018-06-10 09:37:15 +02:00
Sollace
ca62866e95 Reimplement the checkbox for enabling/disabling GLWindow for performance 2018-06-10 09:28:48 +02:00
Sollace
0b4086db05 Keep the player model where it is, translate the shadow instead 2018-06-10 09:05:44 +02:00
Sollace
0fb1c77137 Fixed 99.9% of the bugs and readd the mixin with clear warnings 2018-06-09 21:57:02 +02:00
Matthew Messinger
d031bb1f43 Remove the mixin from the skin drop and mark it as experimental.
It's disabled by default.
2018-06-09 02:38:40 -04:00
PolyacovYury
2dff61c925 Implemented player strafing calculation from change in model rotation angle (since a strafing model that doesn't turn anywhere would look silly and would be exponentially hard to implement) 2018-06-09 05:18:01 +03:00
Sollace
8fe228ae5a Removed sleepy solly code. 2018-06-08 23:30:18 +02:00
Sollace
9ad00347a9 Sort out some issues with the new window 2018-06-08 22:11:14 +02:00
Sollace
46199208ce Fix strafing getting stuck at invalid angles 2018-06-08 21:21:08 +02:00
Sollace
3800bc2424 Fix placement and improve animations 2018-06-08 01:06:38 +02:00
Sollace
03b558bb8f Whitespace 2018-06-08 01:06:38 +02:00
Sollace
9d5c6d1a37 Fix trigger pixel for saddlebags 2018-06-08 01:06:37 +02:00
Sollace
2c8ecdf1b5 Off by one 2018-06-08 01:06:37 +02:00
Sollace
42081b38d4 Implemented pony wearables as saddlebags and (soon) 2018-06-08 01:06:37 +02:00
Sollace
ad77b48e59 Get a trigger value on each individual component of a pixel rather than the whole colour 2018-06-08 01:06:36 +02:00
Sollace
a4a6e7a1c4 Fixed parrots spazzing out when riding a pony. I GET IT I'M A TALKING HORSE GASH 2018-06-07 23:19:54 +02:00
Sollace
9611198a86 Merge branch 'skins_fix' 2018-06-07 20:31:51 +02:00
Sollace
6cc976f1f8 Handle file drop events directly into the client 2018-06-07 19:56:34 +02:00
Sollace
f39d55826c Derpiderderderp 2018-06-06 21:49:12 +02:00
Sollace
b5d8492b31 Cache bust misbehaving servers 2018-06-06 21:05:38 +02:00
Sollace
eba8589963 Add protocol to the minelp server urls 2018-06-06 20:53:24 +02:00
Sollace
d338a4ddb6 HDSkins has player data loaded when fetching a pony. 2018-06-06 20:02:26 +02:00
Sollace
44e38c0329 Fixed GLContext is not defined. 2018-06-06 19:51:56 +02:00
Sollace
0710d51b23 Properly delete both mojang's and _our_ skin cache 2018-06-06 19:28:53 +02:00
Sollace
3ea22fd67c Implement saddlebags as a separate component with more interesting animations 2018-06-04 22:26:05 +02:00
Sollace
4123ee8c6e Resolve naming clash between IModelPart and ModelRenderer 2018-06-04 19:34:31 +02:00
Sollace
3aedf474ba Better barrel roles! This should be less likely to break on diagonals. 2018-06-04 19:27:57 +02:00
Sollace
d3efbc5c05 Pegasus wings flap slower when underwater 2018-06-03 22:23:32 +02:00
Sollace
b879c979ce Typo 2018-06-03 22:18:42 +02:00
Sollace
da2d435ca2 Multiply, not divide (0.2 / 5 == 0.04) 2018-06-03 19:59:55 +02:00
Sollace
bafe9aca31 Apply the same amount of waggle to saddlebags as is applied to the body 2018-06-03 19:34:32 +02:00
Sollace
f584f40826 Fixed transforms on villagers' bits 2018-06-03 19:20:10 +02:00
Sollace
5f8b0cf395 Naming collusion between MCP:ModelRenderer.render and MLP:IModelPart.render 2018-06-03 17:47:21 +02:00
Sollace
979782c8f8 guess ponies still have to block with a bow, even if their arms bust through the front... 2018-06-03 17:30:53 +02:00
Sollace
32df82ba77 Skeletons should now hold their items correctly 2018-06-03 17:26:43 +02:00
Sollace
2dc2642bc9 Fixed more wonkyness and inconsistency between players and mobs 2018-06-03 17:20:30 +02:00
Sollace
a5d67a7e1c Fix leg wonkyness in general 2018-06-03 16:38:03 +02:00
Sollace
086ff5a677 Fixed UI thread not being updated with new file drops 2018-06-03 14:28:59 +02:00
Sollace
51dc230d1a Fix alignment of held shields and blocking 2018-06-03 13:23:27 +02:00
Sollace
28274b76fd Clear the pony cache alongside the skin cache, and fixed windows appearing behind the client 2018-06-03 11:57:22 +02:00
Sollace
5178b8f40d Translate everypony down so they don't float 2018-06-02 23:32:01 +02:00
Sollace
1afc1cc301 Center and align players and mobs to the same position whilst riding 2018-06-02 23:27:59 +02:00
Sollace
04d2dac5e8 Add the missing wing for priest villagers. Fixes #62 2018-06-02 20:22:56 +02:00
Sollace
86fe40f48f Unmirror wings. Fixes #63 2018-06-02 20:15:42 +02:00
Sollace
8d992a5361 Fixed the tops and bottoms of saddlebags being flipped 2018-06-02 20:14:01 +02:00
Sollace
7f6a01cf9d Fixed swinging animation not playing for horny ponies 2018-06-02 20:05:22 +02:00
Sollace
12600fff3d Fixed villagers flapping their wings whilst in a boat (RenderPonyMob and RenderPonyBase can be merged some time in the future) 2018-06-02 19:52:25 +02:00
Sollace
cd84f64d37 Fixed snouts not following the snuzzles config option 2018-06-02 19:13:52 +02:00
Sollace
9e2983d6b9 Fixed mixin error 2018-06-02 18:22:14 +02:00
Sollace
0393daa0ba Fix merge conflicts 2018-06-02 18:05:33 +02:00
Sollace
9899a01aae Correct translation strings for zombie pigmen. You should've named your config variable correctly. 2018-06-02 17:54:46 +02:00
Sollace
bc65369964 Reorganise how settings work, and renderers change immediately when you toggle an option 2018-06-02 17:52:36 +02:00
Sollace
e56611c3fc Docs! 2018-06-02 17:50:42 +02:00
Sollace
23b2618f1e Fixed buttons triggering their actions twice on the Liteloader pane 2018-06-02 17:50:41 +02:00
Sollace
dabd9ecad0 Rewrite the settings gui and add it to the liteloader panel 2018-06-02 17:50:33 +02:00
Matthew Messinger
46180b9691
Merge pull request #50 from Sollace/trim_armour_models
Cut all of the extra code from armour
2018-06-02 11:34:59 -04:00
Matthew Messinger
0a11cfc4ab
Merge pull request #48 from Sollace/zebra_models
Further rework models and added a few new ones
2018-06-02 11:34:05 -04:00
PolyacovYury
8a8feb5b2d Fixed typo in Content-Type request 2018-06-02 16:01:08 +03:00
Sollace
28fce6ef5d Cut all of the extra code from armour 2018-06-02 13:35:28 +02:00
Sollace
36d6f421a9 Fix character encoding (dammit PinkishPie, ANSI is not okay) 2018-05-27 12:36:53 +02:00
Sollace
e13a5c326d Added "ponify guardians" to the cluster 2018-05-27 12:36:53 +02:00
Sollace
362f17ea49 Added unicorn models to all the stuffs 2018-05-27 12:36:52 +02:00
Sollace
76044f17e6 Fix some errors with the seapony texture 2018-05-27 12:36:52 +02:00
Sollace
93ec981628 Guardians are now seaponies! 2018-05-27 12:36:47 +02:00
Sollace
cc6dfaf772 Texture for the seapony 2018-05-27 12:35:39 +02:00