Commit Graph

2112 Commits

Author SHA1 Message Date
Nikolay Korolev
6e51ed3c53 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-22 23:35:19 +03:00
erorcun
4b99d7127f
Merge pull request #579 from Xinerki/miami
InitAfterFocusLoss compile fix
2020-05-22 16:10:35 +03:00
Xin
a878e09f0f
InitAfterFocusLoss compile fix 2020-05-22 16:04:52 +03:00
erorcun
8b82e9c40f
Merge pull request #574 from Xinerki/miami
many additions
2020-05-22 15:49:37 +03:00
erorcun
4fd1771f71
Merge pull request #577 from erorcun/miami
VC CMenuManager struct, ctor etc.
2020-05-22 15:24:08 +03:00
eray orçunus
a5f23a0342 VC CMenuManager struct, ctor etc. 2020-05-22 03:48:12 +03:00
Nikolay Korolev
5a18e69425 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-22 02:42:43 +03:00
Nikolay Korolev
864847a6fe new script commands - mostly stubs 2020-05-22 02:42:04 +03:00
Xinerki
900d5a4ce0 focus loss improvement
for u aap
2020-05-21 21:48:39 +03:00
Xinerki
e0345732c0 wasted/busted text color
how did nobody change it yet
2020-05-21 17:50:08 +03:00
Xinerki
0db3d03c3c sorry my bad 2020-05-21 17:36:12 +03:00
Xinerki
1c00e3cf2c vehicle cheats and debug cheat string display 2020-05-21 17:28:03 +03:00
Xinerki
6692f5b2aa make reloadables optional 2020-05-21 16:47:48 +03:00
Xinerki
6912cfe98a menu map color change 2020-05-21 16:26:56 +03:00
Xinerki
46c6b0d29d fancy HUD.TXD reloader
TODO: make optional with defines, also add more reload options
2020-05-21 16:25:46 +03:00
Xinerki
3e75de9709 radardisc shadow
thank tomasak
2020-05-21 15:46:53 +03:00
Xinerki
1cb7b9876f scuffed InitAfterFocusLoss implementation 2020-05-21 14:23:12 +03:00
Xinerki
b4060a4789 add freecam toggle in control settings
comes with a free config save!
2020-05-21 13:06:09 +03:00
Xinerki
2db26d304f approach separation differently 2020-05-21 12:45:45 +03:00
Xinerki
6d32cf4a11 blip marker colors, also isolate crgba 2020-05-21 12:21:02 +03:00
aap
bc4d628940
Merge pull request #573 from Nick007J/miami
script revision
2020-05-21 10:32:11 +02:00
Nikolay Korolev
7e5342e9f0 script revision 2020-05-21 11:22:25 +03:00
Nikolay Korolev
510261cb05 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-20 23:54:22 +03:00
Nikolay Korolev
0085ed894f script revision 2020-05-20 23:47:44 +03:00
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
Nikolay Korolev
f33a01e8c8 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-20 20:40:36 +03:00
Nikolay Korolev
d84650fbe5 script revision 2020-05-20 20:40:04 +03: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