[Adonthell-commits] [ksterker/adonthell] 203cf3: FIXED compilation on OSX

[noreply]

Branch: refs/heads/master
Home:   https://github.com/ksterker/adonthell

Commit: 203cf34a7deb922ac2990ce970e76caaf09e92cf
    
https://github.com/ksterker/adonthell/commit/203cf34a7deb922ac2990ce970e76caaf09e92cf
Author: Kai Sterker <address@hidden>
Date:   2011-01-31 (Mon, 31 Jan 2011)

Changed paths:
  M src/rpg/log_index.h

Log Message:
-----------
FIXED compilation on OSX


Commit: 08114cda7276f9c3ac8df93ec48318eed25daf39
    
https://github.com/ksterker/adonthell/commit/08114cda7276f9c3ac8df93ec48318eed25daf39
Author: Kai Sterker <address@hidden>
Date:   2011-01-31 (Mon, 31 Jan 2011)

Changed paths:
  M src/base/base.cc
  M src/base/base.h
  M src/base/logging.cc
  M src/base/logging.h
  M src/gfx/drawing_area.h
  M src/gfx/gfx.cc
  M src/gfx/screen.cc
  M src/gfx/screen.h
  M src/gfx/surface.cc
  M src/gfx/surface.h
  M src/gui/CMakeLists.txt
  M src/gui/Makefile.am
  A src/gui/canvas.cc
  A src/gui/canvas.h
  M src/gui/conversation.cc
  M src/gui/conversation.h
  M src/gui/decoration.cc
  M src/gui/decoration.h
  M src/gui/gui.h
  A src/gui/indicatorbar.cc
  A src/gui/indicatorbar.h
  M src/gui/layout.cc
  M src/gui/layout.h
  A src/gui/listlayout.cc
  A src/gui/listlayout.h
  A src/gui/scrollview.cc
  A src/gui/scrollview.h
  M src/gui/textbox.h
  M src/gui/widget.h
  M src/gui/window_manager.cc
  M src/gui/window_manager.h
  M src/input/mouse_event.cc
  M src/input/sdl13/manager_sdl.cc
  M src/main/adonthell.cc
  M src/main/adonthell.h
  M src/main/sdl/osx.m
  M src/py-runtime/py_runtime.i
  M src/py-wrappers/adonthell/py_gui.i
  M src/python/python.cc
  M src/rpg/log_index.h
  M src/world/character.cc
  M src/world/placeable.cc
  M src/world/renderer.cc
  M test/data/characters/character.py
  A test/data/gfx/gui/black.png
  A test/data/gfx/gui/list_item.xml
  A test/data/gfx/gui/scrollbar.xml
  A test/data/gfx/gui/scrollbar_bg.png
  A test/data/gfx/gui/scrollbar_bl.png
  A test/data/gfx/gui/scrollbar_bot.png
  A test/data/gfx/gui/scrollbar_br.png
  A test/data/gfx/gui/scrollbar_h_end.png
  A test/data/gfx/gui/scrollbar_h_handle.png
  A test/data/gfx/gui/scrollbar_h_mid.png
  A test/data/gfx/gui/scrollbar_h_start.png
  A test/data/gfx/gui/scrollbar_lft.png
  A test/data/gfx/gui/scrollbar_rgt.png
  A test/data/gfx/gui/scrollbar_tl.png
  A test/data/gfx/gui/scrollbar_top.png
  A test/data/gfx/gui/scrollbar_tr.png
  A test/data/gfx/gui/scrollbar_v_end.png
  A test/data/gfx/gui/scrollbar_v_handle.png
  A test/data/gfx/gui/scrollbar_v_mid.png
  A test/data/gfx/gui/scrollbar_v_start.png
  M test/data/schedules/map/mapview.py
  M test/guitest.cc
  M test/worldtest.cc

Log Message:
-----------
Merge branch 'master' of address@hidden:ksterker/adonthell

Conflicts:
        src/rpg/log_index.h


Commit: 8199534ce031e386b69081caecceb133a0686bd2
    
https://github.com/ksterker/adonthell/commit/8199534ce031e386b69081caecceb133a0686bd2
Author: Kai Sterker <address@hidden>
Date:   2011-02-01 (Tue, 01 Feb 2011)

Changed paths:
  M src/base/logging.h

Log Message:
-----------
UPDATED glog mockup to exit Adonthell on FATAL error, just like the original


Commit: 50fda4b6285aa5c1cbf9aa9ab91441164f932a13
    
https://github.com/ksterker/adonthell/commit/50fda4b6285aa5c1cbf9aa9ab91441164f932a13
Author: Kai Sterker <address@hidden>
Date:   2011-02-01 (Tue, 01 Feb 2011)

Changed paths:
  M src/gfx/screen.cc
  M src/gfx/screen.h

Log Message:
-----------
ADDED support for 1440x900 screen detection
UPDATED screen detection routine to exit application if no screen could be 
created. Prevents segmentation fault later on and does not bury the relevant 
logging under a heap of subsequent messages.