Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve: implement client 12x assets protobuf reader #15

Closed
wants to merge 35 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
63af726
Initial commit
marcosvf132 Apr 8, 2022
9a6fc76
Merge branch 'main' into assets-protobuf
dudantas Mar 29, 2023
d87fc53
fixes
dudantas Mar 29, 2023
7b77f8e
improve: add reading client folder by properties window
dudantas Mar 29, 2023
10ad3b2
fix: materials and assets loading
dudantas Mar 30, 2023
95c2a55
fix items palette
dudantas Mar 30, 2023
bf502b1
remove deprecated
dudantas Mar 30, 2023
23475a4
fix compilation
dudantas Apr 5, 2023
af2d1fc
fix: remove libbmp and added libpng instead
dudantas Apr 6, 2023
dfc73e2
fix: compilation and warnings
dudantas Apr 7, 2023
9fd6b61
Merge branch 'main' into assets-protobuf
dudantas Apr 7, 2023
0c3a22f
fix: compilation errors
dudantas Apr 7, 2023
13b8913
fix: remove unused functions and fix wxWindow sprites
dudantas Apr 7, 2023
85626af
improve: create function body
dudantas Apr 7, 2023
2d76e2e
fix: images 64x64 on wxWindows
dudantas Apr 9, 2023
5eefd0f
improve: rename from client_version to client_assets
dudantas Apr 9, 2023
59c2a20
fix: some item type and indentations
dudantas Apr 9, 2023
ccfc7db
fix indent
dudantas Apr 9, 2023
39f5758
fix: change project name and some small fixes
dudantas Apr 9, 2023
1999a13
Remove some extensions
dudantas Apr 9, 2023
252914a
fix: open window if directory client is empty
dudantas Apr 9, 2023
d0aad5e
improve some log error
dudantas Apr 9, 2023
4601ce6
fix: monsters draw map
dudantas Apr 11, 2023
45c10fa
improve: add new function to check if sprite 64x64 is 32x32 pixels empty
dudantas Apr 14, 2023
6010b36
fix: sprite 64x64 with 32x32 only ocupped pixels
dudantas Apr 14, 2023
c4f1bd1
Some image fixes
dudantas Apr 14, 2023
07a4b3b
fix: getSpriteId
dudantas Apr 18, 2023
2564900
fix: windows compilation
dudantas Apr 18, 2023
17d9b63
fix: saving map file
dudantas Apr 18, 2023
93d82f5
improve: remove OTGZ support
dudantas Apr 18, 2023
0c7100f
fix: not save items not exist
dudantas May 26, 2023
5014f33
improve: change to pragma once (gha action is expired)
dudantas Aug 25, 2023
0ab1bda
fix: final fixes
dudantas Jan 29, 2024
479e968
Merge branch 'main' into pr/15
dudantas Jan 29, 2024
52e88bb
Code format - (Clang-format)
github-actions[bot] Jan 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ vcpkg_installed/
.vscode/
*.filters
*.users
*.ilk

# Xcode
xcuserdata
Expand All @@ -58,7 +59,8 @@ cmake-build-debug/
*.exe
*.pdb
*.rar
*.lzma
*.dat
*.manifest
vcpkg_installed/
*.ilk
remeres.exe.manifest
remeres
37 changes: 26 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@ cmake_minimum_required(VERSION 3.22)

project(cmake)

# *****************************************************************************
# Append cmake search path
# *****************************************************************************
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

# *****************************************************************************
# Include cmake tools
# *****************************************************************************
include(MessageColors)
include(LoggingHelper)

# *****************************************************************************
# Vcpkg Configs
# *****************************************************************************
Expand Down Expand Up @@ -41,6 +52,20 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
option(OPTIONS_ENABLE_CCACHE "Enable ccache" OFF)
option(OPTIONS_ENABLE_SCCACHE "Use sccache to speed up compilation process" OFF)
option(OPTIONS_ENABLE_IPO "Check and Enable interprocedural optimization (IPO/LTO)" ON)
option(ASAN_ENABLED "Build this target with AddressSanitizer" ON)

# === ASAN ===
if(ASAN_ENABLED AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
log_option_enabled("asan")
if(MSVC)
add_compile_options(/fsanitize=address)
else()
add_compile_options(-fsanitize=address)
link_libraries(-fsanitize=address)
endif()
else()
log_option_disabled("asan")
endif()

# *****************************************************************************
# Set Sanity Check
Expand All @@ -62,17 +87,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
endif()
endif()

# *****************************************************************************
# Append cmake search path
# *****************************************************************************
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

# *****************************************************************************
# Include cmake tools
# *****************************************************************************
include(MessageColors)
include(LoggingHelper)

# *****************************************************************************
# Options Code
# *****************************************************************************
Expand Down Expand Up @@ -119,4 +133,5 @@ endif()
# *****************************************************************************
# Add source project
# *****************************************************************************
add_subdirectory(source/protobuf)
add_subdirectory(source)
38 changes: 38 additions & 0 deletions CMakeSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"configurations": [
{
"name": "x64-Release",
"generator": "Ninja",
"configurationType": "Release",
"buildRoot": "${projectDir}\\build\\${name}",
"installRoot": "${projectDir}\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "",
"ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_x64_x64" ]
},
{
"name": "x64-Release-DebInfo",
"generator": "Ninja",
"configurationType": "RelWithDebInfo",
"buildRoot": "${projectDir}\\build\\${name}",
"installRoot": "${projectDir}\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "",
"ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_x64_x64" ]
},
{
"name": "x64-Debug",
"generator": "Ninja",
"configurationType": "Debug",
"buildRoot": "${projectDir}\\build\\${name}",
"installRoot": "${projectDir}\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "",
"ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_x64_x64" ],
"variables": []
}
]
}
Binary file removed data/items/items.otb
Binary file not shown.
Loading
Loading