[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] [pingus] 6 new revisions pushed by address@hidden on 2011-1
|
From: |
pingus |
|
Subject: |
[Pingus-CVS] [pingus] 6 new revisions pushed by address@hidden on 2011-10-22 20:53 GMT |
|
Date: |
Sat, 22 Oct 2011 20:54:22 +0000 |
6 new revisions:
Revision: d189bd431b99
Author: Ingo Ruhnke <address@hidden>
Date: Sat Oct 22 13:48:07 2011
Log: Relocated tree to prevent user from jumping into it
http://code.google.com/p/pingus/source/detail?r=d189bd431b99
Revision: e5a4cc562aeb
Author: Ingo Ruhnke <address@hidden>
Date: Sat Oct 22 13:48:21 2011
Log: Reduced save count to reduce frustration
http://code.google.com/p/pingus/source/detail?r=e5a4cc562aeb
Revision: 1dbdca1a8c8d
Author: Ingo Ruhnke <address@hidden>
Date: Sat Oct 22 13:48:55 2011
Log: Added some ground to make the bridge building to reach the switch
a bi...
http://code.google.com/p/pingus/source/detail?r=1dbdca1a8c8d
Revision: 6fcd0c1412fd
Author: Ingo Ruhnke <address@hidden>
Date: Sat Oct 22 13:52:30 2011
Log: Moved 'paint-mode' keys to Home, Del, Ins so they don't conflict
with ...
http://code.google.com/p/pingus/source/detail?r=6fcd0c1412fd
Revision: 594ebb62ba65
Author: Ingo Ruhnke <address@hidden>
Date: Sat Oct 22 13:53:04 2011
Log: Removed "s" for single step, conflicts with "s" for down
http://code.google.com/p/pingus/source/detail?r=594ebb62ba65
Revision: 67c3bcff8b97
Author: Ingo Ruhnke <address@hidden>
Date: Sat Oct 22 13:53:42 2011
Log: Pick the last resolution in the list, instead of the first one in
Opti...
http://code.google.com/p/pingus/source/detail?r=67c3bcff8b97
==============================================================================
Revision: d189bd431b99
Author: Ingo Ruhnke <address@hidden>
Date: Sat Oct 22 13:48:07 2011
Log: Relocated tree to prevent user from jumping into it
http://code.google.com/p/pingus/source/detail?r=d189bd431b99
Modified:
/data/levels/halloween2011/halloween10-grumbel.pingus
=======================================
--- /data/levels/halloween2011/halloween10-grumbel.pingus Fri Oct 21
07:50:10 2011
+++ /data/levels/halloween2011/halloween10-grumbel.pingus Sat Oct 22
13:48:07 2011
@@ -21,7 +21,7 @@
(surface
(image "textures/easter_sky")
(modifier "ROT0"))
- (position -400 691 -1000)
+ (position -619 624 -1000)
(colori 50 0 0 150)
(stretch-x #f)
(stretch-y #t)
@@ -54,6 +54,116 @@
(groundpiece
(type "transparent")
(surface
+ (image "groundpieces/transparent/misc/moos5")
+ (modifier "ROT0"))
+ (position 617 1219 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/misc/moos4")
+ (modifier "ROT0"))
+ (position 654 1193 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/halloween/kirby2")
+ (modifier "ROT0"))
+ (position 663 1255 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/halloween/tree2")
+ (modifier "ROT0"))
+ (position 607 1189 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/halloween/ground6")
+ (modifier "ROT90FLIP"))
+ (position 388 1006 0))
+ (group
+ (objects
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/halloween/kirby1")
+ (modifier "ROT0"))
+ (position 513 1099 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/halloween/kirby1")
+ (modifier "ROT0"))
+ (position 523 1113 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/halloween/kirby2")
+ (modifier "ROT0"))
+ (position 505 1114 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/halloween/kirby4")
+ (modifier "ROT0"))
+ (position 492 1129 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/halloween/kirby4")
+ (modifier "ROT0"))
+ (position 535 1129 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/halloween/kirby3")
+ (modifier "ROT0"))
+ (position 510 1128 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/halloween/kirby1")
+ (modifier "ROT0"))
+ (position 498 1145 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/halloween/kirby3")
+ (modifier "ROT0"))
+ (position 476 1144 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/halloween/kirby1")
+ (modifier "ROT0"))
+ (position 541 1145 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/halloween/kirby3")
+ (modifier "ROT0"))
+ (position 519 1144 0))))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/halloween/ground2")
+ (modifier "ROT0"))
+ (position 448 1165 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/halloween/ground1")
+ (modifier "ROT0"))
+ (position 252 1074 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/halloween/ground6")
+ (modifier "ROT0"))
+ (position 596 1018 0))
+ (groundpiece
+ (type "transparent")
+ (surface
(image "groundpieces/transparent/misc/moos4")
(modifier "ROT0"))
(position 1577 826 0))
@@ -239,68 +349,6 @@
(image "groundpieces/transparent/halloween/spiderweb1")
(modifier "ROT0"))
(position 1176 2009 0))
- (group
- (objects
- (groundpiece
- (type "transparent")
- (surface
- (image "groundpieces/transparent/halloween/kirby1")
- (modifier "ROT0"))
- (position 592 1236 0))
- (groundpiece
- (type "transparent")
- (surface
- (image "groundpieces/transparent/halloween/kirby1")
- (modifier "ROT0"))
- (position 602 1250 0))
- (groundpiece
- (type "transparent")
- (surface
- (image "groundpieces/transparent/halloween/kirby2")
- (modifier "ROT0"))
- (position 584 1251 0))
- (groundpiece
- (type "transparent")
- (surface
- (image "groundpieces/transparent/halloween/kirby4")
- (modifier "ROT0"))
- (position 571 1266 0))
- (groundpiece
- (type "transparent")
- (surface
- (image "groundpieces/transparent/halloween/kirby4")
- (modifier "ROT0"))
- (position 614 1266 0))
- (groundpiece
- (type "transparent")
- (surface
- (image "groundpieces/transparent/halloween/kirby3")
- (modifier "ROT0"))
- (position 589 1265 0))
- (groundpiece
- (type "transparent")
- (surface
- (image "groundpieces/transparent/halloween/kirby1")
- (modifier "ROT0"))
- (position 577 1282 0))
- (groundpiece
- (type "transparent")
- (surface
- (image "groundpieces/transparent/halloween/kirby3")
- (modifier "ROT0"))
- (position 555 1281 0))
- (groundpiece
- (type "transparent")
- (surface
- (image "groundpieces/transparent/halloween/kirby1")
- (modifier "ROT0"))
- (position 620 1282 0))
- (groundpiece
- (type "transparent")
- (surface
- (image "groundpieces/transparent/halloween/kirby3")
- (modifier "ROT0"))
- (position 598 1281 0))))
(groundpiece
(type "ground")
(surface
@@ -812,7 +860,7 @@
(surface
(image "groundpieces/ground/halloween/ground5")
(modifier "ROT0"))
- (position 314 1129 0))
+ (position 250 1066 0))
(groundpiece
(type "ground")
(surface
@@ -1005,7 +1053,7 @@
(surface
(image "groundpieces/ground/halloween/ground1")
(modifier "ROT0"))
- (position 465 922 0))
+ (position 481 881 0))
(groundpiece
(type "ground")
(surface
@@ -1071,7 +1119,7 @@
(surface
(image "groundpieces/ground/halloween/ground1")
(modifier "ROT0"))
- (position 306 986 0))
+ (position 248 944 0))
(groundpiece
(type "ground")
(surface
@@ -1081,12 +1129,6 @@
(groundpiece
(type "ground")
(surface
- (image "groundpieces/ground/halloween/ground1")
- (modifier "ROT0"))
- (position 466 1040 0))
- (groundpiece
- (type "ground")
- (surface
(image "groundpieces/ground/halloween/tree3")
(modifier "ROT0"))
(position 1477 670 0))
@@ -1115,20 +1157,8 @@
(modifier "ROT0"))
(position 744 1426 0))
(groundpiece
- (type "transparent")
- (surface
- (image "groundpieces/transparent/halloween/kirby2")
- (modifier "ROT0"))
- (position 799 1353 0))
- (groundpiece
(type "ground")
(surface
- (image "groundpieces/ground/halloween/tree2")
- (modifier "ROT0"))
- (position 743 1287 0))
- (groundpiece
- (type "ground")
- (surface
(image "groundpieces/ground/halloween/ground2")
(modifier "ROT0"))
(position 694 1397 0))
@@ -1311,12 +1341,6 @@
(image "groundpieces/ground/halloween/ground2")
(modifier "ROT0"))
(position 570 1300 0))
- (groundpiece
- (type "ground")
- (surface
- (image "groundpieces/ground/halloween/ground6")
- (modifier "ROT0"))
- (position 623 1083 0))
(exit
(surface
(image "exits/halloween")
@@ -2068,13 +2092,13 @@
(surface
(image "groundpieces/transparent/misc/weed1")
(modifier "ROT0"))
- (position 745 1119 0))
+ (position 711 1057 0))
(groundpiece
(type "transparent")
(surface
(image "groundpieces/transparent/misc/moos4")
(modifier "ROT0"))
- (position 751 1116 0))
+ (position 582 1048 0))
(groundpiece
(type "transparent")
(surface
@@ -2358,18 +2382,6 @@
(groundpiece
(type "transparent")
(surface
- (image "groundpieces/transparent/misc/moos4")
- (modifier "ROT0"))
- (position 790 1291 0))
- (groundpiece
- (type "transparent")
- (surface
- (image "groundpieces/transparent/misc/moos5")
- (modifier "ROT0"))
- (position 753 1317 0))
- (groundpiece
- (type "transparent")
- (surface
(image "groundpieces/transparent/misc/moos6")
(modifier "ROT0"))
(position 713 1399 0))
@@ -3070,6 +3082,30 @@
(surface
(image "groundpieces/transparent/misc/weed1")
(modifier "ROT0FLIP"))
- (position 1714 990 0))))
+ (position 1714 990 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/halloween/ground6")
+ (modifier "ROT0"))
+ (position 400 981 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/misc/moos6")
+ (modifier "ROT0"))
+ (position 456 1161 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/misc/moos6")
+ (modifier "ROT0"))
+ (position 495 1163 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/misc/moos6")
+ (modifier "ROT0"))
+ (position 527 1165 0))))
;; EOF ;;
==============================================================================
Revision: e5a4cc562aeb
Author: Ingo Ruhnke <address@hidden>
Date: Sat Oct 22 13:48:21 2011
Log: Reduced save count to reduce frustration
http://code.google.com/p/pingus/source/detail?r=e5a4cc562aeb
Modified:
/data/levels/halloween2011/halloween18-grumbel.pingus
=======================================
--- /data/levels/halloween2011/halloween18-grumbel.pingus Fri Oct 21
07:50:10 2011
+++ /data/levels/halloween2011/halloween18-grumbel.pingus Sat Oct 22
13:48:21 2011
@@ -6,7 +6,7 @@
(description "The pingus are at the top of the tower, the way down
isn't long, but high. How shall they overcome that distance?")
(author "Ingo Ruhnke <address@hidden>")
(number-of-pingus 50)
- (number-to-save 50)
+ (number-to-save 48)
(time -1)
(music "sorcerer.it")
(actions
==============================================================================
Revision: 1dbdca1a8c8d
Author: Ingo Ruhnke <address@hidden>
Date: Sat Oct 22 13:48:55 2011
Log: Added some ground to make the bridge building to reach the switch
a bit more interesting
http://code.google.com/p/pingus/source/detail?r=1dbdca1a8c8d
Modified:
/data/levels/halloween2011/halloween15-grumbel.pingus
=======================================
--- /data/levels/halloween2011/halloween15-grumbel.pingus Fri Oct 21
07:50:10 2011
+++ /data/levels/halloween2011/halloween15-grumbel.pingus Sat Oct 22
13:48:55 2011
@@ -48,6 +48,60 @@
(groundpiece
(type "ground")
(surface
+ (image "groundpieces/ground/halloween/ground4")
+ (modifier "ROT270"))
+ (position 2010 564 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/halloween/ground4")
+ (modifier "ROT270"))
+ (position 2011 538 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/halloween/ground4")
+ (modifier "ROT180"))
+ (position 1869 599 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/halloween/ground4")
+ (modifier "ROT180"))
+ (position 1973 584 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/halloween/ground4")
+ (modifier "ROT180"))
+ (position 1926 596 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/halloween/ground5")
+ (modifier "ROT0"))
+ (position 1898 598 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/halloween/ground4")
+ (modifier "ROT180"))
+ (position 1830 580 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/halloween/ground6")
+ (modifier "ROT0"))
+ (position 1890 546 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/halloween/ground4")
+ (modifier "ROT180"))
+ (position 1813 546 0))
+ (groundpiece
+ (type "ground")
+ (surface
(image "groundpieces/ground/halloween/ground2")
(modifier "ROT0"))
(position 1914 692 0))
@@ -1265,13 +1319,7 @@
(surface
(image "groundpieces/transparent/misc/moos6")
(modifier "ROT0"))
- (position 1920 690 0))
- (groundpiece
- (type "transparent")
- (surface
- (image "groundpieces/transparent/misc/moos6")
- (modifier "ROT0FLIP"))
- (position 1879 690 0))
+ (position 1936 690 0))
(group
(objects
(groundpiece
@@ -2127,6 +2175,102 @@
(surface
(image "groundpieces/transparent/misc/moos6")
(modifier "ROT0FLIP"))
- (position 1958 691 0))))
+ (position 1958 691 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/halloween/ground2")
+ (modifier "ROT0FLIP"))
+ (position 1821 534 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/halloween/ground2")
+ (modifier "ROT0FLIP"))
+ (position 1922 536 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/misc/moos6")
+ (modifier "ROT0"))
+ (position 1939 536 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/misc/moos6")
+ (modifier "ROT0"))
+ (position 1880 536 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/misc/moos6")
+ (modifier "ROT0"))
+ (position 1820 536 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/misc/moos6")
+ (modifier "ROT0"))
+ (position 2000 534 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/halloween/tree2")
+ (modifier "ROT0FLIP"))
+ (position 1863 422 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/misc/moos3")
+ (modifier "ROT0"))
+ (position 1889 518 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/misc/moos3")
+ (modifier "ROT0"))
+ (position 1884 528 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/misc/moos3")
+ (modifier "ROT0FLIP"))
+ (position 1916 527 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/halloween/kirby1")
+ (modifier "ROT0"))
+ (position 1859 488 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/halloween/kirby2")
+ (modifier "ROT0"))
+ (position 1926 461 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/misc/moos4")
+ (modifier "ROT0"))
+ (position 2015 557 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/misc/moos4")
+ (modifier "ROT0"))
+ (position 1955 541 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/misc/moos5")
+ (modifier "ROT0"))
+ (position 1879 431 0))
+ (groundpiece
+ (type "transparent")
+ (surface
+ (image "groundpieces/transparent/misc/moos4")
+ (modifier "ROT0"))
+ (position 1896 599 0))))
;; EOF ;;
==============================================================================
Revision: 6fcd0c1412fd
Author: Ingo Ruhnke <address@hidden>
Date: Sat Oct 22 13:52:30 2011
Log: Moved 'paint-mode' keys to Home, Del, Ins so they don't conflict
with new WASD mappings
http://code.google.com/p/pingus/source/detail?r=6fcd0c1412fd
Modified:
/src/pingus/components/playfield.cpp
=======================================
--- /src/pingus/components/playfield.cpp Thu Oct 13 19:03:23 2011
+++ /src/pingus/components/playfield.cpp Sat Oct 22 13:52:30 2011
@@ -215,7 +215,7 @@
if (globals::developer_mode)
{ // Some fun stuff that lets you draw directly on the level
Uint8 *keystate = SDL_GetKeyState(NULL);
- if (keystate[SDLK_r])
+ if (keystate[SDLK_DELETE])
{
CollisionMask mask("other/bash_radius_gfx");
Vector2i p = state.screen2world(mouse_pos);
@@ -223,7 +223,7 @@
p.x - mask.get_width()/2,
p.y - mask.get_height()/2);
}
- else if (keystate[SDLK_g])
+ else if (keystate[SDLK_INSERT])
{
CollisionMask mask("other/bash_radius_gfx");
Vector2i p = state.screen2world(mouse_pos);
@@ -232,7 +232,7 @@
p.y - mask.get_height()/2,
Groundtype::GP_GROUND);
}
- else if (keystate[SDLK_b])
+ else if (keystate[SDLK_HOME])
{
CollisionMask mask("other/bash_radius_gfx");
Vector2i p = state.screen2world(mouse_pos);
==============================================================================
Revision: 594ebb62ba65
Author: Ingo Ruhnke <address@hidden>
Date: Sat Oct 22 13:53:04 2011
Log: Removed "s" for single step, conflicts with "s" for down
http://code.google.com/p/pingus/source/detail?r=594ebb62ba65
Modified:
/data/controller/default.scm
=======================================
--- /data/controller/default.scm Fri Oct 21 10:14:48 2011
+++ /data/controller/default.scm Sat Oct 22 13:53:04 2011
@@ -33,7 +33,6 @@
(sdl:keyboard-button (key "space")))
(single-step-button
- (sdl:keyboard-button (key "s"))
(sdl:keyboard-button (key "f")))
(armageddon-button
==============================================================================
Revision: 67c3bcff8b97
Author: Ingo Ruhnke <address@hidden>
Date: Sat Oct 22 13:53:42 2011
Log: Pick the last resolution in the list, instead of the first one in
OptionMenu
http://code.google.com/p/pingus/source/detail?r=67c3bcff8b97
Modified:
/src/pingus/screens/option_menu.cpp
=======================================
--- /src/pingus/screens/option_menu.cpp Wed Oct 19 17:00:36 2011
+++ /src/pingus/screens/option_menu.cpp Sat Oct 22 13:53:42 2011
@@ -110,7 +110,7 @@
std::vector<Size> resolutions = Display::get_fullscreen_video_modes();
Size fullscreen = config_manager.get_fullscreen_resolution();
- resolution_box->set_current_choice(resolutions.size()-1);
+ int choice = resolutions.size()-1;
for (auto it = resolutions.begin(); it != resolutions.end(); ++it)
{
// add resolution to the box
@@ -120,9 +120,11 @@
if (fullscreen == *it)
{
- resolution_box->set_current_choice(it - resolutions.begin());
+ choice = it - resolutions.begin();
}
}
+
+ resolution_box->set_current_choice(choice);
}
ChoiceBox* renderer_box = new ChoiceBox(Rect());
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] [pingus] 6 new revisions pushed by address@hidden on 2011-10-22 20:53 GMT,
pingus <=