Commit Graph

82 Commits

Author SHA1 Message Date
Gordon Weeks
d53505ab07 Song track updates 2026-01-31 18:59:05 -08:00
dffec71beb SOMEBODY 2026-01-31 18:56:18 -08:00
f38ddcc178 UNDA DA SEA 2026-01-31 18:53:03 -08:00
f9a4c09682 Shoryuken 2026-01-31 18:43:22 -08:00
ef0016b530 Merge branch 'master' of mx.cogentleman.com:cogentleman/guitarHeroButBetter 2026-01-31 18:37:34 -08:00
1929c401b4 Let'sa go! 2026-01-31 18:37:27 -08:00
Gordon Weeks
87d20e7a16 Increased game start delay from 3 to 10 seconds 2026-01-31 18:35:38 -08:00
James Whiteman
19e83f07d8 Try tracks again 2026-01-31 18:34:08 -08:00
91394c777b Oof.wav 2026-01-31 18:15:50 -08:00
Gordon Weeks
c279644612 Bottom bar UI fixes 2026-01-31 18:10:16 -08:00
Gordon Weeks
7686391ff9 Fixed from merge 2026-01-31 18:00:43 -08:00
Gordon Weeks
d8f35df012 Merge remote-tracking branch 'origin/master' 2026-01-31 17:54:57 -08:00
Gordon Weeks
2227c7ac52 Added extra end-game stats 2026-01-31 17:54:11 -08:00
James Whiteman
4a1db37970 fix combos 2026-01-31 17:51:06 -08:00
6a4c712f96 Merge branch 'master' of mx.cogentleman.com:cogentleman/guitarHeroButBetter 2026-01-31 17:44:48 -08:00
8ae06d25d3 Updated string samples 2026-01-31 17:44:41 -08:00
Gordon Weeks
f66952ef5c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/samples/ghhb_game.h
2026-01-31 17:35:14 -08:00
Gordon Weeks
b5a4cb0708 Rearranged instrument icons to match .wav's 2026-01-31 17:33:40 -08:00
Gordon Weeks
afdfb4ef20 Allow any player to start game 2026-01-31 17:33:15 -08:00
Gordon Weeks
aab7cbdafa Mapped notes to new .wav's and their midi ranges 2026-01-31 17:32:58 -08:00
27c371e97e Merge branch 'master' of mx.cogentleman.com:cogentleman/guitarHeroButBetter 2026-01-31 17:24:32 -08:00
1e2a709fe8 Offset octave ranges 2026-01-31 17:24:26 -08:00
Gordon Weeks
77610f6b06 Merge remote-tracking branch 'origin/master' 2026-01-31 17:11:18 -08:00
Gordon Weeks
bb4ba0d9d1 Debug code for bug where combos are broken when playing with CPU 2026-01-31 17:11:06 -08:00
8217bc1ec2 Merge branch 'master' of mx.cogentleman.com:cogentleman/guitarHeroButBetter 2026-01-31 17:08:20 -08:00
f5a36a08bd Normalize WAV volume 2026-01-31 17:08:12 -08:00
James Whiteman
0f79e2ee5e add track listings 2026-01-31 17:03:26 -08:00
81142c0ef0 Merge branch 'master' of mx.cogentleman.com:cogentleman/guitarHeroButBetter 2026-01-31 16:55:17 -08:00
13146298bf Merge branch 'master' of mx.cogentleman.com:cogentleman/guitarHeroButBetter 2026-01-31 16:55:02 -08:00
James Whiteman
4961816b4b instrument select images 2026-01-31 16:54:03 -08:00
d74e355713 Added more instrument wavs 2026-01-31 16:53:45 -08:00
Gordon Weeks
5ed8d09f4a Merge remote-tracking branch 'origin/master' 2026-01-31 16:53:16 -08:00
Gordon Weeks
65a1c122c4 Fixes 2026-01-31 16:52:57 -08:00
James Whiteman
c9db4c6fc5 lots of songs and instrument graphics 2026-01-31 16:49:14 -08:00
Gordon Weeks
c370dbef9a Fixed overlapping glyph bug. Reverted mary.json to single track. 2026-01-31 16:30:35 -08:00
Gordon Weeks
7654d1323c Merge branch 'Tracks'
# Conflicts:
#	src/samples/ghhb_game.h
2026-01-31 15:15:34 -08:00
Gordon Weeks
a0fab24f28 Synchronized hit-note WAV playing timing 2026-01-31 14:58:12 -08:00
57e105ca91 Resolve conflicts, duration's back on the menu 2026-01-31 14:51:50 -08:00
Gordon Weeks
727fd97f39 Songs now only play specific tracks from the MIDI, and instruments are ignored (each player still has their own instrument) 2026-01-31 14:49:27 -08:00
e7cbf8bed1 Variable sound duration 2026-01-31 14:29:01 -08:00
Gordon Weeks
e1c6f4d2f9 Refactored instrument select to remove confusing concept of player color. 2026-01-31 14:16:57 -08:00
Gordon Weeks
566c814162 Removed python, pokemon, and sustained .wav's 2026-01-31 13:40:40 -08:00
Gordon Weeks
29a5ad6c2b Merge remote-tracking branch 'origin/master' 2026-01-31 13:11:48 -08:00
Gordon Weeks
3bf5456921 Implemented song catalog feature. Added undertale and pallet town to song list. Revised logic for multiple simultaneous notes. 2026-01-31 13:11:44 -08:00
James Whiteman
e9519a278c add pokemon song 2026-01-31 12:28:38 -08:00
1a524b1a1b Merge branch 'master' of mx.cogentleman.com:cogentleman/guitarHeroButBetter 2026-01-31 12:11:09 -08:00
341f93d3ea Added synth instrument 2026-01-31 12:11:01 -08:00
Gordon Weeks
edc9e1dbb3 Merge remote-tracking branch 'origin/master' 2026-01-31 11:55:09 -08:00
Gordon Weeks
82feac5d5b Added simultaneous notes. 2026-01-31 11:55:05 -08:00
2c76479f1e Resolve conflicts 2026-01-31 11:48:53 -08:00