erorcun
|
20ab7d1739
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
|
2020-10-18 19:31:39 +03:00 |
|
erorcun
|
937290db09
|
Fix attractor even more
|
2020-10-18 19:31:02 +03:00 |
|
Sergeanur
|
0d20f1c364
|
Merge branch 'master' into miami
# Conflicts:
# src/audio/AudioLogic.cpp
# src/control/RoadBlocks.cpp
# src/entities/Entity.h
# src/entities/Physical.cpp
# src/peds/Ped.cpp
# src/render/Renderer.cpp
# src/vehicles/Automobile.cpp
# src/vehicles/CarGen.cpp
# src/weapons/BulletInfo.cpp
# src/weapons/Weapon.cpp
|
2020-10-18 17:15:49 +03:00 |
|
Sergeanur
|
cc0ae51631
|
lil fix
|
2020-10-18 16:55:11 +03:00 |
|
Sergeanur
|
b91f6a4550
|
Setter for bIsStatic (became virtual in SA)
|
2020-10-18 16:40:06 +03:00 |
|
erorcun
|
1b59b2c9bc
|
Attractor obj. fixes
|
2020-10-18 16:38:36 +03:00 |
|
Filip Gawin
|
23220d799c
|
Cleanup breaks CAutomobile::ProcessOpenDoor
|
2020-10-18 15:26:20 +02:00 |
|
Filip Gawin
|
747fe7ab67
|
Merge branch 'master' of github.com:GTAmodding/re3 into master
|
2020-10-18 15:14:03 +02:00 |
|
Filip Gawin
|
3594b35fbb
|
Add missing breaks in AudioLogic.cpp
|
2020-10-18 15:13:43 +02:00 |
|
eray orçunus
|
ab071163e5
|
Fix ped buoyancy
|
2020-10-18 14:34:20 +03:00 |
|
eray orçunus
|
f60e3d667a
|
Minor things
|
2020-10-18 13:53:17 +03:00 |
|
shfil
|
cafe4e38db
|
Script.cpp missing breaks
|
2020-10-18 13:37:17 +03:00 |
|
shfil
|
82f54b946f
|
Script.cpp missing breaks
|
2020-10-18 00:56:07 +02:00 |
|
Roman Masanin
|
9cf38634b9
|
ProcessWaterCannon bug and refractoring (#773)
* fix audio bug and some refractoring
* mark original bugs
|
2020-10-17 20:56:42 +02:00 |
|
erorcun
|
4e4e0e8e04
|
Merge pull request #765 from erorcun/miami
Radar, WaterCannon, win/glfw skels
|
2020-10-17 18:39:56 +03:00 |
|
Sergeanur
|
588fb26728
|
Fix player model not changing in cutscenes
|
2020-10-17 18:26:48 +03:00 |
|
eray orçunus
|
b84dc2bc9b
|
Fix management issue
|
2020-10-17 18:10:37 +03:00 |
|
eray orçunus
|
dc80884ab5
|
Fix management issue
|
2020-10-17 18:07:20 +03:00 |
|
eray orçunus
|
b98864d134
|
Radar, WaterCannon, win/glfw skels
|
2020-10-17 17:35:26 +03:00 |
|
Sergeanur
|
516a02d2da
|
Fix pickup fix :P
|
2020-10-17 15:33:22 +03:00 |
|
Sergeanur
|
ca64a49af1
|
fix build
|
2020-10-17 14:23:31 +03:00 |
|
Nikolay Korolev
|
0cf2c8505e
|
cranes done
|
2020-10-17 14:18:20 +03:00 |
|
Sergeanur
|
1f36b78c20
|
Pickup fixes
|
2020-10-17 13:48:08 +03:00 |
|
Nikolay Korolev
|
40434eadfd
|
small fix
|
2020-10-17 12:31:14 +03:00 |
|
Nikolay Korolev
|
000c5edc4a
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-10-15 22:52:01 +03:00 |
|
aap
|
c40d628fe0
|
Merge pull request #767 from theR4K/master
SpecialFX fixes
|
2020-10-15 14:56:43 +02:00 |
|
Roman Masanin
|
07143ee73b
|
SpecialFX fixes
|
2020-10-15 15:52:37 +03:00 |
|
eray orçunus
|
7bf2373fed
|
update librw
|
2020-10-14 18:04:58 +03:00 |
|
Nikolay Korolev
|
2634d3b427
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-10-14 15:05:11 +03:00 |
|
Sergeanur
|
a96146c87b
|
Pickup fix
|
2020-10-14 03:29:25 +03:00 |
|
erorcun
|
971b7cba65
|
Merge pull request #761 from erorcun/SampleMan
SampleManager
|
2020-10-13 13:18:49 +03:00 |
|
shfil
|
3b40e003ab
|
Fix typo in fire.cpp
|
2020-10-12 22:51:49 +02:00 |
|
Fire-Head
|
1e068aea73
|
fix AskForObjectToBeRenderedInGlass
|
2020-10-12 23:10:08 +03:00 |
|
Sergeanur
|
6450fd2692
|
Fix zone saving on 64 bit
|
2020-10-12 22:54:46 +03:00 |
|
erorcun
|
1e11c1eac6
|
Merge pull request #762 from Nick007J/miami
Control update
|
2020-10-12 21:52:59 +03:00 |
|
erorcun
|
4e07297503
|
Update sampman_miles.cpp
|
2020-10-12 20:51:52 +03:00 |
|
eray orçunus
|
342da2430b
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into new
|
2020-10-12 20:47:34 +03:00 |
|
eray orçunus
|
3772be32bf
|
Streaming and cross-platform fixes
|
2020-10-12 20:41:13 +03:00 |
|
eray orçunus
|
be6b97b5d8
|
Streaming and cross-platform fixes
|
2020-10-12 20:30:49 +03:00 |
|
eray orçunus
|
d18a55f429
|
SampleManager
|
2020-10-12 20:22:39 +03:00 |
|
Nikolay Korolev
|
d3788a9c70
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-10-12 13:57:25 +03:00 |
|
erorcun
|
96f36d16ae
|
Merge pull request #753 from majesticCoding/miami
CWaterCreatures
|
2020-10-12 12:37:47 +03:00 |
|
eray orçunus
|
40020f4e1e
|
Fix forgotten wanted/busted text
|
2020-10-12 12:36:15 +03:00 |
|
eray orçunus
|
b1e235535c
|
Cutscene aspect ratio fix
|
2020-10-12 12:16:24 +03:00 |
|
Nikolay Korolev
|
49c48f2ec2
|
sync with upstream
|
2020-10-12 12:11:53 +03:00 |
|
erorcun
|
9e0b23f065
|
Merge pull request #758 from erorcun/miami
Hud, Fire, OnscreenBlaBla
|
2020-10-12 11:13:46 +03:00 |
|
eray orçunus
|
8a622a0e72
|
Hud, Fire, OnscreenBlaBla
|
2020-10-12 06:42:54 +03:00 |
|
Sergeanur
|
239e09ad07
|
Merge pull request #759 from Sergeanur/VC/ZoneSaveLoad
Zones saving and loading
|
2020-10-12 04:16:30 +03:00 |
|
Nikolay Korolev
|
28b47b601f
|
fix
|
2020-10-11 18:14:35 +03:00 |
|
Nikolay Korolev
|
91a274da2b
|
small fix
|
2020-10-11 13:11:25 +03:00 |
|