archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-11-04 00:47:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,326 Commits 3 Branches 0 Tags
a01a9e5943445f4bf3e5d6ed3af711cfc31abc3e
Commit Graph

4326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
erorcun
0750f04019 Messages, fix Font 2020-10-20 22:24:56 +03:00
erorcun
42fbe7572e Messages, fix Font 2020-10-20 22:19:05 +03:00
Roman Masanin
0594ed5b46 peds 2020-10-18 23:03:03 +03:00
Nikolay Korolev
a1112183de fix 2020-10-18 22:53:25 +03:00
Nikolay Korolev
6173e1dd10 fix 2020-10-18 22:52:49 +03:00
Nikolay Korolev
e2c29a3b28 fix 2020-10-18 22:15:44 +03:00
Nikolay Korolev
fb80236214 fixed ped attractor crash 2020-10-18 21:17:37 +03:00
Filip Gawin
7ae25761d5 Tweak comparison in CFallingGlassPane::Render 2020-10-18 19:57:39 +02:00
Nikolay Korolev
bc42b3a78e Merge remote-tracking branch 'upstream/miami' into miami 2020-10-18 20:35:19 +03:00
erorcun
0eb4aca1d6 Fix build 2020-10-18 20:09:55 +03:00
erorcun
1858904ce0 Merge pull request #769 from Sergeanur/VC/Pickups 
Partial Pickups
 2020-10-18 20:01:32 +03:00
erorcun
10758088ef Merge pull request #766 from Fire-Head/miami 
Glass
 2020-10-18 19:59:11 +03:00
erorcun
4bfc75c2f9 Merge pull request #763 from theR4K/miami 
SpecialFX
 2020-10-18 19:57:47 +03:00
hazelnot
aad7395324 Added icons 2020-10-18 19:47:09 +03:00
erorcun
70f9832e14 Merge branch 'miami' into miami 2020-10-18 19:45:11 +03:00
erorcun
497c179245 Merge pull request #772 from Nick007J/miami 
Original save/load support + bugfixes
 2020-10-18 19:37:49 +03:00
erorcun
20ab7d1739 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-10-18 19:31:39 +03:00
erorcun
937290db09 Fix attractor even more 2020-10-18 19:31:02 +03:00
erorcun
a6aa782d6d Fixes and style changes from miami 2020-10-18 19:16:37 +03:00
shfil
4c305fd48b Upload to bintray when creating tags 2020-10-18 16:54:47 +02:00
Nikolay Korolev
d7789661cd Merge remote-tracking branch 'upstream/miami' into miami 2020-10-18 17:30:51 +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
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
erorcun
1b59b2c9bc Attractor obj. fixes 2020-10-18 16:38:36 +03:00
Filip Gawin
23220d799c Cleanup breaks CAutomobile::ProcessOpenDoor 2020-10-18 15:26:20 +02:00
Filip Gawin
747fe7ab67 Merge branch 'master' of github.com:GTAmodding/re3 into master 2020-10-18 15:14:03 +02:00
Filip Gawin
3594b35fbb Add missing breaks in AudioLogic.cpp 2020-10-18 15:13:43 +02:00
Nikolay Korolev
8d92a0681a fix in ped attractor 2020-10-18 15:39:27 +03:00
eray orçunus
ab071163e5 Fix ped buoyancy 2020-10-18 14:34:20 +03:00
eray orçunus
f60e3d667a Minor things 2020-10-18 13:53:17 +03:00
shfil
cafe4e38db Script.cpp missing breaks 2020-10-18 13:37:17 +03:00
Nikolay Korolev
c856d88691 object field renamed 2020-10-18 12:34:34 +03:00
Sergeanur
b3385015e5 Merge remote-tracking branch 'origin/miami' into VC/Pickups 2020-10-18 04:54:01 +03:00
shfil
82f54b946f Script.cpp missing breaks 2020-10-18 00:56:07 +02:00
Roman Masanin
9cf38634b9 ProcessWaterCannon bug and refractoring (#773) 
* fix audio bug and some refractoring

* mark original bugs
 2020-10-17 20:56:42 +02:00
Roman Masanin
f5f9b8b79f mark original bugs 2020-10-17 21:53:13 +03:00
Roman Masanin
ec69a0e57d fix audio bug and some refractoring 2020-10-17 21:38:02 +03:00
Roman Masanin
1e3aabf654 fix bugs 2020-10-17 21:30:48 +03:00
Nikolay Korolev
720abca826 finished save/load 2020-10-17 20:45:07 +03:00
Roman Masanin
3cbccd2ad3 typo fixes 2020-10-17 19:05:41 +03:00
Nikolay Korolev
cae3990eac Merge remote-tracking branch 'upstream/miami' into miami 2020-10-17 18:50:41 +03:00
Nikolay Korolev
1195f3db7b saves part 1 2020-10-17 18:50:16 +03:00
erorcun
4e4e0e8e04 Merge pull request #765 from erorcun/miami 
Radar, WaterCannon, win/glfw skels
 2020-10-17 18:39:56 +03:00
Sergeanur
588fb26728 Fix player model not changing in cutscenes 2020-10-17 18:26:48 +03:00
eray orçunus
b84dc2bc9b Fix management issue 2020-10-17 18:10:37 +03:00
eray orçunus
dc80884ab5 Fix management issue 2020-10-17 18:07:20 +03:00
Sergeanur
e465cea07b Pickup arrays done 2020-10-17 18:05:23 +03:00
eray orçunus
b98864d134 Radar, WaterCannon, win/glfw skels 2020-10-17 17:35:26 +03:00