Sergeanur
|
cb4b4d584c
|
Merge branch 'miami' into lcs
# Conflicts:
# src/control/Script.cpp
# src/control/Script3.cpp
# src/extras/custompipes_d3d9.cpp
# src/extras/custompipes_gl.cpp
|
2021-01-12 12:55:07 +02:00 |
|
majestic
|
0f0812618a
|
unused CFerryDoor
|
2021-01-11 12:47:09 -08:00 |
|
withmorten
|
4a8a1af885
|
fix CPed struct, GetWantedLevel
|
2021-01-11 18:43:04 +01:00 |
|
erorcun
|
b5711b21dc
|
Automobile: fix
|
2021-01-11 01:10:24 +03:00 |
|
shfil
|
c3b6e9da43
|
Fix linux build
|
2021-01-10 17:14:33 +01:00 |
|
Nikolay Korolev
|
203dff9165
|
script
|
2021-01-09 20:33:21 +03:00 |
|
aap
|
434bc01f0b
|
fix fix
|
2021-01-09 16:17:47 +01:00 |
|
aap
|
f6f0cb708e
|
boat fix
|
2021-01-09 16:13:38 +01:00 |
|
aap
|
4a7b3d6d7b
|
fix world bounds check for cars
|
2021-01-09 00:13:29 +01:00 |
|
Sergeanur
|
af09cb06f5
|
Merge branch 'miami' into lcs
* miami:
Use original names
|
2021-01-08 21:53:42 +02:00 |
|
Sergeanur
|
faa9e6441b
|
Use original names
|
2021-01-08 21:53:11 +02:00 |
|
Sergeanur
|
bf3135eb41
|
Enable trains
|
2021-01-08 18:31:50 +02:00 |
|
aap
|
d820df0dbe
|
small cleanup
|
2021-01-08 01:44:19 +01:00 |
|
aap
|
ebdf08a514
|
first commit for LCS
|
2021-01-08 01:41:40 +01:00 |
|
erorcun
|
0d3e6a3dce
|
Vehicle: Automobile: more pointless fixes
|
2021-01-05 04:41:24 +03:00 |
|
aap
|
8026bba723
|
pop boot fix
|
2021-01-04 22:59:55 +01:00 |
|
Nikolay Korolev
|
6fa081e004
|
fix
|
2021-01-05 00:48:25 +03:00 |
|
aap
|
6579645934
|
Merge pull request #916 from Sergeanur/VC/VarConsole
CVarConsole
|
2021-01-03 17:01:17 +01:00 |
|
aap
|
57677b7b55
|
slightly better variable name
|
2021-01-02 20:30:16 +01:00 |
|
aap
|
ec1e8b6c86
|
"clarification" of handling code
|
2021-01-02 20:15:07 +01:00 |
|
aap
|
e58acce9e4
|
old line was better (until we know whats going on)
|
2021-01-02 13:00:23 +01:00 |
|
erorcun
|
2268365c3b
|
Vehicle: Automobile: fixes and style things
|
2021-01-02 14:41:53 +03:00 |
|
Sergeanur
|
42e4a068bb
|
CVarConsole
|
2021-01-02 13:32:25 +02:00 |
|
aap
|
60197c2d7e
|
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
|
2021-01-01 14:02:05 +01:00 |
|
aap
|
0127d7eb8b
|
wrong bike fall off anim
|
2021-01-01 14:02:02 +01:00 |
|
Nikolay Korolev
|
9fd93e8e57
|
merge master to miami
|
2021-01-01 14:53:20 +03:00 |
|
aap
|
4d1305efb2
|
some CAutomobile fixes
|
2020-12-31 23:59:45 +01:00 |
|
aap
|
2e38b51e1c
|
foobar!
|
2020-12-29 20:32:37 +01:00 |
|
aap
|
c93fb5e443
|
fix neo screendroplet moving
|
2020-12-28 21:58:21 +01:00 |
|
Sergeanur
|
9c2f1b0833
|
More bike leftovers
|
2020-12-28 14:00:44 +02:00 |
|
Sergeanur
|
7eb96d5373
|
Add bike leftovers
|
2020-12-28 13:44:20 +02:00 |
|
aap
|
beb0ec673c
|
rename unused field
|
2020-12-27 20:38:05 +01:00 |
|
aap
|
637cff3180
|
rename unused field
|
2020-12-27 20:38:03 +01:00 |
|
aap
|
d33f1071ae
|
handling unit conversion
|
2020-12-27 20:34:19 +01:00 |
|
aap
|
ab80ff7132
|
handling unit conversion
|
2020-12-27 20:34:12 +01:00 |
|
aap
|
0f020127f3
|
fixed some bike bugs
|
2020-12-26 16:00:06 +01:00 |
|
Sergeanur
|
3b2558bb9e
|
Add optimize off to fix compiler bug CBike::ProcessControl
|
2020-12-26 11:54:35 +02:00 |
|
Sergeanur
|
e00b8a93bf
|
Fix use of strncmp
|
2020-12-25 15:18:48 +02:00 |
|
Sergeanur
|
b12eef1d56
|
Fix use of strncmp
|
2020-12-25 15:18:13 +02:00 |
|
Sergeanur
|
de31bdc89f
|
Small type use fixes
|
2020-12-25 08:59:32 +02:00 |
|
Nikolay Korolev
|
8cc3f867a6
|
fixed double explosion
|
2020-12-24 17:44:59 +03:00 |
|
Nikolay Korolev
|
8d1996833b
|
merge attempt
|
2020-12-19 03:21:04 +03:00 |
|
Sergeanur
|
cfda5eb148
|
PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes
|
2020-12-18 02:58:09 +02:00 |
|
Walied K. Yassen
|
55414f7ef2
|
Few bug fixes in CAutomobile
|
2020-12-15 18:05:37 +02:00 |
|
Walied K. Yassen
|
37d3188ce7
|
Few bug fixes in CAutomobile
|
2020-12-15 12:20:55 +02:00 |
|
aap
|
ccbbde549e
|
Merge pull request #869 from Nick007J/miami
garages revision + fixes
|
2020-12-09 09:55:50 +01:00 |
|
erorcun
|
ac3484b82e
|
Merge pull request #872 from withmorten/sized-enums-miami
Get rid of sized enums 2: Electric Boogaloo
|
2020-12-09 03:31:03 +03:00 |
|
Nikolay Korolev
|
016ff5b4aa
|
sync with upstream
|
2020-12-08 12:00:24 +03:00 |
|
Sergeanur
|
f3e9c82432
|
Pool fixes from master
|
2020-12-08 07:52:03 +02:00 |
|
Sergeanur
|
579efc05fc
|
Fix bike's fInAirXRes
|
2020-12-08 05:26:48 +02:00 |
|
withmorten
|
4c0744260d
|
uint8 enums fixed
|
2020-12-07 01:59:17 +01:00 |
|
withmorten
|
9e2ac26a1d
|
uint32 enums fixed
|
2020-12-07 01:04:23 +01:00 |
|
withmorten
|
4696e3f9c8
|
uint8 enums fixed
|
2020-12-07 00:36:40 +01:00 |
|
Nikolay Korolev
|
406f646949
|
pool stuff fix
|
2020-12-06 21:28:40 +03:00 |
|
Nikolay Korolev
|
fe918d41c2
|
garages revision + some fixes
|
2020-12-06 19:30:51 +03:00 |
|
aap
|
13cefd3293
|
more PS2 stuff; memory movement done
|
2020-12-03 16:04:59 +01:00 |
|
aap
|
56c471d02e
|
Merge pull request #854 from Nick007J/master
small garages + templates revision
|
2020-12-01 11:25:02 +01:00 |
|
aap
|
8de7072720
|
Merge pull request #857 from majesticCoding/miami
skimmer shadow
|
2020-12-01 11:24:24 +01:00 |
|
aap
|
d545246bbf
|
plane fix
|
2020-12-01 10:19:11 +01:00 |
|
majestic
|
cd23695116
|
skimmer shadow
|
2020-11-30 23:52:35 -08:00 |
|
Nikolay Korolev
|
8f05ccd6c4
|
small garages revision + small template stuff
|
2020-11-30 02:15:03 +03:00 |
|
aap
|
d5bc382cb5
|
GTA_VERSION define and some config.h cleanup
|
2020-11-29 21:29:48 +01:00 |
|
aap
|
d857758c16
|
start using CMemoryHeap
|
2020-11-26 17:39:59 +01:00 |
|
Sergeanur
|
8f5e60f787
|
Original enum name
|
2020-11-24 17:16:39 +02:00 |
|
Sergeanur
|
833bf4a619
|
Add some TODO stubs for unused code to be reversed
|
2020-11-23 18:59:50 +02:00 |
|
Sergeanur
|
fe40f65703
|
Reorganize CPed functions into their original cpp files
|
2020-11-20 01:18:37 +02:00 |
|
Sergeanur
|
9e45feb4fa
|
Reorganize CPed functions into their original cpp files
|
2020-11-19 21:12:20 +02:00 |
|
aap
|
3d46f2a3af
|
fixed bike collision damage
|
2020-11-12 20:05:02 +01:00 |
|
Nikolay Korolev
|
a67d4c70d7
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-11-11 12:22:57 +03:00 |
|
aap
|
48d0653331
|
urgh, merge and changes to RW layer in one commit.
|
2020-11-11 09:38:33 +01: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 |
|
Roman Masanin
|
23d23f6462
|
merge upstream
|
2020-11-08 16:23:05 +03:00 |
|
Filip Gawin
|
e24513d2ad
|
Sfx audio logic
|
2020-11-06 18:42:52 +01:00 |
|
aap
|
244b91ee80
|
fixed boats for new renderer
|
2020-11-04 16:22:15 +01:00 |
|
aap
|
7041f11987
|
bike bug
|
2020-11-02 13:57:51 +01: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
|
370d693f9d
|
the driver fix
|
2020-11-01 15:15:23 +03:00 |
|
Sergeanur
|
db84afd263
|
Revert
|
2020-11-01 12:31:37 +02:00 |
|
Sergeanur
|
1f5a6dab67
|
Revert
|
2020-11-01 12:30:23 +02:00 |
|
Sergeanur
|
20ea2fde84
|
Also fix SetModelIndex in CAutomobile and CTrain ctors
|
2020-11-01 09:46:25 +02:00 |
|
Sergeanur
|
5711251b0f
|
Also fix SetModelIndex in CAutomobile and CTrain ctors
|
2020-11-01 09:46:02 +02:00 |
|
Sergeanur
|
3c4f166a82
|
Fix virtual SetModelIndex call in CBoat ctor
|
2020-11-01 09:34:10 +02:00 |
|
Sergeanur
|
d370c2076d
|
Fix virtual SetModelIndex call in CBoat ctor
|
2020-11-01 09:20:37 +02:00 |
|
Roman Masanin
|
04b841c719
|
processVehicleOneShots
|
2020-10-26 00:11:04 +03:00 |
|
Sergeanur
|
ca497e2cbd
|
ScriptSounds
|
2020-10-23 16:56:34 +03:00 |
|
Nikolay Korolev
|
d7789661cd
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-10-18 17:30:51 +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
|
b91f6a4550
|
Setter for bIsStatic (became virtual in SA)
|
2020-10-18 16:40:06 +03:00 |
|
Filip Gawin
|
23220d799c
|
Cleanup breaks CAutomobile::ProcessOpenDoor
|
2020-10-18 15:26:20 +02:00 |
|
Nikolay Korolev
|
720abca826
|
finished save/load
|
2020-10-17 20:45:07 +03:00 |
|
Nikolay Korolev
|
1195f3db7b
|
saves part 1
|
2020-10-17 18:50:16 +03:00 |
|
Nikolay Korolev
|
0cf2c8505e
|
cranes done
|
2020-10-17 14:18:20 +03:00 |
|
Sergeanur
|
f1bb09826d
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# gamefiles/TEXT/american.gxt
# premake5.lua
# src/audio/MusicManager.cpp
# src/control/Darkel.cpp
# src/control/Script.cpp
# src/core/FileLoader.cpp
# src/core/Frontend.cpp
# src/core/Game.cpp
# src/core/Streaming.cpp
# src/core/config.h
# src/core/re3.cpp
# src/extras/frontendoption.cpp
# src/extras/frontendoption.h
# src/render/Hud.cpp
# src/skel/glfw/glfw.cpp
# src/vehicles/CarGen.cpp
# src/vehicles/Vehicle.cpp
# src/weapons/WeaponInfo.cpp
# utils/gxt/american.txt
|
2020-10-11 01:18:08 +03:00 |
|
eray orçunus
|
a01b14f301
|
Fix sniper and water creatures bug, mark some files
|
2020-10-09 12:24:21 +03:00 |
|
eray orçunus
|
570ccb7db1
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into new
|
2020-10-08 22:45:37 +03:00 |
|
erorcun
|
b97f86deea
|
Merge pull request #750 from erorcun/miami
Pad, BulletInfo, ProjectileInfo, fixes
|
2020-10-08 21:39:11 +03:00 |
|
Roman Masanin
|
e52c5ca1bb
|
fix for wheelie cras
|
2020-10-08 20:34:59 +03:00 |
|
eray orçunus
|
fec01aeff1
|
Fix some sanitizer errors, improve POSIX streamer
|
2020-10-08 17:58:18 +03:00 |
|
erorcun
|
fa373c7fdb
|
Merge branch 'miami' into miami
|
2020-10-08 01:29:35 +03:00 |
|