[epiar-commits] [cthielen/Epiar] 4d2064: Move some of the user Input to the Simulation.

[noreply at github.com]

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

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

Changed paths:
  M Source/Engine/simulation.cpp
  M Source/Engine/simulation.h
  M Source/Input/input.cpp
  M Source/Input/input.h

Log Message:
-----------
Move some of the user Input to the Simulation.

No functional changes.
This is done to avoid dependencies on global values in Input.


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

Changed paths:
  M Source/Engine/console.cpp
  M Source/Engine/console.h
  M Source/Engine/hud.cpp
  M Source/Engine/simulation.cpp
  M Source/Engine/simulation.h
  M Source/Utilities/lua.cpp

Log Message:
-----------
Make Console a non-singleton

This removes the "echo" function until we can get that working again.


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

Changed paths:
  M Source/Engine/hud.cpp
  M Source/Engine/hud.h
  M Source/Engine/simulation.cpp
  M Source/Engine/simulation.h

Log Message:
-----------
Make currentFPS a non-static member of Simulation


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

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

Log Message:
-----------
Add SpriteManager and Camera to the list of Simulation variables

They're both singletons, but so there's no functional changes here.


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

Changed paths:
  M Source/Engine/simulation.cpp
  M Source/Engine/starfield.cpp
  M Source/Engine/starfield.h

Log Message:
-----------
Change Starfield accept passed Camera rather than using Global.


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

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

Log Message:
-----------
Change the Camera focusSprite to a spriteID.

The Camera now needs to be passed the SpriteManager during update.
The SpriteManager no longer has to compare on every sprite deletetion.

This makes the Camera follow the general "No Storage of Sprite Pointers".

The camera now doesn't have any Global dependencies, but since it is still being used as a Singleton, we can't make it a non-singleton yet.


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

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

Log Message:
-----------
Load lua scripts in the simulation rather than from Lua itself.

It seems that the 'dofile' lua command isn't supposed to be used the way that we're using it: one Lua script loading all other lua scripts.

This also removes duplicated code.


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

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

Log Message:
-----------
Added option for a random universe rather than the normal planets.xml


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

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

Log Message:
-----------
Move the Quadrant Map to the Hud layer rather than the Sprite Layer.


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

Changed paths:
  M Source/Graphics/video.cpp
  M Source/Graphics/video.h

Log Message:
-----------
Create DrawBox (Unfilled Circle) and consolidate the two DrawRect functions.


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

Changed paths:
  M Resources/Definitions/options.xml
  M Resources/Scripts/universe.lua
  M Source/UI/ui_button.cpp
  M Source/UI/ui_checkbox.cpp
  M Source/UI/ui_label.cpp
  M Source/UI/ui_picture.cpp
  M Source/UI/ui_tabs.cpp
  M Source/UI/ui_textbox.cpp
  M Source/UI/ui_widget.cpp
  M Source/UI/ui_widget.h
  M Source/UI/ui_window.cpp

Log Message:
-----------
Adds the ui-debug option

When this option is on, widgets that are being hovered over draw green border boxes and red context lines around themselves.  This nests, so that UIContainers (Window and Tab widgets) give the hovered widget context.

Some widgets do not draw this debug information.


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

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

Log Message:
-----------
Add Catch for Lua PANIC situations.

This can't actually save anything unfortunately, since any return from the function causes Lua to PANIC anyway.  The advantage here is that we can assert(0) which makes it easier to catch errors in a debugger.


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

Changed paths:
  M Resources/Definitions/options.xml
  M Source/Sprites/player.cpp

Log Message:
-----------
Turning off random-universe and cosmetic change to Players logging.


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

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

Log Message:
-----------
Sanity checks and minor fixes for Labels and Pictures.

The Label width should change when the text changes.
The Picture name should match the Image source.  Adding an assert to catch more failed picture loads.


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

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

Log Message:
-----------
Change Map displays to use a Hud variable rather than OPTIONs.

At some point, it might be a good idea to have the Hud do the Input handling as well.

(This also turns off the UI and Sprite xml dumps.)


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

Changed paths:
  M Source/Sprites/player.cpp

Log Message:
-----------
Fix Ammo bug in Saved Games.

Also adds a xml comment to explain the machine readable lastLoadTime in human readable (ctime) format.


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

Changed paths:
  M Source/UI/ui_tabs.cpp

Log Message:
-----------
Fix bug in Tab::DetermineFocus

The Scrollbars within a Tab are not subject to the scrollbar offsets, but everything else should consider the Offsets when Determining Focus.

(Also, it doesn't make sense for a Tab to contain a Tab, so that line was obviously wrong.)


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

Changed paths:
  M Source/Engine/simulation.cpp
  M Source/Utilities/camera.cpp

Log Message:
-----------
Fix broken --editor-mode

Only load the player when editor-mode is off.
Focusing the Camera on NULL should be a valid way of turning off Camera Focusing.


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

Changed paths:
  M Source/UI/ui_widget.cpp

Log Message:
-----------
Fix for Textbox blinking cursor

The cursor was based on the keyactivated bool, which was not being updated when the widget gained keyboard focus.


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

Changed paths:
  M Resources/Scripts/universe.lua

Log Message:
-----------
Add options menu option to turn on viewing ships in the Universe Map.


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

Changed paths:
  M Resources/Scripts/player.lua
  M Source/Sprites/player.cpp
  M Source/UI/ui_widget.cpp
  M Source/Utilities/quadtree.h

Log Message:
-----------
Minor bug fixes

Abort targetClosestShip when there are no nearby ships (including the player).
Windows doesn't seem to support ctime_r, using ctime instead.
includes.h must always be before common.h
V_SQRT2 should be cast to a float before use with other floats.


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

Changed paths:
  M README

Log Message:
-----------
Added a "Controls" section to README.