mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-17 03:18:59 +00:00
Code Issues Projects Releases Wiki Activity
2161 commits 3 branches 0 tags 63 MiB
Commit graph

1768 commits

Author SHA1 Message Date
Nikolay Korolev
7e5342e9f0 script revision 2020-05-21 11:22:25 +03:00
Nikolay Korolev
73ff01e35b
script fix 2020-05-21 00:18:13 +03:00
Nikolay Korolev
510261cb05 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-20 23:54:22 +03:00
Nikolay Korolev
3405cfffb7 fixed dumb 2020-05-20 23:52:17 +03:00
Nikolay Korolev
0085ed894f script revision 2020-05-20 23:47:44 +03:00
Nikolay Korolev
b7c1784dd2
script fix 2020-05-20 23:25:01 +03:00
eray orçunus
5b953228b4 Pickup and audio fix 2020-05-20 21:22:40 +03:00
aap
71b9b2ecf9
Merge pull request #572 from erorcun/miami 
Fixes for melees and various things
 2020-05-20 19:55:05 +02:00
Nikolay Korolev
c0c8278c63 fixed ped comment 2020-05-20 20:45:07 +03:00
Nikolay Korolev
f33a01e8c8 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-20 20:40:36 +03:00
Nikolay Korolev
d84650fbe5 script revision 2020-05-20 20:40:04 +03:00
eray orçunus
2ab3fb5dd0 Fixes for melees and various things 2020-05-20 20:21:27 +03:00
Sergeanur
c53b23cff0 Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	src/core/Radar.h
#	src/core/World.cpp
#	src/core/config.h
#	src/entities/Entity.cpp
#	src/modelinfo/ModelIndices.h
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Population.cpp
#	src/render/Clouds.cpp
#	src/render/Hud.cpp
#	src/vehicles/HandlingMgr.h
 2020-05-20 14:39:36 +03:00
aap
fd4cd3e8f1
Merge pull request #569 from aap/miami 
CEntity and friends
 2020-05-20 12:41:12 +02:00
Nikolay Korolev
1b96e6c378
fixed script bug 2020-05-19 23:49:28 +03:00
Nikolay Korolev
fec0028e12 sync with upstream 2020-05-19 23:27:41 +03:00
aap
50f0c7a1dc bla 2020-05-19 22:01:28 +02: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
Nikolay Korolev
46d1889344 slightly restructured ped flags for convenience 2020-05-19 21:34:28 +03:00
Nikolay Korolev
e967db4a3c fixed annoying bug 2020-05-19 21:10:40 +03:00
Nikolay Korolev
41d7b3244b Merge remote-tracking branch 'upstream/miami' into miami 2020-05-19 20:54:10 +03:00
Nikolay Korolev
4c822e8375 script revision 2020-05-19 20:54:05 +03:00
eray orçunus
99574ebfc6 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-05-19 17:46:18 +03:00
eray orçunus
a6972714b7 Melee weapons(half-working), Ped and Hud bits 2020-05-19 17:43:16 +03:00
aap
8a90e32f1b
Merge pull request #564 from Xinerki/miami 
fix audio menu crash
 2020-05-19 13:26:43 +02:00
aap
6b0b984909
Merge pull request #561 from Nick007J/miami 
script revision
 2020-05-19 13:26:21 +02:00
Xinerki
ffd175c705 fix frontend control config menu a little 
thank erorcun
 2020-05-19 14:23:59 +03:00
aap
0d0f4da27a little cleanup of handlingmgr 2020-05-19 13:09:20 +02:00
Xinerki
12b48edada fix audio menu crash 2020-05-19 14:07:24 +03:00
aap
53cdf6ab41 HandlingMgr 2020-05-19 13:07:12 +02:00
aap
401e45d63e
Merge pull request #563 from Xinerki/miami 
match frontend to vc more; isolate crgba
 2020-05-19 12:50:47 +02:00
Xinerki
9e14e8553f match frontend to vc more; isolate crgba 2020-05-19 13:47:55 +03:00
Nikolay Korolev
ff0e039599 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-19 12:44:40 +03:00
aap
9d16df5aa8
Merge pull request #562 from Xinerki/miami 
Load VC frontend textures and use some
 2020-05-19 10:41:17 +02:00
Xinerki
00ee82aba6 Zone and Vehicle text slant 2020-05-19 11:36:08 +03:00
aap
62db8cd9b0 finished CFileLoader; some COcclusion stubs 2020-05-19 10:23:08 +02:00
Xinerki
d425358181 Load VC frontend textures and use some 2020-05-19 10:07:15 +03:00
Nikolay Korolev
a27fc8d9d9 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-19 01:49:51 +03:00
Nikolay Korolev
6510b15704 script revision 2020-05-19 01:49:09 +03:00
Nikolay Korolev
c47292b518
script fix 2020-05-19 00:10:45 +03:00
aap
abd230dcdd some less certainly fps fixes 2020-05-18 22:52:35 +02:00
aap
a8f4f74a76 only one sunbathe anim group 2020-05-18 22:25:06 +02:00
Nikolay Korolev
746f2aa479 script FPS fix 2020-05-18 22:43:06 +03:00
shfil
6bf79120dc
Fix string assignment (aldlist.cpp) 2020-05-18 21:08:01 +02:00
Sergeanur
e891cf858f Remove MAX_VOLUME dups 2020-05-18 20:17:24 +03:00
aap
b05e6632be
Merge pull request #556 from Fire-Head/master 
nullsampman
 2020-05-18 17:08:32 +02:00
aap
2588e69849 some less certainly fps fixes 2020-05-18 16:55:38 +02:00
aap
68f1c03a85 fixes for braking and cloud rotation at high fps 2020-05-18 16:43:40 +02:00
aap
9b09aa3384 fixes for braking and cloud rotation at high fps 2020-05-18 16:40:30 +02:00
aap
2d4861454c
Merge pull request #557 from Nick007J/miami 
script and script stubs
 2020-05-18 13:08:24 +02:00
aap
8f9ce275c8
Merge pull request #558 from Sergeanur/VC/text 
CText
 2020-05-18 13:07:59 +02:00
Sergeanur
af22bb1495 CText 2020-05-18 01:28:40 +03:00
Nikolay Korolev
5ab2c85e97 some debug changes 2020-05-18 00:34:24 +03:00
eray orçunus
f71cfdf8ef Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-05-18 00:27:36 +03:00
eray orçunus
96151ec0f0 TransformToNode crash fix? 2020-05-18 00:27:04 +03:00
Nikolay Korolev
ad8a8913d9 a few more stubs 2020-05-18 00:20:26 +03:00
Nikolay Korolev
fd2948f045 sync with upstream 2020-05-17 23:32:32 +03:00
Nikolay Korolev
39931a5284 some more script stubs 2020-05-17 23:31:16 +03:00
aap
d4a429d986 little cleanup on radar 2020-05-17 22:24:23 +02:00
aap
13903d7c46 radar sprites 2020-05-17 22:21:39 +02:00
eray orçunus
7bd6c70318 just in case 2020-05-17 22:17:43 +03:00
Nikolay Korolev
d5d2f6a822 sync with upstream 2020-05-17 21:48:21 +03:00
Nikolay Korolev
3cc20d7962 sync with upstream 2020-05-17 21:48:12 +03:00
Nikolay Korolev
a5b84eb9fe full script basic support 2020-05-17 21:43:11 +03:00
aap
8a7210cad1
Merge pull request #555 from erorcun/miami 
Weapon fixes and thingies
 2020-05-17 20:20:14 +02:00
Fire-Head
91fbfc1d23 nullsampman 2020-05-17 21:13:25 +03:00
eray orçunus
84f8312b86 Weapon fixes and thingies 2020-05-17 21:01:52 +03:00
aap
a0703fd9e1 loading screens 2020-05-17 19:45:21 +02:00
aap
3f2bdc096d some HUD colors 2020-05-17 15:57:59 +02:00
aap
4ab49780b5 collect HUD colors at top of file 2020-05-17 15:33:44 +02:00
aap
405a6fcbef Merge branch 'master' of github.com:GTAmodding/re3 2020-05-17 15:16:27 +02:00
aap
964acba083 fix head/hand atomics 2020-05-17 15:16:12 +02:00
aap
72ccf9a0db revert accidental commit; also update librw 2020-05-17 14:21:09 +02:00
Sergeanur
37480fb617 Fix compilation errors 2020-05-17 00:33:52 +03:00
Sergeanur
77f97ad2ad Merge branch 'master' into miami 
# Conflicts:
#	src/animation/AnimManager.cpp
#	src/audio/AudioManager.cpp
 2020-05-16 23:58:44 +03:00
Sergeanur
ad0b99231e Remove magic consts from ms_aAnimAssocDefinitions 2020-05-16 23:54:44 +03:00
Nikolay Korolev
5c8888d2ed Merge remote-tracking branch 'upstream/miami' into miami 2020-05-16 23:09:34 +03:00
Nikolay Korolev
b587d835e8 more script stuff 2020-05-16 23:06:33 +03:00
Sergeanur
4ff0697b4d More small audio fixes 2020-05-16 21:00:27 +03:00
Sergeanur
13a0bf1c43 Move sound processors to AudioLogic.cpp, plus small fixes 2020-05-16 20:29:13 +03:00
Sergeanur
1a42d62d3a Merge branch 'master' into miami 
# Conflicts:
#	premake5.lua
#	src/peds/Ped.cpp
#	src/peds/PedIK.cpp
#	src/peds/PedIK.h
 2020-05-16 17:09:13 +03:00
Nikolay Korolev
e3291b0cb1 gangs, script and replay fixes 2020-05-16 17:00:40 +03:00
Sergeanur
dc5ece8327 Fix audio use of number instead of enum for CAR_ACCEL 2020-05-16 16:55:37 +03:00
aap
c54d3ba2ab fixes for 64 bit build 2020-05-16 14:34:51 +02:00
eray orçunus
40ee29fb99 Weapon fixes 2020-05-16 15:07:09 +03:00
aap
793a6a6d7e bla 2020-05-16 13:07:08 +02:00
Nikolay Korolev
7b89baceaa Merge remote-tracking branch 'upstream/miami' into miami 2020-05-16 14:01:58 +03:00
Nikolay Korolev
c33b93793f new horn 2020-05-16 14:01:32 +03:00
aap
9558baa353 fixed CText to be 64 bit compatible 2020-05-16 12:52:37 +02:00
aap
b21f49ad6b fixed CText to be 64 bit compatible 2020-05-16 12:51:54 +02:00
Nikolay Korolev
6556cb0db9 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-16 13:40:00 +03:00
Nikolay Korolev
4defd8b75c minimal weather stuff + multiple bugfixes 2020-05-16 13:31:23 +03:00
aap
9dc5dca209 remove some unneeded plane paths for the moment; also different exe icon 2020-05-16 11:34:51 +02:00
aap
0c23166318 changed CPedIK names 2020-05-16 10:33:19 +02:00
Nikolay Korolev
9067469f7c more attractor fixes 2020-05-16 11:30:58 +03:00
Nikolay Korolev
cf5db73117 a few fixes 2020-05-16 11:22:12 +03:00
Nikolay Korolev
03c4a979c8 removed duplicate code 2020-05-16 10:53:20 +03:00
Nikolay Korolev
5abd466b5d Merge remote-tracking branch 'upstream/miami' into miami 2020-05-16 10:52:58 +03:00
Nikolay Korolev
5491a51daa remove debug 2020-05-16 10:39:18 +03:00