JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
vor.git
14 years agomore refactoring in main.c
Joshua Grams [Wed, 28 Jun 2006 20:16:37 +0000 (20:16 +0000)]
more refactoring in main.c

14 years agostarted ship in the middle vertically (instead of the top of the ship in the middle)
Jason Woofenden [Mon, 26 Jun 2006 19:34:14 +0000 (19:34 +0000)]
started ship in the middle vertically (instead of the top of the ship in the middle)

14 years agonow scrolling to center of ship, not its top-left corner
Joshua Grams [Thu, 22 Jun 2006 21:55:24 +0000 (21:55 +0000)]
now scrolling to center of ship, not its top-left corner

14 years agooops, was drawing *inactive* bang dots
Joshua Grams [Thu, 22 Jun 2006 21:53:30 +0000 (21:53 +0000)]
oops, was drawing *inactive* bang dots

14 years agorefactoring main loop organization
Joshua Grams [Tue, 13 Jun 2006 20:33:17 +0000 (20:33 +0000)]
refactoring main loop organization

14 years agostarted factoring out global t_frame
Joshua Grams [Tue, 13 Jun 2006 19:49:29 +0000 (19:49 +0000)]
started factoring out global t_frame

14 years agomade it so engine dots are created throughout the time of the frame so it looks right...
Jason Woofenden [Tue, 30 May 2006 16:00:45 +0000 (16:00 +0000)]
made it so engine dots are created throughout the time of the frame so it looks right even with a big lag.
factored out move_engine_dots
added now config var THRUSTER_STRENGTH
added new config var ENGINE_DOTS_PER_TIC
adjusted settings so there are fewer engine dots and they don't push the rocks so hard

14 years agooops, didn't mean to commit those other files
Jason Woofenden [Sat, 15 Apr 2006 16:26:44 +0000 (16:26 +0000)]
oops, didn't mean to commit those other files

14 years agofixed crashing bug in move_dust() (bounds checking wasn't right)
Jason Woofenden [Sat, 15 Apr 2006 16:22:32 +0000 (16:22 +0000)]
fixed crashing bug in move_dust() (bounds checking wasn't right)

14 years agooops, didn't fix bang dots correctly.
Joshua Grams [Fri, 14 Apr 2006 14:15:02 +0000 (14:15 +0000)]
oops, didn't fix bang dots correctly.

14 years agoparticle generation no longer depends on the framerate
Joshua Grams [Fri, 14 Apr 2006 14:02:25 +0000 (14:02 +0000)]
particle generation no longer depends on the framerate
(now that particles are part of the gameplay, not just visual effects).

14 years agonow really removed SDL_SetAlpha calls on Windows
Joshua Grams [Wed, 12 Apr 2006 19:28:58 +0000 (19:28 +0000)]
now really removed SDL_SetAlpha calls on Windows

14 years agoslightly less half-assed event handling
Joshua Grams [Wed, 12 Apr 2006 19:13:07 +0000 (19:13 +0000)]
slightly less half-assed event handling
removed message fades on windows

14 years agoincludes fixes
Joshua Grams [Wed, 12 Apr 2006 17:01:30 +0000 (17:01 +0000)]
includes fixes

14 years agoMakefile.win fixes
Joshua Grams [Wed, 12 Apr 2006 16:57:21 +0000 (16:57 +0000)]
Makefile.win fixes

14 years agoplatform-independent arg parsing
Joshua Grams [Wed, 12 Apr 2006 16:55:57 +0000 (16:55 +0000)]
platform-independent arg parsing

14 years agomore changes for windows
Joshua Grams [Tue, 11 Apr 2006 11:08:37 +0000 (11:08 +0000)]
more changes for windows

14 years agowindows port, maybe?
Joshua Grams [Mon, 10 Apr 2006 01:07:58 +0000 (01:07 +0000)]
windows port, maybe?

14 years agofinish moving data files around (I think)
Joshua Grams [Mon, 10 Apr 2006 00:58:34 +0000 (00:58 +0000)]
finish moving data files around (I think)

14 years agoremoving most data subdirs
Joshua Grams [Mon, 10 Apr 2006 00:47:05 +0000 (00:47 +0000)]
removing most data subdirs

14 years agobumped dev version to 0.5pre
Joshua Grams [Sun, 26 Mar 2006 11:35:35 +0000 (11:35 +0000)]
bumped dev version to 0.5pre

14 years agogrr...had -ggdb in Makefile
Joshua Grams [Sun, 26 Mar 2006 11:32:08 +0000 (11:32 +0000)]
grr...had -ggdb in Makefile

14 years agobumped version to 0.4
Joshua Grams [Sun, 26 Mar 2006 11:30:20 +0000 (11:30 +0000)]
bumped version to 0.4

14 years agoremoved ship fade in code (unused)
Joshua Grams [Sun, 26 Mar 2006 11:17:57 +0000 (11:17 +0000)]
removed ship fade in code (unused)

14 years agooops, missed some.
Joshua Grams [Sun, 26 Mar 2006 11:17:20 +0000 (11:17 +0000)]
oops, missed some.

14 years agomade bang dots hit rocks, removed blast_rocks function.
Joshua Grams [Sun, 26 Mar 2006 11:16:30 +0000 (11:16 +0000)]
made bang dots hit rocks, removed blast_rocks function.

14 years agooops, updated todo
Joshua Grams [Sun, 26 Mar 2006 11:15:42 +0000 (11:15 +0000)]
oops, updated todo

14 years agorefactored messages a bit
Joshua Grams [Sun, 26 Mar 2006 10:50:28 +0000 (10:50 +0000)]
refactored messages a bit

14 years agoseparate scores for easy mode.
Joshua Grams [Sun, 26 Mar 2006 02:52:35 +0000 (02:52 +0000)]
separate scores for easy mode.

14 years agofixed messages
Joshua Grams [Sun, 26 Mar 2006 01:56:24 +0000 (01:56 +0000)]
fixed messages

14 years agoeasy mode; messages at game over.
Joshua Grams [Sun, 26 Mar 2006 01:25:34 +0000 (01:25 +0000)]
easy mode; messages at game over.

14 years agoAdded Jason's comments from openbubbles bounce code.
Joshua Grams [Sat, 25 Mar 2006 22:12:55 +0000 (22:12 +0000)]
Added Jason's comments from openbubbles bounce code.

14 years agoproper moving-away detection in bounce()?
Joshua Grams [Sat, 25 Mar 2006 21:16:48 +0000 (21:16 +0000)]
proper moving-away detection in bounce()?

14 years agocorrect bounce math?
Joshua Grams [Sat, 25 Mar 2006 20:57:18 +0000 (20:57 +0000)]
correct bounce math?

14 years agoengine dots push rocks
Jason Woofenden [Sat, 25 Mar 2006 20:22:53 +0000 (20:22 +0000)]
engine dots push rocks
pixel collision functions return what sprite was hit
new config var: ENGINE_DOT_WEIGHT

14 years agoremoved new ship fade, blast leaves rocks collidable, some refactoring.
Joshua Grams [Sat, 25 Mar 2006 13:07:00 +0000 (13:07 +0000)]
removed new ship fade, blast leaves rocks collidable, some refactoring.

14 years agooops, pressing space was skipping high score entry.
Joshua Grams [Fri, 24 Mar 2006 20:39:11 +0000 (20:39 +0000)]
oops, pressing space was skipping high score entry.

14 years agoRemoved control of ship during dead pause; the new ship
Joshua Grams [Fri, 24 Mar 2006 20:22:42 +0000 (20:22 +0000)]
Removed control of ship during dead pause; the new ship
velocity change upon dying makes it unnecessary.

14 years agoMade it easier (I hope) to avoid getting killed twice in a row.
Joshua Grams [Fri, 24 Mar 2006 20:18:28 +0000 (20:18 +0000)]
Made it easier (I hope) to avoid getting killed twice in a row.
We now take the square root of the ship's velocity, instead of just half.
This appears to put it nicely in the middle of the hole left by the
explosion, whatever speed you are going.

Also, you now have control over your ship during the DEAD_PAUSE; so it fades
in, and is invulnerable until it becomes fully opaque.  Note that the dead
pause is still the same length as it was before.

14 years agofade new ships in,
Joshua Grams [Fri, 24 Mar 2006 17:13:00 +0000 (17:13 +0000)]
fade new ships in,
add complaints from HappyPenguin to todo,
some refactoring.

14 years agosprites now have a flag field (MOVE/DRAW/COLLIDE).
Joshua Grams [Fri, 24 Mar 2006 00:46:58 +0000 (00:46 +0000)]
sprites now have a flag field (MOVE/DRAW/COLLIDE).
rocks which have been blasted do not collide.

14 years agowe now return you to your regularly scheduled exploding ship.
Joshua Grams [Fri, 24 Mar 2006 00:09:35 +0000 (00:09 +0000)]
we now return you to your regularly scheduled exploding ship.

14 years agorenamed *_SPRITE to *, made rocks bounce off each other.
Joshua Grams [Thu, 23 Mar 2006 22:44:21 +0000 (22:44 +0000)]
renamed *_SPRITE to *, made rocks bounce off each other.

14 years agorewording bounce calculations.
Joshua Grams [Thu, 23 Mar 2006 16:56:23 +0000 (16:56 +0000)]
rewording bounce calculations.

14 years agoadded area back to get_shape, bounce() uses area.
Joshua Grams [Thu, 23 Mar 2006 15:40:06 +0000 (15:40 +0000)]
added area back to get_shape, bounce() uses area.
fixed 'sticking to rocks' bug in bounce().

14 years ago* sprite.c (collide): fixed yov computation.
Joshua Grams [Thu, 23 Mar 2006 15:38:29 +0000 (15:38 +0000)]
* sprite.c (collide): fixed yov computation.

14 years agobouncy ship :)
Joshua Grams [Thu, 23 Mar 2006 14:36:15 +0000 (14:36 +0000)]
bouncy ship :)

14 years agomoved grid stuff from rocks.c to sprite.c
Joshua Grams [Wed, 22 Mar 2006 14:02:58 +0000 (14:02 +0000)]
moved grid stuff from rocks.c to sprite.c

14 years ago* rocks.c (struct rock): changed generic ones to Sprite.
Joshua Grams [Tue, 21 Mar 2006 22:18:29 +0000 (22:18 +0000)]
* rocks.c (struct rock): changed generic ones to Sprite.

14 years agoditched the separate shape struct.
Joshua Grams [Tue, 21 Mar 2006 21:25:16 +0000 (21:25 +0000)]
ditched the separate shape struct.

14 years agoUpdated collide to take two sprites.
Joshua Grams [Tue, 21 Mar 2006 17:33:25 +0000 (17:33 +0000)]
Updated collide to take two sprites.
removed references to stdint.h (using inttypes.h where necessary).
Makefile: update header dependencies.

14 years agorenamed shape files to sprite, added todo list to svn.
Joshua Grams [Tue, 21 Mar 2006 13:21:50 +0000 (13:21 +0000)]
renamed shape files to sprite, added todo list to svn.

14 years agorefactoring towards sprites, updated todo
Joshua Grams [Tue, 21 Mar 2006 12:43:36 +0000 (12:43 +0000)]
refactoring towards sprites, updated todo

14 years agocommented DEAD_PAUSE_LENGTH and updated URL
Jason Woofenden [Thu, 16 Mar 2006 00:55:46 +0000 (00:55 +0000)]
commented DEAD_PAUSE_LENGTH and updated URL

14 years agominor rearrangements and the beginnings of a Windows port.
Joshua Grams [Thu, 2 Feb 2006 22:38:39 +0000 (22:38 +0000)]
minor rearrangements and the beginnings of a Windows port.

14 years ago* rocks.c (hit_rock, pixel_hit_rock): fix more possible bugs.
Joshua Grams [Thu, 5 Jan 2006 04:12:20 +0000 (04:12 +0000)]
* rocks.c (hit_rock, pixel_hit_rock): fix more possible bugs.

14 years ago* rocks.c (hit_rocks): oops, had r(ight) where I should have had t(op).
Joshua Grams [Thu, 5 Jan 2006 03:47:00 +0000 (03:47 +0000)]
* rocks.c (hit_rocks): oops, had r(ight) where I should have had t(op).
(pixel_hit_rocks): added bucket validity checks.

14 years ago* rocks.c (bucket): rewrote to work with either division rounding mode (symmetric...
Joshua Grams [Thu, 5 Jan 2006 03:40:56 +0000 (03:40 +0000)]
* rocks.c (bucket): rewrote to work with either division rounding mode (symmetric or floored).
(hit_rocks): rewrote to check validity of all buckets before using them.

14 years ago* rocks.c (init_buckets): oops, we weren't allocating big enough arrays.
Joshua Grams [Thu, 5 Jan 2006 00:09:57 +0000 (00:09 +0000)]
* rocks.c (init_buckets): oops, we weren't allocating big enough arrays.

14 years ago* rocks.c: refactored stuff and fixed linked-list bug (I think).
Joshua Grams [Wed, 4 Jan 2006 23:37:51 +0000 (23:37 +0000)]
* rocks.c: refactored stuff and fixed linked-list bug (I think).

* file.c (add_path): renamed to add_data_path, changed all callers.

* main.c (load_image): new function - changed all image loads.

* mt.c (frnd, crnd): converted literals to standard constants.
* mt.h: including inttypes.h instead of the less common stdint.h.

14 years agooops, have to check all 9 buckets.
Joshua Grams [Mon, 11 Jul 2005 18:39:39 +0000 (18:39 +0000)]
oops, have to check all 9 buckets.
maybe I should consider doing the 4 resort/check cycles instead...

14 years agofixed 2 more dot collision bugs (last ones?)
Joshua Grams [Mon, 11 Jul 2005 18:21:34 +0000 (18:21 +0000)]
fixed 2 more dot collision bugs (last ones?)

14 years agoRocks now sorted on a grid to speed collision checking.
Joshua Grams [Mon, 11 Jul 2005 17:13:54 +0000 (17:13 +0000)]
Rocks now sorted on a grid to speed collision checking.

14 years agonow deleting dots which hit rocks.
Joshua Grams [Sun, 10 Jul 2005 22:27:01 +0000 (22:27 +0000)]
now deleting dots which hit rocks.

14 years agooops, fixed off-by-one error in new_engine_dots
Joshua Grams [Sun, 10 Jul 2005 20:55:04 +0000 (20:55 +0000)]
oops, fixed off-by-one error in new_engine_dots

14 years agoraised max for -g to 200
Jason Woofenden [Sun, 10 Jul 2005 20:19:27 +0000 (20:19 +0000)]
raised max for -g to 200

15 years agocleaned up bang dots code a bit
Joshua Grams [Sun, 10 Jul 2005 12:23:44 +0000 (12:23 +0000)]
cleaned up bang dots code a bit

15 years agoremoved debug stuff because it ws useless.
Joshua Grams [Sat, 9 Jul 2005 11:29:53 +0000 (11:29 +0000)]
removed debug stuff because it ws useless.
removed some unnecessary globals.
went back to using ticks for everything (gives nice sized numbers for things).

15 years agow00t! Finally rearranged the scroll equations so they make sense to me.
Joshua Grams [Fri, 8 Jul 2005 21:22:32 +0000 (21:22 +0000)]
w00t!  Finally rearranged the scroll equations so they make sense to me.
Also moved reset_rocks() call to init_rocks() from main().

15 years ago* mt.c: Added (Mersenne Twister random number generator).
Joshua Grams [Thu, 7 Jul 2005 23:29:54 +0000 (23:29 +0000)]
* mt.c: Added (Mersenne Twister random number generator).
* sound.h: moved #defines out to here, used them in main.c.
* dust.c: moved space dust functions out to here.

15 years agoFriction doesn't make sense any more, dropped that.
Joshua Grams [Thu, 7 Jul 2005 21:13:33 +0000 (21:13 +0000)]
Friction doesn't make sense any more, dropped that.
Tail engine is just dumb, dropped that.
Undocumented -l option.
Rewrote particle generation for jets (same results, shorter code).

15 years agorenamed framelen and friends (again)
Joshua Grams [Thu, 7 Jul 2005 18:11:01 +0000 (18:11 +0000)]
renamed framelen and friends (again)

15 years ago* file.c (g_score_mode): renamed to g_score_mask.
Joshua Grams [Thu, 7 Jul 2005 14:15:53 +0000 (14:15 +0000)]
* file.c (g_score_mode): renamed to g_score_mask.
* Makefile (install-data uninstall-data): removed score-file stuff.

15 years agoMoved macros and such from config.h to common.h
Joshua Grams [Thu, 7 Jul 2005 13:49:09 +0000 (13:49 +0000)]
Moved macros and such from config.h to common.h
Now using ~/.vor-scores as our only choice for score file.
(it can get deleted if you put it in with data)
(and locking issues if multiple users on one machine, etc.)
Now passing DATA_PREFIX from Makefile as INSTALL suggests.

15 years agoWe now limit how far ahead you can get. This is measured in screen
Joshua Grams [Wed, 6 Jul 2005 23:05:39 +0000 (23:05 +0000)]
We now limit how far ahead you can get.  This is measured in screen
widths, and has a command-line option --max-lead.

Also added error checking to command-line parsing.

15 years agoNow have a "barrier" (which can fall behind) to enforce minimum speed.
Joshua Grams [Wed, 6 Jul 2005 22:04:29 +0000 (22:04 +0000)]
Now have a "barrier" (which can fall behind) to enforce minimum speed.

15 years agorenamed gamerate to framelen
Joshua Grams [Wed, 6 Jul 2005 22:00:17 +0000 (22:00 +0000)]
renamed gamerate to framelen

15 years agonew option --bounciness (default changed from 100% to 50%).
Joshua Grams [Tue, 5 Jul 2005 21:21:41 +0000 (21:21 +0000)]
new option --bounciness (default changed from 100% to 50%).
pressing space at the Game Over screen now goes only to score display.
  (press space again to start a new game)
refactored the Makefile again.
moved command-line parsing stuff out to args.c/args.h.
rearranged command-line help.

15 years agoAdded constant SCREENDXMIN instead of using 7.5 everywhere.
Joshua Grams [Mon, 4 Jul 2005 16:50:12 +0000 (16:50 +0000)]
Added constant SCREENDXMIN instead of using 7.5 everywhere.
Fixed options array so the help displays properly.
Removed some stupid stuff from rocks.c.

15 years agoOK, now we're really done with 0.3
Joshua Grams [Mon, 4 Jul 2005 13:14:37 +0000 (13:14 +0000)]
OK, now we're really done with 0.3

15 years agopoking some changes back into 0.3 before anyone notices. :)
Joshua Grams [Mon, 4 Jul 2005 13:08:35 +0000 (13:08 +0000)]
poking some changes back into 0.3 before anyone notices. :)

15 years agoRefactored Makefile
Joshua Grams [Mon, 4 Jul 2005 12:55:44 +0000 (12:55 +0000)]
Refactored Makefile
 * clean now only cleans up program, not graphics.
 * maintainer-clean cleans up everything.
Switched from getopt to argp for command-line parsing.
Also new command-line option --game-speed (-g N%).
Cleaned up some unnecessary stuff in config.h

15 years agofinal changes to README, bumped to version 3
Joshua Grams [Mon, 4 Jul 2005 02:55:22 +0000 (02:55 +0000)]
final changes to README, bumped to version 3

15 years agoUpdated feature list in README
Joshua Grams [Mon, 4 Jul 2005 02:32:57 +0000 (02:32 +0000)]
Updated feature list in README
Removed speed indicator graphic

15 years agoRemoved stupid speed indicator, gave screendx a minimum instead.
Joshua Grams [Mon, 4 Jul 2005 02:17:25 +0000 (02:17 +0000)]
Removed stupid speed indicator, gave screendx a minimum instead.
Fixed bouncing off screen edges.

15 years agoremoved rock counting code
Joshua Grams [Mon, 4 Jul 2005 02:16:33 +0000 (02:16 +0000)]
removed rock counting code

15 years agofixed bug when you bounce off the left or right
Jason Woofenden [Tue, 3 May 2005 20:11:09 +0000 (20:11 +0000)]
fixed bug when you bounce off the left or right
fixed avg speed meter for subsequent games

15 years ago* main.c: removed a whole bunch of unnecessary src rects for SDL blits.
Joshua Grams [Sun, 1 May 2005 20:32:55 +0000 (20:32 +0000)]
* main.c: removed a whole bunch of unnecessary src rects for SDL blits.
          added a rudimentary speed indicator (still a bit buggy, avg speed
            gets stuck way up high sometimes).
* rocks.c: added a rock counter to print out how far from our goal we are.

15 years agofixed the speed probabilities and direction for new rocks
Jason Woofenden [Sun, 1 May 2005 19:07:02 +0000 (19:07 +0000)]
fixed the speed probabilities and direction for new rocks

15 years agonumber of rocks on screen now starts at 25, gradually increasing
Joshua Grams [Fri, 29 Apr 2005 22:50:40 +0000 (22:50 +0000)]
number of rocks on screen now starts at 25, gradually increasing
to a max of 45 at 2:00 minutes into the game.
See config.h: I_ROCKS/F_ROCKS.

15 years agomade closest stars a bit further away
Jason Woofenden [Fri, 29 Apr 2005 03:51:58 +0000 (03:51 +0000)]
made closest stars a bit further away

made scrolling adjustments happen even when you're dead etc (dying also doesn't reset shipx and shipy. Just shipdx and shipdy. The scrolling adjustments get the x and y straightened out durring DEAD_PAUSE)

x scrolling tries to get you one third of the way in from the left, instead of in the center

tried to make explosion center keep moving (not slow down as the ship does). It's much safer now, but still doesn't look like it matches with the graphics correctly.

strengthened the blast a bit and got rid of the silly thing where it only effects slow moving rocks at the end

15 years agoimproved ship placement/velocity (initial and after a death).
Joshua Grams [Fri, 29 Apr 2005 00:17:52 +0000 (00:17 +0000)]
improved ship placement/velocity (initial and after a death).

15 years agoadded constant MAX_DUST_DEPTHS.
Joshua Grams [Thu, 28 Apr 2005 23:50:38 +0000 (23:50 +0000)]
added constant MAX_DUST_DEPTHS.
put ship back in center of screen at start.
explosion now in same place as ship.

15 years agohorizontal scrolling
Joshua Grams [Thu, 28 Apr 2005 23:25:49 +0000 (23:25 +0000)]
horizontal scrolling

15 years agooops, I wasn't using nrocks in my timing calculations. doh\!
Joshua Grams [Thu, 28 Apr 2005 22:16:30 +0000 (22:16 +0000)]
oops, I wasn't using nrocks in my timing calculations.  doh\!

15 years agorock generation mostly works now.
Joshua Grams [Thu, 28 Apr 2005 21:49:56 +0000 (21:49 +0000)]
rock generation mostly works now.

15 years agostarted on new rock generation.
Joshua Grams [Thu, 28 Apr 2005 14:57:02 +0000 (14:57 +0000)]
started on new rock generation.

15 years agoyou can quite regardles of game state
Jason Woofenden [Mon, 25 Apr 2005 20:57:12 +0000 (20:57 +0000)]
you can quite regardles of game state

15 years ago* main.c (gameloop): now stops scrolling up/down when you die.
Joshua Grams [Sat, 23 Apr 2005 16:35:27 +0000 (16:35 +0000)]
* main.c (gameloop): now stops scrolling up/down when you die.
(dist_sq): unnecessary, removed.

15 years ago* config.h: added CONDERROR and NULLERROR macros.
Joshua Grams [Sat, 23 Apr 2005 13:32:37 +0000 (13:32 +0000)]
* config.h: added CONDERROR and NULLERROR macros.
* globals.h: structure definitions and declarations of global variables.
* main.c: removed rock code to rocks.c & rocks.h.
* rocks.c rocks.h: crudely factored-out rock code.
* shape.h shape.c: added area (in pixels).
* sound.c: replaced spaces with tabs.