Zach Charo
|
b47c505438
|
Update Script.cpp
Case sensitivity fix. Causes compile issue on linux.
|
2020-11-28 13:36:38 +02:00 |
|
Sergeanur
|
164f16c85b
|
Some TODOs done in Peds code
|
2020-11-25 19:39:57 +02:00 |
|
Sergeanur
|
a35b3b4602
|
Script commands split to original files
|
2020-11-24 14:06:48 +02:00 |
|
Sergeanur
|
3289bfaa87
|
Darkel done
|
2020-11-22 23:18:35 +02:00 |
|
Nikolay
|
2b53f267a7
|
one more fix
# Conflicts:
# src/control/Restart.cpp
|
2020-11-22 23:13:43 +02:00 |
|
Nikolay
|
6a6551f39b
|
small improvement
# Conflicts:
# src/control/Restart.cpp
|
2020-11-22 23:13:23 +02:00 |
|
aap
|
b9b7d5ac21
|
Merge pull request #825 from aap/miami
neo screen droplets
|
2020-11-22 00:12:31 +01:00 |
|
Sergeanur
|
fe40f65703
|
Reorganize CPed functions into their original cpp files
|
2020-11-20 01:18:37 +02:00 |
|
aap
|
07fe099b4e
|
neo screen droplets
|
2020-11-19 19:07:32 +01:00 |
|
Nikolay Korolev
|
15b7126243
|
small fix of fix
|
2020-11-16 12:28:20 +03:00 |
|
Nikolay Korolev
|
0ac621588e
|
small fix
|
2020-11-16 12:22:55 +03:00 |
|
Nikolay Korolev
|
26c6908d25
|
car AI revision
|
2020-11-14 14:21:56 +03:00 |
|
Nikolay Korolev
|
6682e56f71
|
small fix
|
2020-11-13 17:53:03 +03:00 |
|
Nikolay Korolev
|
3048a77a05
|
fix
|
2020-11-13 16:02:06 +03:00 |
|
Nikolay
|
a76c6b2307
|
damn
|
2020-11-11 13:40:11 +03:00 |
|
Nikolay
|
a8b5303207
|
Update src/control/Pickups.cpp
Co-authored-by: Sergeanur <s.anureev@yandex.ua>
|
2020-11-11 13:19:21 +03:00 |
|
Nikolay Korolev
|
612a6dd06c
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-11-11 00:08:54 +03:00 |
|
Nikolay Korolev
|
ef2089cafb
|
CWorld done
|
2020-11-11 00:08:32 +03:00 |
|
Sergeanur
|
5c64dba65a
|
Merge pull request #771 from theR4K/miamiDev
more audio for god of audio
|
2020-11-10 22:32:12 +02:00 |
|
Sergeanur
|
51e7f44433
|
Pickup fix
|
2020-11-08 22:40:05 +02:00 |
|
erorcun
|
fe5d0c9cdf
|
Font: Hud: Use orig. text dimensions, fix right-align calculations
|
2020-11-08 20:49:47 +03:00 |
|
Roman Masanin
|
95bd5b073a
|
pointers into referencies!
|
2020-11-08 20:31:24 +03:00 |
|
Roman Masanin
|
23d23f6462
|
merge upstream
|
2020-11-08 16:23:05 +03:00 |
|
Sergeanur
|
a2e0373d22
|
Pickups fix
|
2020-11-08 15:00:54 +02:00 |
|
Nikolay Korolev
|
e473123a6a
|
fixes
|
2020-11-03 00:07:25 +03:00 |
|
Nikolay Korolev
|
0ccc70c843
|
embarassing
|
2020-11-02 23:53:52 +03:00 |
|
Nikolay Korolev
|
bae6c24209
|
fix
|
2020-11-02 15:54:42 +03:00 |
|
Roman Masanin
|
55c4346610
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDev
|
2020-11-01 22:35:46 +03:00 |
|
Nikolay Korolev
|
5edd9e75da
|
finished script and replay
|
2020-11-01 18:21:05 +03:00 |
|
Nikolay Korolev
|
45c09224f7
|
fixed KYFC
|
2020-11-01 16:34:39 +03:00 |
|
Nikolay Korolev
|
63a27fbc5f
|
overflow fix
|
2020-11-01 13:55:29 +03:00 |
|
Sergeanur
|
9a3758bfc1
|
Fix undefined colorId for pickups
|
2020-10-26 16:39:43 +02:00 |
|
Roman Masanin
|
a12789c632
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDev
|
2020-10-24 22:26:56 +03:00 |
|
erorcun
|
07d1637342
|
Merge pull request #779 from Sergeanur/VC/Pickups
Pickups Done
|
2020-10-24 17:56:21 +03:00 |
|
Roman Masanin
|
39b7075502
|
merge Upstream
|
2020-10-24 14:20:08 +03:00 |
|
Sergeanur
|
ca497e2cbd
|
ScriptSounds
|
2020-10-23 16:56:34 +03:00 |
|
Sergeanur
|
2709531f09
|
Rename CObject flag
|
2020-10-21 21:14:40 +03:00 |
|
Sergeanur
|
e9a89236a2
|
Pickups Done
|
2020-10-21 21:00:13 +03:00 |
|
erorcun
|
0750f04019
|
Messages, fix Font
|
2020-10-20 22:24:56 +03:00 |
|
Roman Masanin
|
0594ed5b46
|
peds
|
2020-10-18 23:03:03 +03:00 |
|
Nikolay Korolev
|
a1112183de
|
fix
|
2020-10-18 22:53:25 +03:00 |
|
Nikolay Korolev
|
6173e1dd10
|
fix
|
2020-10-18 22:52:49 +03:00 |
|
erorcun
|
1858904ce0
|
Merge pull request #769 from Sergeanur/VC/Pickups
Partial Pickups
|
2020-10-18 20:01:32 +03:00 |
|
erorcun
|
10758088ef
|
Merge pull request #766 from Fire-Head/miami
Glass
|
2020-10-18 19:59:11 +03:00 |
|
erorcun
|
70f9832e14
|
Merge branch 'miami' into miami
|
2020-10-18 19:45:11 +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 |
|
shfil
|
cafe4e38db
|
Script.cpp missing breaks
|
2020-10-18 13:37:17 +03:00 |
|