64 Commits

Author SHA1 Message Date
87399213b3 Malutki refactor 2024-12-12 22:22:01 +01:00
f1dc19e795 Bomber i wiazkowiec nie wylaza poza ekran 2024-12-12 00:11:24 +01:00
168ba2e477 5 przeciwnikow, do poprawy lewa strona mapy przy poruszaniu i teksturki 2024-12-11 23:52:06 +01:00
38fd71b8e6 5 przeciwnikow, jakos to dziala 2024-12-11 23:47:20 +01:00
1c0e5d0293 wiazkowiec strzela, gora dol 2024-12-11 23:00:19 +01:00
c898aa0d81 wiazkowiec strzela, gora dol 2024-12-11 23:00:07 +01:00
b257837d18 Bomber nie chce trzymac sie granic mapy da faq 2024-12-11 18:06:26 +01:00
17c372fad9 Kamikadze poprawnie zadaje orbazenia graczowi, problemem byla za mala odleglosc 2024-12-11 17:58:32 +01:00
0c706625d2 Kamikadze wybucha nawet bez gracza 2024-12-11 17:49:31 +01:00
c1a24a701b Kamikadze sledzi gracza 2024-12-11 17:43:43 +01:00
41945b3d88 Cos usprawnione i nasrane 2024-12-11 16:51:56 +01:00
2234e4d973 Dodanie bombera 2024-12-11 16:33:24 +01:00
81b04bae0f Dziuala 3 strzlowiec 2024-12-10 20:20:05 +01:00
77eb83c2c3 enemy kolizja rakiet 2024-12-09 23:36:50 +01:00
a81cf284d0 Strzela z kolizja 2024-12-09 23:09:44 +01:00
13066709a7 Niby strzela, ale bez kolizji 2024-12-09 17:36:57 +01:00
44f4556fda Jakieś działające gówno
Ale nie strzela chujek
2024-12-09 16:49:18 +01:00
c655409596 Jakieś działające gówno
Ale nie strzela chujek
2024-12-09 16:48:31 +01:00
e2e44ff1ba Mac and Linux fix 2024-12-06 19:43:17 +01:00
b6830c305b ObjectItem class added to accordance of diagram class 2024-12-05 12:46:03 +01:00
087a8d7672 Merge remote-tracking branch 'refs/remotes/origin/refactor'
# Conflicts:
#	main.cpp
2024-12-04 23:46:09 +01:00
9d4af21d4d Migrated the whole main loop
The main loop of the game is now contained in Plansza class
2024-12-04 22:12:30 +01:00
5eda245ccc Plansza to be continued (WIP) 2024-12-04 16:04:25 +01:00
72e2116dc7 Refactor of structs
Refactored Size and Position
Placed them in different .h files
2024-12-04 14:47:50 +01:00
7ecb90af1f Directory structure refactor 2024-12-04 12:26:10 +01:00
29d3c11fd1 SFML przeniesiono do innego folderu 2024-12-04 11:47:47 +01:00
5ccb29f27b fix 2024-12-02 15:51:01 +01:00
2341c2fa6d New Projectiles class
Refactor of Bullet class
Different method of shooting.
2024-12-01 17:44:25 +01:00
2f6c98f4be start 2024-11-29 14:53:58 +01:00
d20fb3043b Przeszkadzało to w zmienianiu brancha 2024-11-27 23:48:08 +01:00
fec3de86d3 Delete cmake-build-debug/LotoStatek.exe 2024-11-27 10:32:07 +01:00
0e1b53fc9b Dźwięk wybuchu przy trafieniu w meteoryt 2024-11-26 21:47:53 +03:00
c7dbca9eb3 gitignore 2024-11-26 16:09:38 +01:00
559d946cab Restrukt classes WIP 2024-11-26 16:05:57 +01:00
6996490f3c little actor.h refactor 2024-11-26 13:15:31 +01:00
1e76a7ca95 Dodana ikonka 2024-11-24 11:07:24 +01:00
61544365b2 a takie, dla kompletu 2024-11-23 19:18:46 +01:00
dd3a4a464e Poprawiona tekstura pocisku 2024-11-22 21:38:37 +01:00
0b55c2aa76 nagłówek :D 2024-11-22 15:00:09 +01:00
b273358107 fix 2024-11-22 13:57:55 +01:00
1a2d2074b8 Sound fix 2024-11-22 13:43:44 +01:00
86ad380275 Aktualizacja do SFML 2.6.2 2024-11-22 13:40:21 +01:00
d0e29b36b8 Lekki refactor 2024-11-22 12:52:50 +01:00
c4a3203153 Merge zrobiony 2024-11-22 12:48:38 +01:00
ec3d4e78ce Merge remote-tracking branch 'refs/remotes/origin/przeszkoda'
# Conflicts:
#	CMakeLists.txt
#	main.cpp
2024-11-22 12:28:57 +01:00
1a228bdfc2 TODO done 2024-11-22 12:15:09 +01:00
b3956956d7 no oczywiście, że zapomniałem 2024-11-22 12:05:08 +01:00
ace2976b38 W pełnie kompletna wersja przeszkód 2024-11-22 12:04:44 +01:00
0c4cdf35b1 Różne meteoryty 2024-11-22 09:38:13 +01:00
94a6d081a1 nowy meteor 2024-11-21 22:49:03 +01:00
343b312227 naprawa pozycji + nowe rakiety 2024-11-21 22:42:12 +01:00
f57d7a8d8a fix 2024-11-21 17:45:52 +01:00
2bdfbb193c Multiple fixes
Obracające się meteoryty, koniec gry przy natrafieniu na meteoryt.
Poprawione sprajty statku, meteorytu i pocisku
2024-11-21 15:50:25 +01:00
0767278d7c nowe tło 2024-11-21 08:58:26 +01:00
44b806333a Nowa lepsza przyszłość!
a nie... to tylko nowe tło
2024-11-20 22:45:26 +01:00
6eee029a0a Merge remote-tracking branch 'origin/tloimuzyka' into tloimuzyka
# Conflicts:
#	cmake-build-debug/Testing/Temporary/LastTest.log
2024-11-20 19:49:11 +01:00
30d808bc80 Zmiana zlych plikow 2024-11-20 19:48:40 +01:00
c58a8c2dc7 Dodano w miare sensowne poruszanie sie tla i muzyke, do zrobienia lepsze tlo 2024-11-20 19:39:32 +01:00
e38bb6e5d0 Dodano w miare sensowne poruszanie sie tla i muzyke, do zrobienia lepsze tlo 2024-11-20 19:32:35 +01:00
b16fd9fad5 usuwam niepotrzeb 2024-11-20 15:51:37 +01:00
c113cc55e3 little fix 2024-11-20 15:49:20 +01:00
f1a3449d47 Meteoryty są spawnowane automatycznie co 1 sekunde, max 5 meteorytów na plansze 2024-11-20 14:57:40 +01:00
1cd9f9b950 Meteory są w tym samym stanie co w poprzednim commit, tylko, że teraz są zdefiniowane w osobnej klasie "Plansza" 2024-11-20 14:01:43 +01:00
cf10a042c0 Meteoryty lecą w trybie testowym. 2024-11-19 14:42:25 +01:00
788 changed files with 4400 additions and 96003 deletions

View File

@@ -11,24 +11,53 @@ add_executable(LotoStatek main.cpp
sources/Player.cpp
headers/Player.h
headers/Bullet.h
sources/Bullet.cpp)
sources/Bullet.cpp
headers/Background.h
sources/Background.cpp
headers/AudioManager.h
sources/AudioManager.cpp
sources/Bullet.cpp
headers/Meteor.h
sources/Meteor.cpp
headers/RandomNumberGenerator.h
headers/Projectile.h
sources/Projectile.cpp
headers/Rocket.h
sources/Rocket.cpp
headers/Size.h
headers/Position.h
headers/ObjectItem.hpp
sources/ObjectItem.cpp
sources/Enemy.cpp
headers/Enemy.h
headers/AdvancedEnemy.h
sources/AdvancedEnemy.cpp
headers/Bomber.h
sources/Bomber.cpp
headers/Kamikadze.h
sources/Kamikadze.cpp
headers/wiazkowiec.h
sources/Wiazkowiec.cpp
headers/Beam.h
sources/Beam.cpp
)
if(WIN32)
set(SFML_ROOT "${CMAKE_SOURCE_DIR}/SFML")
set(SFML_ROOT "${CMAKE_SOURCE_DIR}/lib/SFML")
# set(SFML_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/SFML/include")
file(GLOB BINARY_DEP_DLLS "${SFML_INCLUDE_DIR}/../bin/*.dll")
file(COPY ${BINARY_DEP_DLLS} DESTINATION ${CMAKE_BINARY_DIR})
include_directories("${CMAKE_SOURCE_DIR}/SFML/bin" "${CMAKE_SOURCE_DIR}/SFML/include" "${CMAKE_SOURCE_DIR}/SFML/lib/cmake/SFML") # dodane
include_directories("${CMAKE_SOURCE_DIR}/lib/SFML/bin" "${CMAKE_SOURCE_DIR}/lib/SFML/include" "${CMAKE_SOURCE_DIR}/lib/SFML/lib/cmake/SFML") # dodane
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake_modules") # dodane
find_package(SFML 2.5.1 COMPONENTS graphics window system REQUIRED)
find_package(SFML 2.6.2 COMPONENTS graphics window system audio REQUIRED)
if(SFML_FOUND)
include_directories(${SFML_INCLUDE_DIR})
target_link_libraries(LotoStatek ${SFML_LIBRARIES})
endif()
elseif(APPLE)
find_package(SFML 2.5.1 COMPONENTS graphics window system REQUIRED)
target_link_libraries(LotoStatek sfml-graphics)
find_package(SFML 2.6.2 COMPONENTS graphics window system REQUIRED)
target_link_libraries(LotoStatek sfml-graphics sfml-window sfml-audio sfml-system)
elseif(LINUX)
find_package(SFML 2.5.1 COMPONENTS graphics window system REQUIRED)
target_link_libraries(LotoStatek sfml-graphics)
find_package(SFML 2.6.2 COMPONENTS graphics window system REQUIRED)
target_link_libraries(LotoStatek sfml-graphics sfml-window sfml-audio sfml-system)
endif()

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,98 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>SFML - Simple and Fast Multimedia Library</title>
<meta http-equiv="Content-Type" content="text/html;"/>
<meta charset="utf-8"/>
<!--<link rel='stylesheet' type='text/css' href="https://fonts.googleapis.com/css?family=Ubuntu:400,700,400italic"/>-->
<link rel="stylesheet" type="text/css" href="doxygen.css" title="default" media="screen,print" />
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
</head>
<body>
<div id="banner-container">
<div id="banner">
<span id="sfml">SFML 2.5.1</span>
</div>
</div>
<div id="content">
<!-- Generated by Doxygen 1.8.14 -->
<div id="navrow1" class="tabs">
<ul class="tablist">
<li><a href="index.html"><span>Main&#160;Page</span></a></li>
<li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
<li><a href="modules.html"><span>Modules</span></a></li>
<li><a href="namespaces.html"><span>Namespaces</span></a></li>
<li><a href="annotated.html"><span>Classes</span></a></li>
<li class="current"><a href="files.html"><span>Files</span></a></li>
</ul>
</div>
<div id="navrow2" class="tabs2">
<ul class="tablist">
<li><a href="files.html"><span>File&#160;List</span></a></li>
<li><a href="globals.html"><span>File&#160;Members</span></a></li>
</ul>
</div>
<div id="nav-path" class="navpath">
<ul>
<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_c0a853e81d6f1c1f0a3eb7a27dc24256.html">SFML</a></li> </ul>
</div>
</div><!-- top -->
<div class="header">
<div class="summary">
<a href="#define-members">Macros</a> </div>
<div class="headertitle">
<div class="title">GpuPreference.hpp File Reference</div> </div>
</div><!--header-->
<div class="contents">
<p>Headers.
<a href="#details">More...</a></p>
<div class="textblock"><code>#include &lt;SFML/Config.hpp&gt;</code><br />
</div>
<p><a href="GpuPreference_8hpp_source.html">Go to the source code of this file.</a></p>
<table class="memberdecls">
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
Macros</h2></td></tr>
<tr class="memitem:ab0233c2d867cbd561036ed2440a4fec0"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="GpuPreference_8hpp.html#ab0233c2d867cbd561036ed2440a4fec0">SFML_DEFINE_DISCRETE_GPU_PREFERENCE</a></td></tr>
<tr class="memdesc:ab0233c2d867cbd561036ed2440a4fec0"><td class="mdescLeft">&#160;</td><td class="mdescRight">A macro to encourage usage of the discrete GPU. <a href="#ab0233c2d867cbd561036ed2440a4fec0">More...</a><br /></td></tr>
<tr class="separator:ab0233c2d867cbd561036ed2440a4fec0"><td class="memSeparator" colspan="2">&#160;</td></tr>
</table>
<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
<div class="textblock"><p>Headers. </p>
<p>File containing SFML_DEFINE_DISCRETE_GPU_PREFERENCE </p>
<p class="definition">Definition in file <a class="el" href="GpuPreference_8hpp_source.html">GpuPreference.hpp</a>.</p>
</div><h2 class="groupheader">Macro Definition Documentation</h2>
<a id="ab0233c2d867cbd561036ed2440a4fec0"></a>
<h2 class="memtitle"><span class="permalink"><a href="#ab0233c2d867cbd561036ed2440a4fec0">&#9670;&nbsp;</a></span>SFML_DEFINE_DISCRETE_GPU_PREFERENCE</h2>
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
<td class="memname">#define SFML_DEFINE_DISCRETE_GPU_PREFERENCE</td>
</tr>
</table>
</div><div class="memdoc">
<p>A macro to encourage usage of the discrete GPU. </p>
<p>In order to inform the Nvidia/AMD driver that an SFML application could benefit from using the more powerful discrete GPU, special symbols have to be publicly exported from the final executable.</p>
<p>SFML defines a helper macro to easily do this.</p>
<p>Place SFML_DEFINE_DISCRETE_GPU_PREFERENCE in the global scope of a source file that will be linked into the final executable. Typically it is best to place it where the main function is also defined. </p>
<p class="definition">Definition at line <a class="el" href="GpuPreference_8hpp_source.html#l00069">69</a> of file <a class="el" href="GpuPreference_8hpp_source.html">GpuPreference.hpp</a>.</p>
</div>
</div>
</div><!-- contents -->
</div>
<div id="footer-container">
<div id="footer">
SFML is licensed under the terms and conditions of the <a href="https://www.sfml-dev.org/license.php">zlib/png license</a>.<br>
Copyright &copy; Laurent Gomila &nbsp;::&nbsp;
Documentation generated by <a href="http://www.doxygen.org/" title="doxygen website">doxygen</a> &nbsp;::&nbsp;
</div>
</div>
</body>
</html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show More