mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-02-24 23:42:49 +01:00
Code Issues Releases Wiki Activity
350 Commits 5 Branches 12 Tags
Commit Graph

350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carlos Santa
6daf8b5fbe android: raw files: add level and music files 
When compiling under Android I get these compilation errrors:

Error:(68, 85) error: cannot find symbol variable level2
Error:(69, 85) error: cannot find symbol variable music

A quick workaround is to move and rename the resources
to the right place.

This is a hack, in the near future users will simply browse
a folder with original game resources.

Bug: https://github.com/XProger/OpenLara/issues/64

Signed-off-by: Carlos Santa <santa.cm@gmail.com>
 2017-05-15 21:42:26 -07:00
Carlos Santa
6c9db4fb72 android:build.gradle: update abi filters for IA 
Adding x86 and x86_64 to abi filters to be able to
run on Intel Architecture.

Signed-off-by: Carlos Santa <santa.cm@gmail.com>
 2017-05-15 21:42:16 -07:00
Gh0stBlade
bdd76ec48b Merge remote-tracking branch 'refs/remotes/XProger/master' 2017-05-16 01:56:02 +01:00
XProger
cacda8d54d Merge branch 'master' of https://github.com/XProger/OpenLara 2017-05-16 02:44:21 +03:00
XProger
6eb38b1e4b #70 fix 2017-05-16 02:43:40 +03:00
Timur Gagiev
7681180503 Merge pull request #68 from csanta/master 
android: minimp3: Avoid redefinition of datatypes
fix null pointer exceptions on Android devices with no audio support.
 2017-05-15 20:42:40 +03:00
Carlos Santa
7e5f484bd9 android: main activity: fix null pointer exceptions 
Let's try/catch null pointer exceptions on Android devices
with no audio support.

Bug: https://github.com/XProger/OpenLara/issues/69

Signed-off-by: Carlos Santa <santa@gmail.com>
 2017-05-14 20:13:45 -07:00
Carlos Santa
5c6b4bd8d2 android: minimp3: Avoid redefinition of datatypes 
Under Linux OS there's no need to redefine int64_t as a data type
still including sys/types.h to take care of any missing data types.

The following compilation errors are thrown if int64_t is defined:

Error:(50, 36) error: typedef redefinition with different types
 ('unsigned long long' vs '__uint64_t' (aka 'unsigned long'))
Error:(51, 37) error: typedef redefinition with different types
 ('long long' vs '__int64_t' (aka 'long'))

Issue: https://github.com/XProger/OpenLara/issues/67

Signed-off-by: Carlos Santa <santa.cm@gmail.com>
 2017-05-14 19:41:40 -07:00
Gh0stBlade
c4505bfa39 Merge remote-tracking branch 'refs/remotes/XProger/master' 2017-05-14 23:36:16 +01:00
XProger
95b1b3ce8d #66 fix (related to #41, solved in #57) 2017-05-15 00:59:22 +03:00
XProger
cb1c38a7b0 #65 fix 2017-05-15 00:39:39 +03:00
Gh0stBlade
9c95d6fc3a Merge remote-tracking branch 'refs/remotes/XProger/master' 2017-05-14 20:39:39 +01:00
XProger
10c31fee39 #57 fix 2017-05-14 21:09:52 +03:00
Gh0stBlade
6cce1fea62 Merge branch 'master' of https://github.com/Gh0stBlade/OpenLara_ 2017-05-14 01:18:36 +01:00
Gh0stBlade
69b6024ba8 Merge remote-tracking branch 'refs/remotes/XProger/master' 2017-05-14 01:15:25 +01:00
XProger
58de431b38 #56 fix 2017-05-14 03:06:00 +03:00
XProger
69f228e3f1 #55 fix 2017-05-14 02:55:34 +03:00
XProger
0eca48f8e5 #22 full list of TR1 entity types & debug names 2017-05-14 02:48:33 +03:00
XProger
d3cf26ac1a #3 fix jumping towards the wall 2017-05-14 00:19:14 +03:00
XProger
44e924bda7 #41 fix 2017-05-13 23:37:53 +03:00
Gh0stBlade
2f7c31b49a Merge remote-tracking branch 'refs/remotes/XProger/master' 2017-05-13 20:11:45 +01:00
XProger
cd29100d6a #47 fix 2017-05-13 21:06:29 +03:00
XProger
4ce50556a3 #49 fix 2017-05-13 20:36:08 +03:00
Gh0stBlade
52492093aa Merge remote-tracking branch 'refs/remotes/XProger/master' 2017-05-13 14:15:04 +01:00
XProger
e4fe64d754 #3 fix collisions check with enemies 2017-05-13 16:07:33 +03:00
XProger
87b32cdf1a #52 #3 fix objects interaction offset chaeck and alignment; fix blob shadows for animation with offset cmd; fix "multi-hit" for walls; fix climb on block above ceiling; fix aiming vertical offsets 2017-05-13 15:55:31 +03:00
Gh0stBlade
5ab38e482d Merge remote-tracking branch 'refs/remotes/XProger/master' 2017-05-10 15:06:56 +01:00
Gh0stBlade
cd22ebec16 Merge remote-tracking branch 'refs/remotes/XProger/master' 2017-05-10 15:05:28 +01:00
XProger
e0ac5e518a #39 quick fix 2017-05-10 17:02:21 +03:00
XProger
7c4f48f378 #14 fix disable hit animation and offsets for some states; #4 collisions for enemies and static geometry 2017-05-10 04:20:03 +03:00
Gh0stBlade
935e628cf2 Merge remote-tracking branch 'refs/remotes/XProger/master' 2017-05-10 01:29:44 +01:00
XProger
42dc19bb39 #14 path blocking by doors 2017-05-10 02:34:59 +03:00
Gh0stBlade
219e897de2 Merge remote-tracking branch 'refs/remotes/XProger/master' 2017-05-10 00:14:30 +01:00
XProger
58e4b27904 Merge branch 'master' of https://github.com/XProger/OpenLara 2017-05-10 01:40:08 +03:00
XProger
c4ab64dec6 #14 Basic logic for Wolf, Bear and Bat; simple path-finding; Laras hit animation (push) 2017-05-10 01:39:28 +03:00
Gh0stBlade
52c655155c Merge remote-tracking branch 'refs/remotes/XProger/master' 2017-05-04 11:17:20 +01:00
Timur Gagiev
5bc3ea6413 Update README.md 
links
 2017-05-03 14:43:19 +03:00
XProger
741e9a90ac #23 increase alpha-test ref 2017-05-01 03:58:21 +03:00
XProger
c959e63366 #23 fix transparent bugs 2017-05-01 03:55:56 +03:00
XProger
84f23a627b #15 add VS project stuff for Win, add fb link for Web version 2017-05-01 00:36:29 +03:00
XProger
13ad99b425 #14 fix box overlap index 2017-05-01 00:23:37 +03:00
XProger
1db6892f66 * #14 debug zone info, CTRL key to set Lara pos by camera (Editor build only) 2017-05-01 00:16:53 +03:00
Gh0stBlade
2abc8daf96 Merge remote-tracking branch 'refs/remotes/XProger/master' 2017-04-29 19:57:51 +01:00
Timur Gagiev
6a09dd5781 Merge pull request #44 from Gh0stBlade/lara_state_names 
Lara state names
 2017-04-29 21:01:59 +03:00
Gh0stBlade
9db02f6c79 Finish up remaining state names for Lara. 2017-04-29 18:55:51 +01:00
Gh0stBlade
f909ab6644 Merge remote-tracking branch 'refs/remotes/XProger/master' 2017-04-29 17:40:33 +01:00
Timur Gagiev
c2b6228040 Merge pull request #32 from Gh0stBlade/lara_jump_forward 
Bug Fix: Jump Forward.
 2017-04-29 19:28:54 +03:00
Gh0stBlade
bfaa12d10b Bug Fix: Jump Forward. 
In the original game, pressing Jump + (Left || Right) should allow Lara
to jump forward too. In OpenLara this is not possible as the input code
only checks if forward flag is set when pressed. Not forward + (Left ||
Right) resuling in Lara not being able to jump forward and only straight
up in these cases.
 2017-04-29 10:56:12 +01:00
XProger
5db4b54bd0 #23 fix over-bright lighting 2017-04-26 01:26:35 +03:00
XProger
8c33378621 #23 braid & blob shadows fix 2017-04-25 03:02:58 +03:00