a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-06-29 09:57:06 +00:00
Code Issues Projects Releases Wiki Activity
2127 commits 4 branches 2 tags 50 MiB
Commit graph

637 commits

Author SHA1 Message Date
Nikolay Korolev 9c6046455e fixed script 2020-05-23 12:17:05 +03:00
Nikolay Korolev 7b7b0fb5f2 removed debug 2020-05-23 02:18:16 +03:00
Nikolay Korolev f8a509ffb3 fixes 2020-05-23 02:17:27 +03:00
Nikolay Korolev 7bf561d440 some fixes 2020-05-23 01:43:12 +03:00
Nikolay Korolev 6e51ed3c53 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-22 23:35:19 +03:00
eray orçunus a5f23a0342 VC CMenuManager struct, ctor etc. 2020-05-22 03:48:12 +03:00
Nikolay Korolev 864847a6fe new script commands - mostly stubs 2020-05-22 02:42:04 +03:00
Nikolay Korolev 7e5342e9f0 script revision 2020-05-21 11:22:25 +03:00
Nikolay Korolev 510261cb05 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-20 23:54:22 +03:00
Nikolay Korolev 0085ed894f script revision 2020-05-20 23:47:44 +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 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 bdbe5d1080 CEntity and friends 2020-05-19 20:56:42 +02: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
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
Nikolay Korolev 746f2aa479 script FPS fix 2020-05-18 22:43:06 +03:00
Nikolay Korolev 5ab2c85e97 some debug changes 2020-05-18 00:34:24 +03:00
Nikolay Korolev ad8a8913d9 a few more stubs 2020-05-18 00:20:26 +03:00
Nikolay Korolev 39931a5284 some more script stubs 2020-05-17 23:31:16 +03: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
eray orçunus 84f8312b86 Weapon fixes and thingies 2020-05-17 21:01:52 +03:00
aap 72ccf9a0db revert accidental commit; also update librw 2020-05-17 14:21:09 +02:00
Nikolay Korolev b587d835e8 more script stuff 2020-05-16 23:06:33 +03:00
Nikolay Korolev e3291b0cb1 gangs, script and replay fixes 2020-05-16 17:00:40 +03:00
aap c54d3ba2ab fixes for 64 bit build 2020-05-16 14:34:51 +02:00
Nikolay Korolev 4defd8b75c minimal weather stuff + multiple bugfixes 2020-05-16 13:31:23 +03:00
Sergeanur 76dd769085 Merge branch 'master' into miami 2020-05-16 05:07:39 +03:00
Sergeanur ec1b91e527 Remove unused audio enum 2020-05-16 05:06:51 +03:00
eray orçunus acd1ea9909 Weapon layer in Peds 2020-05-15 21:21:25 +03:00
Sergeanur 24875f34d0 Merge branch 'master' into miami 
# Conflicts:
#	src/modelinfo/ClumpModelInfo.cpp
 2020-05-14 17:05:42 +03:00
Nikolay Korolev b01987719e
fixed script error 2020-05-14 15:26:59 +03:00
Nikolay Korolev 1237941180 fixed traffic lights 2020-05-13 17:33:50 +03:00
Nikolay Korolev 509d57edcb car control and cranes fixes 2020-05-13 13:29:17 +03:00
Sergeanur 7c2b9478d5 Merge branch 'master' into miami 
# Conflicts:
#	src/control/Garages.cpp
#	src/core/FileLoader.cpp
#	src/core/Streaming.cpp
#	src/core/Zones.cpp
#	src/core/Zones.h
#	src/render/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp
 2020-05-13 00:55:52 +03:00
Sergeanur 33dfaf7da1 Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	premake5.lua
#	src/core/ZoneCull.cpp
#	src/core/Zones.cpp
#	src/objects/CutsceneHead.cpp
#	src/render/Clouds.cpp
 2020-05-13 00:27:15 +03:00
Filip Gawin c2ac6b3759 Fix linux warnings 2020-05-12 23:18:54 +02:00