Marek Moeckel [Mon, 17 May 2004 17:28:52 +0000 (17:28 +0000)]
added another test level which covers vertical scrolling, the butt stomp and the forest tune (although it doesn't fit in there, of course)
SVN-Revision: 1243
Ryan Flegel [Mon, 17 May 2004 17:05:22 +0000 (17:05 +0000)]
- typo fix
SVN-Revision: 1242
Ryan Flegel [Mon, 17 May 2004 17:01:21 +0000 (17:01 +0000)]
- some trampoline changes
- fixed bug mentioned by Marek in the mailing list (I think)
SVN-Revision: 1241
Marek Moeckel [Mon, 17 May 2004 16:52:05 +0000 (16:52 +0000)]
Improved forest tune
SVN-Revision: 1240
Ricardo Cruz [Mon, 17 May 2004 14:11:03 +0000 (14:11 +0000)]
Just made the keys UP code go when the menu is called.
This way they are only done once, instead of every time. Doesn't solve anything, it's just cleaner IMO.
SVN-Revision: 1239
Ricardo Cruz [Mon, 17 May 2004 10:15:01 +0000 (10:15 +0000)]
Made player to use the old status when aborting a level.
SVN-Revision: 1238
Ricardo Cruz [Mon, 17 May 2004 10:14:29 +0000 (10:14 +0000)]
This is a duplication of the arctic image.
SVN-Revision: 1237
Ricardo Cruz [Mon, 17 May 2004 10:13:17 +0000 (10:13 +0000)]
It was using a duplication of the arctis image.
SVN-Revision: 1236
Ricardo Cruz [Mon, 17 May 2004 10:12:19 +0000 (10:12 +0000)]
Fixed a crash. It was using the old name of the background image.
SVN-Revision: 1235
Ricardo Cruz [Mon, 17 May 2004 10:11:43 +0000 (10:11 +0000)]
Don't open the menu on the end sequence.
SVN-Revision: 1234
Ricardo Cruz [Mon, 17 May 2004 09:13:14 +0000 (09:13 +0000)]
Make use of the arctic background instead of the Tux oil one.
I think we should keep the oil Tux for the end of the game credits background... To be like a reward.
SVN-Revision: 1233
Ricardo Cruz [Mon, 17 May 2004 09:11:58 +0000 (09:11 +0000)]
Added a skelaton for the config bad guys code. Just a rip from the Ingo's tiles code.
SVN-Revision: 1232
Ryan Flegel [Mon, 17 May 2004 06:27:12 +0000 (06:27 +0000)]
- spike test level
SVN-Revision: 1231
Ryan Flegel [Mon, 17 May 2004 06:26:41 +0000 (06:26 +0000)]
- added spikes
SVN-Revision: 1230
Ryan Flegel [Mon, 17 May 2004 06:00:25 +0000 (06:00 +0000)]
- gave spike the spike property
SVN-Revision: 1229
Ryan Flegel [Mon, 17 May 2004 05:49:08 +0000 (05:49 +0000)]
- added spike tile from Benjamin
SVN-Revision: 1228
Ryan Flegel [Mon, 17 May 2004 05:35:21 +0000 (05:35 +0000)]
- oops. don't need two iostream's.. or do we.. :)
SVN-Revision: 1227
Ryan Flegel [Mon, 17 May 2004 05:24:40 +0000 (05:24 +0000)]
- tux can now pick up trampoline
SVN-Revision: 1226
Ryan Flegel [Mon, 17 May 2004 01:24:24 +0000 (01:24 +0000)]
- trampoline stuff
SVN-Revision: 1225
Ryan Flegel [Sun, 16 May 2004 23:11:54 +0000 (23:11 +0000)]
- Trampoline test level
SVN-Revision: 1222
Ryan Flegel [Sun, 16 May 2004 18:44:54 +0000 (18:44 +0000)]
- collision fix
SVN-Revision: 1221
Marek Moeckel [Sun, 16 May 2004 18:19:36 +0000 (18:19 +0000)]
New music!
SVN-Revision: 1220
Ricardo Cruz [Sun, 16 May 2004 18:14:19 +0000 (18:14 +0000)]
Pushed copyright message down.
It feels a bit empty, but I am thinking in re-introducing Highscores, so...
SVN-Revision: 1219
Ricardo Cruz [Sun, 16 May 2004 18:11:08 +0000 (18:11 +0000)]
Changed the menu to have 19-height tiles.
SVN-Revision: 1218
Ryan Flegel [Sun, 16 May 2004 18:05:10 +0000 (18:05 +0000)]
- added trampoline entries
SVN-Revision: 1217
Ricardo Cruz [Sun, 16 May 2004 17:56:58 +0000 (17:56 +0000)]
Added '--leveleditor' to --usage and corrected another thing.
SVN-Revision: 1216
Ryan Flegel [Sun, 16 May 2004 17:44:39 +0000 (17:44 +0000)]
- added missing include
SVN-Revision: 1215
Ryan Flegel [Sun, 16 May 2004 16:49:13 +0000 (16:49 +0000)]
- trampoline stuff
SVN-Revision: 1213
Ricardo Cruz [Sun, 16 May 2004 16:33:21 +0000 (16:33 +0000)]
Renamed sound effect files, so that musiceans now better what which one means.
SVN-Revision: 1212
Ricardo Cruz [Sun, 16 May 2004 12:31:31 +0000 (12:31 +0000)]
Game end screen is drawn by the world map now. This is just a step to make a dialog like the SM3 one when the player's lost all lives.
(In case there isn't any worldmap, we should draw it anyway...)
Also, don't allow the player to open the menu when he is dying. Avoids cheating.
SVN-Revision: 1211
Ricardo Cruz [Sun, 16 May 2004 12:18:05 +0000 (12:18 +0000)]
Y background scrolling. It should start be drawing from the bottom of the level to the up.
Dunno if it is working well.
SVN-Revision: 1210
Marek Moeckel [Sun, 16 May 2004 09:48:49 +0000 (09:48 +0000)]
Resized the arctis background to 800x600
(Has a few glitches, don't know if they are noticable)
Saved the old background as arctis640.png
Resized levels 9-12
SVN-Revision: 1209
Ryan Flegel [Sun, 16 May 2004 05:48:28 +0000 (05:48 +0000)]
- trampoline stuff
SVN-Revision: 1208
Ryan Flegel [Sun, 16 May 2004 04:04:03 +0000 (04:04 +0000)]
- started creating trampoline functions
SVN-Revision: 1207
Ryan Flegel [Sun, 16 May 2004 03:28:22 +0000 (03:28 +0000)]
- more game object changes. looks a bit nicer now
SVN-Revision: 1206
Ryan Flegel [Sun, 16 May 2004 02:07:26 +0000 (02:07 +0000)]
- more game object progress
SVN-Revision: 1205
Ryan Flegel [Sun, 16 May 2004 01:36:54 +0000 (01:36 +0000)]
- Made some changes to object code
I'm Cleaning up object code to make it more flexible/reusable.
It's currently in an unfinished state.
SVN-Revision: 1204
Ryan Flegel [Sun, 16 May 2004 00:36:58 +0000 (00:36 +0000)]
- added support for different types of objects
- working on adding trampoline
SVN-Revision: 1203
Ryan Flegel [Sun, 16 May 2004 00:01:19 +0000 (00:01 +0000)]
- added Ben's trampoline images
SVN-Revision: 1202
Ricardo Cruz [Sat, 15 May 2004 18:27:57 +0000 (18:27 +0000)]
Made the menu to get back to the main menu after the slot deleting dialog.
I would prefer it would get back to the load menu, but at least this is better than exiting the game...
SVN-Revision: 1199
Ricardo Cruz [Sat, 15 May 2004 18:26:48 +0000 (18:26 +0000)]
Made level editor to use the draw_bg() that Ryan added to level. This way the background bug is fixed.
SVN-Revision: 1198
Marek Moeckel [Sat, 15 May 2004 16:07:20 +0000 (16:07 +0000)]
Resized levels 6-8
SVN-Revision: 1197
Ricardo Cruz [Sat, 15 May 2004 14:26:38 +0000 (14:26 +0000)]
Ooops, forgot to remove a comment.
SVN-Revision: 1196
Ricardo Cruz [Sat, 15 May 2004 14:19:01 +0000 (14:19 +0000)]
I allways noticed that in the SDL mode, the gradient was sometimes different than the OpenGL. But when I did the function, everything was okay and in most of the gradients it worked fine.
Finally, gone to the code and corrected that. It was just a typo (screen->w was being used in green and blue calculation, instead of screen->h).
SVN-Revision: 1195
Ricardo Cruz [Sat, 15 May 2004 14:16:15 +0000 (14:16 +0000)]
Changed the gradient colors.
This gradient caused the SDL frontend to be different than the OpenGL.
SVN-Revision: 1194
Ricardo Cruz [Sat, 15 May 2004 12:08:57 +0000 (12:08 +0000)]
Only do vertical scrolling when the height is higher than 19.
This fixes the problem that scrolling was used in 19 Y tiles levels. Since the right number of Y tiles is 18.75, not 19.
SVN-Revision: 1193
Marek Moeckel [Sat, 15 May 2004 11:31:48 +0000 (11:31 +0000)]
Updated matrix's grassland tiles
Edited levels 1-5 to fit the new resolution
SVN-Revision: 1192
Ricardo Cruz [Sat, 15 May 2004 11:29:47 +0000 (11:29 +0000)]
Fixed Coins text position in world map.
SVN-Revision: 1191
Ryan Flegel [Sat, 15 May 2004 11:00:32 +0000 (11:00 +0000)]
- fixed level editor crash
- some other resolution fixes in level editor
- fixed level editor not scrolling all the way to end of level (last two columns were hiding behind the panel). This is in 0.1.1, too.
SVN-Revision: 1190
Ryan Flegel [Sat, 15 May 2004 10:29:35 +0000 (10:29 +0000)]
- fixed drawgradient() function (res fix)
SVN-Revision: 1189
Ricardo Cruz [Sat, 15 May 2004 10:09:59 +0000 (10:09 +0000)]
Made levels to use arctis.jpg, instead of arctis2.jpg
SVN-Revision: 1188
Ricardo Cruz [Sat, 15 May 2004 10:07:41 +0000 (10:07 +0000)]
Changed "arctis2.jpg" to "arctis.jpg".
SVN-Revision: 1187
Ricardo Cruz [Sat, 15 May 2004 10:06:48 +0000 (10:06 +0000)]
Moved old arctic background image into the old dir.
SVN-Revision: 1186
Ricardo Cruz [Sat, 15 May 2004 10:01:07 +0000 (10:01 +0000)]
Replaced this background by a 800x600 version.
Ingo sent this some time ago to the mailing list.
SVN-Revision: 1185
Ricardo Cruz [Sat, 15 May 2004 09:59:02 +0000 (09:59 +0000)]
Cleanup. Also applied the same fix to leveleditor. Unfortanely, still crashes, aparentelly in the same point.
SVN-Revision: 1184
Ryan Flegel [Fri, 14 May 2004 22:47:35 +0000 (22:47 +0000)]
- even more res fixes--we're getting there
SVN-Revision: 1183
Ryan Flegel [Fri, 14 May 2004 21:49:30 +0000 (21:49 +0000)]
- more resolution fixes
SVN-Revision: 1182
Ryan Flegel [Fri, 14 May 2004 20:50:22 +0000 (20:50 +0000)]
- some resolution fixes
SVN-Revision: 1181
Marek Moeckel [Fri, 14 May 2004 19:35:06 +0000 (19:35 +0000)]
Added a new branch "unfinished" to the levels tree, including matr1x's levels and one of my own. As you probably have guessed, I labelled them "work in progress". :)
SVN-Revision: 1180
Ryan Flegel [Fri, 14 May 2004 17:35:30 +0000 (17:35 +0000)]
- fixed drawing crash
- not quite in a playable state yet :)
SVN-Revision: 1179
Ricardo Cruz [Fri, 14 May 2004 16:02:41 +0000 (16:02 +0000)]
First try to switch to 800x600.
Unfortanely, the game crashes when drawing the tiles. I committed this in the hope that somebody fixes it. :D
SVN-Revision: 1178
Ricardo Cruz [Fri, 14 May 2004 14:04:48 +0000 (14:04 +0000)]
Just changed hard coded values by definitions. Please do this, or else the code turns ugly and gets hard to change that value everywhere.
Also tuned the values.
SVN-Revision: 1177
Marek Moeckel [Fri, 14 May 2004 11:38:29 +0000 (11:38 +0000)]
Added factory(-fast).mod to the music directory
Use for inspiration! :)
SVN-Revision: 1176
Ryan Flegel [Fri, 14 May 2004 08:36:13 +0000 (08:36 +0000)]
- fixed [sorta] the mushroom bumping problems
- is it okay to determine the direction from the player's position?
SVN-Revision: 1175
Ryan Flegel [Fri, 14 May 2004 08:16:13 +0000 (08:16 +0000)]
- updated TODO
SVN-Revision: 1174
Ryan Flegel [Fri, 14 May 2004 08:10:24 +0000 (08:10 +0000)]
- fixed badguy collisions so they no longer get jammed
SVN-Revision: 1173
Ryan Flegel [Fri, 14 May 2004 07:42:30 +0000 (07:42 +0000)]
- changed b/g for credits
- fixed firebullet not killing some enemies
SVN-Revision: 1172
Ryan Flegel [Fri, 14 May 2004 05:24:24 +0000 (05:24 +0000)]
- added sounds from Nathan McCoy
SVN-Revision: 1171
Ryan Flegel [Fri, 14 May 2004 05:14:30 +0000 (05:14 +0000)]
- uncomment crash fix that was accidentally commented
SVN-Revision: 1170
Ryan Flegel [Fri, 14 May 2004 02:44:34 +0000 (02:44 +0000)]
- fixed an ugly hack I was using before for the JS config menu
SVN-Revision: 1169
Ryan Flegel [Fri, 14 May 2004 02:29:15 +0000 (02:29 +0000)]
- added some joystick config options.. I think
- I don't have a joystick/gamepad so this could use some testing
SVN-Revision: 1168
Ryan Flegel [Thu, 13 May 2004 23:20:45 +0000 (23:20 +0000)]
- oops. Fixed filename extension
SVN-Revision: 1167
Ryan Flegel [Thu, 13 May 2004 23:16:46 +0000 (23:16 +0000)]
- added freedesktop.org .desktop file from Mike Hearn
- added supertux icons as supertux.xpm and supertux.png (old ones can be [re]moved)
- added TODO item
SVN-Revision: 1166
Ryan Flegel [Thu, 13 May 2004 21:02:15 +0000 (21:02 +0000)]
- made mriceblock break blocks when kicked into them
SVN-Revision: 1165
Ricardo Cruz [Thu, 13 May 2004 17:50:51 +0000 (17:50 +0000)]
Up was moving to down and down to up - fixed.
SVN-Revision: 1164
Ricardo Cruz [Thu, 13 May 2004 12:47:34 +0000 (12:47 +0000)]
Added more enemies to this fire level test.
SVN-Revision: 1163
Ricardo Cruz [Thu, 13 May 2004 12:46:29 +0000 (12:46 +0000)]
Added ice enemies entries.
SVN-Revision: 1162
Ricardo Cruz [Thu, 13 May 2004 12:45:53 +0000 (12:45 +0000)]
Added ice versions of enemies.
By Benjamin!
SVN-Revision: 1161
Ricardo Cruz [Thu, 13 May 2004 12:44:36 +0000 (12:44 +0000)]
Improved frozen behavior.
Still isn't perfect, enemies don't fall right away you kill'em.
SVN-Revision: 1160
Ricardo Cruz [Thu, 13 May 2004 10:03:17 +0000 (10:03 +0000)]
Made some checking before the scrolling code, in order to avoid code duplication.
SVN-Revision: 1159
Ricardo Cruz [Thu, 13 May 2004 09:52:59 +0000 (09:52 +0000)]
Fixed crash.
Also made map to work with height > 15. But the rectangle in the map, still doesn't show precisely the Y visible area.
SVN-Revision: 1158
Ricardo Cruz [Thu, 13 May 2004 09:41:05 +0000 (09:41 +0000)]
Committed Matrix tiles. But they should allow repetition!
SVN-Revision: 1157
Ricardo Cruz [Thu, 13 May 2004 09:13:33 +0000 (09:13 +0000)]
Added vertical scrolling for the level editor.
Unfortanely, it crashes after scrolling a bit. (hint: use the right mouse button to scroll... it will stay a bit longer without crashing :/)
SVN-Revision: 1156
Ricardo Cruz [Thu, 13 May 2004 09:12:05 +0000 (09:12 +0000)]
Changed up and down to previous and next. And added up and down icons.
SVN-Revision: 1155
Ricardo Cruz [Thu, 13 May 2004 08:44:08 +0000 (08:44 +0000)]
Id 400 was already given.
Fixes iceflower bonus bug.
SVN-Revision: 1154
Ricardo Cruz [Thu, 13 May 2004 08:35:39 +0000 (08:35 +0000)]
Replaced backscrolling bug by camera one.
SVN-Revision: 1153
Ryan Flegel [Thu, 13 May 2004 02:58:45 +0000 (02:58 +0000)]
- added new sign (from Benjamin)
SVN-Revision: 1152
Ryan Flegel [Thu, 13 May 2004 02:50:13 +0000 (02:50 +0000)]
- fixed a warning
SVN-Revision: 1151
Ryan Flegel [Thu, 13 May 2004 02:40:10 +0000 (02:40 +0000)]
- fixed potential crash
SVN-Revision: 1150
Ryan Flegel [Wed, 12 May 2004 20:02:46 +0000 (20:02 +0000)]
- 'nicer' icebullet
SVN-Revision: 1149
Ryan Flegel [Wed, 12 May 2004 19:43:08 +0000 (19:43 +0000)]
- fixed crash when hitting badguy with bullet
SVN-Revision: 1148
Ryan Flegel [Wed, 12 May 2004 19:22:32 +0000 (19:22 +0000)]
- added old iceflower images
SVN-Revision: 1147
Ricardo Cruz [Wed, 12 May 2004 19:18:31 +0000 (19:18 +0000)]
Benjamin has been kind enough to make us Icy Tux images :)
SVN-Revision: 1146
Ryan Flegel [Wed, 12 May 2004 19:00:10 +0000 (19:00 +0000)]
- reverted to old iceflower
SVN-Revision: 1145
Ricardo Cruz [Wed, 12 May 2004 18:35:35 +0000 (18:35 +0000)]
Added ice flower bonuses and a few enemies.
Test fire here!
SVN-Revision: 1144
Ricardo Cruz [Wed, 12 May 2004 18:32:03 +0000 (18:32 +0000)]
Added a few entries.
SVN-Revision: 1143
Ricardo Cruz [Wed, 12 May 2004 18:31:38 +0000 (18:31 +0000)]
Added ice flower entry.
SVN-Revision: 1142
Ricardo Cruz [Wed, 12 May 2004 18:31:16 +0000 (18:31 +0000)]
Added bonus ice and fire flower, used by the level editor.
SVN-Revision: 1141
Ricardo Cruz [Wed, 12 May 2004 18:29:37 +0000 (18:29 +0000)]
Added a very bad drawn ice flower.
SVN-Revision: 1140
Ricardo Cruz [Wed, 12 May 2004 18:28:37 +0000 (18:28 +0000)]
Fire should be working again.
Unfortanely, both ice and fire shots crash the game when colliding with a badguy.
SVN-Revision: 1139
projects / supertux.git / log