Commit Graph

2086 Commits

Author SHA1 Message Date
eray orçunus
5b953228b4 Pickup and audio fix 2020-05-20 21:22:40 +03:00
aap
71b9b2ecf9
Merge pull request #572 from erorcun/miami
Fixes for melees and various things
2020-05-20 19:55:05 +02:00
eray orçunus
2ab3fb5dd0 Fixes for melees and various things 2020-05-20 20:21:27 +03:00
Sergeanur
c53b23cff0 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/core/Radar.h
#	src/core/World.cpp
#	src/core/config.h
#	src/entities/Entity.cpp
#	src/modelinfo/ModelIndices.h
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Population.cpp
#	src/render/Clouds.cpp
#	src/render/Hud.cpp
#	src/vehicles/HandlingMgr.h
2020-05-20 14:39:36 +03:00
aap
fd4cd3e8f1
Merge pull request #569 from aap/miami
CEntity and friends
2020-05-20 12:41:12 +02:00
aap
98b158c783
Merge pull request #568 from Nick007J/miami
script revision
2020-05-20 12:40:59 +02:00
Nikolay Korolev
1b96e6c378
fixed script bug 2020-05-19 23:49:28 +03:00
Nikolay Korolev
fec0028e12 sync with upstream 2020-05-19 23:27:41 +03:00
aap
50f0c7a1dc bla 2020-05-19 22:01:28 +02:00
aap
0b0ba49abc small fixes 2020-05-19 21:42:55 +02:00
erorcun
ada5c245a8
Merge pull request #567 from erorcun/miami
Melee weapons(half-working), Ped and Hud bits
2020-05-19 22:41:59 +03:00
aap
bdbe5d1080 CEntity and friends 2020-05-19 20:56:42 +02:00
Nikolay Korolev
46d1889344 slightly restructured ped flags for convenience 2020-05-19 21:34:28 +03:00
Nikolay Korolev
e967db4a3c fixed annoying bug 2020-05-19 21:10:40 +03:00
Nikolay Korolev
41d7b3244b Merge remote-tracking branch 'upstream/miami' into miami 2020-05-19 20:54:10 +03:00
Nikolay Korolev
4c822e8375 script revision 2020-05-19 20:54:05 +03:00
eray orçunus
99574ebfc6 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-05-19 17:46:18 +03:00
eray orçunus
a6972714b7 Melee weapons(half-working), Ped and Hud bits 2020-05-19 17:43:16 +03:00
aap
8a90e32f1b
Merge pull request #564 from Xinerki/miami
fix audio menu crash
2020-05-19 13:26:43 +02:00
aap
6b0b984909
Merge pull request #561 from Nick007J/miami
script revision
2020-05-19 13:26:21 +02:00
Xinerki
ffd175c705 fix frontend control config menu a little
thank erorcun
2020-05-19 14:23:59 +03:00
aap
0d0f4da27a little cleanup of handlingmgr 2020-05-19 13:09:20 +02:00
Xinerki
12b48edada fix audio menu crash 2020-05-19 14:07:24 +03:00
aap
53cdf6ab41 HandlingMgr 2020-05-19 13:07:12 +02:00
aap
401e45d63e
Merge pull request #563 from Xinerki/miami
match frontend to vc more; isolate crgba
2020-05-19 12:50:47 +02:00
Xinerki
9e14e8553f match frontend to vc more; isolate crgba 2020-05-19 13:47:55 +03:00
Nikolay Korolev
ff0e039599 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-19 12:44:40 +03:00
aap
9d16df5aa8
Merge pull request #562 from Xinerki/miami
Load VC frontend textures and use some
2020-05-19 10:41:17 +02:00
Xinerki
00ee82aba6 Zone and Vehicle text slant 2020-05-19 11:36:08 +03:00
aap
62db8cd9b0 finished CFileLoader; some COcclusion stubs 2020-05-19 10:23:08 +02:00
Xinerki
d425358181 Load VC frontend textures and use some 2020-05-19 10:07:15 +03:00
Nikolay Korolev
a27fc8d9d9 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-19 01:49:51 +03:00
Nikolay Korolev
6510b15704 script revision 2020-05-19 01:49:09 +03:00
Nikolay Korolev
c47292b518
script fix 2020-05-19 00:10:45 +03:00
aap
abd230dcdd some less certainly fps fixes 2020-05-18 22:52:35 +02:00
aap
a8f4f74a76 only one sunbathe anim group 2020-05-18 22:25:06 +02:00
Nikolay Korolev
746f2aa479 script FPS fix 2020-05-18 22:43:06 +03:00
shfil
3cda88ea20
Merge pull request #560 from GTAmodding/ShFil119-patch-1
Fix string assignment (aldlist.cpp)
2020-05-18 21:19:42 +02:00
shfil
6bf79120dc
Fix string assignment (aldlist.cpp) 2020-05-18 21:08:01 +02:00
shfil
37e462b9eb
Merge pull request #559 from ShFil119/travis
Add basic linux build on travis
2020-05-18 19:55:28 +02:00
Filip Gawin
b55ba13586 Add basic linux build on travis 2020-05-18 19:43:02 +02:00
Sergeanur
e891cf858f Remove MAX_VOLUME dups 2020-05-18 20:17:24 +03:00
aap
b05e6632be
Merge pull request #556 from Fire-Head/master
nullsampman
2020-05-18 17:08:32 +02:00
aap
2588e69849 some less certainly fps fixes 2020-05-18 16:55:38 +02:00
aap
68f1c03a85 fixes for braking and cloud rotation at high fps 2020-05-18 16:43:40 +02:00
aap
9b09aa3384 fixes for braking and cloud rotation at high fps 2020-05-18 16:40:30 +02:00
aap
2d4861454c
Merge pull request #557 from Nick007J/miami
script and script stubs
2020-05-18 13:08:24 +02:00
aap
8f9ce275c8
Merge pull request #558 from Sergeanur/VC/text
CText
2020-05-18 13:07:59 +02:00
Sergeanur
af22bb1495 CText 2020-05-18 01:28:40 +03:00
Nikolay Korolev
5ab2c85e97 some debug changes 2020-05-18 00:34:24 +03:00