Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,317 Commits 7 Branches 7 Tags
166bcb5c43b1fa25beeab1a30aa24bf191bf616a
Commit Graph
160 Commits
Author SHA1 Message Date
Alexander Eckart 166bcb5c43 fixed merge error 2013-05-10 19:47:49 +02:00
Alexander Eckart fd7b3ae3a3 fixed some merge errors 2013-05-10 19:36:58 +02:00
Alexander Eckart 4161652a1d Merge remote-tracking branch 'remotes/flokuep/Font_Rewrite' into develop 
Conflicts:
	Vocaluxe/Base/CBackgroundMusic.cs
	Vocaluxe/Base/CMain.cs
	Vocaluxe/Base/CTheme.cs
	Vocaluxe/Base/Font/CGlyph.cs
	Vocaluxe/Lib/Draw/CDirect3D.cs
	Vocaluxe/Lib/Draw/CDrawWinForm.cs
	Vocaluxe/Lib/Draw/COpenGL.cs
	Vocaluxe/Program.cs
	Vocaluxe/Screens/CScreenCredits.cs
	Vocaluxe/Screens/CScreenMain.cs
	Vocaluxe/Screens/CScreenOptionsTheme.cs
	Vocaluxe/Screens/CScreenSing.cs
	Vocaluxe/Vocaluxe.csproj
	VocaluxeLib/Menu/IMenu.cs
 2013-05-10 19:28:20 +02:00
Alexander Eckart 50046901fd fixed some bugs 2013-05-10 00:10:12 +02:00
Alexander Eckart 19339c6888 reconstructed CProfiles (preparing for async profile adding) 2013-05-07 16:56:23 +02:00
Alexander Eckart bde99ff2aa some more reconstructions on avatars 2013-05-07 00:23:44 +02:00
Alexander Eckart ec5bdb7742 SProfile => CProfile; SAvatar => CAvatar 2013-05-06 23:29:31 +02:00
Alexander Eckart ed3047314b finished moving around 2013-05-06 23:18:02 +02:00
Alexander Eckart 685bc019fd moved some files 2013-05-06 23:11:56 +02:00
Florian Küpper 76340f7826 Rename HAlign to ResizeAlign 2013-05-04 11:16:41 +02:00
Flamefire c407b26098 Fixed relative reflection 2013-05-02 18:28:58 +02:00
Flamefire 1216a2d0c2 Fixed relative reflection distance 2013-05-02 03:37:53 +02:00
Flamefire 95ff3cd7a3 Simpler CText.Draw... 
Bugfix CMenu._IsMouseOver
 2013-05-02 02:33:39 +02:00
Flamefire fa22096914 Fixed bounds calculation of CText 2013-05-02 02:00:48 +02:00
Flamefire c5f5266126 Cleaned up graphics stuff (mostly optional parameters) 2013-05-01 23:05:56 +02:00
Flamefire 553be47783 Removed unused and temporary stuff 2013-05-01 22:14:34 +02:00
Alexander Eckart 9e2040e1b7 set video initialization value in CSongMenuFramework.cs to -1. otherwise it will try to unload the wrong stream on start up. 2013-05-01 18:27:20 +02:00
Flamefire 7aa83f0f43 Merge branch 'develop' into Font_Rewrite 2013-04-30 19:54:00 +02:00
Flamefire 1402d92c5b Changed config for lyrics position 2013-04-30 19:53:44 +02:00
Flamefire b54a4c3608 Merge branch 'develop' into Font_Rewrite 2013-04-30 19:47:35 +02:00
Flamefire 5a12cb48f9 Merge branch 'develop' into develop_fk 2013-04-30 19:42:53 +02:00
Flamefire dc3866975e Refactored CText constructor 2013-04-30 16:33:20 +02:00
Flamefire 5df160971d Removed unnecessary Reflection bool 
fixed typo
 2013-04-30 16:25:25 +02:00
Flamefire e602f55bb4 First attempt with smaller glyph textures 
Some CText and SColor improvements
 2013-04-30 15:12:36 +02:00
Flamefire 2967a01cb8 Changed name of CInput to CController 
Added message for missing mic in partymode
Removed pointless input entry for record devices
 2013-04-29 16:14:24 +02:00
Florian Küpper 4aa94e188c Added more lyric-position-options. 
TRANSIFEX:
Add: TR_SCREENOLYRICS_POSITION, TR_CONFIG_LYRICSPOSITION_BOTTOM, TR_CONFIG_LYRICSPOSITION_TOP, TR_CONFIG_LYRICSPOSITION_BOTH, TR_CONFIG_LYRICSPOSITION_DYNAMIC
Remove: TR_SCREENOLYRICS_ONTOP
 2013-04-29 09:24:28 +02:00
Florian Küpper 9712771eda Fixed error on loading playlists. 2013-04-29 08:28:15 +02:00
Florian Küpper ed89a91ae5 Merge branch 'develop' of github.com:Flamefire/Vocaluxe into develop 2013-04-29 08:12:03 +02:00
Flamefire 69c36362f5 On change of Tabs to on it will go out of any category 
Auto reformat
 2013-04-29 02:24:36 +02:00
Flamefire f950b1f3ad Better fix for older OpenGL versions 2013-04-28 23:19:08 +02:00
Florian Küpper b213ee5b51 Merge branch 'develop' of github.com:Flamefire/Vocaluxe into develop 2013-04-28 20:08:09 +02:00
Flamefire 0af6fbfcde Added missing file 2013-04-28 19:16:24 +02:00
Florian Küpper ee91798639 Merge branch 'develop' of github.com:Flamefire/Vocaluxe into develop 2013-04-28 17:47:59 +02:00
Flamefire 5172f17da7 Fixed and changed category handling and visible songs 2013-04-28 17:19:22 +02:00
Flamefire 2f3f121f88 Split Font-File 2013-04-28 14:02:27 +02:00
Florian Küpper 98ad7a6be0 Update for fast-player-selection. Press MB or P to start, use mouse or arrow-keys to choose player, select player with LB or Enter. Use [1..6] or MB to skip a player, RB or escape to abort. 
I will think about a easy reset-function...
 2013-04-27 12:28:22 +02:00
Flamefire 780a179fcb Added Gamemode-Classes 2013-04-26 18:56:33 +02:00
Flamefire f43817efd0 Renamed ambiguous Notes classes 2013-04-26 17:47:26 +02:00
Flamefire 7cbae3d2db Better player handling with bugfix (selecting not available player number) 2013-04-26 13:19:22 +02:00
Flamefire 1d628fc09c Bugfix for CProfiles 2013-04-25 19:17:05 +02:00
Flamefire bdca0554e4 Changed players->Profile handling (no redundant entries) 2013-04-25 18:27:59 +02:00
Flamefire 69d8af4e87 Automatic cleanup/formating 2013-04-24 01:26:36 +02:00
Flamefire b1e28ae7bc More refactoring (mainly LINQ) 2013-04-24 00:41:08 +02:00
Flamefire f53e08607b Small cleanup (join declarations) 2013-04-23 22:14:53 +02:00
Flamefire b8fe334153 Used object initializers 2013-04-23 22:11:32 +02:00
Flamefire 477b023520 More refactoring (unused stuff removed) 2013-04-23 21:47:46 +02:00
Flamefire ec766aa7b5 Removed code redundancies 2013-04-23 16:55:57 +02:00
Flamefire 5cd47f0537 Fixed floating point comparisons 2013-04-23 15:42:32 +02:00
Flamefire 9d481cabc1 Fixed wrong float.epsilon comparisons 2013-04-23 15:14:47 +02:00
Flamefire cf39a4b107 Changed string comparisons to easier != "" syntax 2013-04-23 14:52:51 +02:00