[epiar-commits] [rikus--/Epiar] 48db82: prevent special ship from appearing randomly in th...

[noreply at github.com]

Branch: refs/heads/master
Home:   https://github.com/rikus--/Epiar

Commit: 48db82967b14b8eaab75543101da165b974fe1ca
    https://github.com/rikus--/Epiar/commit/48db82967b14b8eaab75543101da165b974fe1ca
Author: Rikus Goodell <rikus+epiar at dusty.rikus.org>
Date:   2010-11-25 (Thu, 25 Nov 2010)

Changed paths:
  M Resources/Simulation/default/technologies-default.xml

Log Message:
-----------
prevent special ship from appearing randomly in the universe


Commit: f9fcca3b8305a335b37dbe25307b91a055774bcf
    https://github.com/rikus--/Epiar/commit/f9fcca3b8305a335b37dbe25307b91a055774bcf
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-11-25 (Thu, 25 Nov 2010)

Changed paths:
  M Resources/Scripts/missions.lua
  M Resources/Scripts/universe.lua

Log Message:
-----------
A new Shipping Mission.


Commit: e24b39b4b06ae5b0097d35c68643114a6a7d60a9
    https://github.com/rikus--/Epiar/commit/e24b39b4b06ae5b0097d35c68643114a6a7d60a9
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-11-25 (Thu, 25 Nov 2010)

Changed paths:
  M Resources/Scripts/universe.lua

Log Message:
-----------
Put Missions in nice Frames


Commit: b560895f146e5441505a60148db8eed58f9766fb
    https://github.com/rikus--/Epiar/commit/b560895f146e5441505a60148db8eed58f9766fb
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-11-25 (Thu, 25 Nov 2010)

Changed paths:
  M Source/Sprites/player.cpp

Log Message:
-----------
Prevent segfault when a mission fails to load.


Commit: 4d606759be9ccc64e984edfb8e131c8a0c6588a6
    https://github.com/rikus--/Epiar/commit/4d606759be9ccc64e984edfb8e131c8a0c6588a6
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-11-25 (Thu, 25 Nov 2010)

Changed paths:
  A Resources/Audio/Weapons/goldbeam.ogg
  A Resources/Audio/Weapons/laser.ogg
  A Resources/Graphics/goldbeam.png
  A Resources/Graphics/goldbeam2.png
  A Resources/Graphics/golden_uber.png
  M Resources/Scripts/ai.lua
  M Resources/Scripts/missions.lua
  M Resources/Scripts/player.lua
  M Resources/Scripts/universe.lua
  M Resources/Simulation/default/models-default.xml
  M Resources/Simulation/default/outfits-default.xml
  M Resources/Simulation/default/planets-default.xml
  M Resources/Simulation/default/technologies-default.xml
  M Resources/Simulation/default/weapons-default.xml
  M Source/Sprites/ship.cpp

Log Message:
-----------
Merge remote branch 'rikus/alternate'

Conflicts:
	Resources/Scripts/missions.lua
	Resources/Scripts/universe.lua


Commit: 163d4da05dcf7559f07d699b1cab717e67206f68
    https://github.com/rikus--/Epiar/commit/163d4da05dcf7559f07d699b1cab717e67206f68
Author: Rikus Goodell <rikus+epiar at dusty.rikus.org>
Date:   2010-11-26 (Fri, 26 Nov 2010)

Changed paths:
  M Resources/Scripts/universe.lua

Log Message:
-----------
adjusted AI credits on board calculation


Commit: dd351da00d509b9074f8ec2a5243c71b6286a2e4
    https://github.com/rikus--/Epiar/commit/dd351da00d509b9074f8ec2a5243c71b6286a2e4
Author: Rikus Goodell <rikus+epiar at dusty.rikus.org>
Date:   2010-11-26 (Fri, 26 Nov 2010)

Changed paths:
  A Resources/Audio/Weapons/goldbeam.ogg
  A Resources/Audio/Weapons/laser.ogg
  A Resources/Graphics/goldbeam.png
  A Resources/Graphics/goldbeam2.png
  A Resources/Graphics/golden_uber.png
  M Resources/Scripts/ai.lua
  M Resources/Scripts/missions.lua
  M Resources/Scripts/player.lua
  M Resources/Scripts/universe.lua
  M Resources/Simulation/default/models-default.xml
  M Resources/Simulation/default/outfits-default.xml
  M Resources/Simulation/default/planets-default.xml
  M Resources/Simulation/default/technologies-default.xml
  M Resources/Simulation/default/weapons-default.xml
  M Source/Sprites/player.cpp
  M Source/Sprites/ship.cpp

Log Message:
-----------
Merge https://github.com/knowknowledge/Epiar


Commit: ab3ee199b2cf354c5259a8baa4236baf4bafa77e
    https://github.com/rikus--/Epiar/commit/ab3ee199b2cf354c5259a8baa4236baf4bafa77e
Author: Rikus Goodell <rikus+epiar at dusty.rikus.org>
Date:   2010-11-26 (Fri, 26 Nov 2010)

Changed paths:
  M Resources/Scripts/utilities.lua

Log Message:
-----------
rewrote linewrap() to be aware of spaces


Commit: 7355ee97a15bcd3425029649d26fae4d26306d92
    https://github.com/rikus--/Epiar/commit/7355ee97a15bcd3425029649d26fae4d26306d92
Author: Rikus Goodell <rikus+epiar at dusty.rikus.org>
Date:   2010-11-26 (Fri, 26 Nov 2010)

Changed paths:
  M Resources/Scripts/ai.lua
  M Resources/Scripts/missions.lua
  M Resources/Scripts/universe.lua

Log Message:
-----------
A "protect the freighter" mission