Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,410 Commits 1 Branch 0 Tags
Commit Graph

2410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc
7bb627586f * New mission.setInstructions to go with mission.setInstructionsKey, analogous to the mission.addText / mission.addTextKey pair. 
* mission RFC part I. Initial implementation of the changes proposed in the forum. Will need tweaking.
* added new parameters to mission: title & foregroundImage (identical to backgroundImage atm)
* assorted code tidying up.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2750 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-15 00:24:23 +00:00
Nikos Barkas
59baa235ce HUD hiding is no more a debug flag, but a proper feature. While in pause, 'o' toggles it on/off. Added visibility of HUD hidenness to scripts via the player.ship.hudHidden read/write boolean property. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2749 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-15 00:12:09 +00:00
Eric Walch
9d963a50b1 - Limited wormhole size in nova systems. 
- Added scoop positions to all ships that can have fuel scoops.
- Raised asteroid and boulder density to 5. (To discourage boulder ramming)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2748 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-14 22:40:43 +00:00
Nikos Barkas
e1c1924e9e Build configuration changes to align the SDL builds with the Mac equivalents. Added the pkg-win-deployment configuration for stable releases. The deployment settings are forced, while the test release ones are adjustable. Tested successfully on Windows for the test releae, deployment, snapshot and debug configurations. Linux testing still needed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2746 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-14 16:18:23 +00:00
Jens Ayton
8d95596e87 Added matrix comparison functions. Removed Blocks from planettool; it is now plain C and should be buildable cross-platform with some fiddling. If you want to fiddle, talk to me. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2744 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-14 14:47:16 +00:00
Jens Ayton
5dd0443728 Refactored AI GraphViz stuff for slightly better legibility and put it in its own file. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2743 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-14 14:29:42 +00:00
Jens Ayton
50a1bca3ef Cleanup of OOPolygonSprite SVG stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2742 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-14 13:45:48 +00:00
Eric Walch
8119a48c8b - Corrected bug in the 2 second AI delay for station launches 
- Corrected escortAI.plist so it now follows their mother better after a station launch

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2741 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-14 13:19:26 +00:00
Eric Walch
d7c3922fba - Corrected delay in: sendAllShipsAway. 
- Corrected key for hostile messages in dockingClearance.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2740 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-12 21:25:32 +00:00
Jens Ayton
31a5c76622 sunSkimExitAI fixes: ATTACK_SHIP no longer tries to go to non-existent state HEAD_AWAY_FROM_PLANET on victory; it and FLEE instead go to a state that chooses between restarting and exiting based on current energy level. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2739 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-12 18:15:27 +00:00
Jens Ayton
8bb929b658 AI GraphViz handles set/switchAITo: followed by setStateTo:; added an entry for DEBUG_GRAPHVIZ to log header. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2738 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-12 17:32:42 +00:00
Jens Ayton
d76d50eb1d minerAI now goes to FLEE rather than non-existing ATTACK_SHIP if attacked in DOCK_WITH_STATION. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2737 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-12 17:18:56 +00:00
Jens Ayton
bd634a4237 Excluded BEHAVIOUR_ATTACK_MINING_TARGET from hasHostileTarget. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2736 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-12 16:23:01 +00:00
Jens Ayton
578a0f351f AI graphing now handles setAITo: and switchAITo:. TODO: handle returns from setAITo: and hyperspace. Also removed some redundant AI states/handers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2735 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-12 12:09:54 +00:00
Jens Ayton
07902c2b70 Whitelisted setPrimaryRole: for AIs, and made setStateTo: a normal method. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2734 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-11 15:24:34 +00:00
Nikos Barkas
d176e1cf90 Fixed some breakage in the Windows builds regarding debug Graphviz. It now builds both with and without DEBUG_GRAPHVIZ defined. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2733 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-11 09:10:26 +00:00
Jens Ayton
8435a65b87 Partial implementation of AI graphing tool - pref key: generate-ai-graphviz. Todo: handle setAI: and switchAI:, check for more terminal cases. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2732 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-11 01:22:48 +00:00
Nikos Barkas
7bb682f245 Fixed crash when scanner_display_color1/2 were being set from shipdata. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2731 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-09 09:32:44 +00:00
Nikos Barkas
0de9646ad2 Fixed build warning from previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2730 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-08 17:59:29 +00:00
Nikos Barkas
33a6ec7f39 OXPs authors can now include notification messages in the OXPMessages.plist file. These messages are read are startup and a notification message appears on the rotating Cobra screen. If less than 5 OXPs are found with messages, these are displayed as well. The OXPMessages.plist is an array of strings that are copied to Latest.log. This way, OXP creators can notify users of OXPs being Works in Progress or pass other information if necessary. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2729 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-08 13:09:09 +00:00
Michael Werle
a64ef42e75 Fixed bug where 'enter' key closing a Mission Screen would get processed by the Status Screen. Removed now unused variable "enterSelectKeyPressed". 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2728 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-08 12:34:21 +00:00
Eric Walch
43b41441cb Asking docking permission for stations/carriers that don't require permission now does send a DOCKING_REQUESTED / DOCKING_COMPLETE message to the ships AI to react on. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2727 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-07 19:56:01 +00:00
Eric Walch
fd2789fa7a Added two new properties to ship: 
* maxThrust  (read-only)
* thrust (read/write for npc, read-only for player and clamped between 0 and maxThrust)
Fixed bug with ships flying out of range when attacking with rear military laser.
Changed miner and scavenger AI to not get lost when flying out of a station scanner range.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2726 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-07 11:21:04 +00:00
Nikos Barkas
bde26b04df Fixed incorrect display of distance and time on Advanced Navigational Array when unreachable systems were targeted. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2725 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-06 16:32:58 +00:00
Marc
89df01f9bb * fix: js timers should now stop and be garbage collected when the script they're attached to goes out of scope. 
* fix: timer related windows DEP crashes should now be a thing of the past. Tested with timer-crash-test oxp & windows XP Data Execution Prevention turned on.

Both fixes seem fine, but we'll need to test them thoroughly.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2724 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-06 03:14:32 +00:00
Nikos Barkas
bd42fdb9ef Added pv4 to contributors' list. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2723 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-05 13:02:29 +00:00
Gary Wong
7784ba69fe Fixed silly arithmetic error (causing incorrect x_offset on wide 
aspect ratios) in rev 2719.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2722 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-05 03:35:09 +00:00
Nikos Barkas
426190ca12 Fixed build warnings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2721 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-04 21:31:01 +00:00
Marc
03a1728895 - Applied pv4's patch to trunk, with modifications. 
* ship.target = null now works as expected.
* adding trumbles to a ship has now got variable chance of working, depending on how many trumbles are already on board. Always works with 0 or very few trumbles.
- more cleanup: removed a windows compile warning, added a possible freeBSD bugfix, updated a js comment & autoindented Universe.m

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2720 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-04 20:57:11 +00:00
Gary Wong
b5315d49e8 Added "x_origin" and "y_origin" keys to HUD dictionaries, to allow 
HUDs to specify dial and legend positions with respect to arbitrary
parts of the screen.

Modified the default HUD to use "y_origin" so that the appropriate
parts of the display are aligned with the screen bottom, for any
aspect ratio.

(Co-ordinate #defines in HeadUpDisplay.h have NOT yet been updated, for
compatibility with any custom HUDs which might rely on them.)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2719 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-03 17:36:18 +00:00
Eric Walch
47e64561d5 escorts added over the escort-role in shipdata.plist now also follow the auto_ai setting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2718 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-03 17:14:52 +00:00
Nikos Barkas
2e9526bcde Added capability of changing scanner lollipop colors for ships by script. The keys scanner_display_color1 and scanner_display_color2 can be defined in shipdata.plist. Any of the two, if defined, will be displayed instead of the standard colors. If both are defined, the lollipop flashes using the two colors. Visibility in JavaScript using the read/write properties scannerDisplayColor1 and scannerDisplayColor2. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2717 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-31 06:52:28 +00:00
Eric Walch
8ed137ce1c Added error logging for wrong subentity orientation in shipdefinition. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2716 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-28 12:01:11 +00:00
Darren Salt
42baf582d7 A little GLfloat[4] const/staticness. 
This reduces the binary size a little...

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2715 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-27 23:28:08 +00:00
Darren Salt
1293ecf3d2 Allow use of # (UK keyboards). Keycode is 126. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2714 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-27 23:27:03 +00:00
Eric Walch
d80f8a1bfd Added a AI command "setThrustFactorTo:" Re-added the group feature for missiles with Thargoid scanclass after having seen some friendly fire going on between a thargoid and a tharglet. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2713 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-27 17:27:33 +00:00
Nikos Barkas
c056dd64b4 SDL builds: Fixed incorrect behaviour of '[' and ']' keys. Added support for the semicolon and quote keys. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2712 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-26 18:17:01 +00:00
Nikos Barkas
294957bb35 Cleared an unused variable warning under Windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2711 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-26 17:25:53 +00:00
Darren Salt
1028ece70c Fix a logic error in full-screen mode enumeration. 
The mode should only not be listed when its dimensions exactly match those of
the previous mode.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2709 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-26 16:15:11 +00:00
Jens Ayton
33a895411b Fixed hypothetical leak. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2707 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-25 16:49:30 +00:00
Jens Ayton
fc242ba895 Disabled polygon sprite VBO support for now. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2706 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-25 15:56:57 +00:00
Darren Salt
86804635ec [SDL] Force the full-screen option to "no" if we couldn't get a suitable mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2703 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-25 12:23:50 +00:00
Marc
9b854cda01 - oops: fixed r2700 windows compile errors. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2702 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-25 11:18:32 +00:00
Marc
f3dff5dff3 * fix: [commander_xxx] token expansion now works everywhere. 
* change: added [commander_bounty] to the expandable tokens.
- minor code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2701 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-25 11:07:43 +00:00
Jens Ayton
e9a1feb3b8 Hot VBO action. (WGL function pointer stuff may need fixing under Windows.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2700 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-25 07:56:42 +00:00
Darren Salt
9fa8558eb4 Cope with failure to set a full-screen mode. 
libsdl1.2debian 1.2.13-5 has a patch which enables xrandr.
However, this patch causes oolite to segfault on selecting full-screen mode.
This can be worked around by setting SDL_VIDEO_X11_XRANDR=0.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2699 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 23:29:38 +00:00
Jens Ayton
edc70ece82 Protection against death by degenerate polygon. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2698 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 22:35:43 +00:00
Jens Ayton
9915908ae6 Fixed geometric reasoning error in r2695. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2697 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 21:46:37 +00:00
Nikos Barkas
49e2fe394e A couple of small fixes with game window set up on Windows. A 800x600 setting will actually generate a 800x600 game window (was creating 792x573 previously). This is consistent with previous Oolite versions. As a byproduct of this, oolite.gameSettings.gameWindow.width/height returns correct values also when used in the this.startUp event handler. Test on Linux may be required. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2696 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 21:04:49 +00:00
Jens Ayton
d89759c039 Improved mitred vertex appearance. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2695 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 20:49:44 +00:00