Rudolf Polzer
|
7fc621fc78
|
Merge remote-tracking branch 'ttimo/master'
Conflicts:
config.py
libs/missing.h
plugins/model/cpicosurface.cpp
plugins/vfspk3/unzip.cpp
radiant/main.cpp
radiant/mainframe.cpp
radiant/mainframe.h
radiant/missing.cpp
radiant/pluginmanager.cpp
radiant/preferences.cpp
radiant/preferences.h
tools/quake3/common/cmdlib.c
tools/quake3/common/unzip.c
tools/quake3/q3map2/image.c
|
2012-05-07 12:32:31 +02:00 |
|
Timothee 'TTimo' Besset
|
9b5ba1fe10
|
error check and bail if permission denied during gamepack install
|
2012-05-06 16:59:07 -05:00 |
|
Timothee 'TTimo' Besset
|
6476802ae8
|
dunno what happened there, someone brain farted hard
|
2012-05-06 15:55:10 -05:00 |
|
Timothee "TTimo" Besset
|
377547668d
|
Merge pull request #50 from merlin1991/ETPack
Add support for W:ET to the game setup dialog
|
2012-05-06 11:23:11 -07:00 |
|
Timothee "TTimo" Besset
|
fd89b34bbb
|
Merge pull request #47 from mrwonko/MapLoading
Ability to open .map files with Radiant
|
2012-05-06 11:21:44 -07:00 |
|
Timothee "TTimo" Besset
|
ef66faa7fe
|
Merge pull request #49 from mrwonko/FloatingWindowWorkaround
Workaround for broken floating windows
|
2012-05-06 11:20:31 -07:00 |
|
Christian Ratzenhofer
|
f0cb191f52
|
Add support for W:ET to the game setup dialog
|
2012-05-06 17:24:12 +02:00 |
|
Timothee 'TTimo' Besset
|
57376baa40
|
typo fix
|
2012-05-05 08:46:41 -05:00 |
|
Timothee "TTimo" Besset
|
4152f5b41f
|
Merge pull request #48 from mrwonko/ModelAlpha
Fixed transparency (qer_trans) not working on models
|
2012-05-04 20:32:27 -07:00 |
|
Willi Schinmeyer
|
e35aa24c74
|
Workaround for broken floating windows (XY Window etc. always in front of e.g. surface inspector, properties)
|
2012-05-04 10:45:49 +02:00 |
|
Willi Schinmeyer
|
069d2350eb
|
Fixed transparency (qer_trans) not working on models
|
2012-05-04 10:32:48 +02:00 |
|
Willi Schinmeyer
|
ead68d8884
|
Fixed spelling in a comment
|
2012-05-04 10:07:28 +02:00 |
|
Willi Schinmeyer
|
22de3606a6
|
If the first argument ends in .map, try to load it as a map (instead of as a project)
|
2012-05-04 10:02:31 +02:00 |
|
Timothee "TTimo" Besset
|
fc61d44bc1
|
Merge pull request #46 from merlin1991/confignamefix
Properly name game configuration files
|
2012-05-03 20:12:53 -07:00 |
|
Christian Ratzenhofer
|
5ed7a304a7
|
Properly name game configuration files, fixes #43 and other issues related to stringcompares against config filename
|
2012-05-04 00:18:30 +02:00 |
|
Rudolf Polzer
|
0bbb58dd9c
|
use http for netradiant gamepack download
|
2012-05-02 17:35:47 +02:00 |
|
Timothee 'TTimo' Besset
|
a2a93d30df
|
fix bobtoolz patch caulk crash
|
2012-04-22 19:43:26 -05:00 |
|
Timothee 'TTimo' Besset
|
c40e0b3e57
|
unused
|
2012-04-15 11:24:38 -05:00 |
|
Timothee 'TTimo' Besset
|
6873f53847
|
only Q3 and UrT pack for now. will need maintainers on the others to re-add them
|
2012-04-15 11:24:08 -05:00 |
|
Timothee 'TTimo' Besset
|
943424faa1
|
fix q3map2
|
2012-04-14 17:31:10 -05:00 |
|
Timothee 'TTimo' Besset
|
85a66c9519
|
fix unzip code
|
2012-04-14 17:15:55 -05:00 |
|
Rudolf Polzer
|
d005d46d64
|
oops, this was broken
|
2012-04-12 17:14:40 +02:00 |
|
Rudolf Polzer
|
62d99f889c
|
Merge remote-tracking branch 'ttimo/master'
Conflicts:
plugins/imagepng/plugin.cpp
radiant/gtkdlgs.cpp
radiant/radiant.ico
tools/quake3/q3map2/image.c
|
2012-04-12 15:32:57 +02:00 |
|
Rudolf Polzer
|
54a0010018
|
Merge branch 'master' of /var/cache/git/xonotic/netradiant
|
2012-04-09 09:44:44 +02:00 |
|
michaelb
|
1f0271a988
|
fix invalid use of <glib/...> headers
|
2012-04-09 09:44:35 +02:00 |
|
Timothee TTimo Besset
|
ea08af07fe
|
moved to the web repository. online at http://icculus.org/gtkradiant/documentation/windows_compile_guide/
|
2012-04-08 18:45:33 -05:00 |
|
Timothee TTimo Besset
|
0280c898c6
|
Merge branch 'master' of github.com:TTimo/GtkRadiant
|
2012-04-07 18:53:20 -05:00 |
|
Timothee TTimo Besset
|
c64cd0cd05
|
Q2Tools source - didn't import this in initially
|
2012-04-07 18:53:01 -05:00 |
|
Rudolf Polzer
|
4324a899fd
|
simplify map file
|
2012-04-02 11:46:02 +02:00 |
|
Timothee "TTimo" Besset
|
961fb5bd5f
|
Merge pull request #27 from freemancw/master
Issue #15 - fixed about dialog / Updated 1.5.0 icon
|
2012-04-01 18:42:22 -07:00 |
|
Clinton Freeman
|
6a2288bb90
|
centered about on parent window
|
2012-04-01 21:01:18 -04:00 |
|
Clinton Freeman
|
5a4c0cc6bc
|
reorganized about dialog code, added updated 1.5.0 .ico
|
2012-04-01 20:37:53 -04:00 |
|
Clinton Freeman
|
adeab050ef
|
reorganized about dialog and updated logo. fixed
broken links
|
2012-04-01 16:54:44 -04:00 |
|
alex8664
|
b6d70499bf
|
This is fix for failure of compilation on new libpng
|
2012-03-31 17:33:33 +04:00 |
|
alex8664
|
67411cb18e
|
This is fix for failure of compilation on new libpng
|
2012-03-31 17:31:50 +04:00 |
|
Rudolf Polzer
|
b7e36c120e
|
Merge remote-tracking branch 'github/master'
Conflicts:
.gitignore
config.py
libs/synapse/synapse.cpp
plugins/imagehl/lbmlib.cpp
plugins/surface_heretic2/surfacedialog.cpp
plugins/surface_ufoai/surfacedialog.cpp
radiant/brushscript.cpp
radiant/main.cpp
radiant/preferences.cpp
tools/quake3/common/cmdlib.c
tools/quake3/common/cmdlib.h
tools/quake3/q3map2/path_init.c
windows_compile_guide/index.html
|
2012-03-27 12:11:37 +02:00 |
|
Rudolf Polzer
|
3c73487420
|
Merge commit '830125fad042fad35dc029b6eb57c8156ad7e176'
|
2012-03-27 12:03:28 +02:00 |
|
Rudolf Polzer
|
e4287c28bb
|
my own uncrustify run
|
2012-03-27 12:03:21 +02:00 |
|
Rudolf Polzer
|
203343b01a
|
remove an useless vcproj
|
2012-03-27 11:45:55 +02:00 |
|
TTimo
|
3b33d2f868
|
uncrustify config - not applying until more sync with internal versions are done
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@212 8a3a26a2-13c4-0310-b231-cf6edde360e5
|
2012-03-27 11:45:20 +02:00 |
|
Rudolf Polzer
|
231225d6f9
|
Merge commit '515673c08f8718a237e90c2130a1f5294f966d6a'
Conflicts:
.gitignore
COMPILING
CONTRIBUTORS
ChangeLog
DoxyConfig
Doxyfile
Doxygen_files/Doxyfile
Doxygen_files/doxy_mainpage.h
Doxygen_files/doxygen_gtkradiant_foot.html
Doxygen_files/doxygen_gtkradiant_head.html
Doxygen_files/doxygen_index.html
Doxygen_files/doxygen_reference_foot.html
Doxygen_files/doxygen_reference_head.html
Doxygen_files/example/annotated.html
Doxygen_files/example/classIEpair-members.html
Doxygen_files/example/classIEpair.html
Doxygen_files/example/classes.html
Doxygen_files/example/files.html
Doxygen_files/example/functions.html
Doxygen_files/example/graph_legend.dot
Doxygen_files/example/graph_legend.html
Doxygen_files/example/index.html
Doxygen_files/example/pages.html
Doxygen_files/example/test_8c-source.html
Doxygen_files/example/test_8c.html
Doxygen_files/example/todo.html
Doxygen_files/genDoxyfile
Doxygen_files/gendoxfunctions
Doxygen_files/reference1.html
README.doxygen
SConscript.q3map2
SConscript.radiant
TODO
config.py
contrib/bkgrnd2d/bkgrnd2d.vcproj
contrib/bobtoolz/bobtoolz.vcproj
contrib/camera/camera.vcproj
contrib/gtkgensurf/gtkgensurf.vcproj
contrib/hydratoolz/hydratoolz.vcproj
contrib/prtview/prtview.vcproj
contrib/ufoai/ufoai.vcproj
gen.readme
gendox
libs/picomodel/picomodules.c
plugins/eclassfgd/fgd.vcproj
plugins/entity/entity.vcproj
plugins/image/image.vcproj
plugins/imagem8/imagem8.vcproj
plugins/imagepng/imagepng.vcproj
plugins/imagewal/imagewal.vcproj
plugins/map/map.vcproj
plugins/mapxml/mapxml.vcproj
plugins/model/model.vcproj
plugins/shaders/shaders.vcproj
plugins/spritemodel/spritemodel.vcproj
plugins/surface/surface.vcproj
plugins/surface_heretic2/surface_heretic2.vcproj
plugins/surface_quake2/surface_quake2.vcproj
plugins/surface_ufoai/surface_ufoai.vcproj
plugins/textool/textool.vcproj
plugins/vfspak/vfspak.vcproj
plugins/vfspk3/vfspk3.vcproj
plugins/vfswad/vfswad.vcproj
radiant.sln
radiant/main.cpp
radiant/mainframe.cpp
radiant/preferences.cpp
radiant/preferences.h
radiant/radiant.vcproj
setup/data/tools/plugins/bt/bt-el2.txt
tools/quake3/q3map2/main.c
tools/quake3/q3map2/q3map2.vcproj
windows_compile_guide/index.html
|
2012-03-27 11:43:50 +02:00 |
|
Rudolf Polzer
|
bfc8a12a6b
|
Merge commit '48410b113dd2036e69dbf723a39ec9af02fc9b12'
|
2012-03-27 11:33:51 +02:00 |
|
Timothee "TTimo" Besset
|
686a211fc3
|
Merge pull request #21 from merlin1991/Q3-gamepack-fix
copy shaderlist for Q3 if missing and make sure the config folder for *.game files exists
|
2012-03-26 06:56:22 -07:00 |
|
Christian Ratzenhofer
|
075e39d582
|
Check if games folder exists, and copy shaderlist for Q3 if missing
|
2012-03-26 13:57:19 +02:00 |
|
Timothee "TTimo" Besset
|
f3eedecd09
|
Merge pull request #19 from merlin1991/scons-update
Scons update
|
2012-03-25 16:33:16 -07:00 |
|
Christian Ratzenhofer
|
5b54de9bf2
|
updated Windows compile guide to include git
and the newest changes to the scons script (no more full blown msys)
|
2012-03-26 01:13:24 +02:00 |
|
Christian Ratzenhofer
|
d4f7c67be1
|
Remove calls to wget unzip and cp in the setup target of scons
This allows to build on windows without msys
|
2012-03-26 01:12:56 +02:00 |
|
Timothee TTimo Besset
|
6ac1b9cfd3
|
Merge branch 'master' of github.com:TTimo/GtkRadiant
|
2012-03-22 22:59:40 -05:00 |
|
Timothee TTimo Besset
|
a5a1d8287b
|
new version of glib is touchy
|
2012-03-22 22:57:36 -05:00 |
|
Timothee "TTimo" Besset
|
02e6ff2dcb
|
Merge pull request #6 from bnoordhuis/cleanup
cleanup + q3map2 crash fix
|
2012-03-18 06:52:13 -07:00 |
|