Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
f1a7dbb
Upgrade Haxe to latest (4.2.3).
EliteMasterEric Sep 14, 2021
7a59700
Missed some spots.
EliteMasterEric Sep 14, 2021
4286363
Add flip, scale, and antialiasing to character data
RagdollClash Oct 26, 2021
2e3f85b
Transfer most characters over to the new format
RagdollClash Oct 26, 2021
f429ecf
Add 'round accuracy' setting
ishsharm0 Oct 27, 2021
6e9d80e
Fix roundAcc to roundAccuracy
ishsharm0 Oct 27, 2021
5daca3e
Update building.md to update Haxe to 4.2.3.
EliteMasterEric Oct 29, 2021
c6117c8
Merge pull request #2607 from ActualMandM/character
Kade-github Oct 30, 2021
c2c62a7
Merge pull request #2622 from devShimaru/master
Kade-github Oct 30, 2021
8c39e02
Merge pull request #2257 from EnigmaEngine/feature/upgrade-haxe
Kade-github Oct 30, 2021
5d1587d
Merge branch 'master' into patch-2
Kade-github Oct 30, 2021
204f70c
Merge pull request #2635 from MasterEric/patch-2
Kade-github Oct 30, 2021
1a65f3c
yessir
Kade-github Oct 30, 2021
a7f5f55
bruh
Kade-github Oct 30, 2021
1ff9705
fix idleLoop issue
RagdollClash Oct 30, 2021
a455e7d
Run files through haxe-formatter
RagdollClash Oct 30, 2021
67dc863
Merge stable into master
RagdollClash Oct 30, 2021
f1d3067
fix some things with this
Kade-github Oct 30, 2021
b0a499d
actually fix it
Kade-github Oct 31, 2021
13b15a0
Move spirit over to character json
RagdollClash Oct 31, 2021
3690650
Move BF (Pixel) over to character json
RagdollClash Oct 31, 2021
d87164a
oops
RagdollClash Oct 31, 2021
a5dab4d
im so high right now
Kade-github Nov 1, 2021
7912525
Merge branch 'master' of https://github.com/KadeDev/Kade-Engine
Kade-github Nov 1, 2021
a8d96ec
Avoid logTrace calls in production.
EliteMasterEric Nov 1, 2021
29a69bd
Update bug.md
EliteMasterEric Nov 1, 2021
67699b7
save
Kade-github Nov 1, 2021
df91a48
ballsex
Kade-github Nov 1, 2021
8f26b8f
Merge pull request #2661 from MasterEric/patch-4
Kade-github Nov 1, 2021
7b6b98e
Merge pull request #2653 from ActualMandM/idleLoop+others
Kade-github Nov 1, 2021
e3b5508
some optimization and maybe other stuff?
Kade-github Nov 1, 2021
97a0bcd
anit-aliasing border
Kade-github Nov 1, 2021
521cdfa
memory leak is now optional until I find a better way of drawing outl…
Kade-github Nov 1, 2021
dab6a30
redo this
Kade-github Nov 3, 2021
02a5074
Add interrupt, nextAnim, and isDancing variables
RagdollClash Nov 5, 2021
3d10915
Add dadVar
RagdollClash Nov 5, 2021
8399d55
add charPos, camPos, camFollow, and isGF
RagdollClash Nov 5, 2021
2bd162f
forgor
RagdollClash Nov 5, 2021
f9b02a2
Add isDanced (only works for isDancing)
RagdollClash Nov 5, 2021
596d23d
oops forgor
RagdollClash Nov 5, 2021
3facd13
forgor again
RagdollClash Nov 5, 2021
a594310
oops i accidently
RagdollClash Nov 5, 2021
dcd00fb
some cleanup
RagdollClash Nov 5, 2021
b2d2691
we do a little forgoring
RagdollClash Nov 6, 2021
35965e1
rename isGF to replacesGF
RagdollClash Nov 6, 2021
aa55928
rename dadVar to holdLength
RagdollClash Nov 6, 2021
294d05b
right this state exists
RagdollClash Nov 6, 2021
350315e
add alt anim support for isDancing
RagdollClash Nov 6, 2021
10265f1
math is hard
RagdollClash Nov 6, 2021
dd111cd
remove logging that could hurt performance in debug
RagdollClash Nov 6, 2021
e166414
fix antialiasing in philly stage
RagdollClash Nov 6, 2021
2db8cd2
Merge pull request #2681 from ActualMandM/more-character-stuff
Kade-github Nov 6, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/ISSUE_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Windows (`x86`), Windows (`x86_64`), Linux, or macOS? Specify below.

## What version of the game are you using? Look in the bottom left corner of the main menu.

## Have you identified any steps to reproduce the bug? If so, please describe them below. Use images if possible.

## Please describe your issue. Provide extensive detail and images if possible.

## Please check the `logs` folder within your game directory, and upload the most recent game logs if you can.

## Have you identified any steps to reproduce the bug? If so, please describe them below. Use images if possible.
2 changes: 1 addition & 1 deletion .github/workflows/html5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v2
- uses: krdlab/setup-haxe@v1
with:
haxe-version: 4.1.5
haxe-version: 4.2.3
# Runs a set of commands using the runners shell
- name: script run line haha
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v2
- uses: krdlab/setup-haxe@v1
with:
haxe-version: 4.1.5
haxe-version: 4.2.3
# Runs a set of commands using the runners shell
- name: script run line haha
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:
- uses: actions/checkout@v2
- uses: krdlab/setup-haxe@v1
with:
haxe-version: 4.1.5
haxe-version: 4.2.3
# Runs a set of commands using the runners shell
- name: script run line haha
run: |
cinst haxe --version 4.1.5 -y
cinst haxe --version 4.2.3 -y
RefreshEnv
mkdir "%HAXELIB_ROOT%"
haxelib setup "%HAXELIB_ROOT%"
Expand Down
48 changes: 44 additions & 4 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,26 @@
"isDefault": true
}
},
{
"label": "Build Linux (Debug)",
"type": "lime",
"targetConfiguration": "Build Linux (Debug)",
"command": "build",
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "Build Linux (Release)",
"type": "lime",
"targetConfiguration": "Build Linux (Release)",
"command": "build",
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "Build HTML5 (Debug)",
"type": "lime",
Expand All @@ -42,19 +62,39 @@
}
},
{
"label": "Build Linux (Debug)",
"label": "Build Windows (Neko Debug)",
"type": "lime",
"targetConfiguration": "Build Linux (Debug)",
"targetConfiguration": "Build Neko (Debug)",
"command": "build",
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "Build Linux (Release)",
"label": "Build Windows (Neko Release)",
"type": "lime",
"targetConfiguration": "Build Linux (Release)",
"targetConfiguration": "Build Windows (Neko Release)",
"command": "build",
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "Build Windows (Hashlink Debug)",
"type": "lime",
"targetConfiguration": "Build Hashlink (Debug)",
"command": "build",
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "Build Windows (Hashlink Release)",
"type": "lime",
"targetConfiguration": "Build Hashlink (Release)",
"command": "build",
"group": {
"kind": "build",
Expand Down
2 changes: 2 additions & 0 deletions Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@
<!-- <haxelib name="markdown" /> -->
<!-- <haxelib name="HtmlParser" /> -->



<!--In case you want to use nape with flixel-->
<!--<haxelib name="nape-haxe4" />-->

Expand Down
4 changes: 2 additions & 2 deletions appveyor-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ install:
- sudo add-apt-repository ppa:haxe/releases -y
- sudo apt update
- sudo apt install neko tar gcc-7 g++-7 gcc-7-multilib g++-7-multilib -y
- wget https://github.com/HaxeFoundation/haxe/releases/download/4.1.5/haxe-4.1.5-linux64.tar.gz
- wget https://github.com/HaxeFoundation/haxe/releases/download/4.2.3/haxe-4.2.3-linux64.tar.gz
- mkdir $HAXE_INSTALLDIR
- tar -xf haxe-4.1.5-linux64.tar.gz -C $HAXE_INSTALLDIR
- tar -xf haxe-4.2.3-linux64.tar.gz -C $HAXE_INSTALLDIR
- export PATH=$PATH:$HAXE_INSTALLDIR/haxe_20201231082044_5e33a78aa
- mkdir $HAXELIB_ROOT && haxelib setup $HAXELIB_ROOT
- haxelib install lime 7.9.0
Expand Down
4 changes: 2 additions & 2 deletions appveyor-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ install:
- brew install neko
- brew install gnu-tar
- brew install wget
- wget "https://github.com/HaxeFoundation/haxe/releases/download/4.1.5/haxe-4.1.5-osx.tar.gz"
- wget "https://github.com/HaxeFoundation/haxe/releases/download/4.2.3/haxe-4.2.3-osx.tar.gz"
- mkdir $HAXE_INSTALLDIR
- tar -xf haxe-4.1.5-osx.tar.gz -C $HAXE_INSTALLDIR
- tar -xf haxe-4.2.3-osx.tar.gz -C $HAXE_INSTALLDIR
- export PATH=$PATH:$HAXE_INSTALLDIR/haxe_20201231082044_5e33a78aa
- mkdir $HAXELIB_ROOT && haxelib setup $HAXELIB_ROOT
- haxelib install lime 7.9.0
Expand Down
2 changes: 1 addition & 1 deletion appveyor-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ install:
# Install the neko chocolatey package (https://chocolatey.org/packages/neko)
- cinst neko --version 2.3.0 -y
# Install the haxe chocolatey package (https://chocolatey.org/packages/haxe)
- cinst haxe --version 4.1.5 -y
- cinst haxe --version 4.2.3 -y
- RefreshEnv
# Setup haxelib
- mkdir "%HAXELIB_ROOT%"
Expand Down
62 changes: 62 additions & 0 deletions assets/preload/data/characters/bf-car.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"name": "Boyfriend (Car)",
"asset": "characters/bfCar",
"barColor": "#31B0D1",
"flipX": true,
"startingAnim": "idle",
"animations": [
{
"name": "idle",
"prefix": "BF idle dance",
"nextAnim": "idleLoop",
"offsets": [-5, 0]
},
{
"name": "idleLoop",
"prefix": "BF idle dance",
"offsets": [-5, 0],
"frameIndices": [10, 11, 12, 13],
"looped": true
},
{
"name": "singUP",
"prefix": "BF NOTE UP0",
"offsets": [-29, 27]
},
{
"name": "singLEFT",
"prefix": "BF NOTE LEFT0",
"offsets": [12, -6]
},
{
"name": "singRIGHT",
"prefix": "BF NOTE RIGHT0",
"offsets": [-38, -7]
},
{
"name": "singDOWN",
"prefix": "BF NOTE DOWN0",
"offsets": [-10, -50]
},
{
"name": "singUPmiss",
"prefix": "BF NOTE UP MISS",
"offsets": [-29, 27]
},
{
"name": "singLEFTmiss",
"prefix": "BF NOTE LEFT MISS",
"offsets": [12, 24]
},
{
"name": "singRIGHTmiss",
"prefix": "BF NOTE RIGHT MISS",
"offsets": [-30, 21]
},
{
"name": "singDOWNmiss",
"prefix": "BF NOTE DOWN MISS",
"offsets": [-11, -19]
}
]
}
59 changes: 59 additions & 0 deletions assets/preload/data/characters/bf-christmas.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"name": "Boyfriend (Christmas)",
"asset": "characters/bfChristmas",
"barColor": "#31B0D1",
"flipX": true,
"startingAnim": "idle",
"animations": [
{
"name": "idle",
"prefix": "BF idle dance",
"offsets": [-5, 0]
},
{
"name": "singUP",
"prefix": "BF NOTE UP0",
"offsets": [-29, 27]
},
{
"name": "singLEFT",
"prefix": "BF NOTE LEFT0",
"offsets": [12, -6]
},
{
"name": "singRIGHT",
"prefix": "BF NOTE RIGHT0",
"offsets": [-38, -7]
},
{
"name": "singDOWN",
"prefix": "BF NOTE DOWN0",
"offsets": [-10, -50]
},
{
"name": "singUPmiss",
"prefix": "BF NOTE UP MISS",
"offsets": [-29, 27]
},
{
"name": "singLEFTmiss",
"prefix": "BF NOTE LEFT MISS",
"offsets": [12, 24]
},
{
"name": "singRIGHTmiss",
"prefix": "BF NOTE RIGHT MISS",
"offsets": [-30, 21]
},
{
"name": "singDOWNmiss",
"prefix": "BF NOTE DOWN MISS",
"offsets": [-11, -19]
},
{
"name": "hey",
"prefix": "BF HEY",
"offsets": [7, 4]
}
]
}
26 changes: 26 additions & 0 deletions assets/preload/data/characters/bf-pixel-dead.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"name": "Boyfriend (Pixel Day) (Game Over)",
"asset": "characters/bfPixelsDEAD",
"barColor": "#31B0D1",
"flipX": true,
"scale": 6,
"antialiasing": false,
"startingAnim": "firstDeath",
"animations": [
{
"name": "firstDeath",
"prefix": "BF Dies pixel",
"offsets": [0, 0]
},
{
"name": "deathLoop",
"prefix": "Retry Loop",
"offsets": [-30, -12]
},
{
"name": "deathConfirm",
"prefix": "RETRY CONFIRM",
"offsets": [-30, -12]
}
]
}
56 changes: 56 additions & 0 deletions assets/preload/data/characters/bf-pixel.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"name": "Boyfriend (Pixel Day)",
"asset": "characters/bfPixel",
"barColor": "#31B0D1",
"flipX": true,
"scale": 6,
"antialiasing": false,
"startingAnim": "idle",
"animations": [
{
"name": "idle",
"prefix": "BF IDLE",
"offsets": [0, 0]
},
{
"name": "singUP",
"prefix": "BF UP NOTE",
"offsets": [0, 0]
},
{
"name": "singLEFT",
"prefix": "BF LEFT NOTE",
"offsets": [0, 0]
},
{
"name": "singRIGHT",
"prefix": "BF RIGHT NOTE",
"offsets": [0, 0]
},
{
"name": "singDOWN",
"prefix": "BF DOWN NOTE",
"offsets": [0, 0]
},
{
"name": "singUPmiss",
"prefix": "BF UP MISS",
"offsets": [0, 0]
},
{
"name": "singLEFTmiss",
"prefix": "BF LEFT MISS",
"offsets": [0, 0]
},
{
"name": "singRIGHTmiss",
"prefix": "BF RIGHT MISS",
"offsets": [0, 0]
},
{
"name": "singDOWNmiss",
"prefix": "BF DOWN MISS",
"offsets": [0, 0]
}
]
}
Loading