Use boost::chrono instead of std::chrono

* Fit spin box buttons properly
* NPC trade you can now look at items you can sell/buy
(Waiting for ed to implement a way to set item image color before its completed)

.gitignore

@@ -1,3 +1,4 @@
+/modules/.project
 build*
 CMakeCache.txt
 CMakeFiles
@@ -35,3 +36,4 @@ otclient.map
 otclient.layout
 LOCALTODO
 tags
+Thumbs.db

.travis.yml

@@ -2,7 +2,7 @@ language: cpp
 compiler:
   - gcc
 before_script:
-  - sudo apt-get install libboost-all-dev libphysfs-dev libssl-dev liblua5.1-dev libglew1.6-dev libvorbis-dev libopenal-dev libz-dev
+  - sudo apt-get install libboost1.48-all-dev libphysfs-dev libssl-dev liblua5.1-dev libglew1.6-dev libvorbis-dev libopenal-dev libz-dev -y
 script: |
   cmake . -DCMAKE_BUILD_TYPE=Release
   make

CMakeLists.txt

@@ -1,18 +1,17 @@
 cmake_minimum_required(VERSION 2.6)
 project(otclient)
 
-set(VERSION "0.5.5")
+set(VERSION "0.6.0")
 
 set(FRAMEWORK_SOUND ON)
 set(FRAMEWORK_GRAPHICS ON)
 set(FRAMEWORK_XML ON)
 set(FRAMEWORK_NET ON)
-#set(FRAMEWORK_GIT ON)
 include(src/framework/CMakeLists.txt)
-include(src/otclient/CMakeLists.txt)
+include(src/client/CMakeLists.txt)
 
 # functions map for reading backtraces
-set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -Wl,-Map=otclient.map")
+set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -Wl,-Map=${PROJECT_NAME}.map")
 
 option(USE_PCH "Use precompiled header (speed up compile)" OFF)
 
@@ -32,25 +31,25 @@ endif()
 
 add_definitions(-D"VERSION=\\"${VERSION}\\"")
 
-# add otclient executable
+# add client executable
-add_executable(otclient ${framework_SOURCES} ${otclient_SOURCES} ${executable_SOURCES})
+add_executable(${PROJECT_NAME} ${framework_SOURCES} ${client_SOURCES} ${executable_SOURCES})
 
 # target link libraries
-target_link_libraries(otclient ${framework_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${framework_LIBRARIES})
 
 if(USE_PCH)
     include(cotire)
-    cotire(otclient)
+    cotire(${PROJECT_NAME})
     message(STATUS "Use precompiled header: ON")
 else()
     message(STATUS "Use precompiled header: OFF")
 endif()
 
 # installation
-set(DATA_INSTALL_DIR share/otclient)
+set(DATA_INSTALL_DIR share/${PROJECT_NAME})
-install(TARGETS otclient RUNTIME DESTINATION bin)
+install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
-install(FILES README.md BUGS LICENSE AUTHORS init.lua otclientrc.lua DESTINATION ${DATA_INSTALL_DIR})
+install(FILES README.md BUGS LICENSE AUTHORS init.lua ${PROJECT_NAME}rc.lua DESTINATION ${DATA_INSTALL_DIR})
-install(DIRECTORY modules DESTINATION ${DATA_INSTALL_DIR} PATTERN ".git" EXCLUDE)
+install(DIRECTORY data modules DESTINATION ${DATA_INSTALL_DIR} PATTERN ".git" EXCLUDE)
 
 # add "make run"
-add_custom_target(run COMMAND otclient DEPENDS otclient WORKING_DIRECTORY ${CMAKE_PROJECT_DIR})
+add_custom_target(run COMMAND ${PROJECT_NAME} DEPENDS ${PROJECT_NAME} WORKING_DIRECTORY ${CMAKE_PROJECT_DIR})

data/fonts/sans-bold-16px.otfont

@@ -0,0 +1,6 @@
+Font
+  name: sans-bold-16px
+  texture: sans-bold-16px_cp1252
+  height: 20
+  glyph-size: 24 24
+  space-width: 3

data/fonts/terminus-14px-bold.otfont

@@ -1,6 +1,6 @@
 Font
   name: terminus-14px-bold
-  texture: terminus-14px-bold.png
+  texture: terminus-14px-bold
   height: 16
   y-offset: 2
   glyph-size: 16 16

data/fonts/verdana-11px-antialised.otfont

@@ -1,6 +1,7 @@
 Font
   name: verdana-11px-antialised
-  texture: verdana-11px-antialised_cp1252.png
+  texture: verdana-11px-antialised_cp1252
   height: 14
   glyph-size: 16 16
   space-width: 4
+  default: true

data/fonts/verdana-11px-monochrome.otfont

@@ -1,6 +1,6 @@
 Font
   name: verdana-11px-monochrome
-  texture: verdana-11px-monochrome_cp1252.png
+  texture: verdana-11px-monochrome_cp1252
   height: 14
   glyph-size: 16 16
   space-width: 3

data/fonts/verdana-11px-rounded.otfont

@@ -1,6 +1,6 @@
 Font
   name: verdana-11px-rounded
-  texture: verdana-11px-rounded_cp1252.png
+  texture: verdana-11px-rounded_cp1252
   height: 16
   glyph-size: 16 16
   y-offset: -2