Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit f20ed9c

Browse files
authored
Merge pull request #1750 from KadeDev/master
Master
2 parents 8be2af7 + a3059f4 commit f20ed9c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1901
-778
lines changed

Project.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
<haxelib name="faxe" if='switch'/>
128128
<haxelib name="polymod"/>
129129
<haxelib name="discord_rpc" if="windows"/>
130-
<haxelib name="linc_luajit" if="windows"/>
130+
<haxelib name="linc_luajit"/>
131131

132132
<!-- <haxelib name="hxcpp-debug-server" if="desktop"/> -->
133133

art/flashFiles/Dad_assets.fla

-280 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
:dad:Not bad for an ugly worm.
2-
:dad:But this time I'll rip your nuts off right after your girlfriend finishes gargling mine.
1+
:dad:Not bad for an ugly worm.
2+
:dad:But this time I'll rip your nuts off right after your girlfriend finishes gargling mine.
33
:bf:Bop beep be be skdoo bep
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
:dad:Ah, a new fair maiden has come in search of true love!
2-
:dad:A serenade between gentlemen shall decide where her beautiful heart shall reside.
1+
:dad:Ah, a new fair maiden has come in search of true love!
2+
:dad:A serenade between gentlemen shall decide where her beautiful heart shall reside.
33
:bf:Beep bo bop
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
:dad:Direct contact with real humans, after being trapped in here for so long...
2-
:dad:and HER of all people.
3-
:dad:I'll make her father pay for what he's done to me and all the others,,,,
4-
:dad:I'll beat you and make you take my place.
1+
:dad:Direct contact with real humans, after being trapped in here for so long...
2+
:dad:and HER of all people.
3+
:dad:I'll make her father pay for what he's done to me and all the others,,,,
4+
:dad:I'll beat you and make you take my place.
55
:dad:You don't mind your bodies being borrowed right? It's only fair...
143 KB
Loading

assets/shared/images/characters/DADDY_DEAREST.xml

Lines changed: 125 additions & 46 deletions
Large diffs are not rendered by default.

docs/building.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
- `haxelib install flixel-ui`
2525
- `haxelib install hscript`
2626
- `haxelib install newgrounds`
27-
- `haxelib install linc_luajit`
27+
- `haxelib git linc_luajit https://github.com/AndreiRudenko/linc_luajit.git`
2828
- `haxelib git faxe https://github.com/uhrobots/faxe`
2929
- `haxelib git polymod https://github.com/larsiusprime/polymod.git`
3030
- `haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc`

docs/changelogs/changelog-1.6.2.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Latest (master) changelog/Changelog
2+
3+
Changes marked with 💖 will be listed in the short version of the changelog in `version.downloadMe`.
4+
5+
### Additions
6+
- Added a Instant Respawn Option
7+
- 💖 Added the ability to select and modify notes in the editor
8+
- Added the ability for note specific alternative animation toggles
9+
- 💖 Added copy and paste (with ctrl z support) while selecting notes
10+
- Added 12th and 24th snaps
11+
12+
### Changes
13+
- Play Here option changed for the better
14+
- Changed left or right in the charter to skip forward or backward a section
15+
- 💖 Optimized gameplay (less lag??)
16+
- 💖 Optimized the chart editor (less lag on longer songs, and faster load times)
17+
- Gameplay Customization now allows for you to change the zoom of the play field
18+
- SM Files now give you more details on why they can't be loaded.
19+
20+
### Bugfixes
21+
- 💖 Fixed stutter at the start of a song
22+
- Fixed a bunch of week 6 crashing related issues
23+
- Fixed tutorial crashing on story mode
24+
- Fixed notes in an SM file desyncing with sections
25+
- 💖 Fixed scroll speed changes so they work when more then one of them exist
26+
- Fixed steps reseting to 0 on a bpm change IN gameplay
27+
- Fixed claps so they're based on time instead of the note's y position
28+
- Swap Section no longer breaks with duets
29+
- 💖 Modcharts now work on Linux!

docs/changelogs/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Changelogs
22

33
- [Latest](latest) (Contains changes that are not in a release yet)
4+
- [1.6.2](changelog-1.6.2)
45
- [1.6.1](changelog-1.6.1)
56
- [1.6](changelog-1.6)
67
- [1.5.4](changelog-1.5.4)

0 commit comments

Comments
 (0)