[Kde-games-devel] KMahjongg git

Christian Krippendorf Coding at christian-krippendorf.de
Fri Sep 21 15:44:36 UTC 2012


Am Freitag, 21. September 2012, 17:30:26 schrieb Wolfgang Rohdewald:
> Am Freitag, 21. September 2012, 17:09:40 schrieb Christian Krippendorf:
> > r1288004 | krippendorf | 2012-04-02 15:14:23 +0200 (Mo, 02. Apr 2012) | 2
> > Zeilen
> > 
> > Add painting and fadeings for a GameItem.
> > 
> > ------------------------------------------------------------------------
> > r1288002 | krippendorf | 2012-04-02 13:47:29 +0200 (Mo, 02. Apr 2012) | 2
> > Zeilen
> > 
> > Add angle parts to make the 2d GameItem more like 3d in visual.
> > 
> > ------------------------------------------------------------------------
> > r1287999 | krippendorf | 2012-04-02 13:07:24 +0200 (Mo, 02. Apr 2012) | 2
> > Zeilen
> > 
> > Add basic GameItem object as a derived object of QGraphicsItem.
> 
> yes, those 3 commits are really missing in git.
> 
> The easiest solution would be to add that branch again in git
> and commit those 3 things in that git branch
> 
> I can do that. You would still appear as author of those
> commits, and I would appear as committer. I can also keep the
> original commit dates
> 
> git commit --author=... --date=....
> 
> What I need is the branch name you want. I do not think
> "krippendorf" is useful as it says nothing about branch content.
> Maybe something like "qgraphics_port"?

Simply qgraphic...

but there are much more commits... these few were only a cut of all. I will 
give you a whole list... and then you could decide if it does not take to much 
time.

###############################################################################
r1306531 | krippendorf | 2012-07-19 15:16:41 +0200 (Do, 19. Jul 2012) | 2 
Zeilen

Move connect commands...

------------------------------------------------------------------------
r1306373 | krippendorf | 2012-07-18 21:55:56 +0200 (Mi, 18. Jul 2012) | 2 
Zeilen

Some restructures of GameView.h

------------------------------------------------------------------------
r1306368 | krippendorf | 2012-07-18 21:01:33 +0200 (Mi, 18. Jul 2012) | 2 
Zeilen

Solve randomly crash when starting and when closing kmahjongg.

------------------------------------------------------------------------
r1305706 | krippendorf | 2012-07-15 09:50:36 +0200 (So, 15. Jul 2012) | 2 
Zeilen

Repair redo action is not allowed when removing a item pair. And update the 
redo action state.

------------------------------------------------------------------------
r1305705 | krippendorf | 2012-07-15 09:35:14 +0200 (So, 15. Jul 2012) | 2 
Zeilen

Clean kmahjongg.cpp/.h

------------------------------------------------------------------------
r1305702 | krippendorf | 2012-07-15 09:24:50 +0200 (So, 15. Jul 2012) | 2 
Zeilen

Solve crash on closing KMahjongg.

------------------------------------------------------------------------
r1305674 | krippendorf | 2012-07-14 18:08:41 +0200 (Sa, 14. Jul 2012) | 2 
Zeilen

Make saving and loading a game session working again.

------------------------------------------------------------------------
r1305536 | krippendorf | 2012-07-13 14:17:17 +0200 (Fr, 13. Jul 2012) | 2 
Zeilen

Clean up the code of kmahjongg.cpp/.h.

------------------------------------------------------------------------
r1305535 | krippendorf | 2012-07-13 13:55:53 +0200 (Fr, 13. Jul 2012) | 2 
Zeilen

Remove unused function in kmahjongg.

------------------------------------------------------------------------
r1305534 | krippendorf | 2012-07-13 13:50:21 +0200 (Fr, 13. Jul 2012) | 2 
Zeilen

Add undo and redo functionality.

------------------------------------------------------------------------
r1305524 | krippendorf | 2012-07-13 09:49:47 +0200 (Fr, 13. Jul 2012) | 2 
Zeilen

When pressing the mouse during demo or game move list animation, stop the 
animation and reset the actual game.

------------------------------------------------------------------------
r1305523 | krippendorf | 2012-07-13 09:43:17 +0200 (Fr, 13. Jul 2012) | 2 
Zeilen

Solve bug with wrong background image size on startup.

------------------------------------------------------------------------
r1305522 | krippendorf | 2012-07-13 09:38:22 +0200 (Fr, 13. Jul 2012) | 2 
Zeilen

Use setBackgroundBrush for the drawing the background and not QPalette 
anymore.

------------------------------------------------------------------------
r1304832 | krippendorf | 2012-07-09 15:40:36 +0200 (Mo, 09. Jul 2012) | 2 
Zeilen

Remove a bug in addItem and let the move list animation stop + create a new 
game when clicking during animation.

------------------------------------------------------------------------
r1304534 | krippendorf | 2012-07-07 21:45:30 +0200 (Sa, 07. Jul 2012) | 2 
Zeilen

Remove a rendering bug after shuffle.

------------------------------------------------------------------------
r1304532 | krippendorf | 2012-07-07 21:08:48 +0200 (Sa, 07. Jul 2012) | 2 
Zeilen

Resolve bug with missing face pixmap.

------------------------------------------------------------------------
r1304394 | krippendorf | 2012-07-06 22:36:16 +0200 (Fr, 06. Jul 2012) | 2 
Zeilen

Clean up GameView.

------------------------------------------------------------------------
r1304392 | krippendorf | 2012-07-06 21:51:00 +0200 (Fr, 06. Jul 2012) | 2 
Zeilen

Clean up GameScene.

------------------------------------------------------------------------
r1304388 | krippendorf | 2012-07-06 19:52:26 +0200 (Fr, 06. Jul 2012) | 2 
Zeilen

Add POSITION support to GameItem and clean the code.

------------------------------------------------------------------------
r1304387 | krippendorf | 2012-07-06 19:07:18 +0200 (Fr, 06. Jul 2012) | 2 
Zeilen

Add MoveListAnimation source files to svn.

------------------------------------------------------------------------
r1304373 | krippendorf | 2012-07-06 16:34:21 +0200 (Fr, 06. Jul 2012) | 2 
Zeilen

Just small changes to make the code clearer.

------------------------------------------------------------------------
r1303992 | krippendorf | 2012-07-05 00:55:24 +0200 (Do, 05. Jul 2012) | 2 
Zeilen

First running MoveListAnimation. But it is still a bit buggy in animation 
itself.

------------------------------------------------------------------------
r1303811 | krippendorf | 2012-07-03 15:26:11 +0200 (Di, 03. Jul 2012) | 2 
Zeilen

Add basic MoveListAnimation für won games.

------------------------------------------------------------------------
r1303810 | krippendorf | 2012-07-03 15:02:51 +0200 (Di, 03. Jul 2012) | 2 
Zeilen

Check for demo animation when creating a new game.

------------------------------------------------------------------------
r1303806 | krippendorf | 2012-07-03 14:47:13 +0200 (Di, 03. Jul 2012) | 2 
Zeilen

Handle on gameOver for the demo animation.

------------------------------------------------------------------------
r1303802 | krippendorf | 2012-07-03 13:56:39 +0200 (Di, 03. Jul 2012) | 2 
Zeilen

Add first demo animation code.

------------------------------------------------------------------------
r1303485 | krippendorf | 2012-06-28 20:12:31 +0200 (Do, 28. Jun 2012) | 2 
Zeilen

Add basic DemoAnimation as an object for the demo mode.

------------------------------------------------------------------------
r1303481 | krippendorf | 2012-06-28 19:25:47 +0200 (Do, 28. Jun 2012) | 2 
Zeilen

Just cosmetics...

------------------------------------------------------------------------
r1303318 | krippendorf | 2012-06-27 11:42:12 +0200 (Mi, 27. Jun 2012) | 2 
Zeilen

Merge trunk to branch/krippendorf: 1287816:1303315

------------------------------------------------------------------------
r1303034 | krippendorf | 2012-06-25 18:49:09 +0200 (Mo, 25. Jun 2012) | 2 
Zeilen

Add SelectionAnimation.x to svn.

------------------------------------------------------------------------
r1303027 | krippendorf | 2012-06-25 18:06:49 +0200 (Mo, 25. Jun 2012) | 2 
Zeilen

Add show match items option.

------------------------------------------------------------------------
r1303024 | krippendorf | 2012-06-25 17:16:44 +0200 (Mo, 25. Jun 2012) | 2 
Zeilen

Fix small bug in orderLine.

------------------------------------------------------------------------
r1303023 | krippendorf | 2012-06-25 17:13:46 +0200 (Mo, 25. Jun 2012) | 2 
Zeilen

Set new tileset and layout only if they are not already set.

------------------------------------------------------------------------
r1302927 | krippendorf | 2012-06-25 15:17:31 +0200 (Mo, 25. Jun 2012) | 2 
Zeilen

Override items() in GameScene.

------------------------------------------------------------------------
r1302925 | krippendorf | 2012-06-25 15:10:52 +0200 (Mo, 25. Jun 2012) | 2 
Zeilen

Add a new SelectionAnimation class and implement the helpMove.

------------------------------------------------------------------------
r1302914 | krippendorf | 2012-06-25 12:32:13 +0200 (Mo, 25. Jun 2012) | 2 
Zeilen

Implement shuffle in GameView.

------------------------------------------------------------------------
r1302912 | krippendorf | 2012-06-25 12:25:14 +0200 (Mo, 25. Jun 2012) | 2 
Zeilen

Remove connection to gameCalculated(...).

------------------------------------------------------------------------
r1302901 | krippendorf | 2012-06-25 11:16:41 +0200 (Mo, 25. Jun 2012) | 2 
Zeilen

Add a connection for the gameover signal.

------------------------------------------------------------------------
r1302897 | krippendorf | 2012-06-25 11:03:54 +0200 (Mo, 25. Jun 2012) | 2 
Zeilen

Handle when the games are over and when no valid moves are left.

------------------------------------------------------------------------
r1302806 | krippendorf | 2012-06-25 09:26:12 +0200 (Mo, 25. Jun 2012) | 2 
Zeilen

Add some comments.

------------------------------------------------------------------------
r1302771 | krippendorf | 2012-06-24 19:29:47 +0200 (So, 24. Jun 2012) | 2 
Zeilen

New ordering algo to make the game item right ordered in the zvalue.

------------------------------------------------------------------------
r1302738 | krippendorf | 2012-06-24 16:36:36 +0200 (So, 24. Jun 2012) | 2 
Zeilen

Add some comments.

------------------------------------------------------------------------
r1302736 | krippendorf | 2012-06-24 16:10:00 +0200 (So, 24. Jun 2012) | 2 
Zeilen

Display and update the tile num informations in the status bar.

------------------------------------------------------------------------
r1302734 | krippendorf | 2012-06-24 15:11:32 +0200 (So, 24. Jun 2012) | 2 
Zeilen

Remove matching tiles.

------------------------------------------------------------------------
r1302732 | krippendorf | 2012-06-24 14:59:11 +0200 (So, 24. Jun 2012) | 2 
Zeilen

Test if a item is selectable in GameScene and set the Selectable flag for all 
items by default.

------------------------------------------------------------------------
r1301789 | krippendorf | 2012-06-19 14:03:17 +0200 (Di, 19. Jun 2012) | 2 
Zeilen

Add selection and removing of matching items.

------------------------------------------------------------------------
r1301206 | krippendorf | 2012-06-16 23:51:35 +0200 (Sa, 16. Jun 2012) | 2 
Zeilen

Move selection logic to GameView.

------------------------------------------------------------------------
r1301192 | krippendorf | 2012-06-16 17:59:30 +0200 (Sa, 16. Jun 2012) | 2 
Zeilen

Redesign of clicking action, for selecting stone and making the shadows 
transparent.

------------------------------------------------------------------------
r1296320 | krippendorf | 2012-05-23 21:05:49 +0200 (Mi, 23. Mai 2012) | 2 
Zeilen

Display game number and some status text messages.

------------------------------------------------------------------------
r1296319 | krippendorf | 2012-05-23 20:45:28 +0200 (Mi, 23. Mai 2012) | 2 
Zeilen

Make pause working again. (Toogle the visiblity of the GameView)

------------------------------------------------------------------------
r1296314 | krippendorf | 2012-05-23 19:54:13 +0200 (Mi, 23. Mai 2012) | 2 
Zeilen

Correct the frame part int he updateItemPosition(...)

------------------------------------------------------------------------
r1296312 | krippendorf | 2012-05-23 19:27:29 +0200 (Mi, 23. Mai 2012) | 2 
Zeilen

Relayout and comment the code for calculating the position of a item on the 
view.

------------------------------------------------------------------------
r1296307 | krippendorf | 2012-05-23 19:17:19 +0200 (Mi, 23. Mai 2012) | 2 
Zeilen

Rename a function in GameView to fit the internal naming convention.

------------------------------------------------------------------------
r1295717 | krippendorf | 2012-05-19 19:09:31 +0200 (Sa, 19. Mai 2012) | 2 
Zeilen

Make the shadows transparent to mouse clicks.

------------------------------------------------------------------------
r1295697 | krippendorf | 2012-05-19 15:13:39 +0200 (Sa, 19. Mai 2012) | 2 
Zeilen

Correct to take the actual angle in updateItemPictures(...).

------------------------------------------------------------------------
r1293475 | krippendorf | 2012-05-08 12:28:37 +0200 (Di, 08. Mai 2012) | 2 
Zeilen

Update zorder on start.

------------------------------------------------------------------------
r1293474 | krippendorf | 2012-05-08 12:27:09 +0200 (Di, 08. Mai 2012) | 2 
Zeilen

Update zorder on changing the angle.

------------------------------------------------------------------------
r1293136 | krippendorf | 2012-05-06 14:37:14 +0200 (So, 06. Mai 2012) | 2 
Zeilen

Times will be replaced when the angle changes.

------------------------------------------------------------------------
r1293135 | krippendorf | 2012-05-06 14:10:16 +0200 (So, 06. Mai 2012) | 2 
Zeilen

Angle changeable again. The won't replace and reorder until now.

------------------------------------------------------------------------
r1292271 | krippendorf | 2012-04-29 20:34:30 +0200 (So, 29. Apr 2012) | 2 
Zeilen

Rename GameWidget to GameView cause this nearer to QGraphicsView.

------------------------------------------------------------------------
r1292256 | krippendorf | 2012-04-29 14:59:19 +0200 (So, 29. Apr 2012) | 2 
Zeilen

Center the preview of the layout selector.

------------------------------------------------------------------------
r1292255 | krippendorf | 2012-04-29 14:55:13 +0200 (So, 29. Apr 2012) | 2 
Zeilen

Display previews on layout selector again.

------------------------------------------------------------------------
r1292244 | krippendorf | 2012-04-29 12:16:26 +0200 (So, 29. Apr 2012) | 2 
Zeilen

Remove QGraphicsView border and some debug messages, cause they are not needed 
any longer.

------------------------------------------------------------------------
r1292237 | krippendorf | 2012-04-29 11:30:36 +0200 (So, 29. Apr 2012) | 2 
Zeilen

Don't send event to underlying items.

------------------------------------------------------------------------
r1291869 | krippendorf | 2012-04-26 11:17:09 +0200 (Do, 26. Apr 2012) | 2 
Zeilen

Make GameItem objects selectable again, but until now there is no decition if 
a specific GameItem object is selectable or not.

------------------------------------------------------------------------
r1291775 | krippendorf | 2012-04-25 17:02:23 +0200 (Mi, 25. Apr 2012) | 2 
Zeilen

Solve crash on closing the kmahjongg.

------------------------------------------------------------------------
r1291773 | krippendorf | 2012-04-25 16:43:55 +0200 (Mi, 25. Apr 2012) | 2 
Zeilen

Draw faces on the tiles.

------------------------------------------------------------------------
r1291768 | krippendorf | 2012-04-25 16:19:12 +0200 (Mi, 25. Apr 2012) | 2 
Zeilen

Correct the offset for the tiles in deph (z).

------------------------------------------------------------------------
r1291767 | krippendorf | 2012-04-25 16:14:02 +0200 (Mi, 25. Apr 2012) | 2 
Zeilen

Correct the z-order for correct vertical overlapping.

------------------------------------------------------------------------
r1291337 | krippendorf | 2012-04-24 11:51:48 +0200 (Di, 24. Apr 2012) | 2 
Zeilen

The layout now centers to the GameWidget.

------------------------------------------------------------------------
r1291336 | krippendorf | 2012-04-24 11:24:33 +0200 (Di, 24. Apr 2012) | 2 
Zeilen

Items are shown and got their layout on the board. For now, the whole tile 
group is not centered! Also the size changed to fit on the given space of the 
GameWidget.

------------------------------------------------------------------------
r1290103 | krippendorf | 2012-04-17 16:23:28 +0200 (Di, 17. Apr 2012) | 2 
Zeilen

Move many functions from the GameWidget to the GameScene and remove the 
boardwidget. Many things are not working now. But the application starts with 
a loaded background.

------------------------------------------------------------------------
r1288222 | krippendorf | 2012-04-04 12:20:02 +0200 (Mi, 04. Apr 2012) | 2 
Zeilen

Displays tiles again, but not in a layout..

------------------------------------------------------------------------
r1288217 | krippendorf | 2012-04-04 11:07:03 +0200 (Mi, 04. Apr 2012) | 2 
Zeilen

Only create a new QPalette object for the background when setting one. Before 
it was created on every update of the widget.

------------------------------------------------------------------------
r1288216 | krippendorf | 2012-04-04 11:01:01 +0200 (Mi, 04. Apr 2012) | 2 
Zeilen

Backgrounds will be displayed again.

------------------------------------------------------------------------
r1288195 | krippendorf | 2012-04-03 22:37:11 +0200 (Di, 03. Apr 2012) | 2 
Zeilen

Replace BoardWidget with GameWidget... it starts but no game is possible yet. 
This is just a basic implementation.

------------------------------------------------------------------------
r1288040 | krippendorf | 2012-04-02 22:47:55 +0200 (Mo, 02. Apr 2012) | 2 
Zeilen

GameWidget: New functions for updating the widget and creating of the scene.

------------------------------------------------------------------------
r1288026 | krippendorf | 2012-04-02 20:56:57 +0200 (Mo, 02. Apr 2012) | 2 
Zeilen

Add GameScene to GameWidget.

------------------------------------------------------------------------
r1288023 | krippendorf | 2012-04-02 20:39:50 +0200 (Mo, 02. Apr 2012) | 2 
Zeilen

Add GameScene object for managing the GameItems.

------------------------------------------------------------------------
r1288022 | krippendorf | 2012-04-02 20:25:02 +0200 (Mo, 02. Apr 2012) | 2 
Zeilen

Extend GameWidget to create a BoardLayout and implement basic 
calculateNewGame().

------------------------------------------------------------------------
r1288011 | krippendorf | 2012-04-02 16:37:21 +0200 (Mo, 02. Apr 2012) | 2 
Zeilen

Add the GameWidget basic object. This should replace the BoardWidget in 
future.

------------------------------------------------------------------------
r1288007 | krippendorf | 2012-04-02 16:17:39 +0200 (Mo, 02. Apr 2012) | 4 
Zeilen

Replace TileSprite with GameItem in BoardWidget.

WARNING: Until now the code compiles fine, but no tiles will be seen until a 
big change or reimplementation of BoardWidget. I made this cause otherwise the 
commit will get to big.

------------------------------------------------------------------------
r1288004 | krippendorf | 2012-04-02 15:14:23 +0200 (Mo, 02. Apr 2012) | 2 
Zeilen

Add painting and fadeings for a GameItem.

------------------------------------------------------------------------
r1288002 | krippendorf | 2012-04-02 13:47:29 +0200 (Mo, 02. Apr 2012) | 2 
Zeilen

Add angle parts to make the 2d GameItem more like 3d in visual.

------------------------------------------------------------------------
r1287999 | krippendorf | 2012-04-02 13:07:24 +0200 (Mo, 02. Apr 2012) | 2 
Zeilen

Add basic GameItem object as a derived object of QGraphicsItem.

------------------------------------------------------------------------
r1287835 | krippendorf | 2012-04-01 17:33:24 +0200 (So, 01. Apr 2012) | 4 
Zeilen

Branch from kdegames in trunk to krippendorf at revision: 1287816

This branch is for porting kmahjongg to the qgraphics framework.
###############################################################################

Sorry for that...

-- 
Mit freundlichen Grüßen / Best Regards

Christian Krippendorf


More information about the kde-games-devel mailing list