Merge branch 'master' of https://gitgud.io/odilitime/netrunner
# Conflicts: # src/main.cpp
No related branches found
No related tags found
Showing
- README.md 3 additions, 8 deletionsREADME.md
- browser.ntrml 30 additions, 0 deletionsbrowser.ntrml
- reltools/darwin/package.sh 1 addition, 0 deletionsreltools/darwin/package.sh
- reltools/linux/package_from_linux.sh 1 addition, 0 deletionsreltools/linux/package_from_linux.sh
- src/browser.cpp 430 additions, 1 deletionsrc/browser.cpp
- src/browser.h 6 additions, 0 deletionssrc/browser.h
- src/graphics/components/AnimeComponent.h 0 additions, 13 deletionssrc/graphics/components/AnimeComponent.h
- src/graphics/components/BoxComponent.cpp 1 addition, 1 deletionsrc/graphics/components/BoxComponent.cpp
- src/graphics/components/ButtonComponent.cpp 1 addition, 1 deletionsrc/graphics/components/ButtonComponent.cpp
- src/graphics/components/ButtonComponent.h 1 addition, 1 deletionsrc/graphics/components/ButtonComponent.h
- src/graphics/components/Component.cpp 155 additions, 0 deletionssrc/graphics/components/Component.cpp
- src/graphics/components/Component.h 13 additions, 9 deletionssrc/graphics/components/Component.h
- src/graphics/components/ComponentBuilder.cpp 3 additions, 3 deletionssrc/graphics/components/ComponentBuilder.cpp
- src/graphics/components/ImageComponent.cpp 25 additions, 10 deletionssrc/graphics/components/ImageComponent.cpp
- src/graphics/components/ImageComponent.h 14 additions, 0 deletionssrc/graphics/components/ImageComponent.h
- src/graphics/components/MultiComponent.cpp 4 additions, 4 deletionssrc/graphics/components/MultiComponent.cpp
- src/graphics/elements/BUTTONElement.cpp 1 addition, 1 deletionsrc/graphics/elements/BUTTONElement.cpp
- src/graphics/elements/INPUTElement.cpp 1 addition, 1 deletionsrc/graphics/elements/INPUTElement.cpp
- src/graphics/opengl/Window.cpp 23 additions, 13 deletionssrc/graphics/opengl/Window.cpp
- src/graphics/opengl/Window.h 1 addition, 0 deletionssrc/graphics/opengl/Window.h
Loading
Please register or sign in to comment