 asarium
|
e08ba026f8
|
Merge branch 'master' into antipodes_/sync
Conflicts:
.travis.yml
code/cmdline/cmdline.cpp
code/fs2netd/fs2netd_client.cpp
code/fs2netd/tcp_client.cpp
code/globalincs/pstypes.h
code/graphics/2d.cpp
code/graphics/2d.h
code/parse/lua.cpp
code/parse/scripting.cpp
code/windows_stub/stubs.cpp
configure.ac
projects/MSVC_2012/Freespace2.vcxproj
projects/MSVC_2012/code.vcxproj
projects/MSVC_2013/code.vcxproj
projects/MSVC_2015/code.vcxproj
|
2015-08-24 12:10:16 +02:00 |
|
|
Echelon9
|
c5493bb480
|
Scripted sort and uniq on (internal) project includes. Improves search time and as a by product removed a number of duplicative includes.
|
2015-06-22 20:24:30 +10:00 |
|
|
The_E
|
88dce29920
|
Trunk sync r10550
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10551 387891d4-d844-0410-90c0-e4c51a9137d3
|
2014-09-11 19:22:12 +10:00 |
|
|
The_E
|
6e91857745
|
From Yarn: Fixes interface graphics scaling issues. If, for some reason, you want to have the interface graphics stretched, use the -stretch_menu commandline flag.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10544 387891d4-d844-0410-90c0-e4c51a9137d3
|
2014-03-30 12:39:54 +10:00 |
|
|
m_m
|
088f0c2c4f
|
Fix a few mouse related issues. This adds the CursorManager class which handles loading cursors and showing/hiding the cursor.
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10487 387891d4-d844-0410-90c0-e4c51a9137d3
|
2014-03-10 20:52:22 +10:00 |
|
|
Echelon9
|
a248a37d58
|
PVS-Studio: Fix V805. Decreased performance. It is inefficient to identify an empty string by using 'strlen(str) > 0' construct
|
2011-08-24 13:37:01 +00:00 |
|
|
Echelon9
|
67eb406443
|
PVS-Studio: Fix V805. Decreased performance. It is inefficient to identify an empty string by using 'strlen(str) > 0' construct
|
2011-08-14 13:14:35 +00:00 |
|
|
portej05
|
719825f80d
|
The big CVS comment removal. This chops approx. 3.5mb off a full checkout.
I've tested this through compiling and through hand checking.
Normalises line endings in ALL files to \n.
|
2009-06-20 08:08:20 +00:00 |
|
|
taylor
|
f09c7e2d03
|
fix things that strict compiling balked at (from compiling with -ansi and -pedantic)
|
2006-09-08 06:14:44 +00:00 |
|
|
taylor
|
3f6e13d20b
|
use vm_malloc(), vm_free(), vm_realloc(), vm_strdup() rather than system named macros
fixes various problems and is past time to make the switch
|
2005-05-12 17:49:18 +00:00 |
|
|
taylor
|
0bf7ee01dc
|
merge with Linux/OSX tree - p0131-2
|
2005-01-31 23:27:55 +00:00 |
|
|
Goober5000
|
401967dd9d
|
ubercommit - basically spelling and language fixes with some additional
warnings disabled
--Goober5000
|
2003-11-11 02:15:47 +00:00 |
|
|
penguin
|
0c503be8d1
|
The big include file move
|
2002-08-01 01:41:11 +00:00 |
|
|
penguin
|
8f92eebd34
|
Warpcore CVS sync
|
2002-06-03 04:10:40 +00:00 |
|
|
penguin
|
663b3471b9
|
Volition sources -- warpcore CVS import
|
2002-06-03 03:26:03 +00:00 |
|