Commit Graph

347 Commits

Author SHA1 Message Date
529cec5653 R to freeroam, idle anims, weapon and cam enum fix 2020-05-29 22:05:33 +03:00
627ffb0f82 fix 2020-05-29 16:52:02 +03:00
e6401bce18 Detect R and start game on menu 2020-05-28 12:46:51 +03:00
98fec63ca7 Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun 2020-05-28 11:40:56 +03:00
329a387fdf Frontend customization functions, freecam toggle, minor things 2020-05-28 11:34:12 +03:00
aap
9bcec54291 Merge pull request #599 from Nick007J/master
Mission replay
2020-05-28 10:25:14 +02:00
d9d57f12fc crash fix 2020-05-28 01:00:49 +03:00
408faf8a66 Support of original mp3/wav/adf 2020-05-27 03:29:54 +03:00
ec1d14971c mission replay 2020-05-27 00:25:12 +03:00
0ce2af7a0d Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/core/SurfaceTable.cpp
#	src/core/SurfaceTable.h
#	src/core/World.cpp
#	src/core/main.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Ped.cpp
#	src/render/Timecycle.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Heli.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/Weapon.cpp
#	src/weapons/WeaponInfo.h
2020-05-26 17:24:47 +03:00
aap
800d706935 Merge pull request #588 from blingu/miami
fixed compiler errors
2020-05-26 11:39:16 +02:00
aap
7bf8337854 CVehicle 2020-05-25 18:33:34 +02:00
79c652e115 Ped.h include not needed 2020-05-24 17:48:13 +02:00
nrb
d59862eb5e fixed compiler errors 2020-05-24 17:27:12 +02:00
8c510a8d5b script fix 2020-05-24 15:00:45 +03:00
e95de89c9a script fix 2020-05-24 12:01:07 +03:00
2966be41ba Merge remote-tracking branch 'upstream/miami' into miami 2020-05-23 20:07:30 +03:00
607175f02a set pieces 2020-05-23 20:06:52 +03:00
5357957fe1 Compatibility with VC weapon.dat + new shotguns 2020-05-23 16:53:20 +03:00
9c6046455e fixed script 2020-05-23 12:17:05 +03:00
7b7b0fb5f2 removed debug 2020-05-23 02:18:16 +03:00
f8a509ffb3 fixes 2020-05-23 02:17:27 +03:00
7bf561d440 some fixes 2020-05-23 01:43:12 +03:00
e18eb0ce01 script fix 2020-05-23 00:50:15 +03:00
6e51ed3c53 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-22 23:35:19 +03:00
a5f23a0342 VC CMenuManager struct, ctor etc. 2020-05-22 03:48:12 +03:00
864847a6fe new script commands - mostly stubs 2020-05-22 02:42:04 +03:00
7e5342e9f0 script revision 2020-05-21 11:22:25 +03:00
73ff01e35b script fix 2020-05-21 00:18:13 +03:00
0085ed894f script revision 2020-05-20 23:47:44 +03:00
b7c1784dd2 script fix 2020-05-20 23:25:01 +03:00
f33a01e8c8 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-20 20:40:36 +03:00
d84650fbe5 script revision 2020-05-20 20:40:04 +03:00
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
1b96e6c378 fixed script bug 2020-05-19 23:49:28 +03:00
fec0028e12 sync with upstream 2020-05-19 23:27:41 +03:00
aap
bdbe5d1080 CEntity and friends 2020-05-19 20:56:42 +02:00
4c822e8375 script revision 2020-05-19 20:54:05 +03:00
99574ebfc6 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-05-19 17:46:18 +03:00
a6972714b7 Melee weapons(half-working), Ped and Hud bits 2020-05-19 17:43:16 +03:00
6510b15704 script revision 2020-05-19 01:49:09 +03:00
c47292b518 script fix 2020-05-19 00:10:45 +03:00
746f2aa479 script FPS fix 2020-05-18 22:43:06 +03:00
5ab2c85e97 some debug changes 2020-05-18 00:34:24 +03:00
ad8a8913d9 a few more stubs 2020-05-18 00:20:26 +03:00
39931a5284 some more script stubs 2020-05-17 23:31:16 +03:00
7bd6c70318 just in case 2020-05-17 22:17:43 +03:00
3cc20d7962 sync with upstream 2020-05-17 21:48:12 +03:00
a5b84eb9fe full script basic support 2020-05-17 21:43:11 +03:00