JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
vor.git
15 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.

15 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.

15 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.

15 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.

15 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.

15 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...

15 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?)

15 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.

15 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.

15 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

15 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.

15 years agoadded README and INSTALL (with dependancies :))
Jason Woofenden [Mon, 18 Apr 2005 17:20:35 +0000 (17:20 +0000)]
added README and INSTALL (with dependancies :))

15 years agoupdated svn:ignore
Jason Woofenden [Mon, 18 Apr 2005 16:54:07 +0000 (16:54 +0000)]
updated svn:ignore

15 years agooops, some gfx didn't have proper transparency.
Joshua Grams [Thu, 7 Apr 2005 19:19:34 +0000 (19:19 +0000)]
oops, some gfx didn't have proper transparency.

15 years agoadded constant GAMESPEED
Joshua Grams [Thu, 7 Apr 2005 13:42:22 +0000 (13:42 +0000)]
added constant GAMESPEED

15 years agoremoved pnmoutline (no longer necessary).
Joshua Grams [Thu, 7 Apr 2005 11:59:12 +0000 (11:59 +0000)]
removed pnmoutline (no longer necessary).

15 years agodeleted old collision-detection code.
Joshua Grams [Thu, 7 Apr 2005 11:56:49 +0000 (11:56 +0000)]
deleted old collision-detection code.

15 years agoBy Jove, I think I've got it!
Joshua Grams [Thu, 7 Apr 2005 11:49:28 +0000 (11:49 +0000)]
By Jove, I think I've got it!
(proper collision detection, that is)

15 years agobbox collision detection.
Joshua Grams [Thu, 7 Apr 2005 01:07:53 +0000 (01:07 +0000)]
bbox collision detection.

15 years agodata/indicators/life.png: now built by povray from ship graphic.
Joshua Grams [Thu, 7 Apr 2005 00:47:13 +0000 (00:47 +0000)]
data/indicators/life.png: now built by povray from ship graphic.
shape.c: generates bitmasks for graphics, no collision detection yet though.

15 years agosplit gfx make rules into separate file for finer-grained dependencies.
Joshua Grams [Wed, 6 Apr 2005 23:49:34 +0000 (23:49 +0000)]
split gfx make rules into separate file for finer-grained dependencies.

15 years agomake clean now deletes the rock pngs as it should.
Jason Woofenden [Wed, 6 Apr 2005 22:43:49 +0000 (22:43 +0000)]
make clean now deletes the rock pngs as it should.
added comments to rocks.pov

15 years agodifferent size rocks :) (and no really weird ones)
Jason Woofenden [Wed, 6 Apr 2005 22:32:05 +0000 (22:32 +0000)]
different size rocks :) (and no really weird ones)

15 years agocustom rocks
Jason Woofenden [Wed, 6 Apr 2005 22:19:29 +0000 (22:19 +0000)]
custom rocks

15 years agofixed makebangdots to check surface's colorkey.
Joshua Grams [Wed, 6 Apr 2005 21:24:24 +0000 (21:24 +0000)]
fixed makebangdots to check surface's colorkey.

15 years ago* pnmoutline.c: actually works now. Stupid, stupid libnetpbm.
Joshua Grams [Wed, 6 Apr 2005 20:59:31 +0000 (20:59 +0000)]
* pnmoutline.c: actually works now.  Stupid, stupid libnetpbm.

15 years agoadded rocks.pov. look good, but need processing (cropping, transparency, filenames...)
Jason Woofenden [Wed, 6 Apr 2005 03:35:12 +0000 (03:35 +0000)]
added rocks.pov. look good, but need processing (cropping, transparency, filenames...)

15 years agonow using netpbm stuff to generate proper ship image.
Joshua Grams [Mon, 4 Apr 2005 23:43:09 +0000 (23:43 +0000)]
now using netpbm stuff to generate proper ship image.

15 years agoPOV-Ray ship -- somehow collision detection still seems to work
Joshua Grams [Mon, 4 Apr 2005 19:53:21 +0000 (19:53 +0000)]
POV-Ray ship -- somehow collision detection still seems to work

15 years agoNo good paused banner, so I took out the code.
Joshua Grams [Mon, 14 Mar 2005 20:45:04 +0000 (20:45 +0000)]
No good paused banner, so I took out the code.

15 years agoreworked ship explosion:
Jason Woofenden [Mon, 21 Feb 2005 18:43:57 +0000 (18:43 +0000)]
reworked ship explosion:
1) bigger
2) ship is gone for longer (much more noticeable)
3) no rocks are left floating ie hardly moving

16 years agoremoved deadrocks because they weren't being used.
Joshua Grams [Mon, 10 Jan 2005 22:20:39 +0000 (22:20 +0000)]
removed deadrocks because they weren't being used.

16 years agoconfig.h - Added debug() macro, fixed Makefile and sound.c to use it.
Joshua Grams [Mon, 10 Jan 2005 22:14:52 +0000 (22:14 +0000)]
config.h - Added debug() macro, fixed Makefile and sound.c to use it.
   Added debug.c debug.h to go along with this.
file.c - fixed bug in find_score_file (added strdup).
score.c (read_high_score_table) - removed initializers so we use values
        which are assigned to the global g_score.

16 years agofixes to new name input code
Joshua Grams [Tue, 4 Jan 2005 21:19:46 +0000 (21:19 +0000)]
fixes to new name input code

16 years agorenames:
Joshua Grams [Mon, 3 Jan 2005 01:49:56 +0000 (01:49 +0000)]
renames:
xship/yship -> shipx/shipy
xvel/yvel -> shipdx/shipdy

16 years agokowtowing to the compiler
Joshua Grams [Sun, 2 Jan 2005 21:53:44 +0000 (21:53 +0000)]
kowtowing to the compiler

16 years agohmm...apparently you can't strdup a NULL pointer :)
Joshua Grams [Sun, 2 Jan 2005 21:45:35 +0000 (21:45 +0000)]
hmm...apparently you can't strdup a NULL pointer :)
renamed load_file to add_path, changed all callers

16 years agoremoved some more unused globals (think I got all of them)
Joshua Grams [Sun, 2 Jan 2005 21:07:11 +0000 (21:07 +0000)]
removed some more unused globals (think I got all of them)

16 years ago* Switched over to using SFont 2.03, which doesn't have tons of
Joshua Grams [Sun, 2 Jan 2005 20:51:19 +0000 (20:51 +0000)]
* Switched over to using SFont 2.03, which doesn't have tons of
  extra cruft.
* Moved all things to do with displaying/editing the score out to
  score.c/score.h

16 years agowhitespace changes: return types in function definitions on previous line, deleted...
Jason Woofenden [Mon, 27 Dec 2004 03:18:21 +0000 (03:18 +0000)]
whitespace changes: return types in function definitions on previous line, deleted some folding comments and some old debugging crap

16 years agoSome code cleanup.
Joshua Grams [Sun, 19 Dec 2004 05:50:42 +0000 (05:50 +0000)]
Some code cleanup.
Factored most of the file-handling code out into a separate file.

16 years agomisc minor stuff.
Joshua Grams [Mon, 13 Dec 2004 22:59:05 +0000 (22:59 +0000)]
misc minor stuff.

16 years agoscreen edge checking for rocks less paranoid
Jason Woofenden [Mon, 13 Dec 2004 22:52:45 +0000 (22:52 +0000)]
screen edge checking for rocks less paranoid

16 years agofixing typo
Jason Woofenden [Mon, 13 Dec 2004 22:47:59 +0000 (22:47 +0000)]
fixing typo

16 years agocleaned up rock wraping/deleting
Jason Woofenden [Mon, 13 Dec 2004 22:39:39 +0000 (22:39 +0000)]
cleaned up rock wraping/deleting

16 years agodying explosion faster
Jason Woofenden [Mon, 13 Dec 2004 22:06:35 +0000 (22:06 +0000)]
dying explosion faster

16 years agooops, can't remember that && has higher precedence than ||.
Joshua Grams [Mon, 13 Dec 2004 22:01:25 +0000 (22:01 +0000)]
oops, can't remember that && has higher precedence than ||.
Also need to move blast (and ship) forwards if we're at the left edge.

16 years agoanother try at re-appearing where you were.
Joshua Grams [Mon, 13 Dec 2004 21:52:36 +0000 (21:52 +0000)]
another try at re-appearing where you were.

16 years agoblowing from where you died
Joshua Grams [Mon, 13 Dec 2004 21:37:30 +0000 (21:37 +0000)]
blowing from where you died

16 years agoA few more modifications to blast-wave rock clearing.
Joshua Grams [Mon, 13 Dec 2004 21:01:01 +0000 (21:01 +0000)]
A few more modifications to blast-wave rock clearing.
Might need to scrap the idea -- you still have to look sharp to
survive re-appearing.

16 years agorocks blowing out of the way (actually somewhat playable).
Joshua Grams [Mon, 13 Dec 2004 20:46:30 +0000 (20:46 +0000)]
rocks blowing out of the way (actually somewhat playable).

16 years agofirst try at blasting the rocks out of the way
Joshua Grams [Mon, 13 Dec 2004 20:26:08 +0000 (20:26 +0000)]
first try at blasting the rocks out of the way

16 years agoadded a little prediction and monentum to the scrolling
Jason Woofenden [Mon, 13 Dec 2004 19:55:41 +0000 (19:55 +0000)]
added a little prediction and monentum to the scrolling

16 years agoRemoved all shields and laser code.
Joshua Grams [Mon, 13 Dec 2004 19:44:29 +0000 (19:44 +0000)]
Removed all shields and laser code.
Removed dotcollision() function
  (wasn't being used, and didn't work anyway).
Fixed some Makefile stuff which was WRONG
  (but just happened to work in this case).
Moved the defines out to config.h, just for grins.
SVN now ignoring the binary.

16 years agono starting shields ever
Jason Woofenden [Mon, 13 Dec 2004 18:41:21 +0000 (18:41 +0000)]
no starting shields ever
rocks near starting position dissapear when you die so you can reapear safely

16 years agojust whitespace changes
Jason Woofenden [Mon, 13 Dec 2004 18:19:35 +0000 (18:19 +0000)]
just whitespace changes

16 years agoadded keybindings for steering with home position (right hand) in dvorak
Jason Woofenden [Mon, 13 Dec 2004 18:12:20 +0000 (18:12 +0000)]
added keybindings for steering with home position (right hand) in dvorak
redid indentation in main.c to use all tabs

16 years agochanged title banners
Joshua Grams [Mon, 13 Dec 2004 16:46:57 +0000 (16:46 +0000)]
changed title banners

16 years agoInitial Import of rockdodger 0.4.2 source
Joshua Grams [Mon, 13 Dec 2004 15:14:49 +0000 (15:14 +0000)]
Initial Import of rockdodger 0.4.2 source
(as modified by Jason and Josh).