mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-26 23:33:43 +00:00
Code Issues Projects Releases Wiki Activity
3120 commits 3 branches 0 tags 63 MiB
Commit graph

855 commits

Author SHA1 Message Date
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
cc0ae51631 lil fix 2020-10-18 16:55:11 +03:00
Sergeanur
b91f6a4550 Setter for bIsStatic (became virtual in SA) 2020-10-18 16:40:06 +03:00
shfil
cafe4e38db Script.cpp missing breaks 2020-10-18 13:37:17 +03:00
shfil
82f54b946f Script.cpp missing breaks 2020-10-18 00:56:07 +02:00
erorcun
4e4e0e8e04
Merge pull request #765 from erorcun/miami 
Radar, WaterCannon, win/glfw skels
 2020-10-17 18:39:56 +03:00
eray orçunus
b98864d134 Radar, WaterCannon, win/glfw skels 2020-10-17 17:35:26 +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
Nikolay Korolev
40434eadfd small fix 2020-10-17 12:31:14 +03:00
Sergeanur
a96146c87b Pickup fix 2020-10-14 03:29:25 +03:00
erorcun
1e11c1eac6
Merge pull request #762 from Nick007J/miami 
Control update
 2020-10-12 21:52:59 +03:00
Nikolay Korolev
d3788a9c70 Merge remote-tracking branch 'upstream/miami' into miami 2020-10-12 13:57:25 +03:00
erorcun
96f36d16ae
Merge pull request #753 from majesticCoding/miami 
CWaterCreatures
 2020-10-12 12:37:47 +03:00
Nikolay Korolev
49c48f2ec2 sync with upstream 2020-10-12 12:11:53 +03:00
erorcun
9e0b23f065
Merge pull request #758 from erorcun/miami 
Hud, Fire, OnscreenBlaBla
 2020-10-12 11:13:46 +03:00
eray orçunus
8a622a0e72 Hud, Fire, OnscreenBlaBla 2020-10-12 06:42:54 +03:00
Nikolay Korolev
28b47b601f fix 2020-10-11 18:14:35 +03:00
Nikolay Korolev
91a274da2b small fix 2020-10-11 13:11:25 +03:00
Nikolay Korolev
68779a4dac small fix 2020-10-11 13:05:41 +03:00
Nikolay Korolev
49ad471b2d removed extra header 2020-10-11 12:58:23 +03:00
Nikolay Korolev
552f308e9e sync with upstream 2020-10-11 12:58:11 +03:00
Nikolay Korolev
c4d4821327 Control updates 2020-10-11 12:56:33 +03:00
majestic
e7ef45a606 CWaterCreatures 2020-10-10 17:49:54 -07: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
570ccb7db1 Merge branch 'miami' of https://github.com/GTAmodding/re3 into new 2020-10-08 22:45:37 +03:00
eray orçunus
fec01aeff1 Fix some sanitizer errors, improve POSIX streamer 2020-10-08 17:58:18 +03:00
eray orçunus
da39624f1c Pad, BulletInfo, ProjectileInfo, fixes 2020-10-08 00:26:24 +03:00
eray orçunus
556dbdcdd6 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-10-05 22:18:51 +03:00
Nikolay Korolev
2bfb54b192 fixed darkel/replay 2020-10-05 16:09:44 +03:00
eray orçunus
8c170a62ee Fix some sanitizer errors, improve POSIX streamer 2020-10-04 22:39:54 +03:00
Nikolay Korolev
39678ba5ca small fix 2020-10-03 16:16:46 +03:00
erorcun
72f342245d
Merge pull request #731 from erorcun/miami 
Population done, mouse AUX buttons, Frontend, Hud, fixes
 2020-10-02 17:39:15 +03:00
Nikolay Korolev
1666995cd9 fixed bad bug 2020-09-30 16:29:39 +03:00
Nikolay Korolev
0a58e3e430 fixed bad bug 2020-09-30 16:25:21 +03:00
eray orçunus
f740588780 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-09-30 02:44:02 +03:00
eray orçunus
f71953077d Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixes 2020-09-30 02:41:42 +03:00
shfil
35d7591def some SilentPatch fixes 
# Conflicts:
#	src/core/Camera.cpp
#	src/weapons/Weapon.cpp
 2020-09-30 02:14:10 +03:00
erorcun
f9dc00a458
Merge pull request #718 from Nick007J/miami 
VC replays
 2020-09-29 23:00:50 +03:00
eray orçunus
a5d6c952a7 Credits & fixes 2020-09-27 02:36:49 +03:00
Nikolay Korolev
c5699a9b30 now fixed properly 2020-09-26 21:35:09 +03:00
Nikolay Korolev
48a10de41f bug fixed 2020-09-26 21:25:40 +03:00
Nikolay Korolev
3c5624bc56 fixed tabs 2020-09-26 21:16:55 +03:00
Nikolay Korolev
796ad66d72 fixed replay bug 2020-09-26 21:12:47 +03:00
Nikolay Korolev
f7d5021ac5 VC replays 2020-09-26 21:10:23 +03:00
Nikolay Korolev
b42d9e3e7c silentpatch fixes 2020-09-26 13:30:22 +03:00
Sergeanur
38ec1bd50d Move a bunch of math to cpp files + small fixes 2020-09-14 21:07:31 +03:00
Nikolay Korolev
084efb1f14 Merge remote-tracking branch 'upstream/miami' into miami 2020-09-13 12:06:44 +03:00
Sergeanur
25a22cc6f2
Merge pull request #702 from Sergeanur/VC/MusicManager 
cMusicManager, cDMAudio, radio position save/load, a few commands imp…
 2020-09-13 03:10:14 +03:00
Nikolay Korolev
f0b15ee053 Merge remote-tracking branch 'upstream/miami' into miami 2020-09-11 16:39:35 +03:00