0f9d9b27ea
cargo fmt
2 years ago
3acb1ad949
cargo fmt
2 years ago
8825736373
tutorial main chunk, definitely buggy... for tomorrow
2 years ago
7a72257633
Plan out tutorial
2 years ago
7566ca1ca2
cargo fmt
2 years ago
207d691b2e
intro with basic animation
2 years ago
b983dc8e23
Stub out intro animation
2 years ago
59755d2bdd
cargo fmt
2 years ago
716c94a5f3
Dynamic UI resolution
2 years ago
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
dc981aafea
cargo fmt
2 years ago
2d60508471
Skip animation
2 years ago
1d8a505d23
Example is close, but still no repro on the rendering bug...
2 years ago
d75658939d
made example closer to real game, but still no repro...
2 years ago
399c1c6208
Saving my place
...
This was too much work to accidentally fuck it up with my "fixes"
2 years ago
8d88a54675
make the shader example closer to reality...
...
With Backup<T> and all that jazz...
I wonder if it will work in the real game!
2 years ago
e6be125c7d
Fixed placing captured pieces on the side of the board
2 years ago
54167d1f5f
factor in piece when scoring
2 years ago
219621c1cc
Use tweak for credits
2 years ago
f9197ab157
Merge PlayState with Side
2 years ago
962bc335c2
cargo fmt
2 years ago
1c206e3079
mute audio with `m`
2 years ago
983314faac
Fixed "reject move" logic.
...
Added a system for tracking a pieces last move, which is not
necessary...
2 years ago
438358aab2
Endgame kinda sorta implemented...
2 years ago
0e2308929c
cargo fmt
2 years ago
18f3797340
Adding endgame tracking
2 years ago
fe2e023036
cargo fmt
2 years ago
609ae8ebb9
In a good-ish spot, going to save
2 years ago
f0a64541e1
Rip out 2d, merge editor and debug mode
2 years ago
c9b2a22e68
Editor, plus better alignment for pieces on side of board
...
The pieces are still not in the right place...
2 years ago
050dd1d3d1
Added scoring, but having trouble placing defunct pieces
2 years ago
63dac42250
Refactor: valid move indicators no longer despawn
2 years ago
8689574e95
Example works, not sure why gray in game.
...
Going to move on to some smaller wins
2 years ago
52efde3756
Progress toward the dissolve animation
...
Not sure why the base coat is gray instead of transparent...
2 years ago
eea2f879d0
skeleton for capture animation flow
2 years ago
31041be37c
Light tweaks working
2 years ago
90a33be8be
Fixup animations, add hover menu sound
2 years ago
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
a1a0814673
Things mostly work! Solved the dumb camera anim...
2 years ago
87b6672631
Everything works!... except animation...
2 years ago
de30eaf06a
Mostly working, battling handle types
2 years ago
cef69b81cc
Toml generalization
...
Trying to make the tweakfile code more general purpose.
I'd like to just throw stuff in there and reference it in code without
having to modify structs and stuff.
So far it's tedious, but mostly because I'll have to go back and rewrite
a bunch of code... sadge.
2 years ago
837c345ffe
Making progress toward 0.12 upgrade completion
2 years ago
0a79c8a53a
This *should* be all I need for the 0.12 upgrade...
2 years ago
eca7e95e10
So close to getting it to compile...
...
Then the real fun begins...
2 years ago
13a2e9f0a0
Started light tweaks
2 years ago
0511b8520a
"fix" mouse cursors
...
Not sure this is final, but it's at least more general purpose.
Also buttons are consistent.
2 years ago
4040d55372
3d models/materials/animations tweaks
...
Likely cannot update these in real time...
2 years ago
d7d89d71da
Side switching works!
2 years ago
4c548cdb45
Ayyy, got 2d sprites loading! With tweaks!
...
Now to get it to reload...
2 years ago
7a35c3e233
BROKEN: Change order of loading systems for tweakfile
2 years ago
3f8232283e
adding msaa configuration
2 years ago
589be78b2b
Added tonemapping tweak to tweakfile
2 years ago
0f17a2523a
Integrating fog and adding color grading to tweakfile
2 years ago
3429e8f0bd
Parsing fog implemented.
...
Now just need to use the fog values...
2 years ago
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
ff7b707bef
*Actually* fix hovering sound not stopping issue
...
And avoid dumb string comparisons that don't even work!
2 years ago
96c3597c67
Use Sam's 2d/3d toggle button icons
2 years ago
79f1e0813d
Very roughly using the spotlight valid move indicators
2 years ago
d3d46a7788
Got tiles working
2 years ago
e2c2f50ab3
Only make display mode switch avaliable after loading
2 years ago
cc0299a65a
Rule: No move rejections (sideA->sideB->sideA)
2 years ago
d737e9c10d
Restirct movement to non-self-capture tiles
2 years ago
69205318dd
Move loading system to loading.rs
2 years ago
1fcd30b026
Restrict movement to valid moves
...
Now need to fix valid moves to be accurate
2 years ago
a58151ee52
Very simple 2d/3d toggle button
...
It's buggy as hell, but it works. Improvements come with icing.
2 years ago
087b427506
Possible solution to cancel hover and music audio
2 years ago
cf68b7aecf
Tried to re-center the pieces but they it is fraught...
2 years ago
ed9a2d6581
Camera animations! And Turns!
2 years ago
420742a2eb
Some cleanup, starting on opening animation fixups
2 years ago
44b233f13f
Only play MenuSelect when an item is selected
2 years ago
39d9b6a6c8
Update 3d model glb file in sync with google drive.
2 years ago
e8e53dcc86
Add asset for number of cameras (should be 1 per display state)
2 years ago
3cee6763f5
Asset cleanup, playing around with hot-swapping music
2 years ago
5f2cd7bb4a
Audio fixed!
2 years ago
50d35533cc
Hey it worksgit add .; git commit Selection handling refactor FTW
2 years ago
12bf2ea96d
About to make a big refactor to selection
2 years ago
0d4a800456
OK so 2d/3d switching is pretty seamless (seemless?)
2 years ago
012593b891
Fixed bug with 3d not having textures on startup
2 years ago
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
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
1d17937b4a
oops, that wasn't supposed to be committed
2 years ago
15c7f5c0fc
and the color inconsistency
2 years ago
8cee0b6fb5
I think the jitter-selected issue is fixed
2 years ago
983779c948
De-select does not work...
2 years ago
ea99af748c
possible moves works as expectedgit add .; git commit (now to filter down to actually valid moves...
2 years ago
1eba3d962e
moves is making progress
2 years ago
cdf0b52ea6
no progress is made, but code has changed
2 years ago
61ce668383
it was z-stackinggit add .; git status duhgit add .; git status
2 years ago
38b796ad31
bug infestation. selecting/capturing/etc in 2d works worse than in 3d
2 years ago
8e0254c7e8
refactor states; separate display and play states
2 years ago
a5bb2aa385
exclusive selection
2 years ago
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
b4270899d2
Moving works in 2d!
...
Now just need to generalize 3d selection to select pieces + board tiles for movement to work there!
Exicted!
2 years ago
729c74e932
Select refactors for 2d, sync select/deselects
2 years ago
fdd3ccaa84
cargo fmt
2 years ago
5c92c07d94
Make it work on MacOS
2 years ago
fce038b7ac
correct credits file name
2 years ago
f32d462df6
Added hitboxes
2 years ago
8a5375e445
The animations work and they look sick
2 years ago
668bb64e68
pickup/putdown animationsgit add .; git commit
2 years ago
1aec9ae9ce
Stand-in pick-up/put-down movement. Next: animationsgit diff HEAD~1
2 years ago
9cb7043eed
Some improvements... 2d breaks when you select in 3d though...
2 years ago
df74674c96
Basic 3d select implemented0
2 years ago
c987ad10b1
got display 3d color changing working
2 years ago
9da2109dd9
Debug rotating camera to appreciate the skybox
2 years ago
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
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
f87bfb5a6c
Loading screen. Ironing out bugs with color change?
2 years ago
6dac7f5e4d
changing side colors, buggy but works
2 years ago
2c17ecb1cd
Credits!
...
They are very rough, but easy enough to improve with some simple
parsing.
2 years ago
8a9b47be6b
Drastic rework of movement
...
* Added `moves` ledger to Board
* This should help with future work like undo, automated tests,
net-play.
* Refactored 2d and 3d displays to use BoardIndex -> Transform
* This means we can have a generic system set the position of Entities
based on moves on the Board.
* Refactored 2d view to have centered board
* (instead of shifting root entity which had poor behavior
characteristics)
2 years ago
03fa207297
Generic update board system in progress
2 years ago
a106db2d14
update fmod assets
2 years ago
1a4ae123ab
Move assets for playing in google drive
2 years ago
ca07ec8da0
TODO Planning
2 years ago
f904945a05
3d board drawing and gizmos enabled with debug mode
2 years ago
4dbf524e3f
load state actually blocks now
2 years ago
b8138c0129
Simple 2d/3d toggle
2 years ago
4f54cece67
moving pieces, background image, pickup/putdown audio
2 years ago
14307a710b
Very simple audio
2 years ago
293f27aba9
menu!
2 years ago
426292685a
Set cargo_manifest_dir if not set
...
This is to address an `unwrap` in bevy_fmod I intend to remove in a PR.
2 years ago
8e57eb3a49
Successful windows build working
2 years ago
955c3effd7
Cross compilation...ish
2 years ago
a425a5756c
Selecting + Calling the piece (board.at)
2 years ago
b73a2ac5bc
2D Selecting indexes works!
...
Also improved art a bit.
Still programmer art, but it's at least on theme.
Inspired by the colors of Mars.
2 years ago
5f255275e0
Drawing pieces on the board!
...
Also states: 2d state, skeleton 3d state, menu state, loading state.
Really leaning into the bevy system scheduling.
2 years ago
9cf884e54f
Mostly 2d sprites and code organization
2 years ago
d5adb6955d
Simple board with ascii debugging system
2 years ago
c856b3be48
Initial commit, fmod kinda works?!
2 years ago
Elijah C. Voigt