archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2026-08-03 23:14:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,500 Commits 3 Branches 0 Tags
fce2e02444a056cc420be6b32844de039fbfafac
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikolay KorolevandGitHub f3937b2971 Merge pull request #467 from Nick007J/master 
bug fixes
 2020-04-18 13:57:11 +03:00
Nikolay Korolev 89688843ec bug fixes 2020-04-18 13:56:21 +03:00
Nikolay Korolev 22c84356b1 Merge remote-tracking branch 'upstream/master' 2020-04-16 02:00:38 +03:00
Nikolay KorolevandGitHub 5993c66efb Fixed bridge despawns 2020-04-16 01:59:19 +03:00
Nikolay Korolev 75733f3c83 Merge remote-tracking branch 'upstream/master' 2020-04-16 01:19:45 +03:00
Nikolay KorolevandGitHub 1fd7b0288c fix Bait crash 2020-04-16 01:19:08 +03:00
Nikolay Korolev edd8f44ffd merge readmes 2020-04-16 00:34:31 +03:00
Nikolay KorolevandGitHub 378f1d180d Update README.md 2020-04-16 00:33:57 +03:00
Nikolay KorolevandGitHub a8f0d77b87 Update README.md 2020-04-16 00:33:11 +03:00
Nikolay Korolev 156177ff5a Merge remote-tracking branch 'upstream/master' 2020-04-16 00:32:29 +03:00
Nikolay KorolevandGitHub 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
Nikolay Korolev 1795f3d479 sync with master 2020-04-15 23:31:52 +03:00
Nikolay KorolevandGitHub 5cb7e2e42a Merge pull request #440 from Fire-Head/master 
CWeapon done, fixes
 2020-04-15 23:28:09 +03:00
Nikolay KorolevandGitHub a43ca86542 Merge pull request #429 from Nick007J/master 
Scene edit
 2020-04-15 23:27:23 +03:00
Nikolay Korolev 1d8484ed7d fix 2020-04-15 17:36:38 +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 KorolevandGitHub 70b51d42f4 fixed crash 2020-04-15 00:33:55 +03: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
Nikolay Korolev f54c83c0b5 Merge branch 'master' into game_dev 2020-04-14 01:18:53 +03:00
Nikolay KorolevandGitHub 906133d3be fix garages 2020-04-13 22:43:41 +03:00
Nikolay Korolev 2709447073 Merge remote-tracking branch 'upstream/master' 2020-04-13 22:17:42 +03:00
Nikolay KorolevandGitHub c21529467a fixed record 2020-04-13 22:16:51 +03:00
Nikolay KorolevandGitHub 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
Nikolay Korolev e71b000cc5 Merge branch 'master' into game_dev 2020-04-12 12:13:32 +03:00
Nikolay Korolev 1732f9b5c6 obviously forgot about it 2020-04-12 12:10:25 +03:00
Nikolay Korolev cbb298c8dd sync with master 2020-04-12 12:08:30 +03:00
Nikolay Korolev 04c9affe2e scene init 2020-04-12 12:06:33 +03:00
Nikolay KorolevandGitHub fa0f5542cc Merge pull request #402 from Nick007J/master 
Record
 2020-04-12 12:06:12 +03:00
Nikolay KorolevandGitHub c593599fc5 Merge pull request #399 from saml1er/master 
CObject complete
 2020-04-12 12:05:49 +03:00
Nikolay KorolevandGitHub 9593a2c000 fixed cranes bug 2020-04-12 11:36:51 +03:00
Nikolay Korolev 15a08192e6 Merge branch 'master' into garages_dev 2020-04-11 21:10:24 +03:00
Nikolay KorolevandGitHub b48617dfde Update README.md 2020-04-11 21:09:52 +03:00
Nikolay Korolev d010f6255a Merge branch 'master' into garages_dev 2020-04-11 21:02:31 +03:00
Nikolay Korolev fbb1bc5b0d Merge remote-tracking branch 'upstream/master' 2020-04-11 21:02:04 +03:00
Nikolay Korolev 38dee74a5a CPools 2020-04-11 21:01:39 +03:00
Nikolay Korolev 1c0c0a0468 fixed malloc/new 2020-04-11 13:20:41 +03:00
Nikolay Korolev 1ecb498458 Merge branch 'master' of https://github.com/Nick007J/re3 2020-04-11 02:28:37 +03:00
Nikolay Korolev bc90f958da fix constants 2020-04-11 02:27:50 +03:00
Nikolay KorolevandGitHub 59d4a29f55 Update README.md 2020-04-11 02:11:18 +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
Nikolay Korolev be260b49b1 Merge branch 'master' into garages_dev 2020-04-10 21:17:00 +03:00
Nikolay KorolevandGitHub 5b579ec52d Merge pull request #397 from Nick007J/master 
game restart crash fix
 2020-04-10 12:21:18 +03:00
Nikolay Korolev 70efae080e Merge remote-tracking branch 'upstream/master' 2020-04-10 12:20:47 +03:00
Nikolay Korolev a27f7359ff fix 2020-04-10 12:20:04 +03:00
Nikolay KorolevandGitHub 6b9aadc021 Merge pull request #396 from Nick007J/master 
script fix
 2020-04-10 12:04:17 +03:00
Nikolay Korolev 4864850657 Merge remote-tracking branch 'upstream/master' 2020-04-10 12:03:48 +03:00
Nikolay Korolev 314bb83b9a fixed intro crash 2020-04-10 12:03:22 +03:00
Nikolay Korolev 917fa80c18 record init 2020-04-10 11:03:38 +03:00
Nikolay KorolevandGitHub 6473778c47 fix weather init 2020-04-10 02:17:32 +03:00
Nikolay KorolevandGitHub 252d40413c Update README.md 2020-04-09 13:41:05 +03:00
Nikolay Korolev 6b06ee21ad Merge remote-tracking branch 'upstream/master' 2020-04-08 23:51:39 +03:00
Nikolay KorolevandGitHub 42d5f65c55 fix bug 2020-04-08 23:50:45 +03:00
Nikolay Korolev d5f34e425e fixed random number retrieval 2020-04-08 21:56:33 +03:00
Nikolay Korolev b9a20da7d8 review fix 2020-04-08 21:47:58 +03:00
Nikolay Korolev ebba8519d9 review fixes 2020-04-08 21:40:02 +03:00
Nikolay Korolev cf36e09d39 final fixes 2020-04-08 21:18:19 +03:00
Nikolay Korolev 3e1062392e Merge branch 'master' into garages_dev 2020-04-08 20:32:56 +03:00
Nikolay Korolev b3571706d1 fix 2020-04-08 20:30:45 +03:00
Nikolay KorolevandGitHub 5966e627f0 fix bug 2020-04-08 15:17:07 +03:00
Nikolay Korolev b075b0fccf Merge branch 'master' into garages_dev 2020-04-08 14:26:07 +03:00
Nikolay Korolev 24fc11a137 rain fix 2020-04-08 14:25:23 +03:00
Nikolay KorolevandGitHub 8ee98574ff fix bug 2020-04-08 14:16:59 +03:00
Nikolay KorolevandGitHub 8e29a5ec88 bug fix 2020-04-08 14:06:27 +03:00
Nikolay Korolev e556ffd3f6 fixes 2020-04-08 01:52:08 +03:00
Nikolay Korolev 48e13ce6c9 Merge branch 'master' into garages_dev 2020-04-07 23:44:30 +03:00
Nikolay Korolev f7ac85e492 weather stuff 2020-04-07 23:43:19 +03:00
Nikolay KorolevandGitHub 3a8cbf393a Update README.md 2020-04-06 19:55:20 +03:00
Nikolay KorolevandGitHub 7342ca7af0 Update README.md 2020-04-06 19:54:49 +03:00
Nikolay KorolevandGitHub 4feb5f3f8c Update README.md 2020-04-06 19:52:24 +03:00
Nikolay KorolevandGitHub 3175f2ee48 Merge pull request #383 from Nick007J/master 
fixed build
 2020-04-06 19:46:52 +03:00
Nikolay Korolev ab25c8cc98 fixed build 2020-04-06 19:46:09 +03:00
Nikolay KorolevandGitHub 81d945488d Merge pull request #382 from Nick007J/master 
Cranes
 2020-04-06 19:31:54 +03:00
Nikolay Korolev 4f1d6123dd stats fix 2020-04-06 19:31:08 +03:00
Nikolay Korolev cf804dee91 Merge remote-tracking branch 'upstream/master' 2020-04-06 19:28:04 +03:00
Nikolay KorolevandGitHub 182ecd301f Merge pull request #354 from PerikiyoXD/master 
Implement Init for Stats
 2020-04-06 19:26:38 +03:00
Nikolay KorolevandGitHub b991fd9766 Merge branch 'master' into master 2020-04-06 19:26:04 +03:00
Nikolay Korolev e6e51492f0 review fixes 2020-04-06 11:19:29 +03:00
Nikolay Korolev 7dc6815903 Merge branch 'master' into garages_dev 2020-04-06 02:01:45 +03:00
Nikolay Korolev 7f8a78e5de Cranes done 2020-04-06 02:01:03 +03:00
Nikolay Korolev 9436b5a8a5 Merge branch 'master' into garages_dev 2020-04-05 12:47:27 +03:00
Nikolay KorolevandGitHub 35a2cc29f7 Merge pull request #380 from Nick007J/master 
Shoreside garage fix
 2020-04-05 12:46:14 +03:00
Nikolay Korolev 5cbcaa57d7 Merge remote-tracking branch 'upstream/master' 2020-04-05 12:45:30 +03:00
Nikolay Korolev 30b8d7300b shoreside garage fix 2020-04-05 12:44:58 +03:00
Nikolay Korolev 057b28e39b cranes init 2020-04-05 12:35:51 +03:00
Nikolay Korolev bd0cd13be1 Merge remote-tracking branch 'upstream/master' 2020-04-01 23:47:57 +03:00
Nikolay Korolev b7d7dca626 Merge branch 'garages_dev' 2020-04-01 01:59:21 +03:00
Nikolay Korolev 347f0a0e9c vehicles missing functions + fixes 2020-04-01 01:58:40 +03:00
Nikolay KorolevandGitHub 8ff8a4de5e Merge pull request #372 from Nick007J/master 
CGarages done
 2020-04-01 01:58:28 +03:00