erorcun
|
4bfc75c2f9
|
Merge pull request #763 from theR4K/miami
SpecialFX
|
2020-10-18 19:57:47 +03:00 |
|
erorcun
|
70f9832e14
|
Merge branch 'miami' into miami
|
2020-10-18 19:45:11 +03:00 |
|
erorcun
|
497c179245
|
Merge pull request #772 from Nick007J/miami
Original save/load support + bugfixes
|
2020-10-18 19:37:49 +03:00 |
|
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 |
|
Nikolay Korolev
|
d7789661cd
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-10-18 17:30:51 +03:00 |
|
Sergeanur
|
8697eebbc2
|
Merge branch 'miami' into VC/Pickups
# Conflicts:
# src/control/Pickups.cpp
|
2020-10-18 17:17:11 +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 |
|
Nikolay Korolev
|
8d92a0681a
|
fix in ped attractor
|
2020-10-18 15:39:27 +03: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 |
|
Nikolay Korolev
|
c856d88691
|
object field renamed
|
2020-10-18 12:34:34 +03:00 |
|
Sergeanur
|
b3385015e5
|
Merge remote-tracking branch 'origin/miami' into VC/Pickups
|
2020-10-18 04:54:01 +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 |
|
Nikolay Korolev
|
720abca826
|
finished save/load
|
2020-10-17 20:45:07 +03:00 |
|
Roman Masanin
|
3cbccd2ad3
|
typo fixes
|
2020-10-17 19:05:41 +03:00 |
|
Nikolay Korolev
|
cae3990eac
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-10-17 18:50:41 +03:00 |
|
Nikolay Korolev
|
1195f3db7b
|
saves part 1
|
2020-10-17 18:50:16 +03: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 |
|
Sergeanur
|
e465cea07b
|
Pickup arrays done
|
2020-10-17 18:05:23 +03:00 |
|
eray orçunus
|
b98864d134
|
Radar, WaterCannon, win/glfw skels
|
2020-10-17 17:35:26 +03:00 |
|
Sergeanur
|
7fc70179ed
|
Pickup save/load
|
2020-10-17 17:06:38 +03:00 |
|
Sergeanur
|
7f3b51dd17
|
Small inner fix
|
2020-10-17 16:04:11 +03:00 |
|
Sergeanur
|
63666391d4
|
More Pickup stuff
|
2020-10-17 15:57:12 +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 |
|
Sergeanur
|
ef47dad566
|
Partial Pickups
|
2020-10-17 08:23:01 +03:00 |
|
Nikolay Korolev
|
000c5edc4a
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-10-15 22:52:01 +03:00 |
|
Roman Masanin
|
63c2b98c5e
|
fix build
|
2020-10-15 16:04:03 +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 |
|
Roman Masanin
|
34b4efe242
|
fix bullet traces rener and some renaming
|
2020-10-15 15:42:10 +03:00 |
|
Fire-Head
|
e4ac934dbf
|
Miami Glass
|
2020-10-15 00:33:57 +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 |
|