Permalink
Browse files

Merge branch 'new_level_refactor' into localization

  • Loading branch information...
coelckers committed Feb 9, 2019
2 parents c0bbb4f + 59954fa commit 88e227f1f39ff55d8527c26d3e0ca7b4ceabc27b
Showing with 222 additions and 22,367 deletions.
  1. +1 −1 .appveyor.yml
  2. +4 −4 .travis.yml
  3. +0 −47 CMakeSettings.json
  4. +0 −21,073 externs.txt
  5. BIN externs.zip
  6. +0 −1,073 p_destructible.cpp
  7. +0 −43 p_destructible.h
  8. +1 −1 src/actor.h
  9. +4 −2 src/events.cpp
  10. +1 −1 src/events.h
  11. +1 −1 src/g_dumpinfo.cpp
  12. +5 −5 src/g_level.cpp
  13. +1 −1 src/g_levellocals.h
  14. +1 −0 src/g_shared/a_decalfx.cpp
  15. +13 −0 src/g_shared/a_decals.cpp
  16. +2 −0 src/g_shared/a_sharedglobal.h
  17. +6 −2 src/g_shared/actorptrselect.cpp
  18. +2 −1 src/g_shared/actorptrselect.h
  19. +14 −3 src/g_shared/p_3dfloors.cpp
  20. +1 −0 src/g_shared/p_checkposition.h
  21. +1 −1 src/g_statusbar/hudmessages.cpp
  22. +1 −1 src/gamedata/g_mapinfo.h
  23. +1 −1 src/gamedata/info.cpp
  24. +1 −1 src/maploader/specials.cpp
  25. +6 −6 src/p_acs.cpp
  26. +2 −2 src/p_actionfunctions.cpp
  27. +5 −5 src/p_conversation.cpp
  28. +3 −3 src/p_interaction.cpp
  29. +2 −1 src/p_local.h
  30. +9 −1 src/p_map.cpp
  31. +7 −1 src/p_maputl.cpp
  32. +1 −0 src/p_maputl.h
  33. +4 −4 src/p_mobj.cpp
  34. +5 −2 src/p_saveg.cpp
  35. +1 −1 src/p_setup.cpp
  36. +2 −2 src/p_things.cpp
  37. +22 −10 src/r_utility.cpp
  38. +2 −2 src/rendering/swrenderer/scene/r_light.cpp
  39. +1 −1 src/rendering/swrenderer/scene/r_light.h
  40. +4 −5 src/rendering/swrenderer/scene/r_portal.cpp
  41. +2 −2 src/rendering/swrenderer/scene/r_scene.cpp
  42. +3 −3 src/rendering/swrenderer/viewport/r_viewport.cpp
  43. +1 −1 src/rendering/swrenderer/viewport/r_viewport.h
  44. +1 −1 src/scripting/backend/codegen.h
  45. +3 −4 src/scripting/vmthunks.cpp
  46. +6 −31 src/scripting/vmthunks_actors.cpp
  47. +1 −1 src/wi_stuff.cpp
  48. +1 −1 wadsrc/static/zscript/actor.txt
  49. +2 −2 wadsrc/static/zscript/actor_inventory.txt
  50. +2 −0 wadsrc/static/zscript/base.txt
  51. +44 −0 wadsrc/static/zscript/constants.txt
  52. +1 −3 wadsrc/static/zscript/doom/fatso.txt
  53. +1 −3 wadsrc/static/zscript/doom/painelemental.txt
  54. +1 −1 wadsrc/static/zscript/inventory/inventory.txt
  55. +2 −2 wadsrc/static/zscript/inventory/powerups.txt
  56. +1 −1 wadsrc/static/zscript/inventory/stateprovider.txt
  57. +11 −1 wadsrc/static/zscript/level_compatibility.txt
  58. +1 −1 wadsrc/static/zscript/raven/minotaur.txt
  59. +1 −1 wadsrc/static/zscript/shared/player.txt
@@ -33,7 +33,7 @@ build_script:
- md build
- cd build
- cmake -G "%GENERATOR%" -T "%TOOLSET%" -DPK3_QUIET_ZIPDIR=YES ..
- cmake --build . --config "%CONFIGURATION%" -- /verbosity:minimal
- cmake --build . --config "%CONFIGURATION%" -- -maxcpucount -verbosity:minimal

after_build:
- set OUTPUT_DIR=%APPVEYOR_BUILD_FOLDER%\build\%CONFIGURATION%\
@@ -108,11 +108,11 @@ matrix:

- os: windows
env:
- CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -A Win32"
- CMAKE_OPTIONS="-A Win32"

- os: windows
env:
- CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -A x64"
- CMAKE_OPTIONS="-A x64"

before_install:
- if [ -n "$GCC_VERSION" ]; then export CC="gcc-${GCC_VERSION}" CXX="g++-${GCC_VERSION}"; fi
@@ -132,8 +132,8 @@ script:
-DFORCE_INTERNAL_GME=YES \
-DPK3_QUIET_ZIPDIR=YES \
..
- if [[ $TRAVIS_OS_NAME == 'windows' ]]; then cmake --build . -- -m; fi
- if [[ $TRAVIS_OS_NAME != 'windows' ]]; then cmake --build . -- -j2; fi
- if [[ $TRAVIS_OS_NAME == 'windows' ]]; then cmake --build . --config Release -- -maxcpucount -verbosity:minimal; fi
- if [[ $TRAVIS_OS_NAME != 'windows' ]]; then cmake --build . -- --jobs=2 --keep-going; fi

notifications:
email: false

This file was deleted.

Oops, something went wrong.
21,073 externs.txt

This file was deleted.

Oops, something went wrong.
BIN -241 KB externs.zip
Binary file not shown.
Oops, something went wrong.

0 comments on commit 88e227f

Please sign in to comment.