Timur Gagiev
20b4f01030
Merge pull request #17 from cochrane/fix-compiling-osx
...
Fix project not compiling on OS X 10.11.6.
2016-11-26 12:30:26 +03:00
XProger
ff9b87ff3c
#15 linux build
2016-11-26 12:20:20 +03:00
XProger
5f3bbadf3a
restore inventory check
2016-11-26 02:09:14 +03:00
XProger
ba5ffaf977
closed #13 add doors implementation & puzzle hole mesh swap; #9 loop ambient sound;
2016-11-26 01:39:40 +03:00
XProger
36fce871cb
#13 trap floors & doors; fix debug render
2016-11-25 04:28:41 +03:00
Gh0stBlade
46e0461c96
Merge remote-tracking branch 'refs/remotes/XProger/master'
2016-11-23 12:31:28 +00:00
XProger
ddf9ae25cc
#8 fix loosing camera room; #10 temporary turn off underwater sound; #9 add rewind mode for samples; #14 add basic AI logic for bears and bats; #3 health, death and basic inventory logic; #15 add fast & slow-motion while holding R & T keys
2016-11-23 01:38:00 +03:00
Gh0stBlade
b4e2054cc0
Merge remote-tracking branch 'refs/remotes/XProger/master'
2016-11-20 22:32:09 +00:00
XProger
251f99339b
code refactoring; animation, character and sprite classes, compiler warnings etc.; fixed #19 ; fixed #20
2016-11-20 23:27:42 +03:00
cochrane
8769bdb3be
Use resources URL instead of main bundle
...
Because it’s nicer.
2016-11-19 07:38:32 +01:00
cochrane
d764b3c8fa
Change return code in case of negative time
...
I’m not sure what to actually return here anyway, but apparently this
symbol does not always exist.
2016-11-19 07:24:59 +01:00
cochrane
cc8853a9ef
Ensure window is centered on being created, not squished somewhere in the corner.
2016-11-18 21:58:12 +01:00
cochrane
a4c16b8d95
Add proper main menu for OS X
...
The OS X code did not create a main menu. While it arguably doesn’t
really need one, it’s considered impolite to forgo it on this platform,
especially since all standard key commands interact with the menu bar
(they quickly highlight the menu item that has the actual
user-selectable command to provide some feedback).
With this menu added, the Command+Q shortcut to quit the application
now also works.
2016-11-18 21:45:23 +01:00
cochrane
4d1738dd0a
Switch OpenLara to use Cocoa on OS X
...
Yes, that does amount to pretty much a rewrite of the main.cpp. Don’t
worry, it’s not that long. It also got renamed to main.mm because it’s
an Objective-C++ file now.
There are still a few rough edges, since I didn’t want to add a nib to
any of this. Among other things, the display link probably starts a
tiny bit too early, resulting in gameplay noises being heard before the
game is actually visible. Resizing may leave white flashes; not quite
sure what that’s about but they are brief. Finally, no menus of any
kind. At least a system and window menu would be necessary (to support
Cmd+Q).
2016-11-18 21:19:11 +01:00
cochrane
1393193a73
Use mach_absolute_time for time retrieval
...
The Microseconds function is a leftover from the days of Carbon and
deprecated since 10.8.
2016-11-18 18:44:37 +01:00
cochrane
93bbb30e02
Fix project not compiling on OS X 10.11.6.
...
As the comment says: In Compatibility mode (used by including gl.h instead of gl3.h), OS X only supports OpenGL 2 with some extensions. VAOs, which are an OpenGL 3 feature, are not available under their OpenGL 3 name. Instead they are exposed through an Apple-specific extension that works identically in all respects that matter. With this, it is possible to build and run the program without any trouble.
2016-11-18 17:29:52 +01:00
Gh0stBlade
6ca0280150
Merge remote-tracking branch 'refs/remotes/XProger/master'
2016-11-17 11:42:52 +00:00
XProger
7f004415e1
#14 basic behavior of wolves
2016-11-17 03:57:40 +03:00
XProger
f9324e6543
#3 tilt control
2016-11-17 00:36:59 +03:00
Gh0stBlade
b4c512d322
Merge remote-tracking branch 'refs/remotes/XProger/master'
2016-11-16 11:58:06 +00:00
XProger
ff6e3f8ece
#15 Web platform: change window mode by Alt+Enter
2016-11-16 04:00:16 +03:00
XProger
0921c615e3
#12 flash lights
2016-11-16 03:26:41 +03:00
XProger
08dc561617
#7 auto-aiming, enemies hit; #8 camera look at enemy, view point on Lara's chest moving while moving blocks; #3 head & chest IK; #15 preventing closing page by Ctrl + W (request)
2016-11-15 03:45:16 +03:00
XProger
7f372076df
#7 pistols aiming
2016-11-14 07:43:49 +03:00
XProger
e2d3e03f59
#7 draw/hide weapons (hand animations and mesh swap), shotting, muzzle flash, tracing bullets for walls
...
#8 combat mode, underwater sound
2016-11-08 02:22:40 +03:00
XProger
b3ef2052c2
#3 draw weapons
2016-11-07 03:14:49 +03:00
XProger
4390eb9a96
#3 add input by arrows ctrl and Z, X; #16 reduce VAOs objects count on sprite sequences
2016-11-05 01:19:28 +03:00
XProger
f108518de9
binaries
2016-11-04 03:06:38 +03:00
XProger
37b716c96c
#16 remap mesh offsets, fix VAO for sprite sequences
2016-11-04 00:49:01 +03:00
XProger
9d13776c5f
#16 VAO, profiling markers and configuration, smart shader binding
2016-11-03 23:39:27 +03:00
XProger
eb37622b15
#15 tabs & includes fix
2016-11-03 22:11:03 +03:00
Timur Gagiev
595780f6fd
#15 plist file
2016-11-03 20:59:09 +03:00
Timur Gagiev
b3f4c9680f
#15 MacOS X
2016-11-03 20:53:09 +03:00
XProger
ea0e1c87a1
fix normals, #3 movable blocks
2016-11-01 04:13:01 +03:00
XProger
bb9b3963d2
#12 fix normals
2016-10-21 02:48:52 +03:00
XProger
df942b2893
#9 fading & panning of sound sources
2016-10-21 00:58:15 +03:00
XProger
8bbd26a9ef
#3 fix hang left/right through walls
2016-10-20 00:17:00 +03:00
XProger
f7849b23c9
fields renaming
2016-10-17 23:07:08 +03:00
XProger
e827cf201f
#12 simple spot shadows for enemies
2016-10-17 22:16:13 +03:00
XProger
1a77c2281c
#3 fix frame bbox calculation in air
2016-10-16 21:30:05 +03:00
XProger
dddcbd13c5
#3 climb & hang states fixes, water splash, item pickup, slow motion mode for debug (R key)
2016-10-16 20:32:31 +03:00
XProger
c22ffa886f
#15 gamepad support on web platform, PSX-like Lara controls
2016-10-11 21:44:15 +03:00
XProger
bf5c3a3232
#3 draft of hang/reach animation, add animation effect command types
2016-10-11 03:51:38 +03:00
XProger
f6cb9c5000
#9 apply sample volume
2016-10-11 00:02:37 +03:00
XProger
5a99d547ba
#3 slide on slant blocks, climb on 2-3 clicks height blocks, asc/desc 1 click blocks while walk or run;
...
#13 add dummy boulder trigger to stop inactive animation & sound, fix short angle checks and non-zero velocity for switch and keyhole triggers;
2016-10-10 02:43:20 +03:00
XProger
3f3a590f73
#15 fix GetProc macros
2016-10-07 01:17:07 +03:00
XProger
3a6f3ad15a
Merge branch 'master' of https://github.com/XProger/OpenLara
2016-10-07 01:15:21 +03:00
XProger
56d5201c0f
#15 reduce executable size, fix keyboard input, turn off LOG in release config
2016-10-07 01:14:45 +03:00
XProger
0fe2853556
Merge branch 'master' of https://github.com/XProger/OpenLara
2016-10-07 01:08:46 +03:00
XProger
74969eea7e
#15 reduce executable size, fix keyboard input, turn off LOG in release config
2016-10-07 01:07:19 +03:00
