KolibriOS/kolibrios
15
25
Fork 61
Code Issues 133 Pull Requests 31 Actions Projects 1 Releases Wiki Activity

max-solitare1 #362

Merged
Burer merged 34 commits from Max/kolibrios:max-solitare1 into main 2026-04-11 12:04:34 +00:00
Conversation 9 Commits 34 Files Changed 16
+1649
Max commented 2026-03-11 16:51:02 +00:00
Contributor
Copy Link
Copy Source

Sorry for the confusion, I'm learning this git.
This is final version. Bitmaps free license.

Sorry for the confusion, I'm learning this git. This is final version. Bitmaps free license.
Max added 4 commits 2026-03-11 16:51:10 +00:00
Upload files to "programs/games/solitare" 5d38b3f76e
Upload files to "programs/games/solitare" 1d31728854
Upload files to "programs/games/solitare" 6da5d391dc
Upload files to "programs/games/solitare"
Build system / Check kernel codestyle (pull_request) Successful in 1m51s
Details
Build system / Build (pull_request) Successful in 15m27s
Details
e1433e7ab8
Max requested review from Burer 2026-03-11 16:51:10 +00:00
Max requested review from mxlgv 2026-03-11 16:51:12 +00:00
Max added 1 commit 2026-03-12 07:12:30 +00:00
Update data/Tupfile.lua
Build system / Check kernel codestyle (pull_request) Successful in 1m17s
Details
Build system / Build (pull_request) Successful in 12m12s
Details
b203b39d18
Max added 1 commit 2026-03-12 07:22:53 +00:00
Upload files to "data"
Build system / Build (pull_request) Failing after 1m22s
Details
Build system / Check kernel codestyle (pull_request) Successful in 1m41s
Details
7ec5e099bc 
Add my game
Max added 1 commit 2026-03-12 09:52:32 +00:00
Upload files to "data"
Build system / Check kernel codestyle (pull_request) Failing after 3s
Details
Build system / Build (pull_request) Failing after 51s
Details
aabd819b23
Max added 1 commit 2026-03-12 09:54:17 +00:00
Merge branch 'main' into max-solitare1
Build system / Build (pull_request) Failing after 11s
Details
Build system / Check kernel codestyle (pull_request) Successful in 26s
Details
d15a2d4f22
Max added 1 commit 2026-03-12 10:00:03 +00:00
Upload files to "programs/games/solitare"
Build system / Build (pull_request) Failing after 2s
Details
Build system / Check kernel codestyle (pull_request) Successful in 1m36s
Details
01a976b171
Max added 1 commit 2026-03-12 10:09:14 +00:00
Update programs/games/solitare/solitare.asm
Build system / Build (pull_request) Failing after 3s
Details
Build system / Check kernel codestyle (pull_request) Successful in 54s
Details
795ba3dfc1
Max commented 2026-03-12 10:12:35 +00:00
Author
Contributor
Copy Link
Copy Source

Is it a problem on the server or in my files?

Is it a problem on the server or in my files?
Screenshot_2.png
244 KiB
Screenshot_2.png
Max added 1 commit 2026-03-12 13:51:26 +00:00
Merge branch 'main' into max-solitare1
Build system / Check kernel codestyle (pull_request) Successful in 1m41s
Details
Build system / Build (pull_request) Failing after 2m15s
Details
c232ed3de1
Max commented 2026-03-12 14:11:13 +00:00
Author
Contributor
Copy Link
Copy Source

the program is looking for the file 'icons16.png' and you changed it to 'icons18.png'

the program is looking for the file 'icons16.png' and you changed it to 'icons18.png'
Screenshot_5.png
106 KiB
Screenshot_5.png
Max added 1 commit 2026-03-12 15:34:19 +00:00
Update data/Tupfile.lua
Build system / Check kernel codestyle (pull_request) Successful in 31s
Details
Build system / Build (pull_request) Failing after 8m12s
Details
65e08fbe38
Max commented 2026-03-12 15:49:11 +00:00
Author
Contributor
Copy Link
Copy Source

What should I change to make the game (if it's too big) be compiled in .iso but not in .img?

What should I change to make the game (if it's too big) be compiled in .iso but not in .img?
Max added 1 commit 2026-03-12 16:18:37 +00:00
Upload files to "data"
Build system / Check kernel codestyle (pull_request) Successful in 25s
Details
Build system / Build (pull_request) Failing after 5m1s
Details
fc9fd1776b 
Try to build my game in iso but not on img
Max added 1 commit 2026-03-12 16:34:29 +00:00
Upload files to "data"
Build system / Build (pull_request) Failing after 3m26s
Details
Build system / Check kernel codestyle (pull_request) Successful in 1m17s
Details
2b3b66594d
Max added 1 commit 2026-03-12 16:48:59 +00:00
Upload files to "data"
Build system / Check kernel codestyle (pull_request) Successful in 53s
Details
Build system / Build (pull_request) Failing after 7m42s
Details
267373c7c5
Max added 1 commit 2026-03-12 17:22:09 +00:00
Upload files to "data"
Build system / Check kernel codestyle (pull_request) Successful in 1m40s
Details
Build system / Build (pull_request) Failing after 3m32s
Details
4b7174b96d
Max added 1 commit 2026-03-12 17:50:00 +00:00
Upload files to "data"
Build system / Check kernel codestyle (pull_request) Successful in 1m9s
Details
Build system / Build (pull_request) Failing after 8m23s
Details
fc09e860a8
Max added 1 commit 2026-03-13 09:24:14 +00:00
Upload files to "programs/games/solitare"
Build system / Check kernel codestyle (pull_request) Successful in 1m5s
Details
Build system / Build (pull_request) Failing after 7m20s
Details
7cee8d29f7
Max added 1 commit 2026-03-13 19:20:13 +00:00
Update programs/games/solitare/solitare.asm
Build system / Check kernel codestyle (pull_request) Successful in 39s
Details
Build system / Build (pull_request) Successful in 9m52s
Details
48bbc800b9
Burer approved these changes 2026-03-14 16:56:09 +00:00
Burer commented 2026-03-14 16:57:07 +00:00
Owner
Copy Link
Copy Source

Hi!
Looks fine enough to me now.
Let's wait for the second approve.
And thank you for nice game!

Hi! Looks fine enough to me now. Let's wait for the second approve. And thank you for nice game!
Max added 1 commit 2026-03-17 09:30:52 +00:00
Merge branch 'main' into max-solitare1
Build system / Check kernel codestyle (pull_request) Successful in 2m5s
Details
Build system / Build (pull_request) Successful in 11m39s
Details
cda7cb7c81
Max requested review from Doczom 2026-03-17 09:32:43 +00:00
Max added 1 commit 2026-03-23 20:02:19 +00:00
Upload files to "data"
Build system / Check kernel codestyle (pull_request) Successful in 1m33s
Details
Build system / Build (pull_request) Failing after 2m4s
Details
5f135c5c6b
Max added 1 commit 2026-03-23 20:03:17 +00:00
merge upstream
Build system / Check kernel codestyle (pull_request) Successful in 1m14s
Details
Build system / Build (pull_request) Successful in 10m38s
Details
1ee9e02e3a
Max added 1 commit 2026-03-23 21:21:50 +00:00
Update data/Tupfile.lua
Build system / Check kernel codestyle (pull_request) Successful in 1m10s
Details
Build system / Build (pull_request) Successful in 10m6s
Details
3c6b508209
Max added 1 commit 2026-03-23 21:34:15 +00:00
Update data/Tupfile.lua
Build system / Check kernel codestyle (pull_request) Successful in 1m9s
Details
Build system / Build (pull_request) Failing after 1m11s
Details
3423ad2ed3
Max added 1 commit 2026-03-23 21:37:46 +00:00
Update data/Tupfile.lua
Build system / Check kernel codestyle (pull_request) Successful in 49s
Details
Build system / Build (pull_request) Successful in 10m56s
Details
4729cfa32c
Max requested review from Burer 2026-03-26 14:17:54 +00:00
Max requested review from dunkaist 2026-03-26 14:19:10 +00:00
mxlgv requested changes 2026-03-27 01:37:08 +00:00
programs/games/solitare/solitare.asm Outdated
@@ -0,0 +1,1575 @@
; SPDX-License-Identifier: GPL-2.0-only
; Program - Solitaire card game
; Copyright (C) 2026 KolibriOS team
; Author: Max, <snapemax@wp.pl>
mxlgv commented 2026-03-27 01:27:56 +00:00
Owner
Copy Link
Copy Source

Please remove ,

Please remove `,`
👍 1
programs/games/solitare/solitare.asm Outdated
@@ -0,0 +2,4 @@
; Program - Solitaire card game
; Copyright (C) 2026 KolibriOS team
; Author: Max, <snapemax@wp.pl>
; Graphics: Designed by rawpixel.com / Freepik
mxlgv commented 2026-03-27 01:30:08 +00:00
Owner
Copy Link
Copy Source

From this it is not at all clear who owns these images and under what license they are distributed

From this it is not at all clear who owns these images and under what license they are distributed
Max commented 2026-03-27 07:02:18 +00:00
Author
Contributor
Copy Link
Copy Source

is this their license, should I include it somewhere?

is this their license, should I include it somewhere?
License free.txt
1.5 KiB
dunkaist commented 2026-04-09 10:30:09 +00:00
Owner
Copy Link
Copy Source

I think you should include this custom license file to your commit and explicitly mention it here like this:
; Graphics: Designed by rawpixel.com / Freepik (see 'License free.txt')

Looks good otherwise, thank you

I think you should include this custom license file to your commit and explicitly mention it here like this: ; Graphics: Designed by rawpixel.com / Freepik (see 'License free.txt') Looks good otherwise, thank you
Max commented 2026-04-10 09:20:51 +00:00
Author
Contributor
Copy Link
Copy Source

I made the changes you wrote about.

I made the changes you wrote about.
programs/games/solitare/solitare.asm
@@ -0,0 +56,4 @@
dd 0, 0
start:
mov esp, stacktop
mxlgv commented 2026-03-27 01:32:03 +00:00
Owner
Copy Link
Copy Source

At startup, the stack address is taken from the header. This is a meaningless action.

At startup, the stack address is taken from the header. This is a meaningless action.
👍 1
programs/games/solitare/solitare.asm
@@ -0,0 +1464,4 @@
txt_replay db 'REPLAY', 0
txt_exit db 'EXIT', 0
score_str rb 16
score dd 0
mxlgv commented 2026-03-27 01:36:21 +00:00
Owner
Copy Link
Copy Source

It seems many of these things can come after i_end:

It seems many of these things can come after i_end:
👍 1
Max added 1 commit 2026-03-27 09:15:19 +00:00
Upload files to "programs/games/solitare"
Build system / Check kernel codestyle (pull_request) Successful in 1m59s
Details
Build system / Build (pull_request) Successful in 11m44s
Details
e64a8bcf68 
the requested changes were made
Max requested review from mxlgv 2026-03-27 14:37:24 +00:00
Max removed review request for Doczom 2026-03-27 14:38:18 +00:00
Max removed review request for Burer 2026-03-27 14:38:22 +00:00
Max requested review from Burer 2026-03-27 14:38:27 +00:00
Max removed review request for dunkaist 2026-03-27 14:39:00 +00:00
Max requested review from dunkaist 2026-03-27 14:39:33 +00:00
Max added 1 commit 2026-03-29 19:08:54 +00:00
Merge branch 'main' into max-solitare1
Build system / Check kernel codestyle (pull_request) Successful in 1m35s
Details
Build system / Build (pull_request) Successful in 20m25s
Details
ec65012535
Max added 1 commit 2026-04-01 09:12:13 +00:00
Merge branch 'main' into max-solitare1
Build system / Check kernel codestyle (pull_request) Successful in 42s
Details
Build system / Build (pull_request) Successful in 27m39s
Details
d95cca5b2a
Max added 1 commit 2026-04-03 09:30:26 +00:00
Upload files to "data"
Build system / Check kernel codestyle (pull_request) Successful in 51s
Details
Build system / Build (pull_request) Failing after 2m30s
Details
5b64b0a7cf
Max added 1 commit 2026-04-03 09:30:54 +00:00
merge upstream
Build system / Check kernel codestyle (pull_request) Successful in 1m21s
Details
Build system / Build (pull_request) Successful in 37m25s
Details
f20dc97c7e
Max added 1 commit 2026-04-10 08:40:44 +00:00
merge upstream
Build system / Check kernel codestyle (pull_request) Successful in 2m14s
Details
Build system / Build (pull_request) Successful in 40m4s
Details
aa12adf656
Max added 1 commit 2026-04-10 08:47:42 +00:00
Upload files to "programs/games/solitare"
Build system / Check kernel codestyle (pull_request) Successful in 44s
Details
Build system / Build (pull_request) Failing after 3h6m31s
Details
44b2c27487
Max added 1 commit 2026-04-10 08:50:32 +00:00
Update programs/games/solitare/solitare.asm
Build system / Check kernel codestyle (pull_request) Successful in 59s
Details
Build system / Build (pull_request) Successful in 37m9s
Details
cd1df67ab5
Max commented 2026-04-10 09:26:59 +00:00
Author
Contributor
Copy Link
Copy Source

Burer can you review again? I made some changes requested by other reviewers.

Burer can you review again? I made some changes requested by other reviewers.
❤️ 1
Burer added 1 commit 2026-04-11 10:52:32 +00:00
games/solitare: fix RNG, add to autobuild
Build system / Check kernel codestyle (pull_request) Successful in 26s
Details
Build system / Build (pull_request) Successful in 10m5s
Details
5d66143ca1
Burer commented 2026-04-11 10:55:05 +00:00
Owner
Copy Link
Copy Source

Hi, @Max.
I am going to finally add all three of your games to autobuild and merge into system image.
Sorry for the delay and thank you for your work!
Also, some code modifications will be done, kind of better practicies.
You can check them for future projects, if you want.

Hi, @Max. I am going to finally add all three of your games to autobuild and merge into system image. Sorry for the delay and thank you for your work! Also, some code modifications will be done, kind of better practicies. You can check them for future projects, if you want.
Burer commented 2026-04-11 12:03:22 +00:00
Owner
Copy Link
Copy Source

Totally playable, from what I can see.
Will be merged.
P.S. Personal thanks for Solitaire. Spend hours playing this game my e-book, nice to see proper implementation in KOS.
image.png

Totally playable, from what I can see. Will be merged. P.S. Personal thanks for Solitaire. Spend hours playing this game my e-book, nice to see proper implementation in KOS. <img width="584" alt="image.png" src="attachments/86db508c-c232-450e-b683-53472edef92b">
image.png
76 KiB
Burer merged commit 87adc0a1df into main 2026-04-11 12:04:34 +00:00
Burer deleted branch max-solitare1 2026-04-11 12:04:35 +00:00
Burer referenced this issue from a commit 2026-04-11 12:04:35 +00:00
games: add solitare(#362)
Sign in to join this conversation.
Reviewers
No Reviewers
mxlgv
Burer
dunkaist
Labels
Clear labels
C
Category/Applications
Category/Drivers
Category/General
Category/Kernel
Category/Libraries
Eolite
FASM
FS
GSoC
This issue in GSoC program
 HardwareTested
HLL
Influence/Settings
Influence/Text/TYPO
IRCC
Kernel
Kind
Breaking
Breaking change that won't be backward compatible
Kind
Bug
Something is not working
Kind
Build
Kind
Documentation
Documentation changes
Kind
Enhancement
Improve existing functionality
Kind
Feature
New functionality
Kind
Security
This is security issue
Kind
Testing
Issue or pull request related to testing
Pay for the code
Paid task
PR
Conflicts
PR conflicts with main
PR
Dependent
This PR is dependent on another PR
Priority
Critical
The priority is critical
Priority
High
The priority is high
Priority
Low
The priority is low
Priority
Medium
The priority is medium
PR
Ready to merge
Pull request is ready for merge
PR
Request changes
Changes requested in pull request
PR
Review required
Reviewed
Confirmed
Issue has been confirmed
Reviewed
Duplicate
This issue or pull request already exists
Reviewed
Invalid
Invalid issue
Reviewed
Won't Fix
This issue won't be fixed
Status
Abandoned
Somebody has started to work on this but abandoned work
Status
Blocked
Something is blocking this issue or pull request
Status
Need More Info
Feedback is required to reproduce issue or to continue work
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
ace-dent (Andrew) Burer Doczom (Mikhail Frolov) dunkaist (Ivan B) Egor00f (Егор) hidnplayr IgorA Leency (Kiril Lipatov) mxlgv (Max Logaev) ramenu rgimad sdongles (Serhii Sakhno) Sweetbread (Gleb Zaharov)
No Assignees
4 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: KolibriOS/kolibrios#362
Delete Branch "Max/kolibrios:max-solitare1"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?