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
Ricardo Cruz [Tue, 20 Apr 2004 22:53:40 +0000 (22:53 +0000)]
These levels are all in the world1 dir.
SVN-Revision: 604
Ingo Ruhnke [Tue, 20 Apr 2004 20:10:53 +0000 (20:10 +0000)]
- added stay-on-platform into the level fileformat
SVN-Revision: 603
Ingo Ruhnke [Tue, 20 Apr 2004 19:55:23 +0000 (19:55 +0000)]
- turned LEFT/RIGHT defines into enum, turned BadGuyModes into enum
SVN-Revision: 602
Ricardo Cruz [Tue, 20 Apr 2004 18:51:22 +0000 (18:51 +0000)]
When Esc was pressed the menu was not being shown in leveleditor (fixed).
SVN-Revision: 601
Ricardo Cruz [Tue, 20 Apr 2004 18:46:57 +0000 (18:46 +0000)]
Level test mode didn't quit properly when Esc was pressed (fixed)
SVN-Revision: 600
Ricardo Cruz [Tue, 20 Apr 2004 18:40:40 +0000 (18:40 +0000)]
Time is not stopped during menu display in gameloop (fix).
Probably there is a prettier way to fix this ;)
SVN-Revision: 599
Ingo Ruhnke [Tue, 20 Apr 2004 18:39:18 +0000 (18:39 +0000)]
- added stay_on_platform flag for badguys
- some code cleanup
- tweaked iceblocx speed
SVN-Revision: 598
Ingo Ruhnke [Tue, 20 Apr 2004 17:58:12 +0000 (17:58 +0000)]
- stop tux if he ran into a block, no more accelerating while standing infront of a block
SVN-Revision: 597
Ricardo Cruz [Tue, 20 Apr 2004 17:47:49 +0000 (17:47 +0000)]
Marek level updating.
According to him, this should be release ready. Though, I have not tried them yet.
Please, try them and send feedback.
SVN-Revision: 596
Ingo Ruhnke [Tue, 20 Apr 2004 17:31:11 +0000 (17:31 +0000)]
- switched gamespeed back to normal
- added high-jump while running
SVN-Revision: 595
Ingo Ruhnke [Tue, 20 Apr 2004 16:50:18 +0000 (16:50 +0000)]
- added config options for joystick buttons/axis
SVN-Revision: 594
Ingo Ruhnke [Tue, 20 Apr 2004 16:26:08 +0000 (16:26 +0000)]
- moved joystick mappings into a struct
SVN-Revision: 593
Ricardo Cruz [Tue, 20 Apr 2004 15:48:08 +0000 (15:48 +0000)]
Improved my flat graphics hack a bit.
Someone should do a from scratch ones, but this work for now.
SVN-Revision: 592
Ricardo Cruz [Tue, 20 Apr 2004 14:30:03 +0000 (14:30 +0000)]
Just removed two printfs I have mistakelly committed.
SVN-Revision: 591
Ingo Ruhnke [Tue, 20 Apr 2004 12:24:28 +0000 (12:24 +0000)]
- turned joystick defines into variables
SVN-Revision: 590
Ingo Ruhnke [Tue, 20 Apr 2004 12:12:31 +0000 (12:12 +0000)]
- fixed some more menu issues
- removed highscore loading from gameloop
SVN-Revision: 589
Ricardo Cruz [Tue, 20 Apr 2004 11:43:43 +0000 (11:43 +0000)]
Recoded credits code, in order to respect fonts height.
(if you think there should be more space between items, just change ITEMS_SPACE).
Also fixed a mistake that was making SDL_QUIT signal to never be used.
SVN-Revision: 588
Ingo Ruhnke [Tue, 20 Apr 2004 11:37:10 +0000 (11:37 +0000)]
- fixed level editor menus a bit (still not 100% working)
- added resetpoint saving to Level
SVN-Revision: 587
Ricardo Cruz [Tue, 20 Apr 2004 11:21:53 +0000 (11:21 +0000)]
Fixed a little mistake that was making title to not be shutdown.
SVN-Revision: 586
Ingo Ruhnke [Tue, 20 Apr 2004 11:09:34 +0000 (11:09 +0000)]
- added standard copyright header to every file
SVN-Revision: 585
Ingo Ruhnke [Tue, 20 Apr 2004 10:42:05 +0000 (10:42 +0000)]
- changed Menu::check() semantics a bit
- speeded up the contrib menu a lot
- fixed a few other menu issues
- might have broken editor a bit, needs more testing
SVN-Revision: 584
Ingo Ruhnke [Mon, 19 Apr 2004 23:02:21 +0000 (23:02 +0000)]
- added resetpoint gfx (level editor only)
SVN-Revision: 583
Ingo Ruhnke [Mon, 19 Apr 2004 22:47:36 +0000 (22:47 +0000)]
- implemented reset points
SVN-Revision: 582
Ingo Ruhnke [Mon, 19 Apr 2004 21:54:34 +0000 (21:54 +0000)]
- cleaned up my last_menu patch a bit more
SVN-Revision: 581
Ingo Ruhnke [Mon, 19 Apr 2004 21:21:00 +0000 (21:21 +0000)]
- fixed problem with last_menu not being able to handle menues deeper than two submenues
- misc other cleanup
SVN-Revision: 580
Ingo Ruhnke [Mon, 19 Apr 2004 19:22:27 +0000 (19:22 +0000)]
- removed menu_process_current()
SVN-Revision: 579
Ingo Ruhnke [Mon, 19 Apr 2004 19:06:45 +0000 (19:06 +0000)]
- removed a few menu variables
SVN-Revision: 578
Ricardo Cruz [Mon, 19 Apr 2004 19:03:43 +0000 (19:03 +0000)]
Removed world1 from the Contrib Levels entry.
It's impossible to navigate through so many levels anyway.
SVN-Revision: 577
Ricardo Cruz [Mon, 19 Apr 2004 14:34:43 +0000 (14:34 +0000)]
Marek update for his musics.
SVN-Revision: 576
Ricardo Cruz [Mon, 19 Apr 2004 14:28:49 +0000 (14:28 +0000)]
Changed Ingo description in Credits as suggested by Marek.
I really should get some English lessons :D
SVN-Revision: 575
Ingo Ruhnke [Mon, 19 Apr 2004 14:27:11 +0000 (14:27 +0000)]
- changed upgrades to use sprites
- added glowing iceflower and star (hardly visible)
SVN-Revision: 574
Ricardo Cruz [Mon, 19 Apr 2004 14:24:30 +0000 (14:24 +0000)]
Fixed a help font bug (was using normal fonts, instead of the small ones).
Tried to make leveleditor quit when SDL_QUIT signal is received without success. Why doesn't this work? :(
SVN-Revision: 573
Ingo Ruhnke [Mon, 19 Apr 2004 14:14:46 +0000 (14:14 +0000)]
- fixed problem with asyncron blinkig bonus block
- fixed indention
SVN-Revision: 572
Ricardo Cruz [Mon, 19 Apr 2004 14:08:54 +0000 (14:08 +0000)]
Made high_scores to use the lispreader (i wasn't able to do proper testing, could someone give a look at the code).
Anyway, do you think high_scores.* should be merged with configfile.* ?
If nobody says anything, I'll do that.
SVN-Revision: 571
Ingo Ruhnke [Mon, 19 Apr 2004 14:06:10 +0000 (14:06 +0000)]
- added UpgradeKind name to nameless enum
- slowed down grow-up upgrade
SVN-Revision: 570
Ingo Ruhnke [Mon, 19 Apr 2004 13:56:10 +0000 (13:56 +0000)]
- added more mario lik duck behaviour
SVN-Revision: 569
Ingo Ruhnke [Mon, 19 Apr 2004 13:34:43 +0000 (13:34 +0000)]
- fixed back direction saving
SVN-Revision: 568
Ingo Ruhnke [Mon, 19 Apr 2004 13:23:33 +0000 (13:23 +0000)]
- fixed bug in live counting
- added save menu to the worldmap
- removed load/save from the game menu
SVN-Revision: 567
Ricardo Cruz [Mon, 19 Apr 2004 12:05:22 +0000 (12:05 +0000)]
Added a flat Mr. Ice Block.
It is ugly as hell, but better than having a laptop.
Ingo, could you make a decent one? ;)
SVN-Revision: 566
Ricardo Cruz [Mon, 19 Apr 2004 11:46:41 +0000 (11:46 +0000)]
Added Marek to in-game credits.
SVN-Revision: 565
Ingo Ruhnke [Sun, 18 Apr 2004 22:36:03 +0000 (22:36 +0000)]
- commited start_pos patch from sik0fewl
SVN-Revision: 564
Ingo Ruhnke [Sun, 18 Apr 2004 21:45:13 +0000 (21:45 +0000)]
- removed static_cast hack
SVN-Revision: 563
Ingo Ruhnke [Sun, 18 Apr 2004 21:16:53 +0000 (21:16 +0000)]
- fixed some align problems with tux
- fixed bug in tilemap resize
SVN-Revision: 562
Ingo Ruhnke [Sun, 18 Apr 2004 20:36:01 +0000 (20:36 +0000)]
- added new bigtux
SVN-Revision: 561
Ingo Ruhnke [Sun, 18 Apr 2004 20:35:04 +0000 (20:35 +0000)]
- added new tux
SVN-Revision: 560
Ingo Ruhnke [Sun, 18 Apr 2004 19:35:27 +0000 (19:35 +0000)]
- some graphics
SVN-Revision: 559
Ricardo Cruz [Sun, 18 Apr 2004 18:00:27 +0000 (18:00 +0000)]
Added Ryan full name.
SVN-Revision: 558
Ricardo Cruz [Sun, 18 Apr 2004 17:58:32 +0000 (17:58 +0000)]
World1 levels update by Marek.
Polishing. Cave levels now use the cave music.
SVN-Revision: 557
Ricardo Cruz [Sun, 18 Apr 2004 17:54:57 +0000 (17:54 +0000)]
Musics by Marek, they are pretty cool and could be used in cave levels.
SVN-Revision: 556
Ingo Ruhnke [Sun, 18 Apr 2004 15:08:27 +0000 (15:08 +0000)]
- moved default start position two tiles higher
SVN-Revision: 555
projects / supertux.git / log