marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://git.openclonk.org/openclonk

shapetextures
Sven Eberhardt 2015-12-13 09:36:55 -05:00
parent fbda2f1843 ff57c03295
commit 9727a5d25d
5 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists.txt
View File

@ -1040,6 +1040,8 @@ src/script/C4ValueMap.cpp
src/script/C4ValueMap.h
)
target_link_libraries(libc4script libmisc)
add_executable(c4script
include/c4script/c4script.h
src/script/C4ScriptMain.cpp
@ -1085,20 +1087,9 @@ target_link_libraries(c4script
libmisc
)
if(HAVE_PTHREAD)
target_link_libraries(openclonk
target_link_libraries(libmisc
pthread
)
target_link_libraries(netpuncher
pthread
)
target_link_libraries(c4script
pthread
)
if(TARGET mape)
target_link_libraries(mape
pthread
)
endif()
endif()
if(USE_CONSOLE)
target_link_libraries(openclonk
@ -1106,13 +1097,7 @@ if(USE_CONSOLE)
)
endif()
if(UNIX AND NOT APPLE)
target_link_libraries(c4group rt)
target_link_libraries(c4script rt)
target_link_libraries(netpuncher rt)
target_link_libraries(openclonk rt)
if(TARGET mape)
target_link_libraries(mape rt)
endif()
target_link_libraries(libmisc rt)
endif()
if (GLEW_FOUND)
set_property(TARGET openclonk APPEND PROPERTY COMPILE_DEFINITIONS ${GLEW_DEFINITIONS})

2
planet/Missions.ocf/DeadlyGrotto.ocs/Landscape.txt
View File

@ -105,7 +105,7 @@ map AcidCave {
};
// rock at entrance
VaryTex { y=93px; mat=Rock; VaryTex { mat=Granite; }; };
VaryTex { y=93px; mat=Rock; VaryTex { mat=Rock; tex=rock_smooth; }; };
};
};

2
planet/Objects.ocd/Animals.ocd/Chippie.ocd/Egg.ocd/Script.c
View File

@ -154,7 +154,7 @@ private func Hatch()
var particles =
{
Prototype = Particles_Material(RGB(50, 200, 50)),
Prototype = Particles_Material(RGB(100, 255, 50)),
DampingX = 800, DampingY = 800,
ForceY = -GetGravity() / 10,
};

10
planet/Objects.ocd/Animals.ocd/Chippie.ocd/Script.c
View File

@ -32,12 +32,16 @@ public func Death()
var particles =
{
Prototype = Particles_Material(RGB(50, 200, 50)),
OnCollision = nil,
OnCollision = PC_Bounce(),
DampingX = 900, DampingY = 900,
};
CreateParticle("SmokeDirty", PV_Random(-5, 5), PV_Random(-5, 5),
for (var particle_graphics in ["SmokeDirty", "Flash"])
{
CreateParticle(particle_graphics, PV_Random(-1, 1), PV_Random(-1, 1),
PV_Random(-20, 20), PV_Random(-20, 20),
PV_Random(20, 60), particles, 120);
PV_Random(20, 60), particles, 60);
}
Sound("ChippieChirp*", false, 50);
RemoveObject();
}

6
tests/CMakeLists.txt
View File

@ -77,6 +77,9 @@ if (GTEST_SOURCE_ALL AND GTEST_INCLUDE_DIR)
)
if (GTEST_ROOT)
include_directories("${GTEST_ROOT}")
endif()
if(HAVE_PTHREAD)
target_link_libraries(gtest pthread)
endif()
include_directories("${GTEST_INCLUDE_DIR}")
set(GTEST_FOUND 1)
@ -101,9 +104,6 @@ if (GTEST_FOUND AND GMOCK_FOUND)
if(UNIX AND NOT APPLE)
target_link_libraries(tests rt)
endif()
if(HAVE_PTHREAD)
target_link_libraries(tests pthread)
endif()
if(WIN32)
target_link_libraries(tests winmm)
endif()