Commit graph

779 commits

Author SHA1 Message Date
Mateos81
f441e81620 Merge remote-tracking branch 'refs/remotes/TTimo/master' into DisplaySizeInfo 2015-10-31 12:39:58 +01:00
Pan7
c95be76a74 Merge pull request #327 from ensiform/misc_model_breakable
Adds misc_model_breakable entity rendering support for Jedi Academy.
2015-10-09 18:20:53 +02:00
Ensiform
cb7276babf Adds misc_model_breakable entity rendering support for Jedi Academy. 2015-10-09 10:59:01 -05:00
Pan7
a9d397f988 Merge pull request #324 from Mateos81/DisplaySizeInfo
Forgot XZ and YZ views, sorry again
2015-10-09 02:35:45 +02:00
Mateos81
242a5aa962 Forgot XZ and YZ views, sorry again 2015-10-06 18:22:26 +02:00
Timothee "TTimo" Besset
11272e6462 Merge pull request #320 from Pan7/errnoh
Missing errno.h header
2015-10-04 12:02:35 -05:00
Pan7
509a9632a2 Missing errno.h header 2015-10-04 12:12:03 +02:00
Timothee "TTimo" Besset
47ee49411b Merge pull request #318 from Pan7/entdef
Fix (entity class) def file parsing
2015-10-03 12:31:15 -05:00
Pan7
b0ca831d84 Fix (entity class) def file parsing 2015-10-03 19:26:12 +02:00
Timothee "TTimo" Besset
6c81fef524 Merge pull request #317 from Mateos81/DisplaySizeInfo
DisplaySizeInfo: Lower x print + Add a space after the ':' char + Tabs instead of spaces.
2015-10-03 11:58:55 -05:00
Timothee "TTimo" Besset
93fa0eed10 Merge pull request #315 from Pan7/usemtl
usemtl for obj models
2015-10-03 11:50:44 -05:00
Timothee "TTimo" Besset
6ab189f0b1 Merge pull request #313 from ensiform/misc_model_static_fix
Jedi Academy misc_model_static support for radiant.
2015-10-03 11:50:10 -05:00
Timothee "TTimo" Besset
9154ce75a7 Merge pull request #306 from Pan7/min3dmspeed
Min speed for 3d mouse velocity
2015-10-03 11:47:11 -05:00
Mateos81
cb00cebbb4 DisplaySizeInfo 2015-10-03 00:01:48 +02:00
Timothee "TTimo" Besset
d2c0ce4370 Merge pull request #314 from ensiform/cpp11_string_concat_fixes
C++11 and newer reserves X"foo" and "bar"Y for string literal syntax.
2015-10-01 11:18:59 -05:00
Pan7
e09ed3bffd usemtl for obj models 2015-10-01 17:56:00 +02:00
Ensiform
cbab8835f9 C++11 and newer reserves X"foo" and "bar"Y for string literal syntax.
This patch fixes the instances that were found by MSVC 2015 compiling so far.
2015-09-29 18:35:44 -05:00
Ensiform
401dc19c39 Jedi Academy misc_model_static support for radiant.
This patch adds misc_model_static model rendering for radiant and tidies up the string check code for model classnames in a couple of places.
2015-09-29 16:55:01 -05:00
Pan7
3496e421c6 Min speed for 3d mouse velocity 2015-09-28 15:22:37 +02:00
Timothee "TTimo" Besset
97ee2b51bd Merge pull request #301 from Pan7/openfiles
Increase the max open files to its maximum for msvc
2015-09-27 10:38:35 -05:00
Pan7
ac95505d93 Increase the max open files to its maximum for msvc 2015-09-26 22:47:39 +02:00
Timothee "TTimo" Besset
b255bc6e41 Merge pull request #300 from Pan7/faceselect
Switching the key bindings for single face select (ctrl+shift+LMB) wi…
2015-09-26 12:18:45 -05:00
Pan7
296ab55ef7 Switching the key bindings for single face select (ctrl+shift+LMB) with multi face select (ctrl+shift+alt+LMB) 2015-09-26 12:02:09 +02:00
Timothee "TTimo" Besset
0b0919245d Merge pull request #297 from Pan7/menu
Patch Inspector menu item
2015-09-13 16:49:10 -05:00
Timothee "TTimo" Besset
a3f21a8c41 Merge pull request #298 from Pan7/errmsg
Error description for file accesses that fail
2015-08-09 15:53:05 +02:00
Pan7
124b4c035b Error description for file accesses that fail 2015-08-09 15:40:41 +02:00
Pan7
3ac658ce04 Patch Inspector menu item 2015-08-06 23:01:08 +02:00
Timothee "TTimo" Besset
424958f54b Merge pull request #292 from xycaleth/fix-undo-crash
Fix crash when undoing a delete of a misc_model
2015-07-23 16:29:19 -05:00
Timothee "TTimo" Besset
f7cd40df07 Merge pull request #293 from pelya/master
GL Display lists were used regardless of display list settings in poi…
2015-07-23 16:24:56 -05:00
pelya
ece18581d1 GL Display lists were used regardless of display list settings in points.cpp, this crashes with some Intel videodrivers 2015-07-23 22:03:52 +03:00
Alex Lo
fcefc8b9de Fix crash when deleting a misc_model
The following sequence of events and conditions will cause a segfault to
occur:

1. Delete a misc_model
2. Undo the delete
3. Delete the same model again
4. Undo the delete

A segfault will occur in CEntityMiscModel::Draw when m_model is
dereferenced as it has been deleted and cleared.

When cloning the misc_model entity, a new CEntityMiscModel is created and
the name is set. However, CEntityMiscModel::BuildCacheRequestString relies
on all epairs to be present before being able to generate the *correct*
request string for the misc_model. Not doing so will cause incorrect
behaviour - in this case, the reference count for the CEntityMiscModel is
decremented one too many times and causes the object to be deleted. The
misc_model object is then used later on after it has been freed.

This commit fixes the problem by copying all epairs, before firing the
OnKeyValueChanged events. This way, all epairs will be available when
BuildCacheRequestString is called.
2015-07-21 00:08:31 +01:00
Timothee "TTimo" Besset
d9d76af697 Merge pull request #290 from ericwa/quake1
Quake 1 Support
2015-05-29 08:03:53 -05:00
Eric Wasylishen
01f7a979ae vfswad: lowercase the wad name at load time, because queries from map/parse.cpp come in as lowercase 2015-05-26 21:23:29 -06:00
Eric Wasylishen
12bc0b1633 Add basic quake1 support to preferences.{h,cpp} 2015-05-26 21:23:29 -06:00
Timothee "TTimo" Besset
0f75c22b0d Merge pull request #287 from jdolan/master
Use g_get_user_special_dir rather than hard-coded "My Documents"
2015-03-18 11:59:15 -05:00
Jay Dolan
e750bb0972 Merge remote-tracking branch 'upstream/master' 2015-03-18 11:01:59 -04:00
Jay Dolan
c626a12e7a Use glib's g_get_user_special_dir to resolve 'Documents'. This works on XP (My Documents) and Vista+ (Documents). 2015-03-18 11:00:57 -04:00
Timothee "TTimo" Besset
7d4b7ad362 Merge pull request #286 from jdolan/master
Fix "My Games" folder on Wintoons.
2015-03-08 10:40:54 -05:00
Jay Dolan
3446bf9b27 Merge branch 'master' of https://github.com/TTimo/GtkRadiant 2015-03-08 11:32:56 -04:00
Jay Dolan
7cd4aa4fe0 Use \My Documents\My Games\ on Windows. This aligns us with NetRadiant and the actual location of this folder on Windows systems. It was an error to use /Users/jdolan\My Games. That's not a thing. 2015-03-08 11:31:53 -04:00
Timothee "TTimo" Besset
b648ceddbc Merge pull request #263 from neumond/defflag
entity.def: parser fix
2015-03-08 10:24:17 -05:00
Timothee "TTimo" Besset
f555e3d13e Merge pull request #261 from neumond/imzoom
Improved mousewheel zoom-in
2015-03-08 10:23:43 -05:00
Timothee "TTimo" Besset
3f58715a04 Merge pull request #241 from xycaleth/master
Fixed a number of out of bounds accesses.
2015-03-08 10:22:26 -05:00
Timothee "TTimo" Besset
3d3418e77f Merge pull request #280 from bigjilm/master
Option to color detail brushes in 2d views
2015-03-08 10:20:54 -05:00
Timothee "TTimo" Besset
c285bb6119 Merge pull request #284 from jdolan/master
Skip Quake4 per-pixel lighting assets in texture window
2015-03-08 10:19:31 -05:00
Jay Dolan
6a5412d95c Updates for Quake2World -> Quetoo project renaming. 2015-03-08 09:55:36 -04:00
Jay Dolan
bca10b6337 Eclipse project file updates. 2015-02-10 10:08:15 -05:00
Jay Dolan
636b1010b3 Suppress a warning. 2015-02-10 10:08:05 -05:00
Jay Dolan
2beef62683 Skip glow, heightmap, normalmap and specularmap files for Q4 texture sets. 2015-02-10 10:07:31 -05:00
Josh Steffen
805ceb9df6 brace alignment 2015-01-16 17:10:09 -05:00