[epiar-commits] [cthielen/Epiar] 549239: Merge remote branch 'sweeney/master'

Tue Aug 24 19:52:37 PDT 2010

Branch: refs/heads/master
Home:   http://github.com/cthielen/Epiar

Commit: 549239888098105c1ab2ad9fe342c36e3498f17b
    http://github.com/cthielen/Epiar/commit/549239888098105c1ab2ad9fe342c36e3498f17b
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-17 (Tue, 17 Aug 2010)

Changed paths:
  M Source/Engine/simulation.cpp
  M Source/Sprites/spritemanager.cpp
  M Source/Sprites/spritemanager.h

Log Message:
-----------
Merge remote branch 'sweeney/master'

Commit: 0f6fd35aa9815971de7b66def08f495cb21cc2e4
    http://github.com/cthielen/Epiar/commit/0f6fd35aa9815971de7b66def08f495cb21cc2e4
Author: gsweeney <gerard0sweeney at gmail.com>
Date:   2010-08-18 (Wed, 18 Aug 2010)

Changed paths:
  M Source/Engine/simulation.cpp
  M Source/Sprites/sprite.cpp
  M Source/Sprites/sprite.h
  M Source/Utilities/timer.cpp
  M Source/Utilities/timer.h

Log Message:
-----------
Changes to simulation, sprite and timer to allow Sprite objects to know how long it has been since their last Update(), and to apply the correct amount of momentum accordingly

Commit: 5bf8b49cdab6b83af217a9a4a29d6af4cf0839d1
    http://github.com/cthielen/Epiar/commit/5bf8b49cdab6b83af217a9a4a29d6af4cf0839d1
Author: gsweeney <gerard0sweeney at gmail.com>
Date:   2010-08-18 (Wed, 18 Aug 2010)

Changed paths:
  M Resources/Definitions/options.xml
  M Source/Engine/simulation.cpp
  M Source/Sprites/spritemanager.cpp

Log Message:
-----------
Changed simulation loop to set lowFps for 600 logical frames at a time when fps drops below 15. This forces wave-update to be used for that period. Also removed the update-all option in options.xml, should no longer be relevant

Commit: 18294e71d0fd54ef48a19b1945bf45ec235d3cf8
    http://github.com/cthielen/Epiar/commit/18294e71d0fd54ef48a19b1945bf45ec235d3cf8
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-18 (Wed, 18 Aug 2010)

Changed paths:
  M Source/Utilities/xml.cpp
  M Source/Utilities/xml.h

Log Message:
-----------
TokenizedPath is a useful function.  Now it is available for classes besides XMLFile.

This function can be used to split a string into a vector of strings given a list of special tokens.

Commit: c87baceb360c0c7dc1a8c36092a0f9488075edd8
    http://github.com/cthielen/Epiar/commit/c87baceb360c0c7dc1a8c36092a0f9488075edd8
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-18 (Wed, 18 Aug 2010)

Changed paths:
  M Source/UI/ui_label.cpp
  M Source/UI/ui_label.h

Log Message:
-----------
Multiline Labels

Labels automatically split the input by the newline character "\n".

Commit: 6715ef3f7979757f4bb15ad33fbae8d39a78dc43
    http://github.com/cthielen/Epiar/commit/6715ef3f7979757f4bb15ad33fbae8d39a78dc43
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-19 (Thu, 19 Aug 2010)

Changed paths:
  M Resources/Definitions/options.xml
  M Resources/Scripts/universe.lua
  M Source/Engine/simulation.cpp

Log Message:
-----------
Add Welcome message for new players

By default, this will only display once, then turn itself off.

Commit: f351707ba7b814e953e44bed31aaec14cd1385b0
    http://github.com/cthielen/Epiar/commit/f351707ba7b814e953e44bed31aaec14cd1385b0
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-19 (Thu, 19 Aug 2010)

Changed paths:
  M Resources/Scripts/universe.lua

Log Message:
-----------
Add a tab of Game Options

For now these include: FullScreen, Show Intro, Random Universe, Automatic Load, and EditorMode.

Commit: 2766a57560da84d2a101b40bedbdcc0718f5f0f5
    http://github.com/cthielen/Epiar/commit/2766a57560da84d2a101b40bedbdcc0718f5f0f5
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-19 (Thu, 19 Aug 2010)

Changed paths:
  M Resources/Definitions/options.xml
  M Resources/Scripts/player.lua
  M Resources/Scripts/universe.lua
  M Source/UI/ui_tabs.cpp
  M Source/main.cpp

Log Message:
-----------
General Prettiness cleanup

Turn off Logging to standard out by default.
This removes superflous printfs.
Changes the Title Screen.

Commit: 42cdb2fdfc07d6200ce18b7b348ed7662b7f6436
    http://github.com/cthielen/Epiar/commit/42cdb2fdfc07d6200ce18b7b348ed7662b7f6436
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-19 (Thu, 19 Aug 2010)

Changed paths:
  M Source/UI/ui_label.cpp

Log Message:
-----------
Multiline Label cleanup

Calculate the Width and Height based on Maximum line width and number of lines respectively.

Commit: 2357b5a7f36298216b4719d98785369849614fd5
    http://github.com/cthielen/Epiar/commit/2357b5a7f36298216b4719d98785369849614fd5
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-19 (Thu, 19 Aug 2010)

Changed paths:
  M Resources/Scripts/player.lua
  M Source/AI/ai_lua.cpp
  M Source/AI/ai_lua.h
  M Source/Sprites/ship.cpp
  M Source/Sprites/ship.h

Log Message:
-----------
Make the Boarding reward the total cost the ship and total credits it has.

The Total Cost of a ship is the total value of the Model, the Engine, all Weapons, all Outfit.

Also slow down disabled ships slightly. (So that the player can catch up to them.)

Commit: ac4927ca6821adf48ae8bb8e7fc380dbe08c41c7
    http://github.com/cthielen/Epiar/commit/ac4927ca6821adf48ae8bb8e7fc380dbe08c41c7
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-19 (Thu, 19 Aug 2010)

Changed paths:
  M Resources/Definitions/options.xml

Log Message:
-----------
Turn off the Random Universe

Commit: ff4db9fcc2a81695628805beccf86287c616b8b4
    http://github.com/cthielen/Epiar/commit/ff4db9fcc2a81695628805beccf86287c616b8b4
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-19 (Thu, 19 Aug 2010)

Changed paths:
  M Resources/Definitions/options.xml
  M Source/Engine/simulation.cpp
  M Source/Sprites/sprite.cpp
  M Source/Sprites/sprite.h
  M Source/Sprites/spritemanager.cpp
  M Source/Utilities/timer.cpp
  M Source/Utilities/timer.h

Log Message:
-----------
Merge remote branch 'sweeney/master'

Commit: 2a038e72a355e64fd24699ba001f5673d73333f1
    http://github.com/cthielen/Epiar/commit/2a038e72a355e64fd24699ba001f5673d73333f1
Author: digital-phoenix <mragonz at yahoo.com>
Date:   2010-08-19 (Thu, 19 Aug 2010)

Changed paths:
  M Resources/Scripts/player.lua
  M Source/Engine/simulation.cpp
  M Source/Engine/simulation.h
  M Source/Sprites/player.cpp
  M Source/Sprites/player.h
  M Source/Utilities/lua.cpp
  M Source/Utilities/lua.h

Log Message:
-----------
Changed the player save function to save every time the player lands and added last planet visited information to the players save file.

Previous epiar save files will not be compatible with new system and will probably prevent epiar from starting properly.

Commit: 406144a087ee0e672c4da90e98bd4b420c83c119
    http://github.com/cthielen/Epiar/commit/406144a087ee0e672c4da90e98bd4b420c83c119
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-19 (Thu, 19 Aug 2010)

Changed paths:
  M Resources/Scripts/player.lua
  M Source/Engine/simulation.cpp
  M Source/Engine/simulation.h
  M Source/Sprites/player.cpp
  M Source/Sprites/player.h
  M Source/Utilities/lua.cpp
  M Source/Utilities/lua.h

Log Message:
-----------
Merge remote branch 'phoenix/master'

Conflicts:
	Source/Engine/simulation.cpp
	Source/Engine/simulation.h
	Source/Sprites/player.cpp
	Source/Sprites/player.h

Commit: cbe5ad351c6b62113862731abeee40ca0f4c24fb
    http://github.com/cthielen/Epiar/commit/cbe5ad351c6b62113862731abeee40ca0f4c24fb
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-19 (Thu, 19 Aug 2010)

Changed paths:
  M Resources/Scripts/player.lua

Log Message:
-----------
Clean up the Player Loading Screen

Commit: a5ef07d9d1463ce85cb2fb4e7ddd0404e3d95c98
    http://github.com/cthielen/Epiar/commit/a5ef07d9d1463ce85cb2fb4e7ddd0404e3d95c98
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-20 (Fri, 20 Aug 2010)

Changed paths:
  M Source/Utilities/components.cpp

Log Message:
-----------
Change Components to use and check the version.h values.

This raises a warning if the version from the file does not match the compiled version.
It will still attempt to process the file.

Commit: 56d8e808ae44c26b4ae1349482b3a811565aed0d
    http://github.com/cthielen/Epiar/commit/56d8e808ae44c26b4ae1349482b3a811565aed0d
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-20 (Fri, 20 Aug 2010)

Changed paths:
  M Resources/Scripts/universe.lua
  M Source/Sprites/player.cpp
  M Source/Sprites/player.h
  M Source/Utilities/lua.cpp

Log Message:
-----------
Use the Planet's current location when loading the player.

This allows the planet's location to change while still allowing the player to load to a valid location.  This could happen if the user is edits the universe since the last save, or if the player is using the random-universe option.

This also saves the player when they land and when they leave a planet so that the purchases made on that planet are recorded.

Commit: 08739838a915a08a8c1390bce61a715c8a160f68
    http://github.com/cthielen/Epiar/commit/08739838a915a08a8c1390bce61a715c8a160f68
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-20 (Fri, 20 Aug 2010)

Changed paths:
  M Resources/Definitions/options.xml

Log Message:
-----------
Turn on intro mode.

Commit: 66dfe4f7d7a9593ecb29f399da3a5f2b8c63cafd
    http://github.com/cthielen/Epiar/commit/66dfe4f7d7a9593ecb29f399da3a5f2b8c63cafd
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-21 (Sat, 21 Aug 2010)

Changed paths:
  M Source/Sprites/sprite.cpp

Log Message:
-----------
Fix projectile momentum bug.

The lastUpdateFrame for new sprites was being initialized to zero, which
meant that on the first frame that the sprites updated, it will move by
momentum*( the total number of logical frames so far).  For most
Sprites, this isn't a problem since their starting momentum is zero.
But for the Projectile, they start with the momentum of the ship that
fired them.  This nonzero momentum was multiplied thousands of times and
moved the projectile so far past the target as to completely miss them.

This reveals another problem with Projectiles: they only hit things that
are near them when they update.  If the projectile is moving quickly, it
can pass through ships without colliding.

Commit: 17a075003a7ee729f4fd048775d6b6b562813f1c
    http://github.com/cthielen/Epiar/commit/17a075003a7ee729f4fd048775d6b6b562813f1c
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-21 (Sat, 21 Aug 2010)

Changed paths:
  M Source/version.h

Log Message:
-----------
Roll the version number since 0.4.0 was DOA.

Commit: b7a94a96327d99898c882a982fe062507907b0ff
    http://github.com/cthielen/Epiar/commit/b7a94a96327d99898c882a982fe062507907b0ff
Author: DuMuT6p <plural at abv.bg>
Date:   2010-08-21 (Sat, 21 Aug 2010)

Changed paths:
  M Resources/Definitions/models-default.xml
  M Source/Engine/models.cpp
  M Source/Engine/models.h
  M Source/Engine/outfit.cpp
  M Source/Sprites/ship.cpp
  M Source/Sprites/ship.h
  M Source/Utilities/lua.cpp

Log Message:
-----------
Added some needed shield variables and ship now takes damage if there are no shields, the values in models-default.xml will be balanced later[now they copy exactly the hullStrength]

Commit: 916253b1cf4874e4a1faf9e9fd983b872db97aaa
    http://github.com/cthielen/Epiar/commit/916253b1cf4874e4a1faf9e9fd983b872db97aaa
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-22 (Sun, 22 Aug 2010)

Changed paths:
  M Resources/Scripts/player.lua
  M Source/Engine/hud.cpp
  M Source/Engine/hud.h
  M Source/Engine/simulation.cpp

Log Message:
-----------
Change the way that StatusBars change values

Before, there was a function "UpdateHUD" that needed to be called every tick and would update each StatusBar.  Now each StatusBar has a "lua_updater" string that it uses to fetch it's new value on each update tick.

The lua_updater string is evaluated and the return value is used as the new name or ratio value.  The evaluation is implicitly returned, so the Lua script can use "7" or "foo()"rather than "return 7" or "return foo()".

This also moves the starfield, camera, and Hud Update calls outside of the pause check.  (This way the 'credits' StatusBar can update while the User is buying things.)

Commit: f1c095b381f54153469f1cbd3eab8cf5650dc820
    http://github.com/cthielen/Epiar/commit/f1c095b381f54153469f1cbd3eab8cf5650dc820
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-23 (Mon, 23 Aug 2010)

Changed paths:
  M Source/Sprites/planets.cpp
  M Source/Sprites/spritemanager.cpp

Log Message:
-----------
Fix STL sort usage

STL list sorting only works on adjacent elements, so the lists have to be sorted first.

Commit: 100ab4be19bae954c2f65c1420c6a5b9360f0408
    http://github.com/cthielen/Epiar/commit/100ab4be19bae954c2f65c1420c6a5b9360f0408
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-23 (Mon, 23 Aug 2010)

Changed paths:
  M Resources/Scripts/basics.lua

Log Message:
-----------
Fix broken Bully AI

When the Bully got too far from a planet, it would just keep trying to fly perpendicular to it ("Orbitting") rather than move towards it.

Commit: 5eef51ba4e40d6c515dab55c582ae5f879b3e041
    http://github.com/cthielen/Epiar/commit/5eef51ba4e40d6c515dab55c582ae5f879b3e041
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-24 (Tue, 24 Aug 2010)

Changed paths:
  M Resources/Scripts/player.lua
  M Source/AI/ai_lua.cpp
  M Source/AI/ai_lua.h
  M Source/Sprites/ship.cpp
  M Source/Sprites/ship.h

Log Message:
-----------
Adds Lua hooks for the Ship shields

Commit: 238c9f05033eb82104a49360ab12be7a068b58d4
    http://github.com/cthielen/Epiar/commit/238c9f05033eb82104a49360ab12be7a068b58d4
Author: Matt Zweig <thezweig at gmail.com>
Date:   2010-08-24 (Tue, 24 Aug 2010)

Changed paths:
  M Resources/Definitions/models-default.xml
  M Resources/Scripts/player.lua
  M Source/AI/ai_lua.cpp
  M Source/AI/ai_lua.h
  M Source/Engine/models.cpp
  M Source/Engine/models.h
  M Source/Engine/outfit.cpp
  M Source/Sprites/ship.cpp
  M Source/Sprites/ship.h
  M Source/Utilities/lua.cpp

Log Message:
-----------
Merge branch 'shields'

Conflicts:
	Resources/Scripts/player.lua

Commit: be58ddce7d93bc6c885eea98f325e0b3ce7aa754
    http://github.com/cthielen/Epiar/commit/be58ddce7d93bc6c885eea98f325e0b3ce7aa754
Author: Christopher Thielen <chris at epiar.net>
Date:   2010-08-24 (Tue, 24 Aug 2010)

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

Log Message:
-----------
Player must have planet targetted before landing sequence.

E.g. if player is over a planet that is not targetted, they must press
'l' twice, once to target, again to land, to match the behavior of old
Epiar.