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

5598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cim
328a261696 Reword options, add exit option 2013-12-02 20:09:03 +00:00
cim
59fc255fb5 Fix some more bugs around strict mode and reloading 
Cleanup some in-game menus now strict mode accessed through scenarios
 2013-12-01 22:21:11 +00:00
cim
977cc031e5 Fix some issues with exiting strict mode 2013-12-01 22:05:52 +00:00
cim
edfd011ecb Add the scenarios, fix some bugs 
Still some more bugs to fix
 2013-12-01 21:57:07 +00:00
cim
6fbcf75363 Scenario loading screen 
(unfinished: scenarios not yet present)
 2013-12-01 18:29:08 +00:00
cim
4dc16316af Adjust start screen to allow for more options than load y/n 2013-12-01 14:32:06 +00:00
cim
91ff0c6647 Fix witchspace entry error for assassins 2013-12-01 12:36:32 +00:00
Jens Ayton
1ba485275d Fix some comment errors 2013-12-01 10:40:36 +01:00
Jens Ayton
5291a65c90 [Mac] Add some profiler flags 2013-12-01 10:24:55 +01:00
cim
207a0d25cd Use a better RNG when expanding descriptions for JS 
Since JS expansions don't get to set a seed value first, I don't think that this can have compatibility implications. NonJS expansions (and JS expansions which don't use expandDescription() or expandMissionText() continue to use the old form)
 2013-11-30 16:35:34 +00:00
Kevin Anthoney
5438bfa6ff Merge remote-tracking branch 'upstream/master' 2013-11-30 15:15:50 +00:00
cim
96f39f3463 Fix some warnings 2013-11-29 21:44:45 +00:00
cim
3fd5ad89b1 Adjust combat odds calculation for bigger fights 2013-11-29 21:06:29 +00:00
cim
b9c5d331f2 Update contributors list for recent patches 2013-11-29 18:49:08 +00:00
cim
694268c95f Fix typo causing errors in comms sending 2013-11-29 18:46:45 +00:00
cim
c1c28ae749 Adjust comms messages to distinguish attack messages a bit 2013-11-28 21:54:00 +00:00
cim
1dd51a6adf Correctly unset wormhole record in ship AIs 2013-11-28 21:00:51 +00:00
cim
281c76205c Flasher frequency can be == 0 2013-11-27 21:19:31 +00:00
cim
5c882d6c36 Some more properties for flashers 
.active , .color , .fraction , .frequency , .phase - all r/w
 2013-11-27 20:36:30 +00:00
Jens Ayton
940e5a936a [Mac] Add JS exhaust and flasher to Xcode project 2013-11-27 16:00:08 +01:00
cim
fb53a45ff2 JS interfaces to exhausts, flashers - closes #43 
ship.exhausts
ship.flashers

Exhausts and flashers both have r/w .size property and .remove() method

Flashers might get some more properties later for colour/phase/etc.
 2013-11-26 23:00:36 +00:00
Kevin Anthoney
0e9ad9fce7 Add instructions to use make -f Makefile to README.txt for GNU make. 2013-11-26 19:07:19 +00:00
Kevin Anthoney
6b44551b73 Remove reference to .relative_gitmodules from README.txt 2013-11-26 12:27:21 +00:00
cim
90ad6c5025 Merge pull request #67 from kanthoney/cim-keyboard 
Fix for opposing keyboard movements
 2013-11-25 14:05:49 -08:00
Jens Ayton
f599581feb Typo cleanup 2013-11-24 19:52:23 +01:00
Jens Ayton
84a2ffe558 Bump Mac-specific for OXZ indexing 2013-11-24 19:52:11 +01:00
Jens Ayton
80a530d209 Update Mac nightly script 2013-11-24 13:27:11 +01:00
Kevin Anthoney
ead9ffc524 Add keyboard fix so that pressing opposing roll, pitch or yaw keys together zeros movement. 2013-11-22 14:55:55 +00:00
KonstantinosSykas
bc82d84a23 Push Linux dependencies into oolite master 
following zlib addition for zipped-oxp support
 2013-11-21 00:57:58 +02:00
KonstantinosSykas
4865a14f4b Push Linux dependencies into oolite master 
following renaming of OpenAL library
 2013-11-20 23:53:42 +02:00
AnotherCommander
4cbd2b346c Merge branch 'master' of github.com:OoliteProject/oolite 2013-11-20 22:39:49 +01:00
AnotherCommander
95301b395c Specifically request dynamic linkage for vorbis libraries on Windows. 2013-11-20 22:39:06 +01:00
cim
9da24c7e60 Fix error in streamed sound decoder causing artifacts 2013-11-20 21:37:40 +00:00
KonstantinosSykas
e96dd59906 Push Linux dependencies into oolite master 
following header files update as per OpenAL transition
 2013-11-20 23:04:14 +02:00
KonstantinosSykas
850ad8b017 Push Linux dependencies into oolite master 
following rename of external library dependencies needed by OpenAL
 2013-11-20 22:34:41 +02:00
KonstantinosSykas
754549b20e Merge branch 'master' of github.com:OoliteProject/oolite 2013-11-20 21:29:53 +02:00
KonstantinosSykas
8786ecdeb8 Push Linux dependencies into oolite master following OpenAL external library dependencies update 2013-11-20 21:28:42 +02:00
cim
fbd6173ef5 Fix misnamed behaviour in escort AI 2013-11-20 17:53:37 +00:00
cim
2d341002cb Regression fix: load volume setting from config as before 2013-11-20 17:29:29 +00:00
AnotherCommander
04765821f7 Pushing Windows deps to latest revision again. 2013-11-19 22:03:20 +01:00
cim
bee5f6d712 Merge pull request #65 from kanthoney/master 
Git instructions in README.txt
 2013-11-19 10:29:02 -08:00
cim
1bab88924b Fix lighting bug when starting straight into a saved game 2013-11-19 18:22:29 +00:00
KonstantinosSykas
da529517a0 Push Linux dependencies into oolite master following OpenAL updates 2013-11-19 00:53:57 +02:00
KonstantinosSykas
37883a22d4 Merge branch 'master' of github.com:OoliteProject/oolite 2013-11-19 00:51:56 +02:00
KonstantinosSykas
8b308ef10a Push Linux dependencies into oolite master following OpenAL updates 2013-11-19 00:50:49 +02:00
cim
7f224dfa03 Sort-of fix bug in marketSeed 
Why did none of our various compilers for the last four years warn us that stuffing a double into an int might not be the smartest thing to do?
 2013-11-18 21:54:14 +00:00
cim
bf95bd3483 Merge branch 'master' of github.com:OoliteProject/oolite 2013-11-18 18:05:08 +00:00
cim
2fe4c4318c Fix some interstellar space bugs in AI 2013-11-18 18:04:12 +00:00
AnotherCommander
d5deb23d46 Pushing Windows dependencies on master to latest revision, following removal of SDL_mixer.dll. 2013-11-18 12:20:34 +01:00
cim
0a0bff2dbf Update CHANGELOG 2013-11-17 16:50:23 +00:00