Sergeanur
|
e38467ef3a
|
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
# .github/workflows/reLCS_msvc_amd64.yml
# .github/workflows/reLCS_msvc_x86.yml
# README.md
# gamefiles/TEXT/american.gxt
# gamefiles/TEXT/french.gxt
# gamefiles/TEXT/german.gxt
# gamefiles/TEXT/italian.gxt
# gamefiles/TEXT/spanish.gxt
# premake5.lua
# src/animation/AnimManager.cpp
# src/animation/AnimationId.h
# src/audio/MusicManager.cpp
# src/audio/audio_enums.h
# src/control/Script7.cpp
# src/core/FileLoader.cpp
# src/core/re3.cpp
# src/extras/custompipes_d3d9.cpp
# src/extras/custompipes_gl.cpp
# src/extras/postfx.cpp
# src/extras/shaders/colourfilterVC.frag
# src/extras/shaders/colourfilterVC_PS.hlsl
# src/extras/shaders/make_hlsl.cmd
# src/extras/shaders/obj/colourfilterVC_PS.cso
# src/extras/shaders/obj/colourfilterVC_PS.inc
# src/extras/shaders/obj/colourfilterVC_frag.inc
# src/peds/PedFight.cpp
# src/render/Font.cpp
# src/render/Hud.cpp
# src/render/Particle.cpp
# src/render/WaterCannon.cpp
# src/skel/win/gtavc.ico
# src/vehicles/Automobile.cpp
# utils/gxt/american.txt
# utils/gxt/french.txt
# utils/gxt/german.txt
# utils/gxt/italian.txt
# utils/gxt/spanish.txt
|
2021-02-16 18:08:19 +02:00 |
erorcun
|
b464bb7fd4
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into VCSanim
|
2021-02-08 13:23:19 +03:00 |
Nikolay Korolev
|
a0c5d75f83
|
fixed bike bomb
|
2021-01-30 14:55:00 +03:00 |
Nikolay Korolev
|
dbf5c06144
|
fixed bike bomb
|
2021-01-30 14:53:51 +03:00 |
erorcun
|
e1e4be9017
|
Use previous naming & fix LineOfSightSectorList too
|
2021-01-28 03:57:12 +03:00 |
erorcun
|
be88a42bad
|
Fix some Collision NaN/inf's
|
2021-01-28 00:51:43 +03:00 |
Sergeanur
|
97351ad2c2
|
Use original animation names from VCS
|
2021-01-27 18:50:24 +02:00 |
Sergeanur
|
defbb01aaa
|
Merge remote-tracking branch 'origin/lcs' into lcs
* origin/lcs:
Remove size assert
Add TXD mid field
Enable GTA_BRIDGE
LCS model indices
|
2021-01-23 15:14:24 +02:00 |
Sergeanur
|
904090cbb6
|
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
# src/modelinfo/BaseModelInfo.cpp
|
2021-01-23 15:14:15 +02:00 |
Sergeanur
|
6b54d04bfc
|
LCS model indices
|
2021-01-23 02:56:48 +02:00 |
erorcun
|
f85b5e99ed
|
Includes overhaul, fix some compiler warnings
|
2021-01-23 03:23:16 +03:00 |
Sergeanur
|
cea6b20c09
|
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
# src/animation/CutsceneMgr.cpp
# src/control/CarCtrl.cpp
# src/control/Script.cpp
# src/control/Script2.cpp
# src/core/Frontend.cpp
# src/core/main.cpp
# src/entities/Physical.cpp
# src/peds/Ped.cpp
# src/peds/PedAI.cpp
# src/text/Messages.cpp
# src/vehicles/Cranes.cpp
# src/vehicles/Transmission.cpp
|
2021-01-22 15:04:09 +02:00 |
withmorten
|
feb993e751
|
get rid of most --MIAMI comments
|
2021-01-22 11:43:29 +01:00 |
Fire-Head
|
37b9ba5bd7
|
lcs pobj
|
2021-01-22 02:59:08 +03:00 |
Sergeanur
|
ccf6232039
|
small CWorld fixes
|
2021-01-01 12:47:22 +02:00 |
aap
|
14eb16d5d4
|
remove superfluous CWorld::
|
2020-12-31 22:03:42 +01:00 |
aap
|
613bb72eb7
|
fix explosion
|
2020-12-31 21:57:52 +01:00 |
Sergeanur
|
b9e97ab79d
|
Reorder CEntity functions into their original order
|
2020-12-29 13:55:26 +02: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 |
erorcun
|
12d16ddc06
|
Fixes and style changes
|
2020-12-16 23:28:25 +03: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 |
Sergeanur
|
f3e9c82432
|
Pool fixes from master
|
2020-12-08 07:52:03 +02:00 |
Sergeanur
|
aae4f3319f
|
Fixes
|
2020-12-08 03:29:08 +02:00 |
withmorten
|
4c0744260d
|
uint8 enums fixed
|
2020-12-07 01:59:17 +01:00 |
aap
|
43fb7fe342
|
one more original name
|
2020-12-03 19:11:57 +01:00 |
Nikolay Korolev
|
be92957328
|
fixed top gear
|
2020-11-11 12:21:30 +03:00 |
Nikolay Korolev
|
ef2089cafb
|
CWorld done
|
2020-11-11 00:08:32 +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 |
Fire-Head
|
a38702a7d2
|
weapons
|
2020-08-27 19:52:43 +03:00 |
Sergeanur
|
7d8ffa9ebd
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/RoadBlocks.cpp
# src/core/Collision.h
# src/core/Pad.cpp
# src/core/SurfaceTable.h
# src/core/main.cpp
# src/core/re3.cpp
# src/peds/Population.cpp
# src/render/Fluff.cpp
# src/render/Shadows.cpp
# src/render/Shadows.h
# src/render/Sprite2d.cpp
# src/weapons/BulletInfo.cpp
|
2020-08-07 12:34:41 +03:00 |
eray orçunus
|
e14252914e
|
Squeeze performance option, minor fixes
Fixes are already in miami
|
2020-08-03 16:00:32 +03:00 |
Sergeanur
|
d0f5464200
|
Merge branch 'master' into miami
# Conflicts:
# src/control/CarAI.cpp
# src/control/Phones.cpp
# src/control/Phones.h
# src/control/Record.cpp
# src/control/Restart.cpp
# src/control/Script.cpp
# src/core/Collision.cpp
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.h
# src/core/Streaming.cpp
# src/core/TempColModels.cpp
# src/core/Wanted.cpp
# src/core/Zones.cpp
# src/core/config.h
# src/core/main.cpp
# src/core/re3.cpp
# src/entities/Entity.cpp
# src/entities/Physical.cpp
# src/extras/frontendoption.cpp
# src/modelinfo/ModelInfo.cpp
# src/modelinfo/PedModelInfo.cpp
# src/peds/CivilianPed.cpp
# src/peds/CopPed.cpp
# src/peds/EmergencyPed.cpp
# src/peds/Ped.cpp
# src/peds/Ped.h
# src/peds/Population.cpp
# src/render/Renderer.cpp
# src/save/GenericGameStorage.cpp
# src/skel/win/win.cpp
# src/vehicles/Automobile.cpp
# src/vehicles/Boat.cpp
# src/vehicles/Boat.h
# src/vehicles/Vehicle.cpp
|
2020-07-13 18:10:17 +03:00 |
Sergeanur
|
841fa5155c
|
Rename LEVEL_NONE to LEVEL_GENERIC
|
2020-07-13 17:43:09 +03:00 |
Sergeanur
|
655eaa36ce
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/Script.cpp
# src/core/Cam.cpp
# src/core/Camera.cpp
# src/core/Camera.h
# src/render/Fluff.cpp
# src/render/Hud.cpp
|
2020-06-15 17:44:47 +03:00 |
aap
|
e6d2b49121
|
more cleanup
|
2020-06-14 23:16:22 +02:00 |
aap
|
0741fd5b1d
|
some more camera stuff
|
2020-06-14 23:15:56 +02:00 |
aap
|
41dac0773f
|
little CCam cleanup; fix in CWorld sphere test
|
2020-06-12 21:53:39 +02:00 |
eray orçunus
|
e07b6fdce7
|
Message box, letterbox and ped attaching
|
2020-06-07 21:44:54 +03:00 |
Sergeanur
|
509ca11d76
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/GameLogic.cpp
# src/control/PathFind.cpp
# src/control/RoadBlocks.cpp
# src/control/Script.cpp
# src/control/Script.h
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/MenuScreens.cpp
# src/core/TempColModels.cpp
# src/core/config.h
# src/core/re3.cpp
# src/modelinfo/SimpleModelInfo.cpp
# src/modelinfo/VehicleModelInfo.cpp
# src/modelinfo/VehicleModelInfo.h
# src/render/Skidmarks.h
# src/render/WaterLevel.cpp
# src/save/GenericGameStorage.h
# src/vehicles/Automobile.cpp
# src/vehicles/Automobile.h
# src/vehicles/DamageManager.cpp
# src/vehicles/Vehicle.cpp
# src/vehicles/Vehicle.h
|
2020-06-03 01:24:08 +03:00 |
Nikolay Korolev
|
111d23beab
|
fix
|
2020-05-28 17:21:00 +03:00 |
aap
|
3c3b1aadc0
|
small fixes
|
2020-05-25 20:36:23 +02:00 |
aap
|
7bf8337854
|
CVehicle
|
2020-05-25 18:33:34 +02:00 |
eray orçunus
|
2ab3fb5dd0
|
Fixes for melees and various things
|
2020-05-20 20:21:27 +03:00 |
aap
|
0b0ba49abc
|
small fixes
|
2020-05-19 21:42:55 +02:00 |
aap
|
bdbe5d1080
|
CEntity and friends
|
2020-05-19 20:56:42 +02:00 |
eray orçunus
|
84f8312b86
|
Weapon fixes and thingies
|
2020-05-17 21:01:52 +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 |