Commit graph

1184 commits

Author SHA1 Message Date
Nikolay Korolev
21a11fd343 scene edit 2020-04-14 20:09:42 +03:00
Sergeanur
6d934892ec RwMatFX support with linked RW libs 2020-04-14 18:35:07 +03:00
Sergeanur
eb0b9f6255 fix CTheCarGenerators::SaveAllCarGenerators 2020-04-14 17:24:31 +03:00
Sergeanur
9a7b833aa5 Added missing audio ctors 2020-04-14 17:13:38 +03:00
saml1er
bf040c7cd1 Remove float casts 2020-04-14 17:05:51 +05:00
saml1er
8bb23ca5d4 Refactor CPedPath::CalcPedRoute 2020-04-14 16:57:28 +05:00
Filip Gawin
41d42a3e53
Merge pull request #414 from ShFil119/audio17
Finish audio
2020-04-14 13:01:40 +02:00
saml1er
b4d5d5249c CPedPath complete 2020-04-14 15:45:47 +05:00
Sergeanur
a19fa8764f CarGen, Cranes, Gangs: cleanup, fixes, r* visioned placement 2020-04-14 13:08:03 +03:00
Sergeanur
7f8a4b4867 Debug font and CProfiles 2020-04-14 10:31:37 +03:00
erorcun
313f547860
Some cleanup 2020-04-14 03:21:16 +03:00
Nikolay Korolev
f54c83c0b5 Merge branch 'master' into game_dev 2020-04-14 01:18:53 +03:00
Filip Gawin
2e20e040cc
Merge pull request #403 from saml1er/roadblocks
CRoadBlocks complete
2020-04-14 00:11:39 +02:00
Filip Gawin
aa3b7869e5
Merge pull request #406 from Nick007J/master
Pools load/save
2020-04-14 00:11:22 +02:00
saml1er
60eb60de4e Use NUMROADBLOCKS enum member in CRoadBlocks 2020-04-14 02:13:00 +05:00
Nikolay Korolev
906133d3be
fix garages 2020-04-13 22:43:41 +03:00
Sergeanur
304b574eba added missing break 2020-04-13 22:25:24 +03:00
Nikolay Korolev
2709447073 Merge remote-tracking branch 'upstream/master' 2020-04-13 22:17:42 +03:00
Nikolay Korolev
c21529467a
fixed record 2020-04-13 22:16:51 +03:00
Filip Gawin
67055c1fbb Cleanup cAudioManager::ProcessRainOnVehicle a bit 2020-04-13 21:13:07 +02:00
Nikolay Korolev
12d36d8710
fixed record 2020-04-13 22:12:41 +03:00
Nikolay Korolev
1c592c26f9 review fix 2020-04-13 21:57:13 +03:00
Nikolay Korolev
3b0cd93f89 Merge remote-tracking branch 'upstream/master' 2020-04-13 21:54:25 +03:00
Nikolay Korolev
cb85091d34 scene edit 2020-04-13 21:50:56 +03:00
erorcun
0e056a8e01
Merge pull request #412 from whampson/save-stuff
GenericLoad() done
2020-04-13 21:49:57 +03:00
Filip Gawin
3b9f1255af Finish audio code 2020-04-13 20:30:18 +02:00
Wes Hampson
a19d5dbee1 Fixes 2020-04-13 11:20:57 -07:00
erorcun
e2fb0578b5
Merge pull request #413 from erorcun/erorcun
CFileLoader last funcs and Frontend cleanup
2020-04-13 15:36:05 +03:00
Sergeanur
d8be75ac46 Fix compilation error 2020-04-13 15:21:26 +03:00
saml1er
68f8a6a9ed more CRoadBlocks::GenerateRoadBlocks improvements 2020-04-13 15:21:39 +05: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
saml1er
28fb1bdde7 Fix CRoadBlocks::GenerateRoadBlocks bugs 2020-04-13 05:52:18 +05:00
Wes Hampson
dbf6e155ff GenericLoad() done 2020-04-12 15:47:12 -07:00
aap
3aae52d220 finished CBoat 2020-04-13 00:20:44 +02:00
erorcun
a622c9e877
Merge pull request #409 from erorcun/erorcun
Frontend fixes + triangle for back as default
2020-04-12 20:24:57 +03:00
eray orçunus
8b2138f7bd Frontend fixes + triangle for back as default 2020-04-12 20:22:28 +03:00
erorcun
9044f57a0e
Merge pull request #408 from erorcun/erorcun
Revert "fix"
2020-04-12 18:53:24 +03:00
eray orçunus
bde3ef4f43 Revert "fix" 2020-04-12 18:51:46 +03:00
erorcun
0caceec1de
Merge pull request #407 from erorcun/erorcun
Ped fix
2020-04-12 18:39:23 +03:00
eray orçunus
8476283174 Ped fix 2020-04-12 18:37:59 +03:00
Nikolay Korolev
e71b000cc5 Merge branch 'master' into game_dev 2020-04-12 12:13:32 +03:00
Nikolay Korolev
1732f9b5c6 obviously forgot about it 2020-04-12 12:10:25 +03:00
Nikolay Korolev
cbb298c8dd sync with master 2020-04-12 12:08:30 +03:00
Nikolay Korolev
04c9affe2e scene init 2020-04-12 12:06:33 +03:00
Nikolay Korolev
fa0f5542cc
Merge pull request #402 from Nick007J/master
Record
2020-04-12 12:06:12 +03:00
Nikolay Korolev
c593599fc5
Merge pull request #399 from saml1er/master
CObject complete
2020-04-12 12:05:49 +03:00
Sergeanur
d804ad48b9
Merge pull request #388 from ShFil119/audio16
Yet another audio PR
2020-04-12 11:46:48 +03:00
Nikolay Korolev
9593a2c000
fixed cranes bug 2020-04-12 11:36:51 +03:00
Filip Gawin
7d137d8f2d Cleanup audio code 2020-04-12 02:50:52 +02:00
eray orçunus
1932d98482 CDebug fix 2020-04-12 01:33:04 +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
saml1er
60898f39f2 Improve CRoadBlocks code 2020-04-12 02:08:16 +05:00
Sergeanur
daceee593b Link with RW libs 2020-04-11 23:37:04 +03:00
Nikolay Korolev
d010f6255a Merge branch 'master' into garages_dev 2020-04-11 21:02:31 +03:00
Nikolay Korolev
fbb1bc5b0d Merge remote-tracking branch 'upstream/master' 2020-04-11 21:02:04 +03:00
Nikolay Korolev
38dee74a5a CPools 2020-04-11 21:01:39 +03:00
aap
c307e72fa0 Merge branch 'master' of github.com:gtamodding/re3 2020-04-11 19:33:46 +02:00
aap
3c999a1eb8 fixed traffic light position 2020-04-11 19:33:39 +02:00
saml1er
ff16ba7801 CObject fixes 2020-04-11 22:31:32 +05:00
saml1er
0d19036a42 CRoadBlocks complete 2020-04-11 21:45:49 +05:00
Sergeanur
0ddc04743c Fix cutscene camera latency 2020-04-11 13:21:21 +03:00
Nikolay Korolev
1c0c0a0468 fixed malloc/new 2020-04-11 13:20:41 +03:00
Nikolay Korolev
bc90f958da fix constants 2020-04-11 02:27:50 +03:00
Nikolay Korolev
c8ac25ebfd Merge branch 'master' into garages_dev 2020-04-11 02:04:56 +03:00
Nikolay Korolev
92b6d775d6 Record 2020-04-11 02:03:42 +03:00
Sergeanur
f1413c4776 fixing r* visioned leak 2020-04-11 00:36:11 +03:00
aap
df872a26b0 fuck you git, i fixed this already 2020-04-10 23:21:34 +02:00
Nikolay Korolev
be260b49b1 Merge branch 'master' into garages_dev 2020-04-10 21:17:00 +03:00
saml1er
4f00576a8c Addendum to previous commit 2020-04-10 21:59:49 +05:00
saml1er
16360eb6df Refactor CObject::ObjectDamage switch statement 2020-04-10 21:52:02 +05:00
aap
c5d61392ea implemented CTrafficLights 2020-04-10 18:36:39 +02:00
saml1er
c2b00d7ad9 Fix cast in CObject::ObjectDamage 2020-04-10 19:37:09 +05:00
saml1er
5544325acb Refactor CObject::ObjectDamage 2020-04-10 19:32:42 +05:00
Sergeanur
3a4442eca4 disabling the code that freezes gang members 2020-04-10 16:14:05 +03:00
saml1er
bb21cff639 Fix Object.h and Object.cpp indentation 2020-04-10 17:03:02 +05:00
saml1er
a8f7bf0bec CObject complete 2020-04-10 16:44:08 +05:00
Nikolay Korolev
a27f7359ff fix 2020-04-10 12:20:04 +03:00
Nikolay Korolev
4864850657 Merge remote-tracking branch 'upstream/master' 2020-04-10 12:03:48 +03:00
Nikolay Korolev
314bb83b9a fixed intro crash 2020-04-10 12:03:22 +03:00
Sergeanur
b76172e2dd PlayerSkin small cleanup 2020-04-10 11:41:48 +03:00
Sergeanur
8917567508 Fixing mixed IsCutsceneProcessing and IsRunning 2020-04-10 11:23:35 +03:00
Nikolay Korolev
917fa80c18 record init 2020-04-10 11:03:38 +03:00
Sergeanur
6647312660 Fix sprite vertical scale 2020-04-10 10:52:47 +03:00
Nikolay Korolev
6473778c47
fix weather init 2020-04-10 02:17:32 +03:00
aap
34349c4df2 normalized line endings to LF 2020-04-09 20:50:24 +02:00
Sergeanur
a5239b554f Merge remote-tracking branch 'Fire-Head/master'
# Conflicts:
#	src/core/Radar.cpp
2020-04-09 21:40:46 +03:00
aap
5b5de5d2f3
Merge pull request #393 from Sergeanur/txdimg
txd.img creator
2020-04-09 20:37:53 +02:00
aap
d8cf6258b7
Merge pull request #395 from aap/master
fixed questionable RW usage; changed radar mask to PS2 technique
2020-04-09 20:35:04 +02:00
Sergeanur
6cfc31510d CStats finished 2020-04-09 20:15:45 +03:00
aap
6225e50723 fixed questionable RW usage; changed radar mask to PS2 techinque 2020-04-09 17:45:05 +02:00
Sergeanur
a5c7151656 AddExplosion shadow fix 2020-04-09 16:15:30 +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
aap
ee057cb427
Merge pull request #389 from Nick007J/master
Weather
2020-04-09 12:30:02 +02:00
aap
26fb53472e
Merge pull request #387 from aap/master
implemented CSkidmarks
2020-04-09 12:29:52 +02:00
Sergeanur
cb262c791e Finished CExplosion 2020-04-09 13:28:17 +03:00
Sergeanur
fd2152923c txd.img creator 2020-04-09 10:28:50 +03:00