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

5857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Anthoney
6dd1296ac2 Remove reference to OO_REDUCED_COMPLEXITY from fragment shader 2014-07-07 17:32:08 +01:00
Kevin Anthoney
ab12768b98 slight tidy up 2014-07-07 14:24:49 +01:00
Kevin Anthoney
d99f401559 make ooliteNormalMatrix a mat3 and normalize it 2014-07-07 14:22:41 +01:00
Kevin Anthoney
e443cc9518 remove commented lines 2014-07-06 22:24:59 +01:00
Kevin Anthoney
3597a54a01 Merge remote branch 'upstream/master' into shader_update 2014-07-06 18:51:10 +01:00
Kevin Anthoney
5ce1987e3c forgot to commit actual shaders 2014-07-06 18:50:30 +01:00
Kevin Anthoney
522d670a72 reinstate original planet shader and adapt for use with uniforms 2014-07-06 18:49:38 +01:00
cim
4f4edaa859 Fix for issue #95 
Force run loop evaluation on Windows while download progresses.
 2014-07-06 15:37:38 +01:00
Kevin Anthoney
ada5e03d7e Merge remote branch 'upstream/master' into shader_update 2014-07-06 15:09:30 +01:00
Kevin Anthoney
0c5ba70498 implement binding standard matrix uniforms and tidy up 2014-07-06 15:08:45 +01:00
AnotherCommander
34da9f9cec Avoid double OGL initialization whenever an automatic resize event (such as windowed->fullscreen or vice versa) is received under Windows. 2014-07-06 10:00:31 +02:00
Kevin Anthoney
88265c298c Resolve merge conflicts in Universe.m and ShipEntity.m 2014-07-05 20:42:29 +01:00
Kevin Anthoney
91d583ae22 Use matrix manager for OpenGL matrices 2014-07-05 20:30:14 +01:00
ericwalch
ed44de864b Updated versioning and gvNumberPadKey’s for the Mac build 2014-07-05 17:36:53 +02:00
cim
956bc96d45 Adjust string entry on mission screens to allow non-alphanumeric on SDL 
Issue #91 (needs further testing on Windows and Mac platforms)
 2014-07-05 15:57:37 +01:00
cim
b9bcacc0c7 Adjust AI reconsideration and ECM delays to depend on accuracy 2014-07-05 15:32:38 +01:00
cim
330ae8b003 Update the document for which files need updating on version increase 
(Next time round, let's remember this document exists)
 2014-07-05 13:18:15 +01:00
cim
b589ba00fe More flexibility in mission.setInstructions() 
Can now take an array as its first parameter, which will appear with the first element as a heading and the remaining elements as entries on the F5F5 screen. String as first parameter works as before.
 2014-07-04 22:39:36 +01:00
cim
03dcb03aad Set default windows/linux directory creation mode to recursive 
Needs post-2008 GNUStep, which I think should be safe on both platforms now.
 2014-07-03 21:38:47 +01:00
cim
4843f8b16d Revert inadvertent change to keyconfig 2014-07-03 18:13:31 +01:00
cim
92df7d5f86 Increase version number to 1.81 for new development cycle 2014-07-02 20:00:32 +01:00
cim
61718766b2 ...and the first bug fix of 1.80 - string conversion of numpad key settings 2014-07-02 19:50:17 +01:00
ericwalch
126622f2e7 Exported the OoliteReadme.odt with OpenOffice as pdf on a mac. Now the two missing ⌘ (cmd) symbols are present. 2014-06-29 23:35:21 +02:00
cim
07cbf8f3cf Merge branch 'bugfixes' 
Fix docking behaviour (needs more testing)
Fix assassin chase behaviour
 2014-06-29 21:22:32 +01:00
cim
e79cfe0925 Put Linux-deps back to latest state 2014-06-29 21:22:15 +01:00
ericwalch
c372d5ae55 Fixed issue on the mac with unused vars in deployment build 2014-06-29 22:03:27 +02:00
cim
c585ac71dd Fix format string 2014-06-29 17:54:27 +01:00
cim
80cc302379 Fix assassin chase routines 2014-06-29 17:19:09 +01:00
cim
2ef15dfb84 Try again to fix docking code 2014-06-29 17:08:34 +01:00
cim
1eea9448a0 Fix version numbers 2014-06-27 19:17:39 +01:00
cim
8d7536b0c8 Sound update needs to happen even while paused, for OpenAL 2014-06-26 17:46:24 +01:00
cim
0c87450f06 Documentation update in OXZ manager 
Warn that OXP versions of old expansions should be removed before installing the OXZ versions.
 2014-06-25 22:03:35 +01:00
cim
cd0534d0a9 Adjust AI description to include JS AI name for debugging 2014-06-25 18:02:43 +01:00
KonstantinosSykas
4d4f10f709 Bump Linux specific readme file corrections 2014-06-24 11:18:23 +03:00
cim
f63f8ccde3 Fix collision avoidance bug in miner AI 2014-06-23 22:16:44 +01:00
cim
c2800c3e5d Warn on download of OXZs on Windows due to bad GNUStep buffer 2014-06-22 15:15:29 +01:00
cim
be31612b3d Fix parcel/passenger contract generation 
Should be some available to new players - not safe hops to a nearby system asking for a Deadly pilot with a flawless reputation. New couriers still don't get to be that picky over what they accept, though.

Also stop generation of occasional contracts with impossible reputation requirements.
 2014-06-22 15:00:38 +01:00
cim
18c05dc080 Make upgrading OXZs from the "installed OXZs" page actually work 2014-06-21 22:01:03 +01:00
cim
0d4d17da2b Fix some problems with interrupted docking sequences 2014-06-21 17:26:59 +01:00
cim
b11c16200b Fix some rare cases in Oolite AI library 
- police in interstellar space
 - scavengers whose home station is destroyed
 2014-06-21 16:23:51 +01:00
KonstantinosSykas
914573e040 Update Linux uninstaller to remove empty ManagedAddOns folder 2014-06-20 18:19:20 +03:00
KonstantinosSykas
b7ac7e18d9 Bump Linux specific new readme file 2014-06-20 18:16:50 +03:00
cim
3d0cf308f2 Fix more shadowing issues - this time shadows inside objects 
This should work for all docking tunnels (except the straight-through ones) - so closes #94 - but the glare effect as a whole will need a better way of handling it after 1.80 is out as there are still a bunch of strange cases: straight-through docking tunnels, odd effects around Torus stations and other large "pancake"-shaped objects, and so on.
 2014-06-19 21:04:17 +01:00
cim
a1efd52f9a Fix bug where entities won't shadow points inside their own collision radius 
Partial fix for issue #94 (needs a bit more doing for rock hermits, where the docking tunnel extends so deep into the object the "nearer sun than object" test unshadows the camera)
 2014-06-19 18:52:11 +01:00
cim
44d12970af Fix turret tracking and shooting 2014-06-18 21:04:40 +01:00
cim
c5fa621439 Fix problem with drawing of turret subentities 
(Still a problem with aiming/firing of turret subentities)
 2014-06-18 21:04:40 +01:00
AnotherCommander
e435b2ab87 Win32 uninstaller: Fix wipeout of managed OXZs. All addons are meant to survive an uninstall. 2014-06-17 23:01:56 +02:00
cim
33d6c8db10 Fix compiler warning 2014-06-16 17:39:38 +01:00
cim
01ac673e91 Fix strobe sun glare bug 2014-06-15 21:47:49 +01:00
cim
e4b29e8a1f Increase version to Oolite 1.80 2014-06-15 20:14:50 +01:00