crt0mega/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2021-09-07 08:09:38 +00:00
Code Issues Projects Releases Wiki Activity
3,985 Commits 3 Branches 0 Tags 79 MiB
adc7127055
Commit Graph

106 Commits

Author SHA1 Message Date
Fire-Head
adc7127055 fix pickup coronas 2021-01-10 22:24:21 +03:00
Sergeanur
0428b5b694 Fix pickup text 2021-01-07 21:55:41 +02:00
Nikolay Korolev
9fd93e8e57 merge master to miami 2021-01-01 14:53:20 +03:00
Fire-Head
0bea6d039b Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-19 22:33:17 +03:00
Nikolay Korolev
8d1996833b merge attempt 2020-12-19 03:21:04 +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
Fire-Head
87bca997a4 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-12-07 21:50:18 +03:00
Fire-Head
c5fbb594a5 ps2 hud, restore original code 2020-12-07 21:12:13 +03:00
withmorten
4c0744260d uint8 enums fixed 2020-12-07 01:59:17 +01:00
withmorten
4696e3f9c8 uint8 enums fixed 2020-12-07 00:36:40 +01:00
Sergeanur
24b5406a1d Add GTA_REPLAY 
# Conflicts:
#	src/control/Replay.cpp
#	src/control/Replay.h
 2020-12-01 22:53:09 +02:00
Sergeanur
e33ab44b7d Add GTA_REPLAY 2020-12-01 22:08:05 +02:00
Nikolay Korolev
8f05ccd6c4 small garages revision + small template stuff 2020-11-30 02:15:03 +03:00
Sergeanur
164f16c85b Some TODOs done in Peds code 2020-11-25 19:39:57 +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
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
51e7f44433 Pickup fix 2020-11-08 22:40:05 +02:00
Sergeanur
a2e0373d22 Pickups fix 2020-11-08 15:00:54 +02:00
Sergeanur
9a3758bfc1 Fix undefined colorId for pickups 2020-10-26 16:39:43 +02: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
Sergeanur
632569cff3 Pickup fixes 2020-10-21 19:48:13 +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
e465cea07b Pickup arrays done 2020-10-17 18:05:23 +03:00
Sergeanur
7fc70179ed Pickup save/load 2020-10-17 17:06:38 +03:00
Sergeanur
7f3b51dd17 Small inner fix 2020-10-17 16:04:11 +03:00
Sergeanur
63666391d4 More Pickup stuff 2020-10-17 15:57:12 +03:00
Sergeanur
516a02d2da Fix pickup fix :P 2020-10-17 15:33:22 +03:00
Sergeanur
1f36b78c20 Pickup fixes 2020-10-17 13:48:08 +03:00
Sergeanur
ef47dad566 Partial Pickups 2020-10-17 08:23:01 +03:00
Sergeanur
a96146c87b Pickup fix 2020-10-14 03:29:25 +03:00
eray orçunus
eafa9cc107 new opcodes, buyable properties, minor fixes 2020-07-30 15:32:34 +03:00
Sergeanur
acdc52116e Merge branch 'master' into miami 
# Conflicts:
#	src/animation/RpAnimBlend.cpp
#	src/audio/oal/stream.cpp
#	src/audio/sampman.h
#	src/control/Pickups.cpp
#	src/core/Collision.cpp
#	src/core/Collision.h
#	src/core/FileLoader.cpp
#	src/core/FileMgr.cpp
#	src/core/FileMgr.h
#	src/core/Streaming.cpp
#	src/core/Streaming.h
#	src/core/SurfaceTable.h
#	src/modelinfo/VehicleModelInfo.h
#	src/peds/Ped.cpp
#	src/rw/RwHelper.cpp
#	src/rw/RwHelper.h
#	src/skel/glfw/glfw.cpp
#	src/skel/platform.h
#	src/text/Text.cpp
#	src/text/Text.h
#	src/vehicles/CarGen.cpp
#	src/vehicles/Heli.cpp
 2020-07-29 15:34:57 +03:00
Sergeanur
581cb5edfa The real pickup reflection fix 2020-07-29 14:56:06 +03:00
eray orçunus
c483a044b5 Noskillx's PR + fix .set loading 2020-07-06 19:26:41 +03:00
eray orçunus
a822692c26 fix crash-VC pickup scaling 2020-06-16 22:55:28 +03:00
eray orçunus
c6bb1f5d0d some cutscene opcodes and heli guns 2020-06-16 20:35:09 +03:00
aap
c7a32bb83d some camera code 2020-06-14 09:36:30 +02:00
Fire-Head
9c0adf6a8f Revert "FONT_BANK renamed to FONT_STANDARD" 
This reverts commit 552205dfba.
 2020-06-07 05:03:06 +03:00
Sergeanur
1c01899799 Merge branch 'master' into miami 
# Conflicts:
#	src/control/Garages.cpp
#	src/core/Frontend.cpp
#	src/peds/PlayerPed.cpp
#	src/render/Hud.cpp
#	src/vehicles/Train.cpp
 2020-06-07 04:15:10 +03:00
Sergeanur
552205dfba FONT_BANK renamed to FONT_STANDARD 2020-06-07 04:10:06 +03:00
Nikolay Korolev
d4ae40ae99 crash fix 2020-05-27 19:39:04 +03:00
eray orçunus
5357957fe1 Compatibility with VC weapon.dat + new shotguns 2020-05-23 16:53:20 +03:00
eray orçunus
5b953228b4 Pickup and audio fix 2020-05-20 21:22:40 +03:00
eray orçunus
2ab3fb5dd0 Fixes for melees and various things 2020-05-20 20:21:27 +03:00