Ricardo Cruz [Sun, 25 Apr 2004 14:16:10 +0000 (14:16 +0000)]
Ooops, did a mistake. Fixed by Arkadiusz Miskiewicz.
Aparentaly, fclose(NULL) causes a segfault.
SVN-Revision: 704
Ingo Ruhnke [Sun, 25 Apr 2004 13:51:19 +0000 (13:51 +0000)]
-added gradient support for start screens
SVN-Revision: 703
Ingo Ruhnke [Sun, 25 Apr 2004 13:45:21 +0000 (13:45 +0000)]
- added background gradient
SVN-Revision: 702
Ingo Ruhnke [Sun, 25 Apr 2004 13:16:43 +0000 (13:16 +0000)]
- improved look of start/gameover screens
SVN-Revision: 701
Ricardo Cruz [Sun, 25 Apr 2004 12:50:24 +0000 (12:50 +0000)]
Just updated the gradients test to use the new color entries.
SVN-Revision: 700
Ingo Ruhnke [Sun, 25 Apr 2004 12:44:22 +0000 (12:44 +0000)]
- removed blurriness
SVN-Revision: 699
Ricardo Cruz [Sun, 25 Apr 2004 12:38:09 +0000 (12:38 +0000)]
Changed the distros images to the old dir.
Finally possible thanks to Ingo.
SVN-Revision: 698
Ricardo Cruz [Sun, 25 Apr 2004 12:34:42 +0000 (12:34 +0000)]
Yet another levels update by Marek.
Changelog:
�I fixed some minor flaws and tried to give each of
the maps an original title. The latter was kinda difficult, because most
of the maps didn't really have a theme, (like the bridge or the castle)
so I had to make up their names; a task in which I maybe failed in some
parts, but at least it's better than just numbers.�
SVN-Revision: 697
Ingo Ruhnke [Sun, 25 Apr 2004 12:29:23 +0000 (12:29 +0000)]
- added new worldmap tux
SVN-Revision: 696
Ingo Ruhnke [Sun, 25 Apr 2004 12:14:02 +0000 (12:14 +0000)]
- added gradient
SVN-Revision: 695
Ingo Ruhnke [Sun, 25 Apr 2004 12:11:25 +0000 (12:11 +0000)]
- fixed/changed gradient tags to match with the one used in the current level files
SVN-Revision: 694
Ingo Ruhnke [Sun, 25 Apr 2004 11:57:19 +0000 (11:57 +0000)]
- smoothed water a little bit
- added new cloud
- fixed stalactit look a bit
SVN-Revision: 693
Ingo Ruhnke [Sun, 25 Apr 2004 11:55:39 +0000 (11:55 +0000)]
replaced distros with coins
SVN-Revision: 692
Ingo Ruhnke [Sun, 25 Apr 2004 11:34:15 +0000 (11:34 +0000)]
- added new cloud tile
SVN-Revision: 691
Ricardo Cruz [Sun, 25 Apr 2004 10:02:14 +0000 (10:02 +0000)]
Just made lispreader to send an error message to stderr when the file could not be open, as suggested by Arkadiusz Miskiewicz.
SVN-Revision: 690
Ingo Ruhnke [Sat, 24 Apr 2004 20:36:19 +0000 (20:36 +0000)]
- added firetux, nothing more than a boring placeholder, but should be better than the current one
SVN-Revision: 689
Ingo Ruhnke [Sat, 24 Apr 2004 19:40:56 +0000 (19:40 +0000)]
- added start/end tiles
SVN-Revision: 688
Ricardo Cruz [Sat, 24 Apr 2004 18:03:35 +0000 (18:03 +0000)]
At least my compiler (g++ (GCC) 3.3.2) needs this include.
Anyway, there is still a crash to be fixed.
SVN-Revision: 687
Ingo Ruhnke [Sat, 24 Apr 2004 17:48:49 +0000 (17:48 +0000)]
'nother music patch by matzeb
SVN-Revision: 686
Ricardo Cruz [Sat, 24 Apr 2004 15:27:38 +0000 (15:27 +0000)]
Ingo, that code is not buggy!
You can say that it is a bad approuch, but it is not a bug!
Besides, I don't think it's a bad approuch. Your code is maybe a better approuch. But in the other hand is buggy, so please let my code be there.
Buggy, why, you may ask...
Imagine this simple and fictional code:
�
#define MNID_START 1
menu->additem("Start Game", MNID_START);
menu->additem("Options");
if(menu->check() == MNID_START)
startgame();
�
With your code, when you pressed Options, the game would also start. Have a look at it again and guess why ;-)
SVN-Revision: 685
Ingo Ruhnke [Sat, 24 Apr 2004 15:08:21 +0000 (15:08 +0000)]
- fixed option menu
SVN-Revision: 684
Ricardo Cruz [Sat, 24 Apr 2004 15:02:11 +0000 (15:02 +0000)]
Marek levels updating. He also added two new levels for the start that are easier.
Updated worldmap as well. Can someone test if level 25 and 26 are there?
SVN-Revision: 683
Ingo Ruhnke [Sat, 24 Apr 2004 14:49:04 +0000 (14:49 +0000)]
- patch from MatzeB to make music handling easier and more stable
SVN-Revision: 682
Ingo Ruhnke [Sat, 24 Apr 2004 13:12:12 +0000 (13:12 +0000)]
- new star tux, still rather pure, but useable
SVN-Revision: 681
Ingo Ruhnke [Sat, 24 Apr 2004 12:45:34 +0000 (12:45 +0000)]
- fixed duck-jump bug
SVN-Revision: 680
Ingo Ruhnke [Sat, 24 Apr 2004 12:30:21 +0000 (12:30 +0000)]
- added holding gfx, still looks rather stupid, but I think thats unavoidable without major changes to the current code
SVN-Revision: 679
Ingo Ruhnke [Sat, 24 Apr 2004 12:11:11 +0000 (12:11 +0000)]
- fixed bug in Menu::check()
- added grab/kick tux to resources
- added flag to use endsequence or not
SVN-Revision: 678
Ingo Ruhnke [Sat, 24 Apr 2004 10:43:15 +0000 (10:43 +0000)]
- added new gfx
SVN-Revision: 677
Ingo Ruhnke [Sat, 24 Apr 2004 10:42:31 +0000 (10:42 +0000)]
- fixed spelling mistake in filename
SVN-Revision: 676
Ingo Ruhnke [Sat, 24 Apr 2004 10:28:04 +0000 (10:28 +0000)]
- added grab and kick tuxes
SVN-Revision: 675
Ricardo Cruz [Sat, 24 Apr 2004 09:32:32 +0000 (09:32 +0000)]
Added a new concept to the menu, the ID.
Each item can have an ID that can be given, this way there won't be any more hardcoded values for the entries.
Anyway, I've made it to be compatible with the current behaviour, in case any ID is given.
I've already updated the mainmenu, optionsmenu, leveleditormenu, leveleditorsettingsmenu and worldmapmenu.
The definitions are enumerated in the menu.h file. Should we keep each enum splited or merge them all?
Feedback is appreciated :)
SVN-Revision: 674
Ricardo Cruz [Sat, 24 Apr 2004 08:38:01 +0000 (08:38 +0000)]
Took st_pause_ticks_stop() out of the events loop.
SVN-Revision: 673
Ricardo Cruz [Sat, 24 Apr 2004 00:10:49 +0000 (00:10 +0000)]
Marek bug fix for this problem:
revilyo: �Antartica 10 : tux falls in the last hole, maybe it could works if I jump really
high. I don't look at the sources yet...�
SVN-Revision: 672
Ricardo Cruz [Fri, 23 Apr 2004 17:15:31 +0000 (17:15 +0000)]
Marek has updated worldmap levels. Changes are:
�
-Added reset points (one per level, except the last one which has two)
-Removed lots of difficult and unfair spots
-Changed order of cave levels according to Matze's suggestion
-Small design fixes
�
SVN-Revision: 671
Ricardo Cruz [Fri, 23 Apr 2004 16:37:38 +0000 (16:37 +0000)]
Just fixed two small bugs in the gameplay during pause:
- don't show the menu, neither quit to level editor;
- when any event happen, the timer would continue (fixed).
SVN-Revision: 670
Ricardo Cruz [Fri, 23 Apr 2004 16:30:43 +0000 (16:30 +0000)]
Added a test level for the gradients.
Seems to work fine.
SVN-Revision: 669
Ricardo Cruz [Fri, 23 Apr 2004 16:30:09 +0000 (16:30 +0000)]
Changed filenames from endseq.stl to level3.stl.
Damn, use level*.stl or else implement a way to set the filenames!
SVN-Revision: 668
Ingo Ruhnke [Fri, 23 Apr 2004 12:41:11 +0000 (12:41 +0000)]
- 'animated' explosion a bit
SVN-Revision: 667
Ricardo Cruz [Fri, 23 Apr 2004 11:42:18 +0000 (11:42 +0000)]
Just removed spaces from key and joystick setup entries... What were does doing there anyway?
SVN-Revision: 666
Ricardo Cruz [Fri, 23 Apr 2004 11:24:37 +0000 (11:24 +0000)]
Added laptop entry back, that is used by Mr. IceBlock, as reported by Ryan. (had to remove comment laptop falling)
The BSOD is not also necessary, is it?
SVN-Revision: 665
Ricardo Cruz [Fri, 23 Apr 2004 11:12:43 +0000 (11:12 +0000)]
Added a joystick control dialog.
I don't have a joystick, so please test and improve this thing. Thx.
SVN-Revision: 664
Ricardo Cruz [Thu, 22 Apr 2004 21:51:19 +0000 (21:51 +0000)]
Implemented explosion sound when Mr.Bomb explodes.
It uses the current stereo system that is kinda of primitive. We should base it on player's coordinates and calculate it according it.
Instead, it bases the screen, besides it is not even calculated, just use some constants.
SVN-Revision: 663
Ricardo Cruz [Thu, 22 Apr 2004 21:29:59 +0000 (21:29 +0000)]
Added an explotion sound file to repository.
To be used by Mr Bomb, until someone replaces it by a better one ;)
SVN-Revision: 662
Ricardo Cruz [Thu, 22 Apr 2004 21:27:36 +0000 (21:27 +0000)]
Distros old images seems to be necessary by this BouncyDistro class in gameobjs.* ...
Weird, what does that thing do anyway?
SVN-Revision: 661
Ricardo Cruz [Thu, 22 Apr 2004 21:24:31 +0000 (21:24 +0000)]
Removed box_full and box_empty from this.
They are now implemented as tiles.
SVN-Revision: 660
Ricardo Cruz [Thu, 22 Apr 2004 21:07:02 +0000 (21:07 +0000)]
Moving a few not used images to old dir.
SVN-Revision: 659
Ricardo Cruz [Thu, 22 Apr 2004 21:05:29 +0000 (21:05 +0000)]
Moving not used images to old dir.
SVN-Revision: 658
Ricardo Cruz [Thu, 22 Apr 2004 20:58:05 +0000 (20:58 +0000)]
Removed a few entries from the sprites config file (supertux.strf).
SVN-Revision: 657
Ricardo Cruz [Thu, 22 Apr 2004 20:57:24 +0000 (20:57 +0000)]
Moving a few images that are not used anymore from shared to the old directory.
SVN-Revision: 656
Ricardo Cruz [Thu, 22 Apr 2004 20:45:22 +0000 (20:45 +0000)]
Just moved the Right with the Left entry in Controls.
I'm so used to define the Left key firstly... :)
SVN-Revision: 655
Ricardo Cruz [Thu, 22 Apr 2004 20:44:11 +0000 (20:44 +0000)]
If you press Esc in the control menu, it quits from there.
SVN-Revision: 654
Ricardo Cruz [Thu, 22 Apr 2004 20:41:40 +0000 (20:41 +0000)]
Made a START_LIVES definition (in defines.h) that has the lives that the players start with.
i have made them to be 4, since the worldmap is so hard...
SVN-Revision: 653
Ingo Ruhnke [Thu, 22 Apr 2004 20:16:45 +0000 (20:16 +0000)]
fixed squish sprite
SVN-Revision: 652
Ingo Ruhnke [Thu, 22 Apr 2004 20:14:49 +0000 (20:14 +0000)]
- made shrink behaviour more mariobros3 like, ie. firetux will go to largetux to smalltux, removed small-firetux
SVN-Revision: 651
Ingo Ruhnke [Thu, 22 Apr 2004 19:53:17 +0000 (19:53 +0000)]
- changed bouncing snowball speed back to normal
SVN-Revision: 650
Ingo Ruhnke [Thu, 22 Apr 2004 19:40:41 +0000 (19:40 +0000)]
- integrated skid tux
SVN-Revision: 649
Ingo Ruhnke [Thu, 22 Apr 2004 19:15:22 +0000 (19:15 +0000)]
- changed way badguy removal is handled (ie. with a flag now)
- changed some pointers to const references in collision code
SVN-Revision: 648
Ricardo Cruz [Thu, 22 Apr 2004 18:39:52 +0000 (18:39 +0000)]
Controls menu wasn't showing the keys until they were changed (fixed).
Also made a few internal changes regarding this.
SVN-Revision: 647
Ingo Ruhnke [Thu, 22 Apr 2004 17:53:08 +0000 (17:53 +0000)]
- made some arrays private
- store badguys in pointers instead of per value
SVN-Revision: 646
Ricardo Cruz [Thu, 22 Apr 2004 17:51:03 +0000 (17:51 +0000)]
Removed a few useless code (it was commented anyway).
SVN-Revision: 645
Ricardo Cruz [Thu, 22 Apr 2004 17:38:56 +0000 (17:38 +0000)]
Changed MAX_BULLETS from 2 to 1.
As someone said Tux with bullets power is totally invencible, this will make it a bit harder.
SVN-Revision: 644
Ingo Ruhnke [Thu, 22 Apr 2004 16:52:02 +0000 (16:52 +0000)]
- undo of my last patch, removing 'this' is not a good idea and causes even worse side effects
SVN-Revision: 643
Ingo Ruhnke [Thu, 22 Apr 2004 16:49:28 +0000 (16:49 +0000)]
- fixed bomb-dup bug (vector increases on add, and this changes I guess, so remove doesn't work, vector should really store pointers, not values)
SVN-Revision: 642
Ingo Ruhnke [Thu, 22 Apr 2004 16:45:15 +0000 (16:45 +0000)]
- fixed bomb
SVN-Revision: 641
Ingo Ruhnke [Thu, 22 Apr 2004 16:36:59 +0000 (16:36 +0000)]
- fixed hotspot
SVN-Revision: 640
Ingo Ruhnke [Thu, 22 Apr 2004 16:28:28 +0000 (16:28 +0000)]
- supertux stand gfx
SVN-Revision: 639
Ingo Ruhnke [Thu, 22 Apr 2004 16:25:32 +0000 (16:25 +0000)]
- synced walk speed of walking enemies
- added standing tux
SVN-Revision: 638
Ingo Ruhnke [Thu, 22 Apr 2004 15:58:20 +0000 (15:58 +0000)]
- little makefile fix
SVN-Revision: 637
Ingo Ruhnke [Thu, 22 Apr 2004 15:53:32 +0000 (15:53 +0000)]
- removed wrong bsod
SVN-Revision: 636
Ingo Ruhnke [Thu, 22 Apr 2004 15:52:47 +0000 (15:52 +0000)]
- some cleanup
SVN-Revision: 635
Ingo Ruhnke [Thu, 22 Apr 2004 15:41:40 +0000 (15:41 +0000)]
- fixed hotspots
SVN-Revision: 634
Ricardo Cruz [Thu, 22 Apr 2004 14:14:51 +0000 (14:14 +0000)]
Make use of Marek's music at the beggining.
SVN-Revision: 633
Ricardo Cruz [Thu, 22 Apr 2004 14:11:57 +0000 (14:11 +0000)]
Improved the control key code a bit, in order to make it possible to write the keys right in the first dialog display (still to be done).
SVN-Revision: 632
Ricardo Cruz [Thu, 22 Apr 2004 13:46:49 +0000 (13:46 +0000)]
Title music update by Marek.
SVN-Revision: 631
Ingo Ruhnke [Thu, 22 Apr 2004 13:24:15 +0000 (13:24 +0000)]
- merged a few duplicated if's in player
- added live-lost tux
SVN-Revision: 630
Ingo Ruhnke [Thu, 22 Apr 2004 12:47:59 +0000 (12:47 +0000)]
- new gfx
SVN-Revision: 629
Ricardo Cruz [Thu, 22 Apr 2004 11:30:53 +0000 (11:30 +0000)]
Just made the intro's Tux to honour the keys chosen by the user.
SVN-Revision: 628
Ricardo Cruz [Thu, 22 Apr 2004 11:26:39 +0000 (11:26 +0000)]
Changed icon.png to icon.xpm. This way we don't have to worry about masks.
But not sure if it works well under windows (someone give a try).
Anyway, I just comment the old code, so we can reverse this any time.
SVN-Revision: 627
Ricardo Cruz [Thu, 22 Apr 2004 11:20:58 +0000 (11:20 +0000)]
Mistake that was making non-characters keys not to work after configuring keys.
Anyway, we still have to fix the fact that the keys are not shown when you open Controls for the first time.
SVN-Revision: 626
Ricardo Cruz [Thu, 22 Apr 2004 11:17:34 +0000 (11:17 +0000)]
Applied MatzeB (Ryan?) patch that fixes crash and also improves music.
Ingo, you seem to have forgotten to add two files to cvs:
smalltux-gameover-0.png
smalltux-gameover-1.png
SVN-Revision: 625
Ricardo Cruz [Thu, 22 Apr 2004 10:44:17 +0000 (10:44 +0000)]
Applied Ryan's patch for MrBomb hotspot.
SVN-Revision: 624
Ricardo Cruz [Thu, 22 Apr 2004 10:43:36 +0000 (10:43 +0000)]
Applied Ryan's patch for overlaping badguys.
SVN-Revision: 623
Ingo Ruhnke [Thu, 22 Apr 2004 00:13:33 +0000 (00:13 +0000)]
- added small skid tux
SVN-Revision: 622
Ingo Ruhnke [Thu, 22 Apr 2004 00:02:18 +0000 (00:02 +0000)]
'nother music fix
SVN-Revision: 621
Ingo Ruhnke [Thu, 22 Apr 2004 00:00:58 +0000 (00:00 +0000)]
patch from MatzeB for freeze at level start
SVN-Revision: 620
Ingo Ruhnke [Wed, 21 Apr 2004 23:38:14 +0000 (23:38 +0000)]
- music patch from MatzeB, should fix crash on level exit too worldmap
SVN-Revision: 619
Ingo Ruhnke [Wed, 21 Apr 2004 23:10:52 +0000 (23:10 +0000)]
- some more gfx
SVN-Revision: 618
Ricardo Cruz [Wed, 21 Apr 2004 22:48:43 +0000 (22:48 +0000)]
Limitated the number of bullets to be shot at the same time.
I have made 2 bullets to be the maximum... if you don't agree tell me. anyway, you can easily change them in defines.h
SVN-Revision: 617
Ingo Ruhnke [Wed, 21 Apr 2004 19:08:24 +0000 (19:08 +0000)]
- improved smalltux
SVN-Revision: 616
Ingo Ruhnke [Wed, 21 Apr 2004 19:02:39 +0000 (19:02 +0000)]
- improved smalltux
SVN-Revision: 615
Ricardo Cruz [Wed, 21 Apr 2004 17:45:17 +0000 (17:45 +0000)]
Made the keys to be displayed when typed and also save them to the file.
Still to fix: display keys when menu is shown.
SVN-Revision: 614
Ricardo Cruz [Wed, 21 Apr 2004 17:43:26 +0000 (17:43 +0000)]
Added Marek music to cvs and play it in the main menu.
SVN-Revision: 613
Ricardo Cruz [Wed, 21 Apr 2004 15:45:39 +0000 (15:45 +0000)]
Display key number on the key selection:
This is not obvious to the user, we have to get a way to translate it into human readable strings...
SVN-Revision: 612
Ricardo Cruz [Wed, 21 Apr 2004 15:15:28 +0000 (15:15 +0000)]
Finally, made keys configurable via the menu!! ;)
Next step is to save them to config file and to make joystick also configurable.
SVN-Revision: 611
Ingo Ruhnke [Wed, 21 Apr 2004 13:41:01 +0000 (13:41 +0000)]
- made end seq a bit more robust
SVN-Revision: 610
Ingo Ruhnke [Wed, 21 Apr 2004 13:40:32 +0000 (13:40 +0000)]
- test level for endseq
SVN-Revision: 609
Ingo Ruhnke [Wed, 21 Apr 2004 12:45:07 +0000 (12:45 +0000)]
- added end-sequence code
SVN-Revision: 608
Ingo Ruhnke [Wed, 21 Apr 2004 11:56:52 +0000 (11:56 +0000)]
- added new icon
SVN-Revision: 607
Ingo Ruhnke [Wed, 21 Apr 2004 11:37:58 +0000 (11:37 +0000)]
- added new tux-life pic by Benjamin P. Jung
SVN-Revision: 606
Ricardo Cruz [Wed, 21 Apr 2004 11:17:31 +0000 (11:17 +0000)]
Now, the worldmap displays the Level's name, instead of the path.
SVN-Revision: 605