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

5309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cim
bf4f6aa689 Basic dependency conflict/requires management for OXPs 2013-11-07 23:47:25 +00:00
cim
3be86948f0 As suggested, include manifest.plist for core, and validate it. 2013-11-07 20:33:46 +00:00
cim
cd2d62d6c0 Some more manifest.plist fields for later. 2013-11-06 21:36:26 +00:00
cim
9b04c93edb Require a manifest.plist in OXZ files 
identifier, version, required_oolite_version are required
title and maximum_oolite_version are processed
some others are defined but not yet used
 2013-11-06 21:32:47 +00:00
Jens Ayton
1547fa5ea8 Remove unused class OOALConcreteSound 2013-11-05 14:49:00 +01:00
Jens Ayton
4a3dff18c3 Replace obsolete POSIX functions 
bcopy() was obsoleted in POSIX 1.2001 and removed in POSIX 1.2008.
 2013-11-05 13:35:57 +01:00
Jens Ayton
086e8ea724 Merge branch 'master' into zipped-oxp-support 
Conflicts:
	Oolite.xcodeproj/project.pbxproj
 2013-11-05 13:33:16 +01:00
Jens Ayton
cd091fb247 [Mac] Replace obsolete POSIX functions 
bcopy() and bzero() were obsoleted in POSIX 1.2001 and removed in
POSIX 1.2008.

Also set _POSIX_C_SOURCE=200809L macro so we don't accidentally
use them again.
 2013-11-05 13:30:37 +01:00
cim
a9e919c18c alert_conditions setting for HUD legends/dials 
Bitmask to control visibility: 1=docked, 2=green, 4=yellow, 8=red
Defaults to 15 if not set.
 2013-11-04 22:00:53 +00:00
cim
9e32bec94b Better way of managing pause message. 2013-11-04 21:17:16 +00:00
AnotherCommander
f56773289a Attempt for crash fix in OOJSVector.m. 2013-11-04 19:07:40 +01:00
cim
bbf8fdcb93 Merge branch 'nafigator-fix-numpadkeys' 
Fix conflicts accumulated from other changes to master.
Conflicts:
	GNUmakefile
	src/Core/Entities/PlayerEntity.h
	src/Core/Entities/PlayerEntity.m
	src/Core/Entities/PlayerEntityControls.m
 2013-11-03 16:51:43 +00:00
cim
dbf2e46978 Remove ferdelance-player thrust difference 2013-11-03 16:00:54 +00:00
cim
1ac5406f07 Set allegiance for stations rather than relying on automatic calc. 
Rock hermits allegiance varies (consistently per hermit) per system.
 2013-11-03 13:36:23 +00:00
cim
04fcf560a8 Make weapons-offline notice much more noticeable 2013-11-03 12:29:23 +00:00
cim
73d6fb162a New ships should start with weapons online 2013-11-03 12:16:19 +00:00
cim
07212c7183 Stop player found target changing during escape sequence 
Closes #57
 2013-11-02 20:33:04 +00:00
cim
2a1ca5aca6 As suggested change priorities for efficiency 2013-11-02 20:16:45 +00:00
cim
1e4b64f60e Rearrange escape pod sequence code - most of issue #57 2013-11-02 20:13:18 +00:00
Jens Ayton
5b97b33024 [Mac] Add role-categories.plist to Xcode project 2013-11-02 20:10:47 +01:00
Jens Ayton
7e4b28834d Update log header, this time for real 2013-11-02 19:50:29 +01:00
cim
e641390dda Merge branch 'master' of github.com:OoliteProject/oolite 2013-11-02 18:46:40 +00:00
Jens Ayton
3ebd74e6a5 [Mac] Use fancy Clang modules in Xcode 5 2013-11-02 19:45:29 +01:00
Jens Ayton
c391730ed3 Update log header 
* Add OpenAL to feature list
* Remove spoken messages and mass/fuel pricing, since these are now
  standard, released features on all platforms.
 2013-11-02 19:42:02 +01:00
cim
f8bf4bf5f6 systemInformationChanged(gal,sys,key,newValue) world event 2013-11-02 18:40:50 +00:00
Jens Ayton
939f5a2806 Disable sound.buffer logging by default 2013-11-02 19:40:22 +01:00
Jens Ayton
9579dcfb6a Use OpenAL in Mac builds 2013-11-02 19:35:22 +01:00
Jens Ayton
88d8d6df6c Deal with Clang warnings in OpenAL code 2013-11-02 19:35:22 +01:00
Jens Ayton
927c245112 Correct OOSoundInternal.h for OpenAL 2013-11-02 19:35:22 +01:00
cim
26fd084f4c Extra special string expansions 
For keyconfig entry "key_FOO", "[oolite_key_FOO]" will describe it.
 2013-11-02 17:24:43 +00:00
cim
5f53acac14 Cleanup as suggested 2013-11-02 16:09:53 +00:00
Jens Ayton
fcd1d21f5b Fix another build warning in MiniZip 2013-11-02 15:37:43 +01:00
Jens Ayton
e69ae01eb5 [Mac] Add type information for OXZs 2013-11-02 14:54:43 +01:00
Jens Ayton
ed55d08251 Merge remote branch 'origin/master' into zipped-oxp-support 2013-11-02 14:44:16 +01:00
Jens Ayton
95d891f9b7 Fix missing symbolic identifier in OOLogHeader 2013-11-02 14:43:24 +01:00
Jens Ayton
71b8b1f6d5 Fix various warnings in Xcode 5 2013-11-02 14:40:46 +01:00
Jens Ayton
d66798f670 Fix more Xcode 5 project issues 
I thought I'd done these, but apparently not.
 2013-11-02 14:27:09 +01:00
Jens Ayton
c58062947c Add missing resources to Xcode project 2013-11-02 14:26:16 +01:00
Jens Ayton
30c2290b64 Fix OOOpenALController build issues under Mac OS X 
Also, repurposed OOOpenAL.h to be broadly equivalent to OOOpenGL.h
and OOCocoa.h.
 2013-11-02 13:29:16 +01:00
Jens Ayton
2ac8322467 Fix MiniZip build issues under Mac OS X 2013-11-02 13:23:59 +01:00
Jens Ayton
4ea7a8078d Add zip support files to Xcode project 2013-11-02 13:23:24 +01:00
cim
450f7358ce Remove bad weapon position override. 2013-11-01 23:06:32 +00:00
cim
5c4c257ed8 Set main station roll rates 2013-11-01 20:22:25 +00:00
cim
b86a3a4181 Fix various issues with looping and replaying of sounds. 
Sounds and music now readable from OXZs just as from disk
 2013-10-31 20:47:59 +00:00
cim
3b8e651e67 Music now works as well. 
Reading sounds from oxz sort-of works, until it needs to be replayed. Can't really seek from the ZIP stream easily, so will need to work around it
 2013-10-31 18:04:25 +00:00
cim
78f0c42f5c Track sample lengths properly 2013-10-31 15:16:13 +00:00
cim
d1bb7075fa Getting closer, but sound now cuts out half-way through playback 2013-10-31 14:45:30 +00:00
cim
d67bfb6c94 Merge branch 'master' of github.com:OoliteProject/oolite into zipped-oxp-support 
Conflicts:
	GNUmakefile

Merge upstream now or this will be messy later with the windows deps
 2013-10-31 14:02:45 +00:00
cim
977190d82e Merge branch 'master' of github.com:OoliteProject/oolite 2013-10-31 14:01:21 +00:00
cim
f00d3bd2fe Start work on OpenAL support 
(Really doesn't work as of this commit...)
 2013-10-31 14:00:18 +00:00