⚲
Project
General
Profile
Sign in
Home
Projects
Help
Search
:
Doomsday Engine
All Projects
Doomsday Engine
Overview
Activity
Roadmap
Issues
Wiki
Repository
«
Previous
|
Next
»
Revision 28843a5a
Added by
skyjake
almost 5 years
ago
ID
28843a5aa6938f15a4b079e80afea64baa82478d
Parent
4126253a
,
81bcdfb0
Child
49ea5a97
Merge branch 'master' of skyjake.fi:doomsday/engine into work/omega
Conflicts:
.gitignore
.travis.yml
README.md
doomsday/CMakeLists.txt
doomsday/apps/api/api_mapedit.h
doomsday/apps/client/CMakeLists.txt
doomsday/apps/client/client-mac.doxy
doomsday/apps/client/client-win32.doxy
doomsday/apps/client/include/render/vissprite.h
doomsday/apps/client/include/world/map.h
doomsday/apps/client/net.dengine.client.pack/Info
doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/Info
doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/fonts.dei
doomsday/apps/client/net.dengine.client.pack/renderer.pack/Info
doomsday/apps/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info
doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/model.dei
doomsday/apps/client/res/linux/net.dengine.Doomsday.desktop.in
doomsday/apps/client/res/macx/English.lproj/InfoPlist.strings
doomsday/apps/client/src/api_mapedit.cpp
doomsday/apps/client/src/client/clientsubsector.cpp
doomsday/apps/client/src/def_main.cpp
doomsday/apps/client/src/render/modelloader.cpp
doomsday/apps/client/src/render/modelrenderer.cpp
doomsday/apps/client/src/render/rend_halo.cpp
doomsday/apps/client/src/render/rend_main.cpp
doomsday/apps/client/src/render/skyfixedge.cpp
doomsday/apps/client/src/render/walledge.cpp
doomsday/apps/client/src/render/wallspec.cpp
doomsday/apps/client/src/ui/home/gamecolumnwidget.cpp
doomsday/apps/client/src/ui/home/gamepanelbuttonwidget.cpp
doomsday/apps/client/src/ui/widgets/taskbarwidget.cpp
doomsday/apps/client/src/world/base/bindings_world.cpp
doomsday/apps/client/src/world/base/map.cpp
doomsday/apps/client/src/world/base/sector.cpp
doomsday/apps/client/src/world/base/surface.cpp
doomsday/apps/libdoomsday/api.doxy
doomsday/cmake/MacOSXBundleInfo.plist.in
doomsday/cmake/MacOSXPluginBundleInfo.plist.in
doomsday/cmake/Macros.cmake
doomsday/cmake/PlatformUnix.cmake
doomsday/cmake/Version.cmake
doomsday/doc/dshell/dshell.ame
doomsday/doc/readme/readme.ame
doomsday/doc/server/server.ame
doomsday/libs/core/include/de/core/vector.h
doomsday/libs/core/include/de/libcore.h
doomsday/libs/core/include/de/scripting/nameexpression.h
doomsday/libs/core/include/de/scripting/scriptlex.h
doomsday/libs/core/net.dengine.stdlib.pack/Info
doomsday/libs/core/src/scripting/builtinexpression.cpp
doomsday/libs/core/src/scripting/catchstatement.cpp
doomsday/libs/core/src/scripting/evaluator.cpp
doomsday/libs/core/src/scripting/nameexpression.cpp
doomsday/libs/core/src/scripting/parser.cpp
doomsday/libs/core/src/scripting/process.cpp
doomsday/libs/core/src/scripting/scriptlex.cpp
doomsday/libs/doomsday/libs/importidtech1/src/mapimporter.cpp
doomsday/libs/doomsday/libs/importidtech1/src/mapinfotranslator.cpp
doomsday/libs/doomsday/net.dengine.base.pack/Info
doomsday/libs/doomsday/src/defs/dedfile.cpp
doomsday/libs/doomsday/src/doomsdayapp.cpp
doomsday/libs/doomsday/src/gameprofiles.cpp
doomsday/libs/gamekit/libs/common/src/common.cpp
doomsday/libs/gamekit/libs/common/src/game/g_game.cpp
doomsday/libs/gamekit/libs/common/src/world/mobj.cpp
doomsday/libs/gamekit/libs/common/src/world/p_map.cpp
doomsday/libs/gamekit/libs/doom/src/intermission.cpp
doomsday/libs/gamekit/libs/doom/src/m_cheat.cpp
doomsday/libs/gamekit/libs/heretic/src/intermission.cpp
doomsday/libs/gui/net.dengine.stdlib.gui.pack/Info
doomsday/libs/gui/src/text/font.cpp
doomsday/post/CMakeLists.txt
doomsday/sdk-qch.doxy
doomsday/sdk.doxy
doomsday/sdk/libcore/CMakeLists.txt
doomsday/tools/shell/CMakeLists.txt
doomsday/tools/shell/res/macx/English.lproj/InfoPlist.strings
doomsday/tools/wadtool/CMakeLists.txt
Files
added
modified
copied
renamed
deleted
Loading...
Doomsday
Engine
2.3
⇣
Builds
Add-ons
Manual
·
Forums
Support
Bug
Tracker
Blog
Merge branch 'master' of skyjake.fi:doomsday/engine into work/omega