Sergeanur
|
9956b27767
|
Merge branch 'master' into miami
# Conflicts:
# src/control/Darkel.cpp
# src/core/main.cpp
|
2020-08-15 15:13:46 +03:00 |
|
eray orçunus
|
8b3ca9564b
|
Continue to Frontend, fix savegame list bug
|
2020-08-14 22:44:12 +03:00 |
|
eray orçunus
|
f403a63a5c
|
Wheelie opcode
|
2020-08-14 18:54:01 +03:00 |
|
Sergeanur
|
489743da41
|
Darkel fixes
|
2020-08-14 17:34:04 +03:00 |
|
eray orçunus
|
b54bb62c94
|
Stats(except displaying), PlayerInfo, marker fix
|
2020-08-14 01:14:04 +03:00 |
|
aap
|
43bf854374
|
timecycle done
|
2020-08-09 19:11:44 +02:00 |
|
Sergeanur
|
7d8ffa9ebd
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/RoadBlocks.cpp
# src/core/Collision.h
# src/core/Pad.cpp
# src/core/SurfaceTable.h
# src/core/main.cpp
# src/core/re3.cpp
# src/peds/Population.cpp
# src/render/Fluff.cpp
# src/render/Shadows.cpp
# src/render/Shadows.h
# src/render/Sprite2d.cpp
# src/weapons/BulletInfo.cpp
|
2020-08-07 12:34:41 +03:00 |
|
eray orçunus
|
e14252914e
|
Squeeze performance option, minor fixes
Fixes are already in miami
|
2020-08-03 16:00:32 +03:00 |
|
eray orçunus
|
eafa9cc107
|
new opcodes, buyable properties, minor fixes
|
2020-07-30 15:32:34 +03:00 |
|
Sergeanur
|
acdc52116e
|
Merge branch 'master' into miami
# Conflicts:
# src/animation/RpAnimBlend.cpp
# src/audio/oal/stream.cpp
# src/audio/sampman.h
# src/control/Pickups.cpp
# src/core/Collision.cpp
# src/core/Collision.h
# src/core/FileLoader.cpp
# src/core/FileMgr.cpp
# src/core/FileMgr.h
# src/core/Streaming.cpp
# src/core/Streaming.h
# src/core/SurfaceTable.h
# src/modelinfo/VehicleModelInfo.h
# src/peds/Ped.cpp
# src/rw/RwHelper.cpp
# src/rw/RwHelper.h
# src/skel/glfw/glfw.cpp
# src/skel/platform.h
# src/text/Text.cpp
# src/text/Text.h
# src/vehicles/CarGen.cpp
# src/vehicles/Heli.cpp
|
2020-07-29 15:34:57 +03:00 |
|
Sergeanur
|
581cb5edfa
|
The real pickup reflection fix
|
2020-07-29 14:56:06 +03:00 |
|
eray orçunus
|
15918feb8e
|
90% fixes, 10% skel refactoring
|
2020-07-24 21:35:04 +03:00 |
|
eray orçunus
|
ad6094ca1d
|
90% fixes, 10% skel refactoring
|
2020-07-24 21:02:55 +03:00 |
|
eray orçunus
|
732b760829
|
64-bit on Windows
|
2020-07-24 20:26:33 +03:00 |
|
eray orçunus
|
1dc6fbda1f
|
64-bit on Windows
|
2020-07-22 18:51:28 +03:00 |
|
eray orçunus
|
f40f44b14e
|
Peds, Hud, CFO 1/2, fixes - including zone names
|
2020-07-22 15:19:22 +03:00 |
|
eray orçunus
|
70df13f9d3
|
Fixes from miami
|
2020-07-20 22:47:41 +03:00 |
|
Sergeanur
|
eaf569eb6d
|
Merge remote-tracking branch 'origin/master' into miami
|
2020-07-18 13:31:32 +03:00 |
|
Nikolay Korolev
|
d4444f8252
|
fix
|
2020-07-18 13:09:37 +03:00 |
|
Sergeanur
|
949d0c8853
|
Add audio cache for faster initialization
|
2020-07-17 13:48:25 +03:00 |
|
Sergeanur
|
ebdc5cca7f
|
Merge branch 'master' into miami
|
2020-07-16 23:03:31 +03:00 |
|
Sergeanur
|
ec09055599
|
Fix CCarStateEachFrame
|
2020-07-16 22:21:09 +03:00 |
|
Sergeanur
|
d0f5464200
|
Merge branch 'master' into miami
# Conflicts:
# src/control/CarAI.cpp
# src/control/Phones.cpp
# src/control/Phones.h
# src/control/Record.cpp
# src/control/Restart.cpp
# src/control/Script.cpp
# src/core/Collision.cpp
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.h
# src/core/Streaming.cpp
# src/core/TempColModels.cpp
# src/core/Wanted.cpp
# src/core/Zones.cpp
# src/core/config.h
# src/core/main.cpp
# src/core/re3.cpp
# src/entities/Entity.cpp
# src/entities/Physical.cpp
# src/extras/frontendoption.cpp
# src/modelinfo/ModelInfo.cpp
# src/modelinfo/PedModelInfo.cpp
# src/peds/CivilianPed.cpp
# src/peds/CopPed.cpp
# src/peds/EmergencyPed.cpp
# src/peds/Ped.cpp
# src/peds/Ped.h
# src/peds/Population.cpp
# src/render/Renderer.cpp
# src/save/GenericGameStorage.cpp
# src/skel/win/win.cpp
# src/vehicles/Automobile.cpp
# src/vehicles/Boat.cpp
# src/vehicles/Boat.h
# src/vehicles/Vehicle.cpp
|
2020-07-13 18:10:17 +03:00 |
|
Sergeanur
|
841fa5155c
|
Rename LEVEL_NONE to LEVEL_GENERIC
|
2020-07-13 17:43:09 +03:00 |
|
erorcun
|
30723cf723
|
Merge pull request #654 from erorcun/miami
VC fighting, Peds, many fixes including ghost bikes
|
2020-07-10 00:06:16 +03:00 |
|
Sergeanur
|
cf69f22a0c
|
Remove island loading
|
2020-07-09 19:18:42 +03:00 |
|
eray orçunus
|
67a3c7d2ee
|
VC fighting, Peds, many fixes including ghost bikes
|
2020-07-09 17:01:07 +03:00 |
|
Dominik
|
fa1263b6a4
|
CDarkel miami hud colors.
|
2020-07-07 01:02:39 +02:00 |
|
eray orçunus
|
c483a044b5
|
Noskillx's PR + fix .set loading
|
2020-07-06 19:26:41 +03:00 |
|
eray orçunus
|
ceb1defc4e
|
fixes from master, menu helper text
|
2020-07-04 23:50:43 +03:00 |
|
aap
|
2c50cf8ac6
|
Merge pull request #648 from Nick007J/miami
ice cream attractor + bike respray
|
2020-07-04 21:24:23 +02:00 |
|
eray orçunus
|
addb701638
|
Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun
|
2020-07-03 16:51:58 +03:00 |
|
eray orçunus
|
15548758ac
|
Bettah car enter canceling, fix CFO crash, ped objs. renaming
|
2020-07-03 16:51:33 +03:00 |
|
Nikolay Korolev
|
49a8dd7459
|
fixed typo
|
2020-07-03 15:21:11 +03:00 |
|
Nikolay Korolev
|
9bb8b39956
|
fixed typo
|
2020-07-03 15:17:02 +03:00 |
|
Nikolay Korolev
|
85e899c1a5
|
fixed typo
|
2020-07-03 15:15:42 +03:00 |
|
Nikolay Korolev
|
48ebbb7292
|
ice cream attractor + bike respray
|
2020-07-03 11:08:19 +03:00 |
|
eray orçunus
|
c4cd210ae0
|
Disable VC_PED_PORTS, better cancellable car enter, weapon and cops fixes
|
2020-07-02 16:01:42 +03:00 |
|
Nikolay Korolev
|
389123cff3
|
fix
|
2020-07-01 16:06:16 +03:00 |
|
Nikolay Korolev
|
ade5dff217
|
script logging for miami
|
2020-07-01 15:43:19 +03:00 |
|
Nikolay Korolev
|
a1356f1001
|
copypaste bug
|
2020-07-01 15:38:32 +03:00 |
|
erorcun
|
eda50bc32b
|
Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639)
|
2020-07-01 15:28:43 +03:00 |
|
Nikolay Korolev
|
779d4e02a4
|
little fix
|
2020-07-01 15:12:25 +03:00 |
|
Sergeanur
|
b26eec5daf
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/soundlist.h
# src/control/Script.cpp
# src/control/ScriptCommands.h
# src/core/Cam.cpp
# src/core/Camera.cpp
# src/core/Camera.h
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.cpp
# src/core/MenuScreens.cpp
# src/core/Pad.cpp
# src/core/Pad.h
# src/core/config.h
# src/entities/Entity.cpp
# src/render/Credits.cpp
# src/render/Fluff.cpp
# src/render/Hud.cpp
# src/render/MBlur.cpp
# src/render/Timecycle.cpp
# src/skel/glfw/glfw.cpp
# src/skel/win/win.cpp
# src/text/Text.cpp
|
2020-06-29 12:56:50 +03:00 |
|
Fire_Head
|
860f75d66c
|
Merge branch 'master' into ps2menu
|
2020-06-29 09:37:53 +03:00 |
|
Nikolay Korolev
|
920bc0a1bf
|
fix
|
2020-06-28 16:24:09 +03:00 |
|
Nikolay Korolev
|
d6e111bb67
|
script logging fixes
|
2020-06-28 11:59:20 +03:00 |
|
Fire-Head
|
1c11a8081f
|
mips overdose
|
2020-06-28 00:01:51 +03:00 |
|
Nikolay Korolev
|
ba3fe38f2e
|
fixes
|
2020-06-22 14:07:19 +03:00 |
|
eray orçunus
|
f3ed6659c3
|
CWanted, anim fix, ped objs renaming, remove III beta features
|
2020-06-22 04:20:56 +03:00 |
|
Nikolay Korolev
|
7a71a47f74
|
updated player control names
|
2020-06-21 16:00:17 +03:00 |
|
Nikolay Korolev
|
0ab4496423
|
copypaste
|
2020-06-21 13:51:20 +03:00 |
|
Nikolay Korolev
|
f5cba0ce89
|
script logging
|
2020-06-21 13:46:23 +03:00 |
|
Nikolay Korolev
|
144f12525e
|
fix
|
2020-06-20 13:51:39 +03:00 |
|
Nikolay Korolev
|
eab6741afe
|
fix
|
2020-06-20 13:26:27 +03:00 |
|
Nikolay Korolev
|
e9e533b0cb
|
bikes in garages + bugfix
|
2020-06-18 00:03:43 +03:00 |
|
eray orçunus
|
e44704dc82
|
Ped, Weapon and fixes
|
2020-06-17 21:24:59 +03:00 |
|
eray orçunus
|
a822692c26
|
fix crash-VC pickup scaling
|
2020-06-16 22:55:28 +03:00 |
|
eray orçunus
|
c6bb1f5d0d
|
some cutscene opcodes and heli guns
|
2020-06-16 20:35:09 +03:00 |
|
eray orçunus
|
ef4c8f53c5
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
|
2020-06-15 00:26:27 +03:00 |
|
eray orçunus
|
2d976827dd
|
much better mission switcher
|
2020-06-15 00:26:19 +03:00 |
|
erorcun
|
f64d3ad7de
|
Merge pull request #631 from erorcun/miami
Peds, mission switcher & fixes
|
2020-06-14 22:59:02 +03:00 |
|
eray orçunus
|
db6110e996
|
Peds, mission switcher & fixes
|
2020-06-14 22:57:26 +03:00 |
|
aap
|
c7a32bb83d
|
some camera code
|
2020-06-14 09:36:30 +02:00 |
|
Nikolay Korolev
|
f78f707935
|
script fix
|
2020-06-13 02:02:59 +03:00 |
|
Nikolay Korolev
|
d415c4edd3
|
minor fix
|
2020-06-13 00:16:10 +03:00 |
|
Nikolay Korolev
|
3900366a6b
|
debug fix
|
2020-06-12 22:39:33 +03:00 |
|
Nikolay Korolev
|
17dd26e1ca
|
heli AI fix
|
2020-06-12 22:38:37 +03:00 |
|
aap
|
b07b1f0b51
|
Merge pull request #624 from erorcun/miami
Peds, bike center of mass and reversing fixes
|
2020-06-09 15:43:25 +02:00 |
|
eray orçunus
|
dba2b052a6
|
Peds, bike center of mass and reversing fixes
|
2020-06-09 01:29:55 +03:00 |
|
Sergeanur
|
95e9fe7693
|
fixes
|
2020-06-08 16:22:49 +03:00 |
|
Sergeanur
|
36a6d124aa
|
Mission audio slots
|
2020-06-08 10:34:31 +03:00 |
|
Nikolay Korolev
|
2de3c6d67b
|
some fixes to heli AI (not all yet)
|
2020-06-08 02:34:53 +03:00 |
|
Nikolay Korolev
|
b498ad800c
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-06-08 02:04:58 +03:00 |
|
Nikolay Korolev
|
d48749f797
|
fixed attached ped
|
2020-06-08 02:04:37 +03:00 |
|
eray orçunus
|
94e9101ce0
|
more fixes
|
2020-06-08 01:51:11 +03:00 |
|
Nikolay Korolev
|
16a5c2f676
|
fixes
|
2020-06-08 01:21:49 +03:00 |
|
Nikolay Korolev
|
af564d865c
|
fixes
|
2020-06-08 01:16:21 +03:00 |
|
eray orçunus
|
a77b181e32
|
CarCtrl fixes
|
2020-06-08 00:59:43 +03:00 |
|
Nikolay Korolev
|
23f20ceaf8
|
fix
|
2020-06-07 19:35:05 +03:00 |
|
Nikolay Korolev
|
2f9becbac6
|
fix
|
2020-06-07 19:31:15 +03:00 |
|
Nikolay Korolev
|
d0213e466c
|
more script commands
|
2020-06-07 15:49:25 +03:00 |
|
Nikolay Korolev
|
0b156f1d26
|
some stats tweaks; saves dead again
|
2020-06-07 15:23:52 +03:00 |
|
Nikolay Korolev
|
c50a61d52a
|
fixed some arithmetic
|
2020-06-07 15:08:58 +03:00 |
|
Nikolay Korolev
|
be2291e44c
|
fixed some arithmetic
|
2020-06-07 15:07:36 +03:00 |
|
eray orçunus
|
de4323f949
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
|
2020-06-07 12:46:15 +03:00 |
|
eray orçunus
|
d1a02e6ddc
|
New ped objectives
|
2020-06-07 12:45:53 +03:00 |
|
Fire-Head
|
9c0adf6a8f
|
Revert "FONT_BANK renamed to FONT_STANDARD"
This reverts commit 552205dfba .
|
2020-06-07 05:03:06 +03:00 |
|
Sergeanur
|
1c01899799
|
Merge branch 'master' into miami
# Conflicts:
# src/control/Garages.cpp
# src/core/Frontend.cpp
# src/peds/PlayerPed.cpp
# src/render/Hud.cpp
# src/vehicles/Train.cpp
|
2020-06-07 04:15:10 +03:00 |
|
Sergeanur
|
552205dfba
|
FONT_BANK renamed to FONT_STANDARD
|
2020-06-07 04:10:06 +03:00 |
|
Nikolay Korolev
|
3f26250d73
|
fixing some uninitialized stuff
|
2020-06-06 13:31:09 +03:00 |
|
eray orçunus
|
f045ce4386
|
Bike riding anims, SA bike/heli cam
|
2020-06-05 23:13:34 +03:00 |
|
Nikolay Korolev
|
83e4023dc0
|
fix
|
2020-06-05 12:59:27 +03:00 |
|
Nikolay Korolev
|
d325a3d247
|
basic bike support in traffic, script and car gen; some heli AI
|
2020-06-05 11:22:15 +03:00 |
|
eray orçunus
|
5dc410a999
|
Peds, eSound and PedState enum, fixes
|
2020-06-03 17:01:11 +03:00 |
|
Sergeanur
|
509ca11d76
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/GameLogic.cpp
# src/control/PathFind.cpp
# src/control/RoadBlocks.cpp
# src/control/Script.cpp
# src/control/Script.h
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/MenuScreens.cpp
# src/core/TempColModels.cpp
# src/core/config.h
# src/core/re3.cpp
# src/modelinfo/SimpleModelInfo.cpp
# src/modelinfo/VehicleModelInfo.cpp
# src/modelinfo/VehicleModelInfo.h
# src/render/Skidmarks.h
# src/render/WaterLevel.cpp
# src/save/GenericGameStorage.h
# src/vehicles/Automobile.cpp
# src/vehicles/Automobile.h
# src/vehicles/DamageManager.cpp
# src/vehicles/Vehicle.cpp
# src/vehicles/Vehicle.h
|
2020-06-03 01:24:08 +03:00 |
|
Nikolay Korolev
|
0803c821ae
|
fixed roadblocks
|
2020-06-01 12:45:03 +03:00 |
|
Nikolay Korolev
|
c1c163d78c
|
game logic
|
2020-05-31 20:59:01 +03:00 |
|
Nikolay Korolev
|
49a897c3b3
|
better name
|
2020-05-30 20:09:58 +03:00 |
|
Nikolay Korolev
|
09c9e16cb1
|
roadblocks
|
2020-05-30 20:08:31 +03:00 |
|
Nikolay Korolev
|
e6b9c20131
|
fix
|
2020-05-30 18:07:01 +03:00 |
|
eray orçunus
|
dd162c3aa0
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
|
2020-05-29 22:05:52 +03:00 |
|
eray orçunus
|
529cec5653
|
R to freeroam, idle anims, weapon and cam enum fix
|
2020-05-29 22:05:33 +03:00 |
|
Nikolay Korolev
|
627ffb0f82
|
fix
|
2020-05-29 16:52:02 +03:00 |
|
eray orçunus
|
e6401bce18
|
Detect R and start game on menu
|
2020-05-28 12:46:51 +03:00 |
|
eray orçunus
|
98fec63ca7
|
Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun
|
2020-05-28 11:40:56 +03:00 |
|
eray orçunus
|
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 |
|
Nikolay Korolev
|
d9d57f12fc
|
crash fix
|
2020-05-28 01:00:49 +03:00 |
|
Nikolay Korolev
|
d4ae40ae99
|
crash fix
|
2020-05-27 19:39:04 +03:00 |
|
aap
|
c068570192
|
Merge pull request #600 from Fire-Head/miami
Miami Particle
|
2020-05-27 07:18:47 +02:00 |
|
Sergeanur
|
408faf8a66
|
Support of original mp3/wav/adf
|
2020-05-27 03:29:54 +03:00 |
|
Fire-Head
|
90947a608f
|
fix linux build
|
2020-05-27 03:18:02 +03:00 |
|
Fire-Head
|
6a32981ba5
|
VC CParticle done
|
2020-05-27 02:16:31 +03:00 |
|
Nikolay Korolev
|
ec1d14971c
|
mission replay
|
2020-05-27 00:25:12 +03:00 |
|
Sergeanur
|
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 |
|
Nikolay Korolev
|
5ca0d6c6cf
|
fixed NE bug
|
2020-05-26 00:45:32 +03:00 |
|
Nikolay Korolev
|
38d2854226
|
fixed FIX_BUGS
|
2020-05-26 00:18:04 +03:00 |
|
aap
|
7bf8337854
|
CVehicle
|
2020-05-25 18:33:34 +02:00 |
|
blingu
|
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 |
|
Nikolay Korolev
|
8705562559
|
how did saving even work in original III?
|
2020-05-24 15:58:25 +03:00 |
|
Nikolay Korolev
|
8c510a8d5b
|
script fix
|
2020-05-24 15:00:45 +03:00 |
|
Nikolay Korolev
|
cda3752838
|
comments
|
2020-05-24 13:48:17 +03:00 |
|
Nikolay Korolev
|
e95de89c9a
|
script fix
|
2020-05-24 12:01:07 +03:00 |
|
Nikolay Korolev
|
2966be41ba
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-23 20:07:30 +03:00 |
|
Nikolay Korolev
|
607175f02a
|
set pieces
|
2020-05-23 20:06:52 +03:00 |
|
eray orçunus
|
5357957fe1
|
Compatibility with VC weapon.dat + new shotguns
|
2020-05-23 16:53:20 +03:00 |
|
Nikolay Korolev
|
9c6046455e
|
fixed script
|
2020-05-23 12:17:05 +03:00 |
|
Nikolay Korolev
|
7b7b0fb5f2
|
removed debug
|
2020-05-23 02:18:16 +03:00 |
|
Nikolay Korolev
|
f8a509ffb3
|
fixes
|
2020-05-23 02:17:27 +03:00 |
|
Nikolay Korolev
|
7bf561d440
|
some fixes
|
2020-05-23 01:43:12 +03:00 |
|
Nikolay Korolev
|
e18eb0ce01
|
script fix
|
2020-05-23 00:50:15 +03:00 |
|
Nikolay Korolev
|
6e51ed3c53
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-22 23:35:19 +03:00 |
|
eray orçunus
|
a5f23a0342
|
VC CMenuManager struct, ctor etc.
|
2020-05-22 03:48:12 +03:00 |
|
Nikolay Korolev
|
864847a6fe
|
new script commands - mostly stubs
|
2020-05-22 02:42:04 +03:00 |
|
Nikolay Korolev
|
7e5342e9f0
|
script revision
|
2020-05-21 11:22:25 +03:00 |
|
Nikolay Korolev
|
73ff01e35b
|
script fix
|
2020-05-21 00:18:13 +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 |
|
Nikolay Korolev
|
b7c1784dd2
|
script fix
|
2020-05-20 23:25:01 +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 |
|
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
|
bdbe5d1080
|
CEntity and friends
|
2020-05-19 20:56:42 +02: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 |
|
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 |
|
Nikolay Korolev
|
746f2aa479
|
script FPS fix
|
2020-05-18 22:43:06 +03:00 |
|
Nikolay Korolev
|
5ab2c85e97
|
some debug changes
|
2020-05-18 00:34:24 +03:00 |
|
Nikolay Korolev
|
ad8a8913d9
|
a few more stubs
|
2020-05-18 00:20:26 +03:00 |
|
Nikolay Korolev
|
39931a5284
|
some more script stubs
|
2020-05-17 23:31:16 +03:00 |
|
eray orçunus
|
7bd6c70318
|
just in case
|
2020-05-17 22:17:43 +03:00 |
|
Nikolay Korolev
|
d5d2f6a822
|
sync with upstream
|
2020-05-17 21:48:21 +03:00 |
|
Nikolay Korolev
|
3cc20d7962
|
sync with upstream
|
2020-05-17 21:48:12 +03:00 |
|
Nikolay Korolev
|
a5b84eb9fe
|
full script basic support
|
2020-05-17 21:43:11 +03:00 |
|
aap
|
8a7210cad1
|
Merge pull request #555 from erorcun/miami
Weapon fixes and thingies
|
2020-05-17 20:20:14 +02:00 |
|
eray orçunus
|
84f8312b86
|
Weapon fixes and thingies
|
2020-05-17 21:01:52 +03:00 |
|
aap
|
72ccf9a0db
|
revert accidental commit; also update librw
|
2020-05-17 14:21:09 +02:00 |
|
Nikolay Korolev
|
b587d835e8
|
more script stuff
|
2020-05-16 23:06:33 +03:00 |
|
Nikolay Korolev
|
e3291b0cb1
|
gangs, script and replay fixes
|
2020-05-16 17:00:40 +03:00 |
|
aap
|
c54d3ba2ab
|
fixes for 64 bit build
|
2020-05-16 14:34:51 +02:00 |
|
Nikolay Korolev
|
4defd8b75c
|
minimal weather stuff + multiple bugfixes
|
2020-05-16 13:31:23 +03:00 |
|
Sergeanur
|
76dd769085
|
Merge branch 'master' into miami
|
2020-05-16 05:07:39 +03:00 |
|
Sergeanur
|
ec1b91e527
|
Remove unused audio enum
|
2020-05-16 05:06:51 +03:00 |
|
eray orçunus
|
acd1ea9909
|
Weapon layer in Peds
|
2020-05-15 21:21:25 +03:00 |
|
Sergeanur
|
24875f34d0
|
Merge branch 'master' into miami
# Conflicts:
# src/modelinfo/ClumpModelInfo.cpp
|
2020-05-14 17:05:42 +03:00 |
|
Nikolay Korolev
|
b01987719e
|
fixed script error
|
2020-05-14 15:26:59 +03:00 |
|
Nikolay Korolev
|
1237941180
|
fixed traffic lights
|
2020-05-13 17:33:50 +03:00 |
|
Nikolay Korolev
|
509d57edcb
|
car control and cranes fixes
|
2020-05-13 13:29:17 +03:00 |
|
Sergeanur
|
7c2b9478d5
|
Merge branch 'master' into miami
# Conflicts:
# src/control/Garages.cpp
# src/core/FileLoader.cpp
# src/core/Streaming.cpp
# src/core/Zones.cpp
# src/core/Zones.h
# src/render/Renderer.cpp
# src/rw/VisibilityPlugins.cpp
|
2020-05-13 00:55:52 +03:00 |
|
Sergeanur
|
33dfaf7da1
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# premake5.lua
# src/core/ZoneCull.cpp
# src/core/Zones.cpp
# src/objects/CutsceneHead.cpp
# src/render/Clouds.cpp
|
2020-05-13 00:27:15 +03:00 |
|
Filip Gawin
|
c2ac6b3759
|
Fix linux warnings
|
2020-05-12 23:18:54 +02:00 |
|
Nikolay Korolev
|
615bd1e878
|
garages fix
|
2020-05-12 20:22:35 +03:00 |
|
Nikolay Korolev
|
ca6ed7f00f
|
fix garages
|
2020-05-12 16:21:00 +03:00 |
|
Nikolay Korolev
|
4b566c26a3
|
fix garages
|
2020-05-12 14:08:42 +03:00 |
|
Nikolay Korolev
|
1afe36d0d0
|
fix garages
|
2020-05-12 14:07:47 +03:00 |
|
Nikolay Korolev
|
3e64274f6b
|
more script
|
2020-05-12 01:59:35 +03:00 |
|
Nikolay Korolev
|
9b23e33c36
|
sync with upstream
|
2020-05-11 21:21:09 +03:00 |
|
Sergeanur
|
0aa7f13c32
|
Merge branch 'master' into miami
# Conflicts:
# src/animation/AnimBlendAssociation.h
# src/animation/AnimBlendClumpData.h
# src/animation/AnimManager.h
# src/animation/FrameUpdate.cpp
# src/control/AutoPilot.h
# src/control/PathFind.h
# src/core/PlayerInfo.h
# src/entities/Building.h
# src/entities/Dummy.h
# src/entities/Entity.h
# src/entities/Physical.h
# src/entities/Treadable.h
# src/modelinfo/BaseModelInfo.h
# src/modelinfo/ClumpModelInfo.cpp
# src/modelinfo/ClumpModelInfo.h
# src/modelinfo/PedModelInfo.h
# src/modelinfo/SimpleModelInfo.h
# src/modelinfo/TimeModelInfo.h
# src/modelinfo/VehicleModelInfo.h
# src/objects/CutsceneHead.h
# src/objects/CutsceneObject.h
# src/objects/DummyObject.h
# src/objects/Object.h
# src/peds/DummyPed.h
# src/peds/PedIK.cpp
# src/rw/VisibilityPlugins.cpp
# src/vehicles/Automobile.h
# src/vehicles/Boat.h
# src/vehicles/Heli.h
# src/vehicles/Plane.h
# src/vehicles/Train.h
# src/vehicles/Vehicle.h
|
2020-05-11 21:07:12 +03:00 |
|
Nikolay Korolev
|
8fae2dcc26
|
garages + script
|
2020-05-11 21:04:35 +03:00 |
|
eray orçunus
|
8a4fa58cd4
|
Linux build support
|
2020-05-11 21:00:55 +03:00 |
|
Nikolay Korolev
|
2f979a8cde
|
some changes
|
2020-05-11 01:00:41 +03:00 |
|
bigbossbro08
|
bd302ecca1
|
Merge remote-tracking branch 'upstream/master'
|
2020-05-10 22:05:45 +06:00 |
|
bigbossbro08
|
c798e1bacd
|
Fixed typos and made all assert functions optional
|
2020-05-10 21:49:33 +06:00 |
|
aap
|
5b605c1271
|
some fixes and cosmetic changes
|
2020-05-10 17:09:57 +02:00 |
|
Nikolay Korolev
|
00cdcef36a
|
some updates for script
|
2020-05-10 17:54:13 +03:00 |
|
bigbossbro08
|
af6e132b37
|
defined out asserts.
|
2020-05-10 19:54:37 +06:00 |
|
Nikolay Korolev
|
61eb361d26
|
script changes
|
2020-05-10 15:23:56 +03:00 |
|
Nikolay Korolev
|
a827f0dd55
|
sync with upstream
|
2020-05-10 12:26:32 +03:00 |
|
Nikolay Korolev
|
2f7d2fa3ad
|
more car control
|
2020-05-10 12:25:30 +03:00 |
|
Sergeanur
|
35c41208f5
|
Merge branch 'master' into miami
# Conflicts:
# src/animation/AnimManager.cpp
# src/control/CarCtrl.cpp
# src/control/Curves.cpp
# src/core/templates.h
|
2020-05-10 01:26:12 +03:00 |
|
Sergeanur
|
d9a3533438
|
Small unification
|
2020-05-10 01:14:00 +03:00 |
|
Nikolay Korolev
|
9fce6c4ed3
|
car control fixes
|
2020-05-09 22:24:31 +03:00 |
|
Nikolay Korolev
|
3de003a8e7
|
new curves + boat fix
|
2020-05-09 22:11:40 +03:00 |
|
Nikolay Korolev
|
609caad7a4
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-09 20:21:36 +03:00 |
|
Nikolay Korolev
|
a55e738dfa
|
ccarctrl big fix
|
2020-05-09 20:21:13 +03:00 |
|
aap
|
97d5698e0c
|
peds starting to work
|
2020-05-09 17:05:26 +02:00 |
|
aap
|
989ded6052
|
removed cutscene heads
|
2020-05-09 13:00:39 +02:00 |
|
Nikolay Korolev
|
e30b538cd3
|
fix
|
2020-05-09 00:07:35 +03:00 |
|
Nikolay Korolev
|
46d891b745
|
fix
|
2020-05-09 00:00:06 +03:00 |
|
Nikolay Korolev
|
7e753c2596
|
CCarCtrl::GenerateOneRandomCar
|
2020-05-08 23:29:43 +03:00 |
|
Nikolay Korolev
|
f902136b6a
|
fix
|
2020-05-08 18:50:16 +03:00 |
|
Nikolay Korolev
|
75943a57b2
|
gang
|
2020-05-08 18:48:44 +03:00 |
|
Nikolay Korolev
|
6065f5e52b
|
fix
|
2020-05-08 17:05:54 +03:00 |
|
Nikolay Korolev
|
c11a20cb4f
|
zone info commands + fix
|
2020-05-08 16:16:46 +03:00 |
|
Nikolay Korolev
|
fb1f51241d
|
fix
|
2020-05-08 13:41:28 +03:00 |
|
Nikolay Korolev
|
db26700352
|
final fix
|
2020-05-08 11:49:40 +03:00 |
|
Nikolay Korolev
|
49cf53644a
|
reasonable spawns
|
2020-05-08 11:43:27 +03:00 |
|
Nikolay Korolev
|
44c5cdf453
|
tmp stuff
|
2020-05-08 11:11:09 +03:00 |
|
Nikolay Korolev
|
b99346e6ca
|
sync with upstream
|
2020-05-07 23:22:15 +03:00 |
|
Nikolay Korolev
|
2dc818e4d2
|
intermediate changes
|
2020-05-07 23:21:36 +03:00 |
|
aap
|
f80474f590
|
little script change
|
2020-05-07 18:08:17 +02:00 |
|
aap
|
19b21cafcd
|
CZoneInfo mostly done; not its dependencies
|
2020-05-07 17:53:38 +02:00 |
|
Nikolay Korolev
|
5780b4503e
|
sync with upstream
|
2020-05-07 16:59:40 +03:00 |
|
Nikolay Korolev
|
40888e9486
|
car control and friends
|
2020-05-07 16:57:49 +03:00 |
|
aap
|
5c30b3a188
|
got rid of superfluous enum; update librw
|
2020-05-07 12:48:57 +02:00 |
|
Sergeanur
|
bef436400d
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/modelinfo/ModelIndices.h
|
2020-05-07 13:42:50 +03:00 |
|
aap
|
05a1d64fbb
|
VC vehicles just barely working now
|
2020-05-07 11:33:20 +02:00 |
|
aap
|
876e402d1e
|
dont hardcode first vehicle ID; little fix for roadblocks
|
2020-05-07 09:38:07 +02:00 |
|
aap
|
a8d8c0690d
|
changed default ID ranges. old default.ide incompatible now
|
2020-05-06 23:39:38 +02:00 |
|
Nikolay Korolev
|
a7c17a329a
|
fixed lane offset
|
2020-05-07 00:27:10 +03:00 |
|
aap
|
a1c229784f
|
Merge pull request #518 from Nick007J/miami
script stubs + REQUEST_COLLISION
|
2020-05-06 21:55:10 +02:00 |
|
aap
|
965ea93a61
|
checked some of streaming for VC changes
|
2020-05-06 21:54:43 +02:00 |
|
Nikolay Korolev
|
599b7301c8
|
script stubs + REQUEST_COLLISION
|
2020-05-06 21:15:58 +03:00 |
|
Nikolay Korolev
|
d5e76471ae
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-06 19:04:52 +03:00 |
|
aap
|
f1c1f56b12
|
CSphere and CBox for CColModel
|
2020-05-06 17:56:38 +02:00 |
|
Nikolay Korolev
|
8c036ec671
|
sync with master
|
2020-05-06 14:42:41 +03:00 |
|
aap
|
e0568a19d5
|
new zone stuff
|
2020-05-06 12:23:57 +02:00 |
|
aap
|
cbfc45b3f7
|
some work on zones
|
2020-05-06 12:23:26 +02:00 |
|
Nikolay Korolev
|
e5da4c2b4d
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-06 01:11:18 +03:00 |
|
Nikolay Korolev
|
0b104a59fe
|
script colstore stuff
|
2020-05-06 01:11:06 +03:00 |
|
aap
|
68d3ea9c42
|
getting the vice city map to work
|
2020-05-05 23:27:43 +02:00 |
|
Nikolay Korolev
|
35bf340401
|
colstore support in script
|
2020-05-06 00:21:26 +03:00 |
|
Nikolay Korolev
|
1291dd534b
|
script stuff
|
2020-05-05 21:45:43 +03:00 |
|
Nikolay Korolev
|
f45ea0a1cf
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-05 20:22:17 +03:00 |
|
Nikolay Korolev
|
918d6dbf56
|
some more miami
|
2020-05-05 20:22:13 +03:00 |
|
aap
|
e81652c2fc
|
cleaned up MIAMI ifdefs
|
2020-05-05 18:06:38 +02:00 |
|
Nikolay Korolev
|
6b4b708fa7
|
skipped one def
|
2020-05-05 19:06:24 +03:00 |
|
Sergeanur
|
22e8b0e419
|
Revert "Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL"
This reverts commit 1eb817de77 .
# Conflicts:
# src/core/Game.cpp
|
2020-05-05 18:34:46 +03:00 |
|
Sergeanur
|
12fbf8cede
|
Merge branch 'master' into miami
# Conflicts:
# src/core/Game.cpp
|
2020-05-05 18:33:32 +03:00 |
|
Sergeanur
|
1eb817de77
|
Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL
|
2020-05-05 18:32:46 +03:00 |
|
Nikolay Korolev
|
edeb8736f1
|
remove ifdefs
|
2020-05-05 18:20:10 +03:00 |
|
Sergeanur
|
cb8ffbac73
|
Revert "Remove #endif"
This reverts commit 7200a783ee .
|
2020-05-05 18:07:43 +03:00 |
|
Sergeanur
|
74b522af71
|
Merge branch 'master' into miami
|
2020-05-05 18:07:33 +03:00 |
|
Sergeanur
|
7200a783ee
|
Remove #endif
|
2020-05-05 18:07:08 +03:00 |
|
Sergeanur
|
c2b9ddc5b8
|
Revert "Remove Miami stuff"
This reverts commit 9960c41193 .
|
2020-05-05 18:04:43 +03:00 |
|
Sergeanur
|
9960c41193
|
Remove Miami stuff
|
2020-05-05 18:04:18 +03:00 |
|
Sergeanur
|
dfe0642195
|
Merge pull request #512 from Nick007J/master
MIAMI CAutoPilot + CCarAI + multiple fixes
|
2020-05-05 17:14:13 +03:00 |
|
Sergeanur
|
fcd386f55d
|
Merge pull request #510 from aap/master
implemented most of streamed collisions and big buildings
|
2020-05-05 17:14:01 +03:00 |
|
Nikolay Korolev
|
fc81a8cbe2
|
fixed traffic lights
|
2020-05-05 16:10:22 +03:00 |
|
aap
|
b3b9be5e8c
|
merged master
|
2020-05-05 14:21:13 +02:00 |
|
Sergeanur
|
4cc1bb92e7
|
Make CBaseModelInfo fields protected
|
2020-05-05 15:06:55 +03:00 |
|
Sergeanur
|
e9b334d7bf
|
More use of GetModelIndex
|
2020-05-05 14:48:35 +03:00 |
|
Nikolay Korolev
|
ee261c996b
|
Merge remote-tracking branch 'upstream/master'
|
2020-05-05 14:40:56 +03:00 |
|
Nikolay Korolev
|
ae0c83fa01
|
CAutoPilot + CCarAI + fixes
|
2020-05-05 14:40:35 +03:00 |
|
aap
|
b44df26d3e
|
implemented most of streamed collisions and big buildings
|
2020-05-05 13:02:42 +02:00 |
|
Sergeanur
|
84c9484e55
|
SetPosition, final part
|
2020-05-05 04:45:18 +03:00 |
|
Nikolay Korolev
|
131e8af174
|
Merge pull request #508 from Nick007J/master
Scripts compatible saving + CCarCtrl bug + crusher coach bug
|
2020-05-04 19:52:26 +03:00 |
|
Nikolay Korolev
|
d1a46c35ce
|
fixed spawn bug
|
2020-05-04 14:57:49 +03:00 |
|
aap
|
67467f15d1
|
GTA_BRIDGE and GTA_TRAIN defines
|
2020-05-03 17:28:54 +02:00 |
|
aap
|
702da55ec9
|
implemented most of vice city path system
|
2020-05-03 16:09:37 +02:00 |
|
Nikolay Korolev
|
926e216dd4
|
Merge remote-tracking branch 'upstream/master'
|
2020-05-03 01:43:12 +03:00 |
|
Nikolay Korolev
|
fa29804c49
|
script compatibility
|
2020-05-03 01:42:46 +03:00 |
|
Sergeanur
|
7fc33d85f7
|
Merge pull request #504 from Sergeanur/PadInputSwitch
Switching pad modes and cheats when player is switching between controller and kb&m
|
2020-05-03 00:12:54 +03:00 |
|
Sergeanur
|
d2712afc78
|
Add CURMODE macro
|
2020-05-03 00:11:02 +03:00 |
|
Sergeanur
|
fc85bb710b
|
Fix COMMAND_GET_CONTROLLER_MODE
|
2020-05-02 19:39:36 +03:00 |
|
Sergeanur
|
ba8aa38654
|
Switching pad modes and cheats when player is switching between controller and kb&m
|
2020-05-02 19:39:36 +03:00 |
|
Nikolay Korolev
|
7d067684ff
|
Merge remote-tracking branch 'upstream/master'
|
2020-05-02 18:02:45 +03:00 |
|
Nikolay Korolev
|
f372ce156d
|
changed saving compatibility
|
2020-05-02 18:02:17 +03:00 |
|
Sergeanur
|
52390062b3
|
SetPosition, part 2
|
2020-05-02 15:28:19 +03:00 |
|
Sergeanur
|
d23b2c423e
|
SetPosition, part 1
|
2020-05-02 15:13:09 +03:00 |
|
Sergeanur
|
7d758f3a9f
|
Adding getters and setters for type and status
|
2020-04-30 16:45:45 +03:00 |
|
aap
|
4e630a1a38
|
Merge pull request #495 from Sergeanur/MoreLanguages
Japanese support
|
2020-04-29 10:26:36 +02:00 |
|
Sergeanur
|
fe353a7cc9
|
Fixes
|
2020-04-27 22:41:09 +03:00 |
|
Sergeanur
|
7bf45124e6
|
Fix use of integers instead of enum/bool/nil
|
2020-04-27 12:41:34 +03:00 |
|
Sergeanur
|
f0890b1112
|
Merge branch 'master' into MoreLanguages
# Conflicts:
# src/core/Frontend.cpp
# src/core/MenuScreens.h
# src/render/Font.cpp
# src/render/Font.h
# src/text/Messages.cpp
# src/text/Text.cpp
|
2020-04-26 22:03:15 +03:00 |
|
Nikolay Korolev
|
34ef766c67
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-25 12:15:29 +03:00 |
|
aap
|
f03b4eec4c
|
implemented skinned peds, no cutscene hands yet
|
2020-04-24 11:42:38 +02:00 |
|
Nikolay Korolev
|
bed41e1bec
|
removed redundant checks
|
2020-04-24 01:40:12 +03:00 |
|
Nikolay Korolev
|
0fc505926f
|
fix annoying bug
|
2020-04-24 01:32:17 +03:00 |
|
Nikolay Korolev
|
0b12cacf15
|
more 1.1 patch
|
2020-04-24 01:01:41 +03:00 |
|
Nikolay Korolev
|
05ddc80ea2
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-23 19:12:20 +03:00 |
|
eray orçunus
|
c80403a2e0
|
Crossplatform work continues
|
2020-04-22 05:24:02 +03:00 |
|
Nikolay Korolev
|
7cc3410846
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-21 11:55:39 +03:00 |
|
shfil
|
7794cca429
|
Merge pull request #477 from ShFil119/mingw
Try to make code working on more platforms
|
2020-04-20 19:50:12 +02:00 |
|
Nikolay Korolev
|
35a7f89f73
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-20 19:41:49 +03:00 |
|
Filip Gawin
|
370c4e48cd
|
Try to build with mingw
|
2020-04-20 18:18:46 +02:00 |
|
Fire_Head
|
c9920b6a2d
|
Merge pull request #480 from Fire-Head/master
camerapickup ps2 code
|
2020-04-20 08:21:27 +03:00 |
|
Fire-Head
|
556a6df401
|
camerapickup ps2 code
|
2020-04-20 08:17:08 +03:00 |
|
Nikolay Korolev
|
7e4c683824
|
fixes
|
2020-04-20 01:04:57 +03:00 |
|
Sergeanur
|
8e9c9fa445
|
Fix CPickups::GenerateNewOne loop
|
2020-04-20 00:14:48 +03:00 |
|
erorcun
|
0f07a323c9
|
Merge pull request #474 from Nick007J/master
Bug fixes, mostly replay; added RegisterReference for player ped pointer
|
2020-04-19 16:56:39 +03:00 |
|
eray orçunus
|
1ffc37735e
|
Struct cleanup, various fixes, enable PS2 rand
|
2020-04-19 16:44:35 +03:00 |
|
Nikolay Korolev
|
c4cd45d47c
|
replays bug fix
|
2020-04-18 23:50:37 +03:00 |
|
Filip Gawin
|
d6314f9564
|
Revert "Part one"
This reverts commit 63951d9b95 .
|
2020-04-18 12:29:28 +02:00 |
|
Filip Gawin
|
2b1570de70
|
Merge branch 'master' of https://github.com/GTAmodding/re3
|
2020-04-18 12:08:38 +02:00 |
|
eray orçunus
|
812b9e7eda
|
Various fixes
|
2020-04-18 05:58:43 +03:00 |
|
Filip Gawin
|
63951d9b95
|
Part one
|
2020-04-17 19:30:57 +02:00 |
|
Sergeanur
|
599164006a
|
Remove patches
|
2020-04-17 16:31:11 +03:00 |
|
Sergeanur
|
b9c8ce0d37
|
Merge remote-tracking branch 'Fire-Head/master' into Standalone
# Conflicts:
# src/render/Coronas.cpp
|
2020-04-17 10:17:38 +03:00 |
|
Sergeanur
|
881d61f811
|
Merge remote-tracking branch 'samler/world' into Standalone
|
2020-04-17 10:16:30 +03:00 |
|
Fire-Head
|
a4922d5cb7
|
rem refs
|
2020-04-17 08:54:14 +03:00 |
|
eray orçunus
|
2c2da558ca
|
Some refs removed, little fixes and teleport
|
2020-04-16 22:19:56 +03:00 |
|
saml1er
|
e52a02fb9e
|
Merge branch 'master' into world
# Conflicts:
# src/core/World.cpp
# src/core/World.h
|
2020-04-17 00:01:53 +05:00 |
|
saml1er
|
52d0d811b7
|
Reverse CWorld
|
2020-04-16 23:46:08 +05:00 |
|
aap
|
89b7085353
|
Merge branch 'master' of github.com:gtamodding/re3
|
2020-04-16 09:23:31 +02:00 |
|
Nikolay Korolev
|
1fd7b0288c
|
fix Bait crash
|
2020-04-16 01:19:08 +03:00 |
|
Nikolay Korolev
|
3517f3f1a1
|
fix script crash
|
2020-04-16 00:31:57 +03:00 |
|
aap
|
afce2e1bb3
|
Merge branch 'master' of github.com:gtamodding/re3
|
2020-04-15 22:36:21 +02:00 |
|
Nikolay Korolev
|
5cb7e2e42a
|
Merge pull request #440 from Fire-Head/master
CWeapon done, fixes
|
2020-04-15 23:28:09 +03:00 |
|
Nikolay Korolev
|
a43ca86542
|
Merge pull request #429 from Nick007J/master
Scene edit
|
2020-04-15 23:27:23 +03:00 |
|
erorcun
|
e132c3fada
|
Merge pull request #416 from saml1er/PedPath
CPedPath complete
|
2020-04-15 19:29:17 +03:00 |
|
erorcun
|
647cfbfd45
|
Merge pull request #446 from erorcun/erorcun
Many fixes and cleanup
|
2020-04-15 19:22:28 +03:00 |
|
eray orçunus
|
4da1879975
|
Many fixes and cleanup
|
2020-04-15 19:19:45 +03:00 |
|
aap
|
90be379bed
|
implemented most of librw wrapper
|
2020-04-15 14:05:40 +02:00 |
|
Sergeanur
|
27c9f7bc88
|
Merge remote-tracking branch 'origin/master' into MoreLanguages
|
2020-04-15 10:54:15 +03:00 |
|
Fire-Head
|
daed13485e
|
CWeapon done, ps2 cheats fix
|
2020-04-15 08:03:53 +03:00 |
|
Nikolay Korolev
|
b354a72de1
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-15 01:06:56 +03:00 |
|
Nikolay Korolev
|
70b51d42f4
|
fixed crash
|
2020-04-15 00:33:55 +03:00 |
|
Sergeanur
|
e373d0526e
|
Merge branch 'master' into MoreLanguages
# Conflicts:
# src/core/Frontend.cpp
# src/render/Font.cpp
# src/render/Hud.cpp
# src/render/Hud.h
# src/text/Messages.cpp
# src/text/Text.cpp
|
2020-04-15 00:10:50 +03:00 |
|
saml1er
|
6d5464b6bb
|
CPedPath improvements
|
2020-04-14 23:32:15 +05:00 |
|
Nikolay Korolev
|
f35d2721f5
|
fix
|
2020-04-14 20:16:02 +03:00 |
|
Nikolay Korolev
|
f2c78e4bfb
|
Merge branch 'master' into game_dev
|
2020-04-14 20:10:39 +03:00 |
|
Nikolay Korolev
|
21a11fd343
|
scene edit
|
2020-04-14 20:09:42 +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 |
|
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 |
|
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 |
|
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
|
c21529467a
|
fixed record
|
2020-04-13 22:16:51 +03:00 |
|
Nikolay Korolev
|
12d36d8710
|
fixed record
|
2020-04-13 22:12:41 +03:00 |
|
Nikolay Korolev
|
cb85091d34
|
scene edit
|
2020-04-13 21:50:56 +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 |
|
Sergeanur
|
741c9405d0
|
CPacManPickups
|
2020-04-13 12:07:07 +03:00 |
|
saml1er
|
28fb1bdde7
|
Fix CRoadBlocks::GenerateRoadBlocks bugs
|
2020-04-13 05:52:18 +05:00 |
|