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

2229 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jens Ayton
f04114145f Polygon sprite outlines implemented. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2694 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 19:58:26 +00:00
Jens Ayton
c2cb7d94e0 Implemented tricky part of polygon sprite outline generation, less tricky part to follow. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2693 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 18:34:39 +00:00
Jens Ayton
6b1933f727 Cross-platformicated r2691 (I think). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2692 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 09:09:01 +00:00
Nikos Barkas
3345d0134d Added information about the game window in the [UNIVERSE gameSettings] dictionary. This information is represented by a dictionary with keys width, height and fullScreen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2691 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-23 21:17:58 +00:00
Nikos Barkas
714f3a33cc Added the shipFiredMissile(missile, target) script event for player and NPCs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2690 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-23 07:16:41 +00:00
Jens Ayton
94a35c235f Fix polygon sprite behaviour when getting empty polygons. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2689 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-23 06:47:57 +00:00
Nikos Barkas
7053a8c47c Added Y A J to the contributors list. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2688 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-22 15:40:26 +00:00
Nikos Barkas
ceac5263af Commited Y A J's patch for caching information on the Short Range Chart screen, in order to avoid [UNIVERSE generateSystemData:] being called continuously and resulting in frame rate drop. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2687 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-22 07:57:55 +00:00
Jens Ayton
09e61dbdc9 Added polygon-sprite-dump-svg preference to save on graph paper. (This will be useful when I implement outline tesselation this weekend.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2686 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-21 19:43:22 +00:00
Eric Walch
5ecd442443 Added "cascade weapon" as cause of death. Corrected the switched "energy damage / removed" messages. scanFonNonThargoid does no longer find cloaked ships. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2685 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-21 12:15:45 +00:00
Nikos Barkas
84800c9134 Allow break pattern model to be specified externally. This works similar to the docking clearance: The default is set in the 'universal' section of planetinfo.plist under the 'default_breakpattern_model' key and is used for both hyperspace and docking pattern. Docking pattern can be overriden for each station by setting the key 'docking_pattern_model' in its shipdata. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2684 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-20 20:28:12 +00:00
Marc
bf2c0ae47e - fix: new missile & beacon icons code seems to be working OK now, resuming normal HUD display... 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2683 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-19 23:47:40 +00:00
Marc
3824a9ae87 - fixed a mac compile warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2682 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-19 21:30:37 +00:00
Marc
228ae5a9f5 - change: hyperspace tunnel colour now scriptable from inside planetinfo.plist 
- comment cleanup inside constrictor hunt.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2681 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-18 19:30:31 +00:00
Michael Werle
aa0821047a Added -Wall to compiler options for Linux 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2680 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-17 15:03:05 +00:00
Nikos Barkas
8fa1b264d9 Cleared 'control reaching end of non-void function' warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2679 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-17 12:50:22 +00:00
Michael Werle
f6f36aeebd Additional dumping for WH_SCANINFO_NONE assertion failure (See: http://aegidian.org/bb/viewtopic.php?t=6925) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2678 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-17 11:28:29 +00:00
Michael Werle
ed416313a0 Heatshield rework as per http://aegidian.org/bb/viewtopic.php?t=6922 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2677 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-16 23:23:31 +00:00
Nikos Barkas
5dcf1b4226 Improvement to the Advanced Navigational Array: Pressing Shift+6+Ctrl now displays the optimized-for-time route to destination in cyan color. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2676 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-16 22:03:59 +00:00
Nikos Barkas
48416ff810 Committed Svengali's converted-to-OpenStep-format plists. Now all core resources property lists should be in OpenStep format. Added Svengali to contributors list. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2675 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-16 16:05:12 +00:00
Marc
c946e0a528 - added USEMASC switch to enable/disable MASC military jammer & filter usage at compile time. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2674 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-16 10:43:25 +00:00
Eric Walch
93ba473d78 fixed sanity check confusion with docked station during firing the playerWillDockStation. Now all places that lose a target while tracking targets will send a noteLostTarget and will go into performIdle. When noteLostTarget was called without a target, it still will notify the ship about losing a target. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2673 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-15 17:09:38 +00:00
Darren Salt
f687e6d385 Fix a .deb build bug which prevents successive builds without regenerating the executable. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2671 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-12 21:57:48 +00:00
Michael Werle
8abfd996a4 Named missile-armed messages, as per http://aegidian.org/bb/viewtopic.php?t=6895 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2670 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-12 21:22:01 +00:00
Marc
c0ca2c8d27 - fix: when selling equipment, playerBoughtEquipment could disrupt time adjustment (test case:buy & sell thargon drones with captured thargons oxp) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2669 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-11 20:30:24 +00:00
Michael Werle
472cdae1dd New OOPolygonSprite - change APIENTRY #define guard from platform-specific to check whether APIENTRY is already defined in current environment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2668 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-11 16:16:16 +00:00
Jens Ayton
545b654b19 Added log message to help tell polygon sprites apart in tesselation spew. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2667 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-11 14:24:30 +00:00
Jens Ayton
233dd3131e Cleaned up APIENTRY stuff, and implemented polygon sprite combine callback, thus enabling self-intersecting polygons. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2666 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-10 22:36:17 +00:00
Marc
b850d1ce79 - got OOPolygonSprite to compile under both windows and macs - might still fail under linux... 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2665 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-10 19:49:00 +00:00
Michael Werle
6843c56f0a Tweak to Target System Memory Expansion - properly uses ID mode now when missile targetting is not active. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2664 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-10 19:40:10 +00:00
Marc
26860395eb - fix for ludicrous display settings 
- last minute tweaks to new APIs for consistency: ship.equipment[n] just returns the type of equipment, finding out if the player's equipment is damaged is handled by querying .equipmentStatus, .maxMissiles is now missileCapacity, again to be consistent with all the other .xyzCapacity properties.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2663 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-10 15:06:02 +00:00