git.rm.cloudns.org Git - xonotic/netradiant.git/log

]> git.rm.cloudns.org Git - xonotic/netradiant.git/log

projects / xonotic / netradiant.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Thomas Debesse [Tue, 23 Feb 2021 01:01:27 +0000 (02:01 +0100)]

Merge commit 'dfce2da577f1e56886ad26e58e37d9eda2d7c8a3' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 22 Feb 2021 23:49:09 +0000 (00:49 +0100)]

Merge commit '461d008daa6328113ea4ccda37e5604d3df14ba3' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 22 Feb 2021 23:24:05 +0000 (00:24 +0100)]

Merge commit '2ab47003e0b34d7ca43d4ac5b9ae18d3413a4f4c' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 22 Feb 2021 23:19:21 +0000 (00:19 +0100)]

Merge commit '0261afc6df181092b7d57751fec84e21d3ac593c' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 22 Feb 2021 23:11:37 +0000 (00:11 +0100)]

radiant/camwindow: use WASD keys like Garux' variant

commit | commitdiff | tree

Thomas Debesse [Mon, 22 Feb 2021 23:03:47 +0000 (00:03 +0100)]

q3map2: add a comment for future readers

commit | commitdiff | tree

Thomas Debesse [Mon, 22 Feb 2021 23:01:16 +0000 (00:01 +0100)]

Merge commit 'dd7f4f1689e8ede7580bdfa8e08d0b78d08f5253' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 22 Feb 2021 22:34:28 +0000 (23:34 +0100)]

Merge commit '87d5b6efe557ee73b613c030cca2374dd23bc1be' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 22 Feb 2021 22:00:22 +0000 (23:00 +0100)]

q3map2: remove a duplicate probably introduced by some merge conflict

commit | commitdiff | tree

Thomas Debesse [Mon, 22 Feb 2021 21:58:55 +0000 (22:58 +0100)]

q3map2: slowallocate is the default behaviour

commit | commitdiff | tree

Thomas Debesse [Mon, 22 Feb 2021 21:56:53 +0000 (22:56 +0100)]

Merge commit '93ca259313e7902e89974877f4110fc818e9208b' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Tue, 26 May 2020 15:37:18 +0000 (17:37 +0200)]

Merge commit 'ed4c8c204443726e852a4c8927b3f8d2571cc522' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Tue, 26 May 2020 15:26:39 +0000 (17:26 +0200)]

Merge commit '804c20949d43175179489ecbb1305752cfa17217' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Tue, 26 May 2020 14:46:18 +0000 (16:46 +0200)]

Merge commit '89c4e25e26ba634d5911fd596597387876f2e636' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Tue, 26 May 2020 14:36:35 +0000 (16:36 +0200)]

Merge commit '2455e50d724c988a300fe30b8bc66f01bb05dd42' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Tue, 26 May 2020 14:36:16 +0000 (16:36 +0200)]

Merge commit 'd079351041fe957ab2cf6b36dab38e5546003dc3' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Tue, 26 May 2020 14:31:18 +0000 (16:31 +0200)]

Merge commit '0709fce07d9c630ca0455ebeb58e3806427ca8ce' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Tue, 26 May 2020 14:30:12 +0000 (16:30 +0200)]

revert about dialog image change

commit | commitdiff | tree

Thomas Debesse [Tue, 26 May 2020 14:28:07 +0000 (16:28 +0200)]

revert icon change

commit | commitdiff | tree

Thomas Debesse [Tue, 26 May 2020 14:17:01 +0000 (16:17 +0200)]

Merge commit 'f79ac495d0735b0002068bd1284bf7918b6f6598' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Tue, 26 May 2020 14:00:22 +0000 (16:00 +0200)]

Merge commit '3a78d902017a780e65f21f12c709aa746dfcab84' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Tue, 26 May 2020 13:46:36 +0000 (15:46 +0200)]

Merge commit 'c845c5cd8f427d39665d6a8b1f6eeff401370d80' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 23:55:24 +0000 (01:55 +0200)]

fix merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 23:50:50 +0000 (01:50 +0200)]

Merge commit '322b0c2ee485a5d787c60bfd34e5ed5567d98ec8' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 23:43:55 +0000 (01:43 +0200)]

Merge commit 'de5fcea3362fe1e6cb68ccfab792469a993da215' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 23:37:54 +0000 (01:37 +0200)]

fix merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 23:37:08 +0000 (01:37 +0200)]

Merge commit '5a8c27d93c0c57243722ade7aa3ca1f696de46f2' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 20:32:22 +0000 (22:32 +0200)]

Merge commit 'cac514541c3ae6f72c4c00c19c215ff62a023df4' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 19:33:45 +0000 (21:33 +0200)]

Merge commit 'e7c45da823515747a88569374d62717b72dcf078' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 19:22:53 +0000 (21:22 +0200)]

Merge commit 'bf6dd1f2d186c799adf11f1e744a1ff57aa8d335' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 19:21:11 +0000 (21:21 +0200)]

Merge commit '0d5ebb17b29d4263ec4f1634af24a27620ab47a4' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 18:29:09 +0000 (20:29 +0200)]

Merge commit 'fa294e421503ea26846c4f4c3420f5e47a837510' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 18:21:45 +0000 (20:21 +0200)]

Merge commit 'e8686a54bfc307bb810c8a724f914bfff28d7351' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 18:21:20 +0000 (20:21 +0200)]

Merge commit 'fab6205991b78b158852d0d5a86e4b73ae0c1d55' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 18:20:45 +0000 (20:20 +0200)]

Merge commit '09b97bb415e380e5eaf6e2f4acbdc7f740494b41' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 18:20:41 +0000 (20:20 +0200)]

Merge commit '4616fea08c641887b841bffa3a974dae63b4c7e7' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 18:19:34 +0000 (20:19 +0200)]

Merge commit '91f09823808ae1ca581592307847b5021c0397ec' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 18:19:15 +0000 (20:19 +0200)]

Merge commit 'f93b3f61846b91a5679daca40a5f23e355ac787b' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 18:19:04 +0000 (20:19 +0200)]

Merge commit '173f350be76237a7dee9c00c389dff4e56b3da4c' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 18:12:36 +0000 (20:12 +0200)]

Merge commit '3ec33465b13ce35100e1557b499ffc335cd6e22c' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 18:12:20 +0000 (20:12 +0200)]

Merge commit 'a62c7302d3930875aafdc56696f370dbdc5ed40e' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 18:01:54 +0000 (20:01 +0200)]

Merge commit 'dce6730b39a2e6484015e483c46edbe93054f6a0' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 17:45:57 +0000 (19:45 +0200)]

csg: add a FIXME to tell the code may be cleaner

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 17:43:59 +0000 (19:43 +0200)]

fix merge of 9d6e27e4e37e7406e8691594fb0b74aab89e954b, pointer stuff

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 17:29:42 +0000 (19:29 +0200)]

Merge commit '7ca59bef0ae15880f51b2f68104b933e918d543c' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 15:43:13 +0000 (17:43 +0200)]

fix merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 14:44:53 +0000 (16:44 +0200)]

Merge commit '6592d65469e5386216a692ba3b5d6e7cc590c617' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 14:35:34 +0000 (16:35 +0200)]

Merge commit '9d6e27e4e37e7406e8691594fb0b74aab89e954b' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 12:53:10 +0000 (14:53 +0200)]

global.xlink: remove Blendmode cheatsheet link

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 12:51:04 +0000 (14:51 +0200)]

import Blendmodes_cheatsheet.jpg

who is author? what is license?

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 12:44:55 +0000 (14:44 +0200)]

Makefile: disable meshtex plugin compilation (does not build)

Not configured in CMakeList.txt yet

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 11:50:24 +0000 (13:50 +0200)]

uncomment accelerator connect commands

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 11:49:02 +0000 (13:49 +0200)]

Merge commit 'b017c473e86330d5908858b8add1b16674b0a1a8' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 11:27:17 +0000 (13:27 +0200)]

Merge commit '4645e19ce9e8f8034233ac965a4103a13b75714c' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 25 May 2020 11:26:36 +0000 (13:26 +0200)]

Merge commit 'f6b9708d076f575f8ecc2baec9d5057824dbfcae' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Sun, 24 Feb 2019 03:45:18 +0000 (04:45 +0100)]

disable gtktheme compilation

commit | commitdiff | tree

Thomas Debesse [Sun, 24 Feb 2019 02:54:35 +0000 (03:54 +0100)]

Merge commit '86023af46cb7b0057fd3c9dae743660b2968e255' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Sun, 24 Feb 2019 01:41:32 +0000 (02:41 +0100)]

properpanes dimensions

fix a minor merge mistake

commit | commitdiff | tree

Thomas Debesse [Sun, 24 Feb 2019 00:18:51 +0000 (01:18 +0100)]

add texbro_tags icon

commit | commitdiff | tree

Thomas Debesse [Sat, 23 Feb 2019 21:43:22 +0000 (22:43 +0100)]

Garux: disable gtk workaround

commit | commitdiff | tree

Thomas Debesse [Sat, 23 Feb 2019 21:40:57 +0000 (22:40 +0100)]

Merge commit '2de8ee725b2a6e54e21d5e217ae453ee115b913a' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Tue, 12 Feb 2019 03:13:56 +0000 (04:13 +0100)]

Garux: qnan workaround like in latest master

commit | commitdiff | tree

Thomas Debesse [Tue, 12 Feb 2019 02:56:56 +0000 (03:56 +0100)]

Garux: sync png files except selection_makeroom

commit | commitdiff | tree

Thomas Debesse [Tue, 12 Feb 2019 02:19:18 +0000 (03:19 +0100)]

Merge commit 'dfc3e9c2a59fec2feaf5c808f316eed17ea227e2' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Tue, 12 Feb 2019 01:56:08 +0000 (02:56 +0100)]

Merge commit '6f51c7f28dc9f56ae64e7da7d42dcbaa068da65a' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Tue, 12 Feb 2019 00:47:38 +0000 (01:47 +0100)]

Garux: renamed disable defines

commit | commitdiff | tree

Thomas Debesse [Tue, 12 Feb 2019 00:44:28 +0000 (01:44 +0100)]

Garux: disable 2button press because of mistake

commit | commitdiff | tree

Thomas Debesse [Tue, 12 Feb 2019 00:43:30 +0000 (01:43 +0100)]

Merge commit '23d2497f12fe91a5eb0e14b71095cbb1c2ec80cb' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 23:24:25 +0000 (00:24 +0100)]

Garux: more ui:: modernization

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 23:01:38 +0000 (00:01 +0100)]

Garux: disable stringio qnan fallback because of mistake

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 22:57:57 +0000 (23:57 +0100)]

Merge commit 'a59855266c41b68a8bfd063713c941eff7449181' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 14:44:28 +0000 (15:44 +0100)]

Merge commit 'f8b2b1f25e7e195c0c11e3d2e2ddf308562de77f' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 14:17:16 +0000 (15:17 +0100)]

Merge commit 'fe73dd74d0e40a33c090993390e4d5721a1f9e05' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 14:07:36 +0000 (15:07 +0100)]

Garux: delete selection_makeroom.bmp, png already there

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 14:06:35 +0000 (15:06 +0100)]

Merge commit '0fb65a91c7530dc2215dddd13e7accf059c6f453' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 10:14:10 +0000 (11:14 +0100)]

Garux: fix a minor bug introduced while merging a78b39f38a98bef33e988ff35d37d15c7e2819a8

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 09:14:40 +0000 (10:14 +0100)]

Merge commit '7d7436ec3dd43cbdb04ad41f0a2c92a905f26807' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 09:06:26 +0000 (10:06 +0100)]

Merge commit '2b85b7c20c20df677e30541c93b80725dc2277c9' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 09:00:31 +0000 (10:00 +0100)]

Merge commit '66d12fc2373b05233aa29ee097efe820f05a8520' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 08:46:59 +0000 (09:46 +0100)]

Garux: replace undefined strnicmp with Q_strncasecmp

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 08:44:15 +0000 (09:44 +0100)]

Garux: replace undefined stricmp with Q_stricmp

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 08:41:27 +0000 (09:41 +0100)]

Garux: disable vfsPackFile because of bad miniz

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 08:12:50 +0000 (09:12 +0100)]

Merge commit 'eef39952025db1375e33b6e314692ac76badb93c' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 07:57:29 +0000 (08:57 +0100)]

Merge commit 'af4e2d29cfd3a54b44eb09e4289f3fa3f29412c9' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 07:30:05 +0000 (08:30 +0100)]

Garux: revert disable existing build process alert

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 07:27:47 +0000 (08:27 +0100)]

Garux: revert custom binds

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 07:24:18 +0000 (08:24 +0100)]

Garux: revert global.xlink

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 07:23:51 +0000 (08:23 +0100)]

Merge commit '6e687efe8899278a955efd1e3ba4de5300f7949a' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 06:38:42 +0000 (07:38 +0100)]

Merge commit 'a255fbd84e64e4f8bb6e6786b6f65579071742b6' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 06:38:06 +0000 (07:38 +0100)]

Merge commit 'f73cc19a6166fc04269f953c980175779f81b9b0' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 06:36:53 +0000 (07:36 +0100)]

Merge commit 'bf803dd851539f0d5f806f12a1e2ab93fdddae08' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 06:10:09 +0000 (07:10 +0100)]

Merge commit '7ca7a54fe6db387a22ea979e62ecbbb30f6d6d30' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 05:38:18 +0000 (06:38 +0100)]

Garux: remove unsupported gtk stuff

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 05:19:08 +0000 (06:19 +0100)]

Garux: revert custom binds

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 05:17:36 +0000 (06:17 +0100)]

Garux: rename TODO

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 05:17:07 +0000 (06:17 +0100)]

Merge commit '9fed37bae007bd5e53963ec67e925381609a2980' into garux-merge

commit | commitdiff | tree

Thomas Debesse [Mon, 11 Feb 2019 01:31:14 +0000 (02:31 +0100)]

Revert partially (manual) "reformat code! now the code is only ugly on the *inside*"

This reverts commit 9dfae1c9b270ee369c6362903a9205b30751b95f.
But only for files whose changes that were manually reverted.

commit | commitdiff | tree

Thomas Debesse [Sun, 10 Feb 2019 19:43:55 +0000 (20:43 +0100)]

Revert partially (auto) "reformat code! now the code is only ugly on the *inside*"

This reverts commit 9dfae1c9b270ee369c6362903a9205b30751b95f.
But only for files whose changes that were automatically reverted.

commit | commitdiff | tree

Rudolf Polzer [Tue, 8 Jan 2019 22:31:59 +0000 (14:31 -0800)]

Remove a mention of -mcpu.

commit | commitdiff | tree

Thomas Debesse [Wed, 28 Nov 2018 22:39:12 +0000 (22:39 +0000)]

Merge branch 'werror' into 'master'

Add -werror option to q3map2 to make all warnings into errors

See merge request xonotic/netradiant!114