Giles Williams
|
d66a1b4762
|
clearing for re-use
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@542 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-10 13:38:46 +00:00 |
|
Giles Williams
|
254586d5f5
|
more work towards scriptable characters
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@541 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-10 13:36:37 +00:00 |
|
Giles Williams
|
10615bdaed
|
return correct result from is_nil_seed()
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@540 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-10 12:10:51 +00:00 |
|
Giles Williams
|
4bfd113941
|
Random Seed utilities
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@539 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-10 12:08:55 +00:00 |
|
Giles Williams
|
4ef23ada7c
|
moving toward scriptable characters
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@538 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-10 12:08:29 +00:00 |
|
Jens Ayton
|
ee09cd634e
|
Fixed isPlaying: fix to actually work.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@537 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-10 11:38:09 +00:00 |
|
Giles Williams
|
fbab15bea0
|
minor fixing
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@536 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-10 07:10:03 +00:00 |
|
Giles Williams
|
71d85a9af9
|
improved current cargo displays
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@535 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-09 23:09:40 +00:00 |
|
Giles Williams
|
dcc1868af4
|
show proper reward when rescuing traders
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@534 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-09 20:03:01 +00:00 |
|
Giles Williams
|
848e522d34
|
can rescue and capture NPCs in escape pods
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@533 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-09 19:53:21 +00:00 |
|
Giles Williams
|
1aba60097e
|
fix autopilot problems since customsounds
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@532 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-09 19:52:38 +00:00 |
|
Giles Williams
|
75906282c5
|
WIP playing with characters
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@531 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-07 11:45:08 +00:00 |
|
Giles Williams
|
99eaf3b095
|
small fix to commander_shipname
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@530 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-07 11:44:12 +00:00 |
|
Giles Williams
|
8606da1d02
|
D'oh! I put the hasShipyard check in the market code!
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@528 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-06 14:23:33 +00:00 |
|
Giles Williams
|
18b122fe3c
|
fix showing planets on f7 screen
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@527 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-05 22:53:21 +00:00 |
|
Giles Williams
|
bb4eae9df7
|
implemented <key>hasShipyard</key> taking either a number value or an array of conditions.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@525 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-05 12:04:16 +00:00 |
|
Giles Williams
|
3ba946c972
|
changes to how mission and local variables are expanded - permitting recursive expansions and doing it all in a a smarter fashion
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@524 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-05 09:30:29 +00:00 |
|
Giles Williams
|
676376f20d
|
changes to try to deal with exhaust lag outside station after fast docking (WIP)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@523 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-05 09:28:52 +00:00 |
|
Giles Williams
|
9a791f1212
|
small fix
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@519 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-02 15:27:21 +00:00 |
|
Giles Williams
|
7ecdae0f70
|
replacing a lot of doubles with GLfloats
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@518 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-02 15:18:18 +00:00 |
|
Giles Williams
|
94f5b5e6f4
|
fix dial_fuel
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@517 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-02 14:16:31 +00:00 |
|
Giles Williams
|
0f5bf28888
|
draw planets without depth tests at distances greater than radius * 5 and rely on the painters algorithm instead (fixes some glitches with Diso.oxp)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@516 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-02 13:46:57 +00:00 |
|
Giles Williams
|
468c176a8b
|
amendments to delivery report and setting PLAYER_MAX_FUEL in place more sternly
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@515 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-02 12:11:20 +00:00 |
|
Giles Williams
|
ec1e2cc346
|
minor debugging additions
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@514 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-02 08:42:56 +00:00 |
|
Giles Williams
|
c71ea39094
|
fixes: abandoned ships cannot scoop; splinters aren't kills.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@513 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-02 07:30:27 +00:00 |
|
Giles Williams
|
2cd69be7d8
|
more bloody tinkering with linked lists
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@512 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-01 18:19:41 +00:00 |
|
Giles Williams
|
6dc9979d05
|
fix more linked list crash conditions
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@510 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-01 16:15:05 +00:00 |
|
Giles Williams
|
85f8bdc469
|
fixed crash on loading player from last commit
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@508 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-01 10:23:17 +00:00 |
|
Giles Williams
|
04f0ccaa8a
|
tidying up and debugging linked list code
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@507 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-05-01 09:40:51 +00:00 |
|
Giles Williams
|
9e92ba1283
|
debugging improvements
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@506 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-29 14:09:20 +00:00 |
|
Giles Williams
|
82a3fe4096
|
quick hack fixing atmosphere tessellation level to match the planet
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@505 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-28 15:26:18 +00:00 |
|
Giles Williams
|
d3e6abded9
|
fix Galactic Witchjump problem introduced with poor fuel-limit code
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@504 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-28 13:04:14 +00:00 |
|
Giles Williams
|
3b4197fa70
|
Giles is dumb and can't tell MIN from MAX!
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@503 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-28 10:41:26 +00:00 |
|
Giles Williams
|
e30946833b
|
speed up sleepy pirates (use a minimum attack speed)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@502 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-28 10:16:08 +00:00 |
|
Giles Williams
|
f58c6bf789
|
double check MIN and MAX are defined
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@501 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-28 10:15:42 +00:00 |
|
Giles Williams
|
274d214868
|
added last few custom sounds replacements for 'boop'
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@500 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-28 09:42:17 +00:00 |
|
Giles Williams
|
3740acd6bc
|
revert the dock.dat model and add a new horizontal dock model (dock-flat.dat) for the stations (fixes some old oxps)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@499 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-28 09:27:21 +00:00 |
|
Giles Williams
|
bd29b33616
|
many improvements to collison detection and to background scenes
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@498 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-27 21:22:24 +00:00 |
|
Giles Williams
|
c1d6fc93fd
|
show number of collision checks in FPS display
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@497 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-26 17:52:54 +00:00 |
|
Giles Williams
|
bfcb053c6d
|
small fixes to revised collision detection
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@496 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-26 10:34:51 +00:00 |
|
Giles Williams
|
0037ef4493
|
w00t narrowed ghost bug to subregions of CollisionRegion, eliminated them, and implemented much more efficient collision group finding routines
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@495 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-26 09:41:56 +00:00 |
|
Giles Williams
|
7543d5db37
|
re-implemented filtering of collision candidates after realising there were mistakes in my original thinking
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@494 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-25 21:50:12 +00:00 |
|
Giles Williams
|
d5563661c4
|
more work on collision detection - it'll be the death of me!
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@493 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-24 23:16:49 +00:00 |
|
Giles Williams
|
0fc689bd8e
|
includes OOGLDefs.h
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@492 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-24 12:59:01 +00:00 |
|
Giles Williams
|
9f32cb72f1
|
show more detail in description only when debug flag is set
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@491 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-24 12:57:51 +00:00 |
|
Giles Williams
|
3570c1e056
|
for the moment discard low detail collision detection
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@490 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-24 12:56:44 +00:00 |
|
Giles Williams
|
dda9094271
|
keep sorted lists of entities by position along x y and z axes (for collision optimisations)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@489 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-24 12:55:36 +00:00 |
|
Jens Ayton
|
eb4e8d8e2e
|
Changed Universe generateSystemInhabitants: into Universe generateSystemInhabitants:plural:, with separate listing of plural terms in description.plist, for localisation.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@486 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-23 01:44:12 +00:00 |
|
Dylan Smith
|
7a3d9c778c
|
Move common OpenGL lighting defs into common include file
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@484 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-20 21:06:33 +00:00 |
|
Dylan Smith
|
30023ea358
|
pull in MyOpenGLView lighting changes from Cocoa
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@483 127b21dd-08f5-0310-b4b7-95ae10353056
|
2006-04-20 20:35:48 +00:00 |
|