Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
5a7c1fb
need to refactor everything, still on progress
tuket Sep 27, 2015
2131c81
removed factories because they produce a lot of code duplication
tuket Sep 28, 2015
fb5e53e
end of day commit, not compiling, a lot remaining to do
tuket Sep 28, 2015
8ff6fac
periodical commit, still in progress
tuket Sep 29, 2015
b90eaa1
periodical commit, still a lot remaining
tuket Oct 2, 2015
bf2a785
merged with master
tuket Oct 3, 2015
8d1fd5f
fixed typo
tuket Oct 3, 2015
ac20b9a
resource manager templates
tuket Oct 3, 2015
2718ea0
working on resource manager
tuket Oct 3, 2015
e3d14c9
still on progress
tuket Oct 5, 2015
e35b5c3
sprite modifications
tuket Oct 6, 2015
a872053
added sprite_status
tuket Oct 6, 2015
108ddb2
eod commit
tuket Oct 6, 2015
edfb799
eod commit
tuket Oct 7, 2015
288b29c
eod commit :camel:
tuket Oct 8, 2015
ce609cc
periodic commit
tuket Oct 9, 2015
9b88f34
eod commit:sad:
tuket Oct 9, 2015
accd875
eod commit :camel:
tuket Oct 10, 2015
3aad1f9
added sprite status
tuket Oct 11, 2015
a52598c
merged
tuket Oct 11, 2015
c7308b6
added tests
tuket Oct 11, 2015
f78d431
eod laptop
tuket Oct 12, 2015
1439eff
eod commit
tuket Oct 14, 2015
99d7174
Merge branch 'new_animation' of https://github.com/tuket/OWMAN into n…
tuket Oct 14, 2015
7a49434
periodical commit
tuket Oct 25, 2015
e03b396
eod commit
tuket Oct 25, 2015
000ac00
eod commit
tuket Oct 31, 2015
b07e4d2
eod commit
tuket Oct 31, 2015
842836c
periodical commit
tuket Nov 26, 2015
e1bf7f2
rugular commit (animation working)
tuket Dec 24, 2015
a66d4f4
updated gitignore
tuket Jan 5, 2016
1974bac
animation working, solved a bug (xml string where losing context and …
tuket Jan 7, 2016
3fc8c11
small refactor (this is a stable version)
tuket Jan 9, 2016
25ac5f6
main character animations are now smooth
tuket Jan 20, 2016
9d42d94
making a better map, stable version
tuket Jan 24, 2016
9b25870
update
tuket Feb 20, 2016
87aa3ce
added physics circle support
tuket Feb 21, 2016
dfe83f0
making a big test set
tuket Mar 2, 2016
9dc81bc
more cell templates
tuket Mar 2, 2016
3b5546b
forest world generator
tuket Mar 4, 2016
b9a76cb
tfg doc extended with animation and open world sections
tuket Mar 6, 2016
eded844
corrected figure reference in doc
tuket Mar 6, 2016
d63270d
presentation
tuket Mar 9, 2016
1a56149
presentation
tuket Mar 9, 2016
eaa8b09
more doc and present
tuket Mar 10, 2016
a351d03
added logos to cover
tuket Mar 11, 2016
a1094a2
tfg doc typos
tuket Mar 11, 2016
ce192d1
tfg doc typos
tuket Mar 11, 2016
95ce863
tfg doc
tuket Mar 17, 2016
67d923e
tfg doc ++
tuket Mar 21, 2016
f651185
tfg doc ++
tuket Mar 22, 2016
5d3d0b9
tfg doc ++
tuket Mar 25, 2016
3b731e2
tfg doc ++
tuket Mar 25, 2016
0219a80
tfg doc ++
tuket Mar 26, 2016
c77c0d3
tfg doc ++
tuket Mar 31, 2016
8d2ae6d
tfg doc ++ merge
tuket Mar 31, 2016
12ac591
tfg doc pdf
tuket Apr 1, 2016
db6a634
presentation modified
tuket Apr 22, 2016
60cdcf6
tfg pres mod
tuket Apr 23, 2016
7266315
present +++
tuket Apr 24, 2016
1143d20
present ++
tuket Apr 26, 2016
1d6a80e
doxygen doc updated
tuket Apr 26, 2016
e70e847
gitignore updated
tuket Apr 26, 2016
897b13d
Add files via upload
tuket Sep 20, 2016
14c2001
Update README.md
tuket Sep 20, 2016
78e362c
added cmake files
ArnCarveris May 29, 2018
61d1dd0
added cmake settings file for vs2017
ArnCarveris May 29, 2018
be8b06a
Merge branch 'stabilisation' into cmake-support
ArnCarveris May 29, 2018
5f16061
updated cmake list file
ArnCarveris May 30, 2018
282bec8
deleted Box2D dependency source code copy
ArnCarveris May 30, 2018
bcf97bd
deleted rapidxml dependency source code copy
ArnCarveris May 30, 2018
11a6339
deleted boost dependency
ArnCarveris May 30, 2018
2fc180d
return success exit code in main function
ArnCarveris May 30, 2018
5ccfe5b
replaced SOIL lib by stb_image
ArnCarveris May 30, 2018
daf187d
diff fix
ArnCarveris May 30, 2018
958b6a4
replaced pthread by std::thread,std::mutex & std::condition_variable
ArnCarveris May 30, 2018
5509bb0
added missing pi macro
ArnCarveris May 30, 2018
53f6b18
implemented missing add/sub&assign methods for Vec2f class
ArnCarveris May 30, 2018
5b42686
added empty helper functions implementation of stack_trace
ArnCarveris May 30, 2018
0f16884
updated git ignore list
ArnCarveris May 30, 2018
919c698
added missing ogl link
ArnCarveris May 31, 2018
9829db9
fixed main function for SDL2main
ArnCarveris May 31, 2018
27f1601
removed not used texture loading function in llr
ArnCarveris May 31, 2018
6023845
fixed sprite name comparator
ArnCarveris May 31, 2018
9ad6127
fixed threading
ArnCarveris May 31, 2018
d6a9e1b
fixed missing stb_image implementation
ArnCarveris May 31, 2018
d752605
added launch file for vs
ArnCarveris May 31, 2018
c934a7f
removed castle sprite status debug out
ArnCarveris Jun 1, 2018
6f1224d
sleep for 1ms in resource manager loop
ArnCarveris Jun 1, 2018
f62f102
forest_world: implemented python3 support
ArnCarveris Jun 1, 2018
07426d1
forest_world: implemented line ending preservation, LF
ArnCarveris Jun 1, 2018
52cd1ae
resource_cell: implemented line ending preservation when saving to file
ArnCarveris Jun 1, 2018
fd274ad
forest_world: implemented simple percentage progress printing
ArnCarveris Jun 1, 2018
b94d280
added generated cell file pattern to ignore list
ArnCarveris Jun 2, 2018
eb4dfdc
event_handler: use WSAD for movement
ArnCarveris Jun 2, 2018
60d1bb1
resource_texture: add missing channels requirement while loading
ArnCarveris Jun 2, 2018
c8398a7
work_queue: compile fix
ArnCarveris Jun 8, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 18 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,23 @@
/src/resource_manager/resource_texture_factory.o
*.o
bin/world_folder
bin/Debug
bin/Release
*.depend
*.layout
*~
*.log
.vs
bin/bin/
doc/be.aux
doc/be.log
doc/be.out
doc/be.synctex.gz
doc/be.toc

*.toc
*.aux
*.log
*.out
*.synctex.gz
*.synctex.gz
cell_*_*.xml

13 changes: 13 additions & 0 deletions .vs/launch.vs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"version": "0.2.1",
"defaults": {},
"configurations": [
{
"type": "default",
"project": "CMakeLists.txt",
"projectTarget": "owman.exe (src\\Debug\\owman.exe)",
"name": "owman.exe (src\\Debug\\owman.exe)",
"currentDir": "${workspaceRoot}\\bin"
}
]
}
49 changes: 49 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#
# Open World Manager
#

cmake_minimum_required(VERSION 3.2)

#
# Building in-tree is not allowed (we take care of your craziness).
#

if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
message(FATAL_ERROR "Prevented in-tree built. Please create a build directory outside of the source code and call cmake from there. Thank you.")
endif()

#
# Project configuration
#

project(owman VERSION 0.0.1)

if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

find_package(OpenGL REQUIRED)
find_package(sdl2 REQUIRED)
find_package(glm REQUIRED)
find_package(unofficial-box2d REQUIRED)
find_package(GLEW REQUIRED)
#
# Compiler stuff
#
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD_REQUIRED ON)


include_directories(${owman_SOURCE_DIR}/src)

add_subdirectory(src)

#
# AOB
#

add_custom_target(
owman_aob
SOURCES
LICENSE
)
19 changes: 19 additions & 0 deletions CMakeSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"configurations":
[
{
"name": "x86-Debug",
"generator": "Visual Studio 15 2017",
"configurationType": "Debug",
"buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "-m -v:minimal",
"variables": [
{
"name": "CMAKE_TOOLCHAIN_FILE",
"value": "C:/Users/Public/vcpkg/scripts/buildsystems/vcpkg.cmake"
}
]
}
]
}
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
# OWMAN
Open world game streaming manager

![owman.png](owman.png)
195 changes: 195 additions & 0 deletions bin/cell_templates/cell_0.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
<cell>
<entity>
<position>
<x>125</x>
<y>125</y>
</position>
<graphics>
<sprite>pixel_grass</sprite>
<width>250</width>
<height>250</height>
<priority>-10</priority>
</graphics>
</entity>
<entity>
<position>
<x>223.853</x>
<y>111.635</y>
</position>
<graphics>
<sprite>pokemon_center</sprite>
<width>64</width>
<height>64</height>
<priority>3</priority>
</graphics>
<physics>
<shape>box</shape>
<width>64</width>
<height>64</height>
<mass>0</mass>
</physics>
</entity>
<entity>
<position>
<x>38</x>
<y>70</y>
</position>
<graphics>
<sprite>tree0</sprite>
<width>38</width>
<height>128</height>
<priority>11</priority>
</graphics>
<physics>
<shape>box</shape>
<width>20</width>
<height>18</height>
<mass>0</mass>
</physics>
</entity>
<entity>
<position>
<x>88</x>
<y>85</y>
</position>
<graphics>
<sprite>tree1</sprite>
<width>42</width>
<height>128</height>
<priority>11</priority>
</graphics>
<physics>
<shape>box</shape>
<width>20</width>
<height>18</height>
<mass>0</mass>
</physics>
</entity>
<entity>
<position>
<x>40</x>
<y>120</y>
</position>
<graphics>
<sprite>tree2</sprite>
<width>38</width>
<height>128</height>
<priority>11</priority>
</graphics>
<physics>
<shape>box</shape>
<width>20</width>
<height>18</height>
<mass>0</mass>
</physics>
</entity>
<entity>
<position>
<x>140</x>
<y>220</y>
</position>
<graphics>
<sprite>fence_16</sprite>
<width>127</width>
<height>13</height>
<priority>5</priority>
</graphics>
<physics>
<shape>box</shape>
<width>127</width>
<height>13</height>
<mass>0</mass>
</physics>
</entity>
<entity>
<position>
<x>77</x>
<y>192</y>
</position>
<graphics>
<sprite>fence_side</sprite>
<width>3</width>
<height>56</height>
<priority>6</priority>
</graphics>
<physics>
<shape>box</shape>
<width>3</width>
<height>56</height>
<mass>0</mass>
</physics>
</entity>
<entity>
<position>
<x>205</x>
<y>192</y>
</position>
<graphics>
<sprite>fence_side</sprite>
<width>3</width>
<height>56</height>
<priority>6</priority>
</graphics>
<physics>
<shape>box</shape>
<width>3</width>
<height>56</height>
<mass>0</mass>
</physics>
</entity>
<entity>
<position>
<x>96</x>
<y>166</y>
</position>
<graphics>
<sprite>fence_5</sprite>
<width>39</width>
<height>13</height>
<priority>7</priority>
</graphics>
<physics>
<shape>box</shape>
<width>39</width>
<height>13</height>
<mass>0</mass>
</physics>
</entity>
<entity>
<position>
<x>170</x>
<y>166</y>
</position>
<graphics>
<sprite>fence_9</sprite>
<width>71</width>
<height>13</height>
<priority>7</priority>
</graphics>
<physics>
<shape>box</shape>
<width>71</width>
<height>13</height>
<mass>0</mass>
</physics>
</entity>
<entity>
<position>
<x>95</x>
<y>190</y>
</position>
<graphics>
<sprite>ball</sprite>
<width>10</width>
<height>10</height>
<priority>4</priority>
</graphics>
<physics>
<shape>circle</shape>
<radius>5</radius>
<mass>1</mass>
</physics>
</entity>
</cell>


Loading