fortressforever/fortressforever-2013
0
0
Fork 0
mirror of https://github.com/fortressforever/fortressforever-2013.git synced 2024-11-26 14:20:48 +00:00
Code Issues Projects Releases Packages Wiki Activity
135 commits 3 branches 0 tags 247 MiB
Commit graph

135 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dexter Haslem
40b86daaa7 made lua scriptman (stub) shared 2013-09-14 23:49:42 -06:00
Dexter Haslem
41130702a1 updated VPC structure 
I was wrong about having 'to include the entire contents' of HL2MP VPCs.
Made it easy to remove HL2DM sdk files as we go without touching stock VPCs,
through usage of '-$File' wizardry. it needs folder structure to match for some
wacky fun reason though.
 2013-09-14 23:40:57 -06:00
Dexter Haslem
4278ad10cc fix client build expecting luaman 2013-09-14 23:01:31 -06:00
Dexter Haslem
65ddb386de Merge branch 'luabind' into develop 
oops shoulda done this before previous work, no prob
nuked the test luaman, hope no problem there

added scriptman serverside like 2.46 for now, will move
to shared once i get this working

Conflicts:
	mp/src/game/server/server_ff.vpc
 2013-09-14 22:58:02 -06:00
Dexter Haslem
e287b1516a hello FF world 
- had to move HL2DM VPC stuff INTO ff server vpc so we can start (re)moving
nonspecific code as it is implemented
 2013-09-14 22:44:17 -06:00
Dexter Haslem
858bd9d3f5 remove SP code from this branch 2013-09-14 21:56:28 -06:00
Dexter Haslem
e78532ce30 Revert "Merge branch 'develop' of https://github.com/fortressforever/ff-code-2013 into develop" 
This reverts commit 2be1bb3fc4, reversing
changes made to 313234c212.
 2013-09-06 21:15:22 -06:00
Dexter Haslem
2be1bb3fc4 Merge branch 'develop' of https://github.com/fortressforever/ff-code-2013 into develop 2013-09-06 21:00:40 -06:00
Dexter Haslem
313234c212 Merge branch 'macosxchanges' into develop 2013-09-06 20:58:32 -06:00
AdamWillden
a67aebc2dd README.md update: 
- TODO node object composition rules
- Further clarification on variable naming convention scope
- VPC modification commit comment rule
 2013-09-06 13:51:39 +01:00
Joe Ludwig
80cf6f02c3 Added missing libs for linux and OSX in their new location. 2013-09-05 18:17:03 -07:00
Joe Ludwig
3c48b3704a Merge pull request #177 from psychonic/xcode_perm_fix 
Add missing executable flag to xcode_ccache_wrapper.
 2013-09-05 18:03:42 -07:00
Nicholas Hastings
cb55ade0b7 Add missing executable flag to xcode_ccache_wrapper. 2013-09-05 08:41:38 -04:00
Dexter Haslem
9438a3a75c fix static linking for lua + luabind 
note: 'build as C++' does NOT work for lua static lib
the name mangling fucks it even with the .hpp, didnt look into
 2013-09-05 00:56:25 -06:00
Dexter Haslem
2321414b29 bat for spitting out lua projects 2013-09-04 21:55:07 -06:00
Dexter Haslem
afd5643d07 remove unused $SRCDIR. removing $BASE fucks things up 2013-09-04 21:52:08 -06:00
Dexter Haslem
461473f467 build luabind dll w/ VPC 2013-09-04 21:50:47 -06:00
Dexter Haslem
52a425ec81 build lua with VPC 
dynamically linked, can flip a switch to use static
 2013-09-04 21:14:48 -06:00
Dexter Haslem
856979e24b Merge branch 'develop' into luabind 2013-09-04 20:03:45 -06:00
Dexter Haslem
99ef655f72 added ff specific shader building bat per wiki 
note the dumb absolute path you will need to change to steam directory
on your machine! woohoo
 2013-09-04 19:35:55 -06:00
Dexter Haslem
a55a85df87 use FF Specific VPC group file 
might make use of this later to build external libs
+ add some notes so i dont forget how this works
 2013-09-04 19:20:12 -06:00
Dexter Haslem
ec2dcd13f8 add ff specific shader VPC 2013-09-04 18:47:56 -06:00
Dexter Haslem
0113d9870c VPC tweaks (oops forgot to commit these) 
reverted projects.vgc back to valve defaults
modified default.vgc w/ 'FF' game string, and looks for FF project file
regenerate your projects
 2013-09-04 18:42:28 -06:00
Dexter Haslem
348e2f83ed add vpc bats for generating FF specific projects 
use these, not the default ones! I made it kick out game_ff /
everything_ff solutions. using a different game-string (in default.vgc)
correctly names solutions client_<gamestr>.vcxproj, etc. you pass
gamestring to vpc so it knows which one to use
 2013-09-04 18:38:02 -06:00
Dexter Haslem
05c5591a1c fix VPC project scripts 
1: restore valve default project.vgc
2: point default.vgc to our specific projects_ff.vgc and use ff game
string
3: add projects_ff.vgc pointing at our ff game/client vpcs that exist
already
 2013-09-04 18:34:55 -06:00
squeek
a87980dd7d Fixed a .md syntax error 2013-09-04 12:16:27 -07:00
Ryan Liptak
e16bdd07e1 Added some file/dir guidelines 2013-09-04 11:37:00 -07:00
Ryan Liptak
11845f8e16 Added a link and fixed some wording 2013-09-04 01:12:18 -07:00
Ryan Liptak
9fac637d0f Update README.md 2013-09-04 01:00:23 -07:00
Ryan Liptak
d8aa4b6ec9 Updated README.md with some Git guidelines 2013-09-04 00:58:10 -07:00
squeek
91b3771d27 Now that building raytrace.lib has been added to the game project, remove it from the repo (since it will more than likely show as modified and we don't want to ever commit it I don't think) 2013-09-04 00:08:00 -07:00
squeek
00db1dda01 Merge branch 'master' into develop 
Conflicts:
	mp/src/lib/public/mathlib.lib
	mp/src/lib/public/tier1.lib
	mp/src/lib/public/vgui_controls.lib
 2013-09-04 00:00:58 -07:00
squeek
9b85904aca * Added initial DOCUMENTATION.md 
* Updated README.md with FF-specific information (renamed from just README)
 2013-09-03 23:03:31 -07:00
Dexter Haslem
55132d8ff5 Merge branch 'master' of https://github.com/ValveSoftware/source-sdk-2013 2013-09-03 21:54:56 -06:00
Joe Ludwig
cfcc016a59 Merge branch 'master' of https://github.com/ValveSoftware/source-sdk-2013 2013-09-03 16:03:22 -07:00
Joe Ludwig
1524321396 * Fixed Source Mod back-compatability by reordering methods in a couple interfaces. 
* Added missing singleplayer OSX libs
* Updated vpc and libs.
 2013-09-03 16:02:10 -07:00
Jørgen P. Tjernø
10e2714784 Merge commit '82fe37f' 2013-09-03 14:23:08 -07:00
Joe Ludwig
a0c29e7dd6 General: 
* Fixed a variety of server browser issues with mods based on this SDK
* Fixed many warnings on various platforms
* Added source code for fgdlib and raytrace
* Updated many source files with the latest shared source from TF2.

OSX:
* Added support for Xcode 4.6
* Switched OSX builds to use Xcode instead of makefiles
* Moved libs from src/lib/osx32 to src/lib/public/osx32 or src/lib/common/osx32 to match windows better.

Linux:
* Moved libs from src/lib/linux32 to src/lib/public/linux32 or src/lib/common/linux32 to match windows better.
 2013-09-02 11:39:10 -07:00
squeek
4945706859 - Added Lua, Luabind, and Boost (Boost is required by Luabind) 
- Added simple Lua integration (use console commands lua_dostring_sv and lua_dostring_cl) and redirected Lua's print function to output to the console
- Added untested Linux and OSX binaries I found various places online
Linux and OSX Lua libraries come from: http://sourceforge.net/projects/luabinaries/files/5.1.4/
Linux Luabind libraries come from: https://launchpad.net/ubuntu/+source/luabind/0.9.1+dfsg-5
 2013-09-01 02:16:23 -07:00
squeek
79efcf837b Seriously, delete these lib files from the repo 2013-09-01 01:03:52 -07:00
squeek502
27c0eca26f Removed the .lib files that are built with the game dlls 2013-08-31 22:11:15 -07:00
squeek502
4f3b8dfe8f Added mod-specific vpc files. 
Add any new source files to client_ff.vpc and/or server_ff.vpc. To
remove hl2mp files, put a - infront of the $File line inside the
_ff.vpc's. Don't think there's any reason to mess with the _hl2mp.vpc
files anymore.
 2013-08-31 21:46:11 -07:00
squeek502
92a3d1bcfc Better .gitignore take 2 2013-08-31 21:39:55 -07:00
squeek502
d4ab306d85 Better .gitignore 2013-08-31 21:36:10 -07:00
squeek502
35d22f9f63 Revert "Testing rolling back Merge pull request #1" 
This reverts commit 20c4cf024f.
 2013-08-31 16:49:46 -07:00
squeek502
4b18d2c1db Merge branch 'develop' of https://github.com/fortressforever/ff-code-2013 into develop 2013-08-31 16:48:10 -07:00
squeek502
20c4cf024f Testing rolling back Merge pull request #1 2013-08-31 16:47:21 -07:00
fortressforever
9306d79180 Merge pull request #1 from DexterHaslem/my-cool-stuff 
My cool stuff
 2013-08-31 15:45:46 -07:00
Dexter Haslem
6fbde94c45 updated my really cool thing 2013-08-31 16:41:45 -06:00
Dexter Haslem
7c99311e3d heres a cool file of things 2013-08-31 16:41:26 -06:00