Commit Graph

1256 Commits

Author SHA1 Message Date
eray orçunus
812b9e7eda Various fixes 2020-04-18 05:58:43 +03:00
aap
bdf9fa2f01 implemented librw alphatest setting 2020-04-17 23:55:20 +02:00
aap
5c474b9c68 Merge branch 'master' of github.com:gtamodding/re3 2020-04-17 21:45:25 +02:00
aap
886d73b123 fixed raster from image conversion 2020-04-17 21:45:02 +02:00
Filip Gawin
63951d9b95 Part one 2020-04-17 19:30:57 +02:00
Sergeanur
64cf568691 We don't need rw.cpp anymore 2020-04-17 18:46:43 +03:00
Sergeanur
941c50ee25 Merge remote-tracking branch 'origin/master' into Standalone 2020-04-17 16:31:43 +03:00
Sergeanur
599164006a Remove patches 2020-04-17 16:31:11 +03:00
aap
6ef7924e01 implemented CVector2D::NormaliseSafe for SkidMarks 2020-04-17 15:15:42 +02:00
Sergeanur
c8af08330a Merge remote-tracking branch 'samler/world' into Standalone 2020-04-17 15:06:49 +03:00
saml1er
ac61da3feb Fix CWorld::FindObjectsOfTypeInRangeSectorList bug 2020-04-17 17:04:09 +05:00
Sergeanur
4ecf56a2d7 Merge remote-tracking branches 'origin/master' and 'samler/world' into Standalone 2020-04-17 15:03:00 +03:00
saml1er
2a4717fa41 Apply clang format to CWorld 2020-04-17 16:14:59 +05:00
saml1er
ce7d6848ba CWorld fixes 2020-04-17 16:13:55 +05:00
Sergeanur
b9c8ce0d37 Merge remote-tracking branch 'Fire-Head/master' into Standalone
# Conflicts:
#	src/render/Coronas.cpp
2020-04-17 10:17:38 +03:00
Sergeanur
881d61f811 Merge remote-tracking branch 'samler/world' into Standalone 2020-04-17 10:16:30 +03:00
Fire-Head
a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
eray orçunus
425395ad25 Ped fixes and ref removal 2020-04-17 07:01:54 +03:00
saml1er
e777f24064 More CWorld fixes 2020-04-17 05:38:05 +05:00
saml1er
03247ce98f Fix CWorld::RepositionOneObject bugs 2020-04-17 03:54:22 +05:00
saml1er
6b1093f1c8 CWorld complete 2020-04-17 03:20:34 +05:00
eray orçunus
2c2da558ca Some refs removed, little fixes and teleport 2020-04-16 22:19:56 +03:00
saml1er
e52a02fb9e Merge branch 'master' into world
# Conflicts:
#	src/core/World.cpp
#	src/core/World.h
2020-04-17 00:01:53 +05:00
saml1er
52d0d811b7 Reverse CWorld 2020-04-16 23:46:08 +05:00
Sergeanur
83cbe4e39e More refs removed 2020-04-16 15:30:47 +03:00
aap
7bd12f4a48 add textures in correct order 2020-04-16 13:33:32 +02:00
Sergeanur
552f8c864f
Merge pull request #448 from Nick007J/master
CBulletInfo
2020-04-16 12:57:58 +03:00
Sergeanur
69c32376fe Increase alpha entity list capacity for wide screen 2020-04-16 12:44:04 +03:00
Sergeanur
b1fc7bc533 More refs removed 2020-04-16 11:50:45 +03:00
aap
4b602940eb first fake RW implementation working 2020-04-16 10:26:16 +02:00
aap
89b7085353 Merge branch 'master' of github.com:gtamodding/re3 2020-04-16 09:23:31 +02:00
Fire-Head
c1fcb7bd43 Removed refs from sampman 2020-04-16 08:28:17 +03:00
eray orçunus
c22e59abab Various fixes 2020-04-16 05:07:32 +03:00
Nikolay Korolev
22c84356b1 Merge remote-tracking branch 'upstream/master' 2020-04-16 02:00:38 +03:00
Nikolay Korolev
5993c66efb
Fixed bridge despawns 2020-04-16 01:59:19 +03:00
Sergeanur
f435455bde Removed refs from weapons/, WeaponEffects moved 2020-04-16 01:56:15 +03:00
Sergeanur
b9a8ad9481 Fix misplaced targeting 2020-04-16 01:44:43 +03:00
Nikolay Korolev
75733f3c83 Merge remote-tracking branch 'upstream/master' 2020-04-16 01:19:45 +03:00
Nikolay Korolev
1fd7b0288c
fix Bait crash 2020-04-16 01:19:08 +03:00
Sergeanur
d455cd8a62 Default native resolution mode and small camera fixes 2020-04-16 00:46:09 +03:00
Nikolay Korolev
156177ff5a Merge remote-tracking branch 'upstream/master' 2020-04-16 00:32:29 +03:00
Nikolay Korolev
3517f3f1a1
fix script crash 2020-04-16 00:31:57 +03:00
Nikolay Korolev
e0394a1558 vs botch 2020-04-16 00:00:04 +03:00
Nikolay Korolev
480573452e definition fix 2020-04-15 23:49:23 +03:00
Nikolay Korolev
2a96846eac anim fix 2020-04-15 23:48:08 +03:00
aap
afce2e1bb3 Merge branch 'master' of github.com:gtamodding/re3 2020-04-15 22:36:21 +02:00
Nikolay Korolev
1795f3d479 sync with master 2020-04-15 23:31:52 +03:00
Nikolay Korolev
5cb7e2e42a
Merge pull request #440 from Fire-Head/master
CWeapon done, fixes
2020-04-15 23:28:09 +03:00
Nikolay Korolev
a43ca86542
Merge pull request #429 from Nick007J/master
Scene edit
2020-04-15 23:27:23 +03:00
Fire-Head
190bc696d8 fixed crash 2020-04-15 21:29:00 +03:00
Fire-Head
a9713125dc fixed uzi/ak47/m16 trace 2020-04-15 20:58:28 +03:00
Fire-Head
c3647ee51e rem comment 2020-04-15 20:34:58 +03:00
Fire-Head
cb4e1d68e7 glass NULL->nil 2020-04-15 20:09:51 +03:00
Fire-Head
708d247c98 'fix' fix 2020-04-15 19:53:08 +03:00
Fire-Head
85fe445fef weapon cosmetic fix 2020-04-15 19:43:16 +03:00
erorcun
e132c3fada
Merge pull request #416 from saml1er/PedPath
CPedPath complete
2020-04-15 19:29:17 +03:00
erorcun
647cfbfd45
Merge pull request #446 from erorcun/erorcun
Many fixes and cleanup
2020-04-15 19:22:28 +03:00
eray orçunus
4da1879975 Many fixes and cleanup 2020-04-15 19:19:45 +03:00
Nikolay Korolev
1d8484ed7d fix 2020-04-15 17:36:38 +03:00
aap
eccc4a3a5b fixed bug and weirdness in CHeli 2020-04-15 16:17:18 +02:00
aap
d7eee5c130 fixed clouds and sprites 2020-04-15 15:26:55 +02:00
aap
90be379bed implemented most of librw wrapper 2020-04-15 14:05:40 +02:00
Fire_Head
7c13d72edc
Update Weapon.cpp 2020-04-15 08:13:46 +03:00
Fire-Head
daed13485e CWeapon done, ps2 cheats fix 2020-04-15 08:03:53 +03:00
Nikolay Korolev
f7f4e44c34 Merge branch 'master' into garages_dev 2020-04-15 01:07:17 +03:00
Nikolay Korolev
b354a72de1 Merge remote-tracking branch 'upstream/master' 2020-04-15 01:06:56 +03:00
Nikolay Korolev
b657a8e17c bullet info 2020-04-15 01:06:32 +03:00
Nikolay Korolev
70b51d42f4
fixed crash 2020-04-15 00:33:55 +03:00
saml1er
6d5464b6bb CPedPath improvements 2020-04-14 23:32:15 +05:00
Nikolay Korolev
f35d2721f5 fix 2020-04-14 20:16:02 +03:00
Nikolay Korolev
fbed2c4530 fix debug stuff 2020-04-14 20:12:26 +03:00
Nikolay Korolev
f2c78e4bfb Merge branch 'master' into game_dev 2020-04-14 20:10:39 +03:00
Nikolay Korolev
21a11fd343 scene edit 2020-04-14 20:09:42 +03:00
Sergeanur
6d934892ec RwMatFX support with linked RW libs 2020-04-14 18:35:07 +03:00
Sergeanur
eb0b9f6255 fix CTheCarGenerators::SaveAllCarGenerators 2020-04-14 17:24:31 +03:00
Sergeanur
9a7b833aa5 Added missing audio ctors 2020-04-14 17:13:38 +03:00
saml1er
bf040c7cd1 Remove float casts 2020-04-14 17:05:51 +05:00
saml1er
8bb23ca5d4 Refactor CPedPath::CalcPedRoute 2020-04-14 16:57:28 +05:00
Filip Gawin
41d42a3e53
Merge pull request #414 from ShFil119/audio17
Finish audio
2020-04-14 13:01:40 +02:00
saml1er
b4d5d5249c CPedPath complete 2020-04-14 15:45:47 +05:00
Sergeanur
a19fa8764f CarGen, Cranes, Gangs: cleanup, fixes, r* visioned placement 2020-04-14 13:08:03 +03:00
Sergeanur
7f8a4b4867 Debug font and CProfiles 2020-04-14 10:31:37 +03:00
erorcun
313f547860
Some cleanup 2020-04-14 03:21:16 +03:00
Nikolay Korolev
f54c83c0b5 Merge branch 'master' into game_dev 2020-04-14 01:18:53 +03:00
Filip Gawin
2e20e040cc
Merge pull request #403 from saml1er/roadblocks
CRoadBlocks complete
2020-04-14 00:11:39 +02:00
Filip Gawin
aa3b7869e5
Merge pull request #406 from Nick007J/master
Pools load/save
2020-04-14 00:11:22 +02:00
saml1er
60eb60de4e Use NUMROADBLOCKS enum member in CRoadBlocks 2020-04-14 02:13:00 +05:00
Nikolay Korolev
906133d3be
fix garages 2020-04-13 22:43:41 +03:00
Sergeanur
304b574eba added missing break 2020-04-13 22:25:24 +03:00
Nikolay Korolev
2709447073 Merge remote-tracking branch 'upstream/master' 2020-04-13 22:17:42 +03:00
Nikolay Korolev
c21529467a
fixed record 2020-04-13 22:16:51 +03:00
Filip Gawin
67055c1fbb Cleanup cAudioManager::ProcessRainOnVehicle a bit 2020-04-13 21:13:07 +02:00
Nikolay Korolev
12d36d8710
fixed record 2020-04-13 22:12:41 +03:00
Nikolay Korolev
1c592c26f9 review fix 2020-04-13 21:57:13 +03:00
Nikolay Korolev
3b0cd93f89 Merge remote-tracking branch 'upstream/master' 2020-04-13 21:54:25 +03:00
Nikolay Korolev
cb85091d34 scene edit 2020-04-13 21:50:56 +03:00
erorcun
0e056a8e01
Merge pull request #412 from whampson/save-stuff
GenericLoad() done
2020-04-13 21:49:57 +03:00
Filip Gawin
3b9f1255af Finish audio code 2020-04-13 20:30:18 +02:00
Wes Hampson
a19d5dbee1 Fixes 2020-04-13 11:20:57 -07:00
erorcun
e2fb0578b5
Merge pull request #413 from erorcun/erorcun
CFileLoader last funcs and Frontend cleanup
2020-04-13 15:36:05 +03:00