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

6001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Anthoney
76a11c5edb Correct OO_ENTER_OPENGL usage 2014-08-13 19:30:36 +01:00
Kevin Anthoney
e2431330ee Merge branch 'planet_vertices' into shader_update 2014-08-11 20:23:09 +01:00
Kevin Anthoney
d18600b3ea Add convenience function for retreiving model-veiw-projection matrix 2014-08-11 20:02:09 +01:00
Kevin Anthoney
ab32bb2b71 Merge remote branch 'upstream/master' into shader_update 2014-08-11 19:15:12 +01:00
Kevin Anthoney
215defd986 Add global convenience functions for accessing OpenGL matrix manager 2014-08-11 19:14:29 +01:00
Kevin Anthoney
0cd0eccde0 Fix cursor being lost on chart when using keyboard 2014-08-11 08:24:48 +01:00
Kevin Anthoney
ece61d55a5 Merge branch 'master' of github.com:OoliteProject/oolite 2014-08-10 21:55:39 +01:00
Kevin Anthoney
b8ceff0106 Don't change target system when dragging chart 2014-08-10 21:54:28 +01:00
cim
28a34e0bd1 Merge branch 'scenarios-with-partial-oxps' 2014-08-10 21:41:11 +01:00
cim
9a94f406b3 Fix display bug, make note for later verifier work 2014-08-10 21:10:43 +01:00
Kevin Anthoney
f6f147dd11 Merge pull request #107 from OoliteProject/mouse-additions 
Mouse additions
 2014-08-10 20:53:09 +01:00
cim
86c9f89d01 Get scenario restrictions working 
Add "tag:oolite-tutorial-compatible" restriction to Tutorial scenario
 2014-08-10 20:45:08 +01:00
Kevin Anthoney
d0028d5cf3 clear mouse before entering chart screen 2014-08-10 19:54:00 +01:00
Kevin Anthoney
359c8e5e5c merge master 2014-08-10 19:32:53 +01:00
Kevin Anthoney
bf6bc9eda4 Fix planet not showing up on double click in chart 2014-08-10 19:28:53 +01:00
Kevin Anthoney
6227bf954c Add mousewheel and chart mouse dragging 2014-08-10 19:06:15 +01:00
AnotherCommander
fd01646094 Enabled mousewheel use for zooming in and out at the Galactic Chart screen, 2014-08-10 19:58:15 +02:00
AnotherCommander
3da4b4abc3 Mousewheel implemented for SDL builds. 2014-08-10 19:57:14 +02:00
cim
b0fc1b52f9 Start on allowing scenarios to restrict OXPs 
- compiles
 - strict mode seems to work
 - loading works

Partial restrictions as yet untested
 2014-08-10 18:36:43 +01:00
cim
16b4e528f1 Update changelog 2014-08-09 14:04:17 +01:00
cim
ce4c3e1e44 Register ship forms should return to the interfaces screen when complete 2014-08-09 13:54:49 +01:00
cim
f17cce6808 Merge branch 'master' of github.com:OoliteProject/oolite 2014-08-09 12:00:18 +01:00
cim
f50dce9db0 Visual indication of ECM activity - scanner fuzziness 2014-08-09 11:57:58 +01:00
Jens Ayton
27144fb1f4 Use fallthrough instead of else in dockingInstructions 
Because every branch of the if tree ended with a return statement, a
Sufficiently Smart Compiler complained that the fallback return was useless.
Removing the else clauses avoids the issue without changing logic or control
flow in any way.
 2014-08-09 12:16:29 +02:00
cim
a43f6e364c Make internal damage occur multiple times for very high-damage hits 
Missile impacts may now damage several pieces of cargo/equipment
 2014-08-09 11:06:23 +01:00
cim
97019ba92c Make sure ECM delay timer is stopped before ship is destroyed 2014-08-07 19:20:16 +01:00
Kevin Anthoney
4c0bdf7602 Set preservation of scanner zoom to nonlinear only 2014-08-07 19:13:58 +01:00
Kevin Anthoney
bab3e8d2af preserve scanner zoom across docking, witchspace and game saves 2014-08-07 17:46:41 +01:00
cim
eca56a3d56 Stop problems on ship library screen 
Also fix bug with NPC shield booster removal
 2014-08-06 22:44:57 +01:00
Jens Ayton
12a611f0f0 Fix use of OO_ENTER_OPENGL() in planetDrawable 2014-08-05 08:56:45 +02:00
Jens Ayton
ebbf7ff84c Fix use of NSInteger as format argument 2014-08-05 08:56:01 +02:00
cim
262b3760c4 Automatically download dependencies, if available, when installing OXZ 
Dependencies already met won't be downloaded (e.g. if an OXZ depends on
ABC >= 0.4, and ABC 0.6 is installed, ABC 0.8 won't be automatically
downloaded)
 2014-08-04 21:38:29 +01:00
cim
fc591c9895 Fix size calculation on laser shot entity - closes #104 
Need to set collisionRadius on entity to get render pass culling to work
May be a few other purely visual entities that have similar problems.
 2014-08-03 21:28:22 +01:00
Kevin Anthoney
da6b2e70ad merge changes 2014-08-02 11:33:34 +01:00
cim
e40fc68afc Label current download with name of what's being downloaded 2014-08-01 11:22:10 +01:00
cim
131c8244e3 Allow "long-range-chart-title-G-S" to be defined 
e.g "long-range-chart-title-0-7" = "Near Lave";
 2014-08-01 10:24:21 +01:00
cim
1a45adbb55 Merge pull request #97 from OoliteProject/two-pass-rendering 
Two pass rendering
 2014-08-01 09:18:38 +01:00
cim
7f90b5dcd6 Slightly more conservative detection of 'credits' abbreviation 2014-07-31 22:09:10 +01:00
cim
eee1cab0cd Fix mass locks - closes #103 2014-07-28 17:31:37 +01:00
Kevin Anthoney
4ddbc09005 retain chart zoom levels while switching between screens 2014-07-28 17:24:18 +01:00
Kevin Anthoney
4b34d5e130 Show chart background screens after mission screen 2014-07-28 17:18:04 +01:00
Kevin Anthoney
79aea50736 Fix disappearing text on chart screen 2014-07-27 22:14:50 +01:00
Kevin Anthoney
aef9e99172 Fix problem with zoomed-in long range chart from mission screen 2014-07-27 21:58:12 +01:00
Kevin Anthoney
7d79883247 clear chart screen of text when changing screens 2014-07-27 21:46:10 +01:00
cim
b1ac90dd5b Unbreak missiles - were not counting kills properly against Constrictor 2014-07-26 21:39:02 +01:00
cim
647c8ebb46 Fix regression with alert condition handling 2014-07-26 20:22:43 +01:00
cim
aa5e137f18 Fix constrictor hunt ship script for some unusual cases 2014-07-26 20:10:17 +01:00
Kevin Anthoney
26420402a0 Retain chart zoom level on F7->F6 2014-07-26 17:42:54 +01:00
Kevin Anthoney
daeccc6144 Restore previous F7->F6 behaviour 2014-07-26 17:30:55 +01:00
cim
a6d81c40e9 Fix typo 2014-07-26 14:54:23 +01:00