Commit Graph

157 Commits (4b9e45d841cb372b43858a04592db9aea8290bd7)

Author SHA1 Message Date
Elijah C. Voigt 595076607e I mean the intro part works...
Outro does not...
2 years ago
Elijah C. Voigt eb698b0316 First stab at dissolving title
I wrote this literally without running it.
Let's see if I nailed it :fingerscrossed:
2 years ago
Elijah C. Voigt 7fd38dab26 yay the shared material problem is fixed
Now on to getting that intro dissolving!
2 years ago
Elijah C. Voigt 3275582176 cargo fmt... also maybe fix that shared materials thing 2 years ago
Elijah C. Voigt 2d476b89da Oh good, the piece was moving, it was just invisible! 2 years ago
Elijah C. Voigt 37a7488852 Dissolve refactor: It ain't perfect, it ain't done, but it's progress!
Yay incremental progress toward the old effect!

The function that plays the animation for dissolving when pieces are
tagged is roughly working.

The only downsides now are that multiple pieces are sharing the same
material, and more importantly the piece should be moving to the side of
the board but it is not!
2 years ago
Elijah C. Voigt 7b4682bc21 mid refactor: dissolve::{in,out} tagging for animation
So far things are borked, but it _feels_ like we're going in the right
direction
2 years ago
Elijah C. Voigt 72811d6d04 The dissolve texture is fixed!
Somehow there are _more_ bugs now, but a big one is fixed!
2 years ago
Elijah C. Voigt e4e993ed64 Dissovle not fixed, but at least it doesn't crash! 2 years ago
Elijah C. Voigt 1b70e0707e Fixing selecting multiple pieces woot woot! 2 years ago
Elijah C. Voigt 06fa416447 Model replacement kinda sorta works -- ship it! 2 years ago
Elijah C. Voigt 6ce3fffa87 Still borked, saving my place
rolling back in hopes that it fixes things...
2 years ago
Elijah C. Voigt 0972d2ef91 Welp I broke something... 2 years ago
Elijah C. Voigt c9cf364c13 Saving my place before making a big change
Going to try simplifying the piece updating logic into one method
2 years ago
Elijah C. Voigt 3d613864bd Upgrade successful, the game runs! 2 years ago
Elijah C. Voigt ac7458a0f9 Clippy is happy 2 years ago
Elijah C. Voigt 618d0c87b4 Remove examples
Too much work to maintain wrt upgrades
2 years ago
Elijah C. Voigt 023dd9dc00 Clippy fixes 2 years ago
Elijah C. Voigt 877f7001b1 Mostly updated to bevy 0.13 2 years ago
Elijah C. Voigt 8e2d4ab7af Still not sure how to get rid of fog at startup... 2 years ago
Elijah C. Voigt bd303af745 clicking through animations/intro scroll 2 years ago
Elijah C. Voigt 4b5c90f1ba saving my place working on menus
Also refactored my custom any_component_X methods to act more like other
conditionals
2 years ago
Elijah C. Voigt 5fc0706c10 Saving my place
Adding a little 'just_pressed' helper for system conditionals
Replaces that lambda I kept using all over the place
2 years ago
Elijah C. Voigt ca092ddbc0 Saving my place, reworking menus 2 years ago
Elijah C. Voigt 82b817a614 State management refactor
Have not run this, almost certain things are broken.

The general idea is we mark entities with components and have a general
purpose "OnStateChange" trigger that marks all "active state" entities
as visible and all "inactive state" entities as invisible.

This should simplify state management -- unless of course there are
exceptions which there will be and will require having some sort of
"Sticky<T>" component that says "When this state transition occurs,
don't touch this one entity"
2 years ago
Elijah C. Voigt ae19a96844 Working better, but not intro -> game animation is missing
the game just pops into existance, no bueno.
2 years ago
Elijah C. Voigt 2bcc240cc3 Doesn't work, but saving my place 2 years ago
Elijah C. Voigt 59755d2bdd cargo fmt 2 years ago
Elijah C. Voigt 666609e419 Not sure why, but resetting is not as elegant as I had hoped
This is definitely the right approach, but why is everything becoming
red??
2 years ago
Elijah C. Voigt dc981aafea cargo fmt 2 years ago
Elijah C. Voigt 2d60508471 Skip animation 2 years ago
Elijah C. Voigt 1d8a505d23 Example is close, but still no repro on the rendering bug... 2 years ago
Elijah C. Voigt d75658939d made example closer to real game, but still no repro... 2 years ago
Elijah C. Voigt 399c1c6208 Saving my place
This was too much work to accidentally fuck it up with my "fixes"
2 years ago
Elijah C. Voigt e6be125c7d Fixed placing captured pieces on the side of the board 2 years ago
Elijah C. Voigt f9197ab157 Merge PlayState with Side 2 years ago
Elijah C. Voigt 0e2308929c cargo fmt 2 years ago
Elijah C. Voigt 18f3797340 Adding endgame tracking 2 years ago
Elijah C. Voigt fe2e023036 cargo fmt 2 years ago
Elijah C. Voigt 609ae8ebb9 In a good-ish spot, going to save 2 years ago
Elijah C. Voigt f0a64541e1 Rip out 2d, merge editor and debug mode 2 years ago
Elijah C. Voigt c9b2a22e68 Editor, plus better alignment for pieces on side of board
The pieces are still not in the right place...
2 years ago
Elijah C. Voigt 050dd1d3d1 Added scoring, but having trouble placing defunct pieces 2 years ago
Elijah C. Voigt 63dac42250 Refactor: valid move indicators no longer despawn 2 years ago
Elijah C. Voigt 8689574e95 Example works, not sure why gray in game.
Going to move on to some smaller wins
2 years ago
Elijah C. Voigt 52efde3756 Progress toward the dissolve animation
Not sure why the base coat is gray instead of transparent...
2 years ago
Elijah C. Voigt eea2f879d0 skeleton for capture animation flow 2 years ago
Elijah C. Voigt 31041be37c Light tweaks working 2 years ago
Elijah C. Voigt 90a33be8be Fixup animations, add hover menu sound 2 years ago
Elijah C. Voigt 3d5d1dd42a Getting things mostly fixed up with the 0.12 update
Problems with animations, regressions IMO. Not sure how to fix w/
correctness in mind.

Waiting on sam to make some updates to the assets file before fixing
animations then can produce a build.
2 years ago
Elijah C. Voigt a1a0814673 Things mostly work! Solved the dumb camera anim... 2 years ago
Elijah C. Voigt 87b6672631 Everything works!... except animation... 2 years ago
Elijah Voigt de30eaf06a Mostly working, battling handle types 2 years ago
Elijah C. Voigt 837c345ffe Making progress toward 0.12 upgrade completion 2 years ago
Elijah Voigt 0a79c8a53a This *should* be all I need for the 0.12 upgrade... 2 years ago
Elijah Voigt 13a2e9f0a0 Started light tweaks 2 years ago
Elijah Voigt 4040d55372 3d models/materials/animations tweaks
Likely cannot update these in real time...
2 years ago
Elijah Voigt 3f8232283e adding msaa configuration 2 years ago
Elijah Voigt 589be78b2b Added tonemapping tweak to tweakfile 2 years ago
Elijah Voigt 0f17a2523a Integrating fog and adding color grading to tweakfile 2 years ago
Elijah C. Voigt 3429e8f0bd Parsing fog implemented.
Now just need to use the fog values...
2 years ago
Elijah C. Voigt 296d79afeb Half way implementing fog tweakfile changes
Parsing the fog parameter in toml is a PITA but a good lesson for future
tweaks I guess...
2 years ago
Elijah C. Voigt 79f1e0813d Very roughly using the spotlight valid move indicators 2 years ago
Elijah C. Voigt d3d46a7788 Got tiles working 2 years ago
Elijah Voigt cc0299a65a Rule: No move rejections (sideA->sideB->sideA) 2 years ago
Elijah Voigt d737e9c10d Restirct movement to non-self-capture tiles 2 years ago
Elijah Voigt a58151ee52 Very simple 2d/3d toggle button
It's buggy as hell, but it works. Improvements come with icing.
2 years ago
Elijah Voigt cf68b7aecf Tried to re-center the pieces but they it is fraught... 2 years ago
Elijah Voigt ed9a2d6581 Camera animations! And Turns! 2 years ago
Elijah Voigt 420742a2eb Some cleanup, starting on opening animation fixups 2 years ago
Elijah C. Voigt 39d9b6a6c8 Update 3d model glb file in sync with google drive. 2 years ago
Elijah C. Voigt 5f2cd7bb4a Audio fixed! 2 years ago
Elijah Voigt 50d35533cc Hey it worksgit add .; git commit Selection handling refactor FTW 2 years ago
Elijah Voigt 12bf2ea96d About to make a big refactor to selection 2 years ago
Elijah Voigt 0d4a800456 OK so 2d/3d switching is pretty seamless (seemless?) 2 years ago
Elijah Voigt 012593b891 Fixed bug with 3d not having textures on startup 2 years ago
Elijah Voigt e2e535137a Most of the way toward the final camera setup
Two cameras only, one for 2d one for 3d -- none of this camera-per-state bs.

Still have a bug with switching while in the menu, but otherwise things
are working well.
2 years ago
Elijah Voigt c7692d36c1 Need to figure out a better way to camera...
The general idea is that we will have 2 cameras total, one for 2d and
one for 3d. Start with 2d and switch to 3d. Each camera will be marked
with it's state, and there will be a system which listens for some event
(or resource update) to change the camera.
2 years ago
Elijah Voigt 15c7f5c0fc and the color inconsistency 2 years ago
Elijah Voigt 8cee0b6fb5 I think the jitter-selected issue is fixed 2 years ago
Elijah Voigt 983779c948 De-select does not work... 2 years ago
Elijah C. Voigt 1eba3d962e moves is making progress 2 years ago
Elijah C. Voigt cdf0b52ea6 no progress is made, but code has changed 2 years ago
Elijah C. Voigt 61ce668383 it was z-stackinggit add .; git status duhgit add .; git status 2 years ago
Elijah C. Voigt 8e0254c7e8 refactor states; separate display and play states 2 years ago
Elijah C. Voigt a5bb2aa385 exclusive selection 2 years ago
Elijah C. Voigt ade967fb67 Hey 2d and 3d selection work!
Small bug w.r.t. selecting multiple entities at once, should be a quick fix...
2 years ago
Elijah C. Voigt 729c74e932 Select refactors for 2d, sync select/deselects 2 years ago
Elijah Voigt f32d462df6 Added hitboxes 2 years ago
Elijah Voigt 8a5375e445 The animations work and they look sick 2 years ago
Elijah Voigt 668bb64e68 pickup/putdown animationsgit add .; git commit 2 years ago
Elijah Voigt 1aec9ae9ce Stand-in pick-up/put-down movement. Next: animationsgit diff HEAD~1 2 years ago
Elijah Voigt 9cb7043eed Some improvements... 2d breaks when you select in 3d though... 2 years ago
Elijah Voigt df74674c96 Basic 3d select implemented0 2 years ago
Elijah Voigt c987ad10b1 got display 3d color changing working 2 years ago
Elijah Voigt 9da2109dd9 Debug rotating camera to appreciate the skybox 2 years ago
Elijah Voigt 91188a6219 Skybox!
Skybox example and working in game.

Need to do something cool to take advantage of it like moving the
camera, but it's there and I know roughly how to make one!
2 years ago
Elijah Voigt fe013dcf3c Starting work on skybox
need to make an example to just prove it out.
But at least it doesn't crash the game!
2 years ago
Elijah Voigt f87bfb5a6c Loading screen. Ironing out bugs with color change? 2 years ago
Elijah Voigt 2c17ecb1cd Credits!
They are very rough, but easy enough to improve with some simple
parsing.
2 years ago