Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,441 Commits 7 Branches 7 Tags
f0c8c46764cece5fe39d7d7dc45d5f5a42d4e605
Commit Graph
3441 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Ostertag f0c8c46764 Merge branch 'develop' into rap 2023-12-24 05:46:12 +01:00
Florian Ostertag b038f5a1ff Merge pull request #636 from damienlaguerre/tictactoe_improvement 
[PartyMode] TicTacToe - improvements
 2023-12-24 05:45:53 +01:00
Damien LAGUERRE b7938ba71c TicTacToe: Optimisation and code compliance 2023-12-23 19:50:07 +01:00
Damien LAGUERRE fddd2f3f2f TicTacToe: Add jockers select to config screen. 
+ Translation.
 2023-12-22 17:46:03 +01:00
Damien LAGUERRE 5360b99745 Add number of jocker as game parameter. 
+ Missing input handler for player switch action.
 2023-12-22 17:16:18 +01:00
Damien LAGUERRE cfca322fcd Improves the random choice of players. 2023-12-22 15:47:15 +01:00
Damien LAGUERRE 143b3303f0 Improvements to TicTacToe : 
+ Fix teams limited to 2 players
+ Add the possibility of changing players
 2023-12-22 12:24:54 +01:00
MarwinandFlorian Ostertag 7148d10963 added new icons for smartphone control (#617) 
replaced old icons in smartphone control with new icons from flaticons.net (free for commercial and personal use)

Co-authored-by: Florian Ostertag <flokuep@users.noreply.github.com>
 2023-11-23 18:25:11 +01:00
Florian OstertagandFlorian Ostertag 3f656e6870 Fix nightly build (#632) 
* Bump JDK version

* Fix: Use sonar.token instead of deprecated login

* Test if sonar has a problem with doctype

* Exclude website-folder from sonar scan

* Fix: Replace another sonar.login

* Exclude website-folder also on develop-build

---------

Co-authored-by: Florian Ostertag <git@florian-ostertag.de>
 2023-11-23 17:17:01 +01:00
Florian Ostertag 568e7d399e Merge branch 'develop' into rap 2023-11-23 17:05:57 +01:00
Florian OstertagandFlorian Ostertag 05064b1904 Fix CI issues (#631) 
* Bump JDK version

* Fix: Use sonar.token instead of deprecated login

* Test if sonar has a problem with doctype

* Exclude website-folder from sonar scan

* Fix: Replace another sonar.login

---------

Co-authored-by: Florian Ostertag <git@florian-ostertag.de>
 2023-11-23 17:03:45 +01:00
BuildTools b7b736a49d Merge branch 'develop' into rap 2022-11-14 23:26:27 +01:00
Stefan dbc1738da1 Improvements to Tic Tac Toe game mode 
- Player selection screen, I added a help line at the bottom and added a text label below the team selector.
- Tic Tac Toe main screen, changed the player name area, including a mic equalizer below the player name.
 2022-10-29 17:09:41 +02:00
Stefan 1fffb034d2 Merge branch 'develop' into Stefan1200-de-patch-TicTacToe 2022-09-14 09:47:50 +02:00
Stefan f00e1d73b7 Merge pull request #586 from lukeIam/fixJsonLib 
Fix Newtonsoft.Json problem / Security Fix
 2022-09-14 09:46:00 +02:00
Stefan 585df4ea6f Merge branch 'develop' into fixJsonLib 2022-09-14 09:34:26 +02:00
lukeIam 95d2596e81 fixes https://github.com/Vocaluxe/Vocaluxe/security/dependabot/1 2022-08-28 14:22:24 +02:00
Stefan 186067d067 Merge branch 'develop' into Stefan1200-de-patch-TicTacToe 2022-05-22 11:58:49 +02:00
GaryCXJk 08c3551548 Merge branch 'Vocaluxe:develop' into rap 2022-03-12 21:57:17 +01:00
Stefan 4d62eff1d7 Merge pull request #573 from lukeIam/fixReleases 
Update git tokens
 2022-01-16 18:14:13 +01:00
lukeIam 79464db984 update git tokens 2022-01-16 15:31:09 +01:00
Stefan 4b07188a93 Merge pull request #570 from JanK118/patch-2 
Update README.md
 2022-01-03 17:01:31 +01:00
JanK118 21991db629 Update Readme.txt 2022-01-03 15:36:59 +01:00
JanK118 45b8b51a4c Update README.md 
As a solution for issues like https://github.com/Vocaluxe/Vocaluxe/issues/567
 2022-01-03 15:30:41 +01:00
Stefan 76daa00fbc Screen Version 2 2021-10-18 23:32:39 +02:00
Stefan 0e272a7d49 Screen Version 2 2021-10-18 23:32:12 +02:00
Stefan b9669a197b Added two text elements 
Added TR_SCREENNAMES_SELPLAYERSTITLE and TR_SCREENNAMES_HELPMESSAGE
 2021-10-18 23:30:34 +02:00
Stefan 714b26109b Added two text elements 
Added TR_SCREENNAMES_SELPLAYERSTITLE and TR_SCREENNAMES_HELPMESSAGE
 2021-10-18 23:30:01 +02:00
Stefan 524c8e94ad Added two text elements 
Added TextSelPlayersTitle and TextHelpBar.
 2021-10-18 23:28:56 +02:00
Stefan d1a602deb1 Updated position of equalizers 2021-10-18 22:00:30 +02:00
Stefan 8ea88d7a49 Implementing more CRecord stuff 
Needed for equalizers in the VocaluxeLib namespace.
 2021-10-18 21:52:40 +02:00
Stefan 819ce3bb57 Implementing more CRecord stuff 
Needed for equalizers in the VocaluxeLib namespace.
 2021-10-18 21:50:03 +02:00
Stefan 392bfaceae Final implementation of the team mic equalizers 2021-10-18 21:47:00 +02:00
Stefan 98622eddbd Adding statics and preparing team equalizers 
Updated theme file for adding team player name static background and team equalizers.
 2021-10-18 00:14:38 +02:00
Stefan dffdd5c3bf Adding statics and preparing team equalizers 
Updated class for the new changes in the theme file for adding team player name static background and team equalizers.

Equalizers not ready! The part in the UpdateGame() has still to be added to see a working equalizer.
 2021-10-18 00:12:34 +02:00
Stefan a1f661c3f5 Assuming playing party mode on ArgumentException 
This make sure, that the party mode flag is set at TicTacToe party mode.
 2021-09-23 20:35:20 +02:00
Stefan 601c4b6d7e Update CScreenSing.cs 2021-09-23 19:52:44 +02:00
Stefan 45b6a39754 Assuming playing party mode on ArgumentException 
If getting an ArgumentException while requesting song selection options (which the TicTacToe party mode do), I assume that Vocaluxe is playing a party mode.
This allows detection of a running party mode in CScreenSing, to prevent song skipping (Shift/CTRL + Arrow Right) while playing party modes.
 2021-09-23 19:50:12 +02:00
Stefan a4cde06c06 Merge pull request #556 from Vocaluxe/Stefan1200-de-CParty_ArgumentException 
Fix crash on an ArgumentException from Party Modes
 2021-09-23 14:32:32 +02:00
Stefan dd39064fbd Merge branch 'develop' into Stefan1200-de-CParty_ArgumentException 2021-09-23 13:18:37 +02:00
Stefan b9922a3b0b Merge pull request #555 from Vocaluxe/Stefan1200-de-songreloadfix 
Fix reloading songs with F5 & CTRL+R key shortcuts
 2021-09-23 13:18:09 +02:00
Stefan 30cf1c356d Fix crash on an ArgumentException from Party Modes 2021-09-23 03:52:15 +02:00
Stefan 98064a98a0 Fix reloading songs with F5 & CTRL+R key shortcuts 2021-09-23 03:02:42 +02:00
Gary Kertopermono 95f74f5b37 Fixed: Merge added double case for rap notes 2021-06-28 10:51:17 +02:00
Gary Kertopermono 612c18326d Merge branch 'develop' into rap 2021-06-28 10:44:22 +02:00
Gary Kertopermono daec506445 Rap notes will use the rap notes graphics 2021-06-18 10:58:55 +02:00
Gary Kertopermono 34f641727a Added rap note placeholder graphics 2021-06-18 10:17:31 +02:00
Gary Kertopermono 7a54269693 Fixed mistakes, re-aligned medley icons 2021-06-15 15:11:36 +02:00
Gary Kertopermono c5f4946a2c Fixed a typo in ScreenSong.xml 2021-06-15 15:09:19 +02:00
Gary Kertopermono 7781cd8fa9 Added the rap icon 2021-06-15 15:01:09 +02:00