Nikolay Korolev
|
5abd466b5d
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-16 10:52:58 +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 |
|
Nikolay Korolev
|
21329b8440
|
sync with upstream
|
2020-05-16 01:50:45 +03:00 |
|
Nikolay Korolev
|
08b2138c7e
|
ped attractors done
|
2020-05-16 01:49:30 +03:00 |
|
eray orçunus
|
acd1ea9909
|
Weapon layer in Peds
|
2020-05-15 21:21:25 +03:00 |
|
Nikolay Korolev
|
d426588496
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-13 17:55:12 +03:00 |
|
Nikolay Korolev
|
81ea6f0258
|
ped attractor: start
|
2020-05-13 11:38:05 +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 |
|
aap
|
98a233da43
|
little fixes to CClouds; disabled object clipping for SA cam
|
2020-05-12 16:36:23 +02:00 |
|
aap
|
40829b5242
|
CClouds; disabled object clipping for SA cam
|
2020-05-12 16:27:39 +02:00 |
|
erorcun
|
5f40f06bf0
|
Merge pull request #533 from erorcun/master
Linux build support
|
2020-05-12 00:33:13 +03:00 |
|
Sergeanur
|
5f1c3fa208
|
Merge remote-tracking branch 'origin/miami' into miami
|
2020-05-11 21:07:36 +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 |
|
eray orçunus
|
8a4fa58cd4
|
Linux build support
|
2020-05-11 21:00:55 +03:00 |
|
aap
|
95920d54f2
|
random fixes
|
2020-05-11 17:04:08 +02:00 |
|
aap
|
d4250fc2c7
|
CRenderer
|
2020-05-11 17:03:44 +02:00 |
|
bigbossbro08
|
c798e1bacd
|
Fixed typos and made all assert functions optional
|
2020-05-10 21:49:33 +06:00 |
|
bigbossbro08
|
af6e132b37
|
defined out asserts.
|
2020-05-10 19:54:37 +06: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
|
28103775ba
|
Place debug menu under ifdef
|
2020-05-09 16:06:13 +03:00 |
|
Sergeanur
|
4b8d6a3223
|
Merge branch 'master' into miami
# Conflicts:
# src/animation/AnimBlendAssocGroup.cpp
# src/animation/AnimBlendAssociation.cpp
# src/animation/AnimManager.cpp
# src/core/Streaming.cpp
|
2020-05-09 02:56:53 +03:00 |
|
Sergeanur
|
e917cd1f46
|
Fix corona scaling
|
2020-05-09 02:50:48 +03:00 |
|
Sergeanur
|
1ef8d61f36
|
Merge branch 'master' into miami
|
2020-05-08 17:49:19 +03:00 |
|
Sergeanur
|
e0b3418e65
|
Fix water UV on high FPS and inverted free camera
|
2020-05-08 14:34:21 +03:00 |
|
aap
|
a8f1505517
|
small fixes
|
2020-05-07 21:56:09 +02:00 |
|
aap
|
c715569d1d
|
CBaseModelInfo done
|
2020-05-07 21:55:54 +02:00 |
|
aap
|
6a7d08ecc2
|
some quick cosmetic fixes
|
2020-05-07 14:41:35 +02:00 |
|
aap
|
dbbf390983
|
use water color and new water texture
|
2020-05-07 13:38:14 +02:00 |
|
aap
|
3931dc795f
|
waterlevel with offset (from Fire_Head)
|
2020-05-06 23:13:12 +02:00 |
|
Nikolay Korolev
|
a24b65cbde
|
IsStatic
|
2020-05-06 19:17:47 +03:00 |
|
aap
|
e0568a19d5
|
new zone stuff
|
2020-05-06 12:23:57 +02:00 |
|
aap
|
edd9301d7f
|
reverting fuckup
|
2020-05-06 09:59:04 +02:00 |
|
aap
|
8e84728f41
|
Merge branch 'master' of github.com:GTAmodding/re3
|
2020-05-06 09:24:18 +02:00 |
|
aap
|
bb0541404d
|
updated librw
|
2020-05-06 09:24:12 +02:00 |
|
aap
|
31f9bb566b
|
implemented most of timecycle and mblur
|
2020-05-06 00:53:26 +02:00 |
|
aap
|
68d3ea9c42
|
getting the vice city map to work
|
2020-05-05 23:27:43 +02:00 |
|
aap
|
e81652c2fc
|
cleaned up MIAMI ifdefs
|
2020-05-05 18:06:38 +02:00 |
|
Sergeanur
|
1eb817de77
|
Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL
|
2020-05-05 18:32:46 +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 |
|
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 |
|
aap
|
b44df26d3e
|
implemented most of streamed collisions and big buildings
|
2020-05-05 13:02:42 +02:00 |
|
aap
|
702da55ec9
|
implemented most of vice city path system
|
2020-05-03 16:09:37 +02:00 |
|
Sergeanur
|
89961325b2
|
Ceil health and armor values in hud (fix 99 health)
|
2020-05-02 23:38:52 +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 |
|
aap
|
d9c987bd8c
|
fix (temporary?) for black bullet traces
|
2020-04-27 12:31:38 +02:00 |
|
Nikolay Korolev
|
68bf239868
|
Merge pull request #489 from Nick007J/master
1.1 patch stuff + flying controls
|
2020-04-27 00:53:54 +03:00 |
|
aap
|
1b5616688e
|
tried to fix some half-pixel bugs
|
2020-04-26 21:50:52 +02: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
|
05ddc80ea2
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-23 19:12:20 +03:00 |
|
Fire-Head
|
75acd78190
|
ps2 particles, sampman oal started
|
2020-04-23 11:24:03 +03:00 |
|
Nikolay Korolev
|
78d6ad7348
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-21 23:41:04 +03:00 |
|
Fire_Head
|
828dc85be5
|
fix RenderExtraPlayerShadows 2
|
2020-04-21 22:53:55 +03:00 |
|
Fire_Head
|
fba4c51f6b
|
fix RenderExtraPlayerShadows
|
2020-04-21 22:52:42 +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
|
83810168ee
|
beta OddJob(unique jump etc) sliding text
|
2020-04-20 07:45:17 +03:00 |
|
Nikolay Korolev
|
b8c34f6654
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-20 01:05:20 +03:00 |
|
Fire-Head
|
2308321805
|
Add polish lang support
|
2020-04-19 22:32:59 +03:00 |
|
Nikolay Korolev
|
df376a13ea
|
sync with master
|
2020-04-19 17:38:48 +03:00 |
|
Nikolay Korolev
|
9e65eb34ec
|
1.1 patch stuff
|
2020-04-19 17:38:10 +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
|
4c133a95bd
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-18 23:50:58 +03:00 |
|
Nikolay Korolev
|
c4cd45d47c
|
replays bug fix
|
2020-04-18 23:50:37 +03:00 |
|
gennariarmando
|
ffe5dce7f5
|
Hide Vehicle/Zone name during Wasted/Busted...
Fixed little mistake in my latest commit.
|
2020-04-18 18:14:38 +02: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 |
|
Sergeanur
|
555f933780
|
Remove padding fields
|
2020-04-18 11:31:53 +03: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
|
941c50ee25
|
Merge remote-tracking branch 'origin/master' into Standalone
|
2020-04-17 16:31:43 +03:00 |
|
Sergeanur
|
599164006a
|
Remove patches
|
2020-04-17 16:31:11 +03:00 |
|
aap
|
6ef7924e01
|
implemented CVector2D::NormaliseSafe for SkidMarks
|
2020-04-17 15:15:42 +02: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 |
|
Fire-Head
|
a4922d5cb7
|
rem refs
|
2020-04-17 08:54:14 +03:00 |
|
eray orçunus
|
425395ad25
|
Ped fixes and ref removal
|
2020-04-17 07:01:54 +03:00 |
|
eray orçunus
|
2c2da558ca
|
Some refs removed, little fixes and teleport
|
2020-04-16 22:19:56 +03:00 |
|
Sergeanur
|
83cbe4e39e
|
More refs removed
|
2020-04-16 15:30:47 +03:00 |
|
aap
|
89b7085353
|
Merge branch 'master' of github.com:gtamodding/re3
|
2020-04-16 09:23:31 +02:00 |
|
Sergeanur
|
f435455bde
|
Removed refs from weapons/, WeaponEffects moved
|
2020-04-16 01:56:15 +03:00 |
|
Sergeanur
|
b9a8ad9481
|
Fix misplaced targeting
|
2020-04-16 01:44:43 +03:00 |
|
Sergeanur
|
3e460d94ac
|
More japanese
|
2020-04-16 00:24:49 +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 |
|
Fire-Head
|
cb4e1d68e7
|
glass NULL->nil
|
2020-04-15 20:09:51 +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
|
d7eee5c130
|
fixed clouds and sprites
|
2020-04-15 15:26:55 +02:00 |
|
aap
|
90be379bed
|
implemented most of librw wrapper
|
2020-04-15 14:05:40 +02:00 |
|
Fire-Head
|
daed13485e
|
CWeapon done, ps2 cheats fix
|
2020-04-15 08:03:53 +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 |
|
eray orçunus
|
60c412149d
|
CFileLoader last funcs and Frontend cleanup
|
2020-04-13 05:42:02 +03:00 |
|
erorcun
|
207aebc46c
|
Merge pull request #400 from erorcun/erorcun
CMenuManager done and CHud fixes
|
2020-04-12 00:57:46 +03:00 |
|
eray orçunus
|
f2995640bd
|
CMenuManager done and CHud fixes
|
2020-04-12 00:56:27 +03:00 |
|
Sergeanur
|
daceee593b
|
Link with RW libs
|
2020-04-11 23:37:04 +03:00 |
|
aap
|
c5d61392ea
|
implemented CTrafficLights
|
2020-04-10 18:36:39 +02:00 |
|
Sergeanur
|
b76172e2dd
|
PlayerSkin small cleanup
|
2020-04-10 11:41:48 +03:00 |
|
Sergeanur
|
8917567508
|
Fixing mixed IsCutsceneProcessing and IsRunning
|
2020-04-10 11:23:35 +03:00 |
|
Sergeanur
|
6647312660
|
Fix sprite vertical scale
|
2020-04-10 10:52:47 +03:00 |
|
Nikolay Korolev
|
6473778c47
|
fix weather init
|
2020-04-10 02:17:32 +03:00 |
|
aap
|
34349c4df2
|
normalized line endings to LF
|
2020-04-09 20:50:24 +02:00 |
|
Sergeanur
|
a5239b554f
|
Merge remote-tracking branch 'Fire-Head/master'
# Conflicts:
# src/core/Radar.cpp
|
2020-04-09 21:40:46 +03:00 |
|
aap
|
5b5de5d2f3
|
Merge pull request #393 from Sergeanur/txdimg
txd.img creator
|
2020-04-09 20:37:53 +02:00 |
|
aap
|
6225e50723
|
fixed questionable RW usage; changed radar mask to PS2 techinque
|
2020-04-09 17:45:05 +02:00 |
|
aap
|
ee057cb427
|
Merge pull request #389 from Nick007J/master
Weather
|
2020-04-09 12:30:02 +02:00 |
|
aap
|
26fb53472e
|
Merge pull request #387 from aap/master
implemented CSkidmarks
|
2020-04-09 12:29:52 +02:00 |
|
Sergeanur
|
fd2152923c
|
txd.img creator
|
2020-04-09 10:28:50 +03:00 |
|
Fire-Head
|
590ff32469
|
PS2 Cheats, restored R*names
|
2020-04-09 06:20:44 +03:00 |
|
Nikolay Korolev
|
d5f34e425e
|
fixed random number retrieval
|
2020-04-08 21:56:33 +03:00 |
|
Nikolay Korolev
|
b9a20da7d8
|
review fix
|
2020-04-08 21:47:58 +03:00 |
|
Nikolay Korolev
|
ebba8519d9
|
review fixes
|
2020-04-08 21:40:02 +03:00 |
|
Nikolay Korolev
|
cf36e09d39
|
final fixes
|
2020-04-08 21:18:19 +03:00 |
|
Nikolay Korolev
|
3e1062392e
|
Merge branch 'master' into garages_dev
|
2020-04-08 20:32:56 +03:00 |
|
Nikolay Korolev
|
b3571706d1
|
fix
|
2020-04-08 20:30:45 +03:00 |
|
aap
|
9176aef1b2
|
Merge branch 'master' of github.com:gtamodding/re3
|
2020-04-08 18:45:55 +02:00 |
|
Sergeanur
|
5a034097c9
|
Fix target sprite size
|
2020-04-08 19:05:22 +03:00 |
|
aap
|
6288d36f34
|
implemented CSkidmarks
|
2020-04-08 16:35:23 +02:00 |
|
Nikolay Korolev
|
b075b0fccf
|
Merge branch 'master' into garages_dev
|
2020-04-08 14:26:07 +03:00 |
|
Nikolay Korolev
|
24fc11a137
|
rain fix
|
2020-04-08 14:25:23 +03:00 |
|
Nikolay Korolev
|
e556ffd3f6
|
fixes
|
2020-04-08 01:52:08 +03:00 |
|
Nikolay Korolev
|
f7ac85e492
|
weather stuff
|
2020-04-07 23:43:19 +03:00 |
|
aap
|
daaf443cfa
|
finished CMotionBlurStreaks, CSpecialFX
|
2020-04-07 22:26:01 +02:00 |
|
aap
|
51512db006
|
implemented CRubbish
|
2020-04-07 17:16:58 +02:00 |
|
aap
|
1207c2ce6f
|
implemented CShinyTexts
|
2020-04-07 12:33:14 +02:00 |
|
Sergeanur
|
c9ace44ca8
|
CFont
|
2020-04-07 08:20:21 +03:00 |
|
aap
|
2100bdd529
|
implemented CRubbish
|
2020-04-07 01:19:24 +02:00 |
|
Sergeanur
|
2aace31b06
|
Merge remote-tracking branch 'origin/master' into MoreLanguages
|
2020-04-05 12:03:13 +03:00 |
|
Sergeanur
|
c0c09f2720
|
Japanese
|
2020-04-05 12:02:51 +03:00 |
|
aap
|
f56909d8b7
|
Merge pull request #377 from Fire-Head/master
Glass
|
2020-04-03 11:49:08 +02:00 |
|
Sergeanur
|
92ec403191
|
Fix CFont type uint16 -> wchar
|
2020-04-02 09:51:35 +03:00 |
|
Sergeanur
|
6e6912b613
|
fixes
|
2020-04-02 09:20:45 +03:00 |
|
Fire_Head
|
c394bd2a6e
|
Glass cosmetic fixes
|
2020-04-02 05:37:22 +03:00 |
|
Fire-Head
|
13fb853fd8
|
Glass done
|
2020-04-02 00:04:56 +03:00 |
|
Sergeanur
|
2607a91d87
|
Merge remote-tracking branch 'origin/master' into MoreLanguages
|
2020-03-30 20:10:12 +03:00 |
|
Sergeanur
|
bb8868eba7
|
Add russian lang support
|
2020-03-30 14:50:14 +03:00 |
|
Fire_Head
|
a0b077574e
|
Merge branch 'master' into master
|
2020-03-29 18:39:47 +03:00 |
|