Tank animations #20
Open
Tank animations #20
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 6aea6e0 Merge: 6612a59 84147b0 Author: FatCat1978 <Pacmandevil1@gmail.com> Date: Sat Apr 2 21:04:49 2022 -0300 Merge pull request #19 from themadrat/bullet working bullet commit 84147b0 Author: themadrat <Jaredshaddick@gmail.com> Date: Sat Apr 2 20:46:31 2022 -0300 working bullet commit 6612a59 Author: FatCat1978 <Pacmandevil1@gmail.com> Date: Sat Apr 2 16:48:33 2022 -0300 commenting commit 72b0d81 Author: FatCat1978 <Pacmandevil1@gmail.com> Date: Sat Apr 2 13:53:51 2022 -0300 Tentative fix for latency movement issue commit 95343f3 Author: FatCat1978 <Pacmandevil1@gmail.com> Date: Sat Apr 2 13:31:57 2022 -0300 potentialFix commit e321e33 Author: FatCat1978 <Pacmandevil1@gmail.com> Date: Sat Apr 2 12:31:41 2022 -0300 tank selection debugging commit 5e0a403 Author: FatCat1978 <Pacmandevil1@gmail.com> Date: Sat Apr 2 10:54:30 2022 -0300 learning experience: pain commit 40a450a Author: FatCat1978 <Pacmandevil1@gmail.com> Date: Thu Mar 31 08:18:00 2022 -0300 more junk commit aead337 Author: FatCat1978 <Pacmandevil1@gmail.com> Date: Thu Mar 31 03:27:27 2022 -0300 fuck?? commit e574b78 Author: FatCat1978 <Pacmandevil1@gmail.com> Date: Thu Mar 31 03:09:43 2022 -0300 fuck me commit 92c3efd Author: FatCat1978 <Pacmandevil1@gmail.com> Date: Thu Mar 31 02:47:01 2022 -0300 more work done. commit 4ecbb72 Author: FatCat1978 <Pacmandevil1@gmail.com> Date: Thu Mar 31 01:57:36 2022 -0300 convert to maven+add gson needed commit 551b886 Author: FatCat1978 <Pacmandevil1@gmail.com> Date: Thu Mar 31 01:54:27 2022 -0300 Client Server Communication start :( commit 452c755 Merge: 713a3ea aec479c Author: FatCat1978 <Pacmandevil1@gmail.com> Date: Wed Mar 30 22:14:37 2022 -0300 Merge branch 'master' into Network-Implementation commit 713a3ea Author: FatCat1978 <Pacmandevil1@gmail.com> Date: Wed Mar 30 20:26:16 2022 -0300 commit so I can fix Jared's PR again commit 87ab2d8 Merge: bef5263 ebce882 Author: FatCat1978 <Pacmandevil1@gmail.com> Date: Tue Mar 29 10:01:59 2022 -0300 Merge branch 'master' into Network-Implementation commit bef5263 Author: FatCat1978 <Pacmandevil1@gmail.com> Date: Tue Mar 29 10:00:58 2022 -0300 Init
This reverts commit 65bc9a5.
It also has the ability to accept multiple textures into a list and animates them in order
Owner
|
You need to resolve the conflicts before I can merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds a particle system that can animate static textures or multiple textures from a list at a given position