Commit graph

19 commits

Author SHA1 Message Date
Rodolfo Bogado
26a2154f7c fix android compilation an initial ishiiruka android version 2020-06-09 23:04:55 -03:00
Rodolfo Bogado
3963a18501 update to visual studio 2019 2019-06-23 21:09:49 -03:00
Rodolfo Bogado
21341a76ec merge latest master changes 2016-09-24 15:42:14 -03:00
Rodolfo Bogado
898f9a2497 merge latest master changes 2016-04-18 20:26:58 -03:00
Rodolfo Bogado
3bb709dfbd merge latets master changes 2016-03-26 14:36:12 -03:00
Rodolfo Bogado
d818f9f2de Merge latest master changes 2016-03-05 20:26:50 -03:00
Rodolfo Bogado
27ce1cdac7 merge latest master changes 2015-05-12 23:28:19 -03:00
Rodolfo Bogado
fba8d72185 partial merge from master master 2014-12-06 10:58:18 -03:00
Rodolfo Bogado
c618bcfb90 BIG merge from master to re enable ogl and software backends 2014-11-24 10:52:57 -03:00
degasus
382be2aabd Merge branch 'master' into GLSL-master
Conflicts:
	.gitignore
2013-03-12 11:28:56 +01:00
Glenn Rice
91a4c9d899 Update translations from transifex.
Also add the transifix client configuration directory to gitignore.
2013-03-10 08:55:52 -05:00
degasus
d60cc373d1 Revert "Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae"
This reverts commit d0301ca89d.

Conflicts:
	.gitignore
2013-01-24 16:11:07 +01:00
Grant Paul
2f28d938cf Add support for the mouse cursor and mouse clicking events on OS X. 2013-01-17 23:32:07 -08:00
Ryan Houdek
d0301ca89d Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae 2013-01-07 13:47:34 -06:00
degasus
c207422987 using of vao, warning: ARB_vertex_array_object is needed
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:25 -06:00
Glenn Rice
614a994150 Instead of ignoring various subdirectories of the Binary directory, just
ignore that directory.
2012-05-02 15:48:14 -05:00
Shawn
7f56842a79 fixup scons (osx) to generate scmrev.h and build.
hopefully this will be the last code change committed directly to master for a while... :/
next is cmake to replace scons on osx hopefully. pointers anyone? (soren?)
2011-08-23 03:50:06 -07:00
Shawn Hoffman
fc12633055 Make the jscript for writing out scmrev.h work on windows.
Add scmrev.h to .gitignore
Remove some SubWCRev.exe and it's template
2011-08-21 19:15:50 -07:00
Shawn Hoffman
6bc81f5ac4 git compat:
add git support to cmake and make_svnrev.h.js
add .gitignore
2011-08-14 13:17:57 -07:00