 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 |
|
 SergeanurandGitHub
|
0b64436f5f
|
Merge pull request #529 from Nick007J/master
car control fixes
|
2020-05-10 01:08:38 +03:00 |
|
|
Sergeanur
|
28103775ba
|
Place debug menu under ifdef
|
2020-05-09 16:06:13 +03:00 |
|
|
Sergeanur
|
1b599b2d35
|
Fix compilation error
|
2020-05-09 15:41:00 +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
|
d686f587cc
|
Merge remote-tracking branch 'origin/master'
|
2020-05-09 02:51:40 +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 |
|
|
Sergeanur
|
a483243c52
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/core/FileLoader.cpp
|
2020-05-08 00:58:39 +03:00 |
|
|
Sergeanur
|
f13c4e6aca
|
Merge branch 'master' into miami
|
2020-05-07 14:49:29 +03:00 |
|
|
Sergeanur
|
0b848bc147
|
Fix looping collision sound
|
2020-05-07 14:48:53 +03:00 |
|
|
Sergeanur
|
7dc649ede6
|
Merge branch 'master' into miami
|
2020-05-07 14:32:41 +03:00 |
|
|
Sergeanur
|
1ac6bea590
|
Fix GetDistanceSquared
|
2020-05-07 14:32:00 +03:00 |
|
|
Sergeanur
|
ed1bb7236f
|
Fixed arguments for sound collisions
|
2020-05-07 14:10:56 +03:00 |
|
|
Sergeanur
|
bef436400d
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/modelinfo/ModelIndices.h
|
2020-05-07 13:42:50 +03:00 |
|
|
Sergeanur
|
6ad66fb2d7
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/render/Renderer.cpp
|
2020-05-06 19:32:57 +03:00 |
|
|
Sergeanur
|
fc8c28722f
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/objects/Object.h
|
2020-05-06 18:24:31 +03:00 |
|
|
Sergeanur
|
d015e09c92
|
Merge branch 'master' into miami
|
2020-05-06 18:03:36 +03:00 |
|
|
Sergeanur
|
b633288d1b
|
Merge remote-tracking branch 'origin/master'
|
2020-05-06 18:02:16 +03:00 |
|
|
Sergeanur
|
daa3b20477
|
Fix cAudioManager::ProcessActiveQueues loop
|
2020-05-06 18:01:52 +03:00 |
|
|
Sergeanur
|
bb55430f75
|
Merge remote-tracking branch 'origin/master' into miami
|
2020-05-06 16:44:30 +03:00 |
|
|
Sergeanur
|
bb8b6348ec
|
Fix appveyor
|
2020-05-06 14:11:21 +03:00 |
|
|
Sergeanur
|
c0488d9ecf
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/Script.cpp
# src/core/FileLoader.cpp
# src/core/User.cpp
# src/core/ZoneCull.cpp
# src/core/Zones.cpp
# src/core/Zones.h
# src/entities/Entity.cpp
|
2020-05-06 14:10:52 +03:00 |
|
|
Sergeanur
|
0b61ae11ec
|
Fix appveyour
|
2020-05-05 21:05:51 +03:00 |
|
|
Sergeanur
|
a02b4c9592
|
Merge branch 'master' into miami
|
2020-05-05 20:54:54 +03:00 |
|
|
Sergeanur
|
42a64a2379
|
appveyor update
|
2020-05-05 20:54:44 +03:00 |
|
|
Sergeanur
|
3adf740bd5
|
Remove audio from premake
|
2020-05-05 20:51:23 +03:00 |
|
|
Sergeanur
|
4bd4d24802
|
Merge branch 'master' into miami
# Conflicts:
# premake5.lua
|
2020-05-05 20:42:11 +03:00 |
|
|
Sergeanur
|
52907088f9
|
Fix build status and don't add random files into the project
|
2020-05-05 20:40:27 +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 |
|
|
Sergeanur
|
7afa4f8316
|
Revert "Remove ColStore"
This reverts commit 0163a7bc46.
|
2020-05-05 18:14:31 +03:00 |
|
|
Sergeanur
|
0aab36c5a7
|
Merge branch 'master' into miami
|
2020-05-05 18:14:19 +03:00 |
|
|
Sergeanur
|
0163a7bc46
|
Remove ColStore
|
2020-05-05 18:13:46 +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 |
|
|
SergeanurandGitHub
|
dfe0642195
|
Merge pull request #512 from Nick007J/master
MIAMI CAutoPilot + CCarAI + multiple fixes
|
2020-05-05 17:14:13 +03:00 |
|
|
SergeanurandGitHub
|
fcd386f55d
|
Merge pull request #510 from aap/master
implemented most of streamed collisions and big buildings
|
2020-05-05 17:14:01 +03:00 |
|
|
Sergeanur
|
3a536f18b1
|
Add GXT util
|
2020-05-05 15:47:18 +03:00 |
|
|
Sergeanur
|
5580eb21a4
|
ModeInfoType -> ModelInfoType
|
2020-05-05 15:13:09 +03: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 |
|
|
Sergeanur
|
84c9484e55
|
SetPosition, final part
|
2020-05-05 04:45:18 +03:00 |
|
|
Sergeanur
|
ff4af35292
|
Fix pad Y axis
|
2020-05-03 01:42:05 +03:00 |
|
|
Sergeanur
|
dcd1ba6578
|
Fix CMessages::InsertStringInString
|
2020-05-03 01:40:37 +03:00 |
|
|
Sergeanur
|
6a40c03442
|
Put camera modes compatibility under COMPATIBLE_SAVES
|
2020-05-03 00:15:28 +03:00 |
|
|
SergeanurandGitHub
|
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
|
9d600802fa
|
Revert "Disable PED_SKIN for now"
This reverts commit d51bf48dcd.
|
2020-05-02 23:52:41 +03:00 |
|
|
SergeanurandGitHub
|
4448156e29
|
Merge pull request #494 from Nick007J/master
pools compatibility
|
2020-05-02 23:48:17 +03:00 |
|
|
Sergeanur
|
89961325b2
|
Ceil health and armor values in hud (fix 99 health)
|
2020-05-02 23:38:52 +03:00 |
|
|
Sergeanur
|
c62d35fed0
|
Adding sound intensity consts
|
2020-05-02 23:31:45 +03:00 |
|
|
Sergeanur
|
52a13e3301
|
Fix number of unique jumps in stat menu
|
2020-05-02 21:28:44 +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 |
|
|
Sergeanur
|
d51bf48dcd
|
Disable PED_SKIN for now
|
2020-05-02 19:13:51 +03:00 |
|
|
Sergeanur
|
271517915f
|
Cleanup cAudioManager::ProcessVehicleSkidding
|
2020-05-02 18:23:48 +03:00 |
|
|
Sergeanur
|
7ba5b3c353
|
A bit more audio cleanup
|
2020-05-02 17:10:51 +03:00 |
|
|
Sergeanur
|
853dab23f5
|
cleanup cAudioManager::UpdateReflections
|
2020-05-02 16:45:24 +03:00 |
|
|
Sergeanur
|
8d0b0051b4
|
AudioManager.cpp autoformat
|
2020-05-02 16:27:40 +03:00 |
|
|
Sergeanur
|
05b2ae10c6
|
Replacing >> and << to / and * in AudioManager
|
2020-05-02 15:56:59 +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
|
e14733367e
|
Rename m_phy_flagA80 to bSkipLineCol
|
2020-04-30 18:58:15 +03:00 |
|
|
Sergeanur
|
81094f2cd7
|
Rename m_ped_flagA2 into bWasStanding
|
2020-04-30 18:13:38 +03:00 |
|
|
Sergeanur
|
94acee8580
|
Fix MakeSureSlotInObjectPoolIsEmpty
|
2020-04-30 16:52:37 +03:00 |
|
|
Sergeanur
|
7d758f3a9f
|
Adding getters and setters for type and status
|
2020-04-30 16:45:45 +03:00 |
|
|
Sergeanur
|
cf5a404f6b
|
Fix downloading from PR
|
2020-04-30 15:02:42 +03:00 |
|
|
Sergeanur
|
080689589c
|
Jap fixes
|
2020-04-30 02:27:15 +03:00 |
|
|
Sergeanur
|
d5256f74e5
|
premake stuff
|
2020-04-28 23:50:59 +03:00 |
|
|
Sergeanur
|
299bbc47ec
|
Changing prefixes for some audio fields
|
2020-04-28 14:00:38 +03:00 |
|
|
Sergeanur
|
fe353a7cc9
|
Fixes
|
2020-04-27 22:41:09 +03:00 |
|
|
Sergeanur
|
64e6af1db8
|
Fix tVehicleSampleData struct
|
2020-04-27 20:26:24 +03:00 |
|
|
Sergeanur
|
c94ccce6d6
|
Audio structs moved to their AudioManager.h
|
2020-04-27 20:06:54 +03:00 |
|
|
Sergeanur
|
7bf45124e6
|
Fix use of integers instead of enum/bool/nil
|
2020-04-27 12:41:34 +03:00 |
|
|
Sergeanur
|
81fce4edab
|
Audio fixes
|
2020-04-27 02:49:07 +03:00 |
|
|
Sergeanur
|
669bbe3cc7
|
Workaround for a crash on release
|
2020-04-27 01:55:06 +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 |
|
|
Sergeanur
|
4dc2f30791
|
Remove little hack
|
2020-04-26 21:58:12 +03:00 |
|
|
Sergeanur
|
b7ee3792df
|
Remove struct workaround in CControllerConfigManager
|
2020-04-26 20:11:19 +03:00 |
|
|
Sergeanur
|
1a44bcccd5
|
A few fixes
|
2020-04-26 14:18:34 +03:00 |
|
|
Sergeanur
|
4f763cba49
|
Fix compilation error
|
2020-04-26 13:59:06 +03:00 |
|
|
Sergeanur
|
8e9c9fa445
|
Fix CPickups::GenerateNewOne loop
|
2020-04-20 00:14:48 +03:00 |
|
|
Sergeanur
|
fce2e02444
|
Fix savename buffer overflow
|
2020-04-18 23:58:43 +03:00 |
|
|
Sergeanur
|
444d6462c5
|
premake cleanup
|
2020-04-18 14:20:49 +03:00 |
|
|
SergeanurandGitHub
|
96bb96841c
|
Merge pull request #466 from ThirteenAG/master
librw compilation in prebuild event of reIII
|
2020-04-18 13:11:53 +03:00 |
|
|
Sergeanur
|
eadb5a16aa
|
Zones save/load
|
2020-04-18 12:24:44 +03:00 |
|
|
Sergeanur
|
555f933780
|
Remove padding fields
|
2020-04-18 11:31:53 +03:00 |
|
|
Sergeanur
|
15f1080b18
|
librw update
|
2020-04-18 00:00:47 +03:00 |
|
|
Sergeanur
|
5922a9b88d
|
premake fixes
|
2020-04-17 19:46:17 +03:00 |
|
|
Sergeanur
|
6822cc5de8
|
Use LIBRW env var it it's set
|
2020-04-17 19:22:29 +03:00 |
|
|
Sergeanur
|
64cf568691
|
We don't need rw.cpp anymore
|
2020-04-17 18:46:43 +03:00 |
|
|
Sergeanur
|
4ff01484c8
|
Update links
|
2020-04-17 18:22:33 +03:00 |
|
|
Sergeanur
|
7e652ef2d3
|
Remove CWorld from README
|
2020-04-17 18:09:42 +03:00 |
|