mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-10-11 00:30:34 +00:00
Code Issues Projects Releases Wiki Activity
2502 commits 3 branches 0 tags 63 MiB
Commit graph

656 commits

Author SHA1 Message Date
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
aap
89b7085353 Merge branch 'master' of github.com:gtamodding/re3 2020-04-16 09:23:31 +02:00
Nikolay Korolev
1fd7b0288c
 		fix Bait crash 2020-04-16 01:19:08 +03:00
Nikolay Korolev
3517f3f1a1
 		fix script crash 2020-04-16 00:31:57 +03:00
aap
afce2e1bb3 Merge branch 'master' of github.com:gtamodding/re3 2020-04-15 22:36:21 +02: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
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
aap
90be379bed implemented most of librw wrapper 2020-04-15 14:05:40 +02:00
Sergeanur
27c9f7bc88 Merge remote-tracking branch 'origin/master' into MoreLanguages 2020-04-15 10:54:15 +03:00
Fire-Head
daed13485e CWeapon done, ps2 cheats fix 2020-04-15 08:03:53 +03:00
Nikolay Korolev
b354a72de1 Merge remote-tracking branch 'upstream/master' 2020-04-15 01:06:56 +03:00
Nikolay Korolev
70b51d42f4
 		fixed crash 2020-04-15 00:33:55 +03:00
Sergeanur
e373d0526e Merge branch 'master' into MoreLanguages 
# Conflicts:
#	src/core/Frontend.cpp
#	src/render/Font.cpp
#	src/render/Hud.cpp
#	src/render/Hud.h
#	src/text/Messages.cpp
#	src/text/Text.cpp
 2020-04-15 00:10:50 +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
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
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
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
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
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
c21529467a
 		fixed record 2020-04-13 22:16:51 +03:00
Nikolay Korolev
12d36d8710
 		fixed record 2020-04-13 22:12:41 +03:00
Nikolay Korolev
cb85091d34 scene edit 2020-04-13 21:50:56 +03:00
Sergeanur
d8be75ac46 Fix compilation error 2020-04-13 15:21:26 +03:00
saml1er
68f8a6a9ed more CRoadBlocks::GenerateRoadBlocks improvements 2020-04-13 15:21:39 +05:00
Sergeanur
741c9405d0 CPacManPickups 2020-04-13 12:07:07 +03:00
saml1er
28fb1bdde7 Fix CRoadBlocks::GenerateRoadBlocks bugs 2020-04-13 05:52:18 +05:00
Nikolay Korolev
e71b000cc5 Merge branch 'master' into game_dev 2020-04-12 12:13:32 +03:00
Nikolay Korolev
04c9affe2e scene init 2020-04-12 12:06:33 +03:00
Nikolay Korolev
fa0f5542cc
 		Merge pull request #402 from Nick007J/master 
Record
 2020-04-12 12:06:12 +03:00
Nikolay Korolev
c593599fc5
 		Merge pull request #399 from saml1er/master 
CObject complete
 2020-04-12 12:05:49 +03:00
Nikolay Korolev
9593a2c000
 		fixed cranes bug 2020-04-12 11:36:51 +03:00
saml1er
60898f39f2 Improve CRoadBlocks code 2020-04-12 02:08:16 +05:00
Nikolay Korolev
fbb1bc5b0d Merge remote-tracking branch 'upstream/master' 2020-04-11 21:02:04 +03:00
aap
3c999a1eb8 fixed traffic light position 2020-04-11 19:33:39 +02:00
saml1er
0d19036a42 CRoadBlocks complete 2020-04-11 21:45:49 +05:00
Nikolay Korolev
1c0c0a0468 fixed malloc/new 2020-04-11 13:20:41 +03:00
Nikolay Korolev
bc90f958da fix constants 2020-04-11 02:27:50 +03:00
Nikolay Korolev
c8ac25ebfd Merge branch 'master' into garages_dev 2020-04-11 02:04:56 +03:00
Nikolay Korolev
92b6d775d6 Record 2020-04-11 02:03:42 +03:00