1
0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-13 00:24:24 +02:00

1046 Commits

Author SHA1 Message Date
XProger
e28e5c79e1 deferred graphical state change; #23 ripples on static water surfaces; #3 fix water out bug; #11 fix lighting, fix key selector, fix water above all in inventory background; #8 screen-space portals for rooms clipping 2017-07-24 06:03:51 +03:00
XProger
8e60fe17a2 #3 remap jump key from ALT to D (for Firefox and IE support) 2017-07-16 05:27:03 +03:00
XProger
d57056e8a0 #23 trapezoidal texturing 2017-07-16 05:21:48 +03:00
XProger
730d027808 #78 fix 2017-07-03 03:44:12 +03:00
XProger
dc46426439 #54 fix 2017-07-03 02:29:19 +03:00
XProger
ecd5d18384 #58 fix 2017-07-03 01:12:17 +03:00
XProger
dd0cd75a97 #60 fix 2017-07-03 00:55:51 +03:00
XProger
e8c22b950f #59 fix 2017-07-02 23:49:27 +03:00
XProger
ec35c44a77 #11 addition of help info; #15 remove controls info from web page 2017-07-02 19:07:42 +03:00
XProger
4364f6d651 #3 dozy mode, #11 help text, key and puzzle items selector 2017-07-02 18:59:40 +03:00
XProger
0ea27ca3d8 #11 ammo & weapon pickup 2017-07-01 19:21:00 +03:00
XProger
8776e04935 #11 ammo counter 2017-07-01 03:56:32 +03:00
Pablo
238e474f9f Fix lack of water effects when using an AMD graphics card under Linux.
There were two instances in the code in which the water texture was left uninitialized and this caused the caustics and reflections not to show. Apparently this only happens with the open source AMD driver on Linux.
2017-06-24 00:40:10 -03:00
XProger
851a15b418 #23 fix underwater fog 2017-06-23 00:53:29 +03:00
XProger
d5c48f936a #11 health & oxygen bars; #23 auto-retarget when enemy died; remove unused shaders; fix underwater sound stop in Web version 2017-06-22 04:03:08 +03:00
XProger
0d8cb3c283 #11 fix OGL ES inventory text rendering (add dynamic mesh) 2017-06-19 06:19:04 +03:00
XProger
0b8ca6f21e Merge branch 'master' of https://github.com/XProger/OpenLara 2017-06-19 04:42:28 +03:00
XProger
bbf6b8a3c5 #11 inventory screen; #27 unified controls preset (old school as default) 2017-06-19 04:42:00 +03:00
Timur Gagiev
27a2ece738 Merge pull request #74 from hexdoll/linux-debug
Linux _DEBUG mode
2017-06-02 07:25:41 +03:00
Gemma Peter
e76f38b1e4 Debug text font setup for Linux 2017-06-02 01:57:41 +01:00
Gemma Peter
8e994211d2 Prevent type errors when compiling with GCC 2017-06-02 01:45:09 +01:00
Gemma Peter
f408f179d2 debugBreak function for Linux 2017-06-02 01:21:10 +01:00
adler3d
d11c62aa5e Update build.sh 2017-06-01 15:50:33 +04:00
adler3d
8150cb82f5 Update main.cpp 2017-06-01 15:47:19 +04:00
XProger
65b73febbc #15 fix web touch, remoove page margin 2017-05-23 02:19:17 +03:00
XProger
be448cb07a #23 fix multi-aim target tracking 2017-05-22 00:29:45 +03:00
XProger
296dfc8a0c #23 multi-aiming 2017-05-22 00:21:03 +03:00
XProger
821f5826c0 #3 fix flash lights after death, fix check hit (now using OBB and spheres instead of AABB) 2017-05-20 02:43:35 +03:00
XProger
669350a02d #14 Raptor & T-Rex behavior, add hitmask for enemies #8 camera shake effect 2017-05-19 09:49:30 +03:00
Timur Gagiev
8d677d5c7d Merge pull request #71 from csanta/master
Additional support for the android build on x86
2017-05-18 18:15:54 +03:00
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
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
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
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
XProger
10c31fee39 #57 fix 2017-05-14 21:09:52 +03: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
XProger
cd29100d6a #47 fix 2017-05-13 21:06:29 +03:00
XProger
4ce50556a3 #49 fix 2017-05-13 20:36:08 +03: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
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