Commit Graph

93 Commits

Author SHA1 Message Date
Sergeanur
fae4c73ad3 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	premake5.lua
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.h
#	src/audio/MusicManager.cpp
#	src/audio/sampman.h
#	src/audio/sampman_oal.cpp
#	src/control/CarCtrl.cpp
#	src/control/Replay.cpp
#	src/control/Script.cpp
#	src/core/Camera.cpp
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.cpp
#	src/core/MenuScreens.cpp
#	src/core/config.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/math/Matrix.cpp
#	src/math/Matrix.h
#	src/math/Vector2D.h
#	src/peds/Ped.cpp
#	src/render/Credits.cpp
#	src/render/Hud.cpp
#	src/render/Skidmarks.cpp
#	src/weapons/Weapon.cpp
2020-09-30 02:25:30 +03:00
shfil
6dfb32d285
Add link to steam store 2020-09-25 13:56:15 +02:00
Sergeanur
3e24ae8812 Merge branch 'master' into miami
# Conflicts:
#	premake5.lua
#	sdk/rwsdk/include/d3d8/baaplylt.c
#	sdk/rwsdk/include/d3d8/rpstereo.h
#	sdk/rwsdk/include/d3d8/rpstereo.rpe
#	sdk/rwsdk/include/d3d8/rtintel.h
#	sdk/rwsdk/include/d3d8/rtintel.rpe
#	src/audio/oal/stream.cpp
2020-08-02 19:49:12 +03:00
shfil
8ceeb106ef
Update README.md 2020-07-29 18:25:27 +02:00
Sergeanur
f882586eb8 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	README.md
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/peds/Ped.cpp
#	src/peds/Ped.h
#	src/render/Renderer.cpp
#	src/vehicles/Plane.cpp
2020-07-22 18:29:17 +03:00
erorcun
7e54a226e2
README 64-bit preparation 2020-07-22 15:21:51 +03:00
erorcun
afc38c0d72
README 64-bit preparation 2020-07-22 15:20:52 +03:00
shfil
4a7f0849ab
Update links to bintray on miami branch 2020-06-04 21:36:06 +02:00
erorcun
24f74a775f
Update README.md 2020-05-12 03:41:41 +03:00
erorcun
603ac9ce4b
Update README.md 2020-05-12 01:24:54 +03:00
Sergeanur
52907088f9 Fix build status and don't add random files into the project 2020-05-05 20:40:27 +03:00
Filip Gawin
8ec481527e Refactor badges 2020-05-01 23:11:51 +02:00
Filip Gawin
7458e07af4 Add opengl build and push artifacts to bintray 2020-05-01 22:40:05 +02:00
Sergeanur
cf5a404f6b Fix downloading from PR 2020-04-30 15:02:42 +03:00
aap
474b0418d3 for real this time 2020-04-29 13:34:53 +02:00
aap
0d37a202c5 fixed links 2020-04-29 13:26:48 +02:00
aap
6998e070ac fixed links 2020-04-29 13:24:43 +02:00
erorcun
ac26d9cdda
Update README.md 2020-04-17 18:30:59 +03:00
Sergeanur
4ff01484c8 Update links 2020-04-17 18:22:33 +03:00
Sergeanur
7e652ef2d3 Remove CWorld from README 2020-04-17 18:09:42 +03:00
Nikolay Korolev
edd8f44ffd merge readmes 2020-04-16 00:34:31 +03:00
Nikolay Korolev
378f1d180d
Update README.md 2020-04-16 00:33:57 +03:00
Nikolay Korolev
a8f0d77b87
Update README.md 2020-04-16 00:33:11 +03:00
eray orçunus
01d18e8f28 Readme update 2020-04-15 19:37:41 +03:00
Filip Gawin
41d42a3e53
Merge pull request #414 from ShFil119/audio17
Finish audio
2020-04-14 13:01:40 +02:00
Sergeanur
fb5846b7bd update readme 2020-04-14 01:13:18 +03:00
erorcun
0e056a8e01
Merge pull request #412 from whampson/save-stuff
GenericLoad() done
2020-04-13 21:49:57 +03:00
Filip Gawin
353310f0cf Update readme 2020-04-13 20:31:46 +02:00
erorcun
e2fb0578b5
Merge pull request #413 from erorcun/erorcun
CFileLoader last funcs and Frontend cleanup
2020-04-13 15:36:05 +03:00
erorcun
c008eb2431
Merge pull request #410 from Sergeanur/PacManPickups
CPacManPickups
2020-04-13 12:51:30 +03:00
Sergeanur
741c9405d0 CPacManPickups 2020-04-13 12:07:07 +03:00
eray orçunus
60c412149d CFileLoader last funcs and Frontend cleanup 2020-04-13 05:42:02 +03:00
Wes Hampson
adde1f7b26 Remove GenericLoad from TODOs 2020-04-12 16:07:41 -07:00
aap
3aae52d220 finished CBoat 2020-04-13 00:20:44 +02:00
Sergeanur
e77accb3f5 Remove CObject from readme 2020-04-12 12:29:29 +03:00
Nikolay Korolev
fa0f5542cc
Merge pull request #402 from Nick007J/master
Record
2020-04-12 12:06:12 +03:00
erorcun
207aebc46c
Merge pull request #400 from erorcun/erorcun
CMenuManager done and CHud fixes
2020-04-12 00:57:46 +03:00
eray orçunus
f2995640bd CMenuManager done and CHud fixes 2020-04-12 00:56:27 +03:00
Nikolay Korolev
b48617dfde
Update README.md 2020-04-11 21:09:52 +03:00
Nikolay Korolev
59d4a29f55
Update README.md 2020-04-11 02:11:18 +03:00
aap
c5d61392ea implemented CTrafficLights 2020-04-10 18:36:39 +02:00
Sergeanur
6cfc31510d CStats finished 2020-04-09 20:15:45 +03:00
Nikolay Korolev
252d40413c
Update README.md 2020-04-09 13:41:05 +03:00
aap
6297a9da11
Merge pull request #391 from Sergeanur/Cheats
Cheats
2020-04-09 12:30:23 +02:00
aap
a6d449a2f4
Merge pull request #390 from Sergeanur/Explosion
Finished CExplosion
2020-04-09 12:30:13 +02:00
Sergeanur
cb262c791e Finished CExplosion 2020-04-09 13:28:17 +03:00
Sergeanur
e6476bafff Cheats 2020-04-09 00:17:14 +03:00
aap
6288d36f34 implemented CSkidmarks 2020-04-08 16:35:23 +02:00
aap
daaf443cfa finished CMotionBlurStreaks, CSpecialFX 2020-04-07 22:26:01 +02:00
aap
51512db006 implemented CRubbish 2020-04-07 17:16:58 +02:00