fortressforever/fortressforever-2013
0
0
Fork 0
mirror of https://github.com/fortressforever/fortressforever-2013.git synced 2025-02-17 17:41:28 +00:00
Code Issues Projects Releases Packages Wiki Activity
187 commits 3 branches 0 tags 247 MiB
Commit graph

187 commits

This branch
This branch
All branches
Author SHA1 Message Date
squeek
b651058b73 Merged SDK changes from the Valve Github repo up until commit: "Updated the SDK with the latest code from the TF and HL2 branches" (beaae8ac45a2f322a792404092d4482065bef7ef) 
Log comments from the Valve commits:

* Make .xcconfigs text files too.

* Fix IceKey.H to be a text file too.

* Adds support for Visual Studio 2012 and 2013
* VR Mode:
. Switches from headtrack.dll to sourcevr.dll
. Improved readability of the UI in VR
. Removed the IPD calibration tool. TF2 will now obey the Oculus
configuration file. Use the Oculus calibration tool in your SDK or
install and run "OpenVR" under Tools in Steam to calibrate your IPD.
. Added dropdown to enable VR mode in the Video options. Removed the -vr
command line option.
. Added the ability to switch in and out of VR mode without quitting the
game
. By default VR mode will run full screen. To switch back to a
borderless window set the vr_force_windowed convar.
. Added support for VR mode on Linux
* Many assorted bug fixes and other changes from Team Fortress in
various shared files

Conflicts:
	mp/src/lib/public/osx32/bitmap.a
	mp/src/lib/public/osx32/choreoobjects.a
	mp/src/lib/public/osx32/dmxloader.a
	mp/src/lib/public/osx32/matsys_controls.a
	mp/src/lib/public/osx32/particles.a
	mp/src/lib/public/osx32/shaderlib.a
	mp/src/lib/public/osx32/tier2.a
	mp/src/lib/public/osx32/tier3.a
	mp/src/lib/public/osx32/vtf.a
 2014-10-13 00:09:14 -07:00
squeek
e03eb9fb6c Merged SDK changes from the Valve Github repo up until commit: "Fix line endings. WHAMMY." (f56bb35301836e56582a575a75864392a0177875) 
* Committing this as its own commit because its so incredibly huge
 * All this really does is change all line endings from CRLF (DOS) to LF (Unix)
 2014-10-13 00:08:24 -07:00
squeek
09be698c71 Fixed trimping not working with cl_jumpqueue 0 when holding jump continuously (from initial jump to touching the ramp) 2014-10-13 00:08:16 -07:00
squeek
53ce519f9c Added support for loading a Lua script file into a luabind object (CFF_SH_ScriptManager::LoadFileIntoObject) 
- Made the UI script environment load ui/settings/layout.lua into the global table LAYOUT (will be used to save/load HUD layout settings)
 - Made the UI script environment load ui/settings/theme_default.lua and ui/settings/theme.lua into the global table THEME (will be used to save/load HUD theme settings)
 2014-10-13 00:08:15 -07:00
hlstriker
5e159d914d - Fixed clips displaying the failed message when they weren't being touched. 2014-10-13 00:08:15 -07:00
hlstriker
ae86db6f70 Added a "renderbrush" key to trigger_ff_goal so mappers can render the entity without the need of an illusionary. 2014-10-13 00:08:14 -07:00
hlstriker
f73ad0309c - Fixed info_ff_goal not staying active if active_time was set to -1. 
- Fixed info_ff_goal being rendered while disabled.
 2014-10-13 00:08:14 -07:00
squeek
6c08c02252 Lag compensate for friendly players even when friendly-fire is off. Mostly a precaution. Note that CFF_SV_Player implements its own WantsLagCompensationOnEntity. 
See: https://github.com/ValveSoftware/source-sdk-2013/issues/201#issuecomment-29565874
 2014-10-13 00:08:13 -07:00
hlstriker
6d0c20febc Start of item_ff_goal. 2014-10-13 00:08:13 -07:00
hlstriker
4e73cc9250 Added start of info_ff_goal. 2014-10-13 00:08:12 -07:00
hlstriker
abfdf3b059 Tiny fix 2014-10-13 00:08:12 -07:00
hlstriker
7c724636f4 Deleting old junk! 2014-10-13 00:06:27 -07:00
hlstriker
93dba7191b Start of the entity goal system. Powerful and awesome stuff! 2014-10-13 00:06:26 -07:00
hlstriker
b2240d15dc Fixed some stuff for the background maps. The ff_sv_client and ff_sv_player code is a complete mess! If you use -allowdebug or -console in your startup line the background maps don't load, not sure where in the code this is set. 2014-10-13 00:06:26 -07:00
hlstriker
6f2933135b Start of info_ff_team_manager entity. Lets you create custom teams (names, color, class limits). 2014-10-13 00:06:25 -07:00
squeek
97da325b84 Start of movable/resizable HUD elements 
* Console command 'hudedit' enables/disables hud editing mode; bind it to a key to make it easy to switch in/out
 * Resizing/moving is re-using code from Frame.cpp
 * To allow the HUD viewport to accept mouse input it had to call MakePopup(), a mysterious base engine function that does who knows what; need to see if this has any knock-on effects (I used to sometimes get a semi-transparent background drawn over everything when reconnecting to a server, but haven't recently)
 2014-10-13 00:06:24 -07:00
squeek
97b5cca68e Made our FF-specific HudViewport create the HL2MP scoreboard/info/spec panels for now 2014-10-13 00:06:24 -07:00
squeek
d6d589637f Implemented FF-specific versions of VGUI RootPanel, HudViewport, and ClientMode in preparation for some unfinished changes that will need them 
- Note: These files are based on the sdk_ versions, not the HL2/HL2MP versions; the scoreboard and whatnot won't work right now, but I will make it use the HL2MP HUD elements again soon
 2014-10-13 00:06:23 -07:00
hlstriker
89b2c2098b Start of weapon spawner entity. 2014-10-13 00:06:23 -07:00
squeek
63c563747d Commented out the IsKeyBoardInputEnabled assert in Panel::RequestFocus, as panels should be able to request focus without having keyboard input enabled (example: scoreboard). Really don't know why this assert existed. 2014-10-13 00:06:22 -07:00
Dexter
0cff262bdd removed HL2DM TEAM_COMBINE / REBELS references so i can start working on dynamic teams crap clientside 2014-10-13 00:06:22 -07:00
Dexter
f0757e06f2 force spec/unassigned to always have the correct team num 2014-10-13 00:06:21 -07:00
Dexter
4ca5b64b5f fix FF_TEAM enum being bigger than an int 
fix old default PickDefaultSpawnTeam() code trying to put you on non-existent COMBINE/REBEL and crashing
messing with adding teams by name only
 2014-10-13 00:06:21 -07:00
hlstriker
b420c98fc4 Updated to use numbers instead of names for the team defs and added some testing weapon definitions. 2014-10-13 00:06:20 -07:00
squeek
04397c4005 A bad but effective way to catch Luabind execution errors when calling Lua functions from C++; still need to formalize a standard method of doing so 2014-10-13 00:06:20 -07:00
squeek
65d28cc2e0 Fixed an unused variable warning 2014-10-13 00:06:19 -07:00
hlstriker
450ba1f4c7 Added back the message entity. 2014-10-13 00:06:19 -07:00
hlstriker
79baa08463 Entity to display HUD messages to specific targets. 2014-10-13 00:06:18 -07:00
squeek
450bf12e72 Made LuaUI_BasePanel's SetPos/SetSize/DrawText functions use proportionality, so that size/position is scaled appropriately depending on your resolution 
* SetPos can use .res-style string parameters with the 'r' and 'c' prefixes to set alignment
 * SetSize can use .res-style string parameters with the 'f' prefix to make it fill its parent
Had to edit vgui_controls/Panel.h to make a few member variables protected instead of private
 2014-10-13 00:06:18 -07:00
Dexter
369121c058 commented out $File "ff\entities\ff_sv_point_ff_message.cpp", not sure if missing! add it if so hlstriker 2014-10-13 00:06:17 -07:00
squeek
065163fe5f * Added basic support for drawing text in LuaPanels, will probably end up changing how this is done 
* Bound C_BaseEntity, C_BasePlayer, CFF_CL_Player and a few member functions (speed/velocity/health getters) to the UI Lua environment
 2014-10-13 00:06:17 -07:00
hlstriker
82afcfedc8 Exposed glowing to all CBaseEntity to make everyones life easier. You can now set the glow RGBA as well. 2014-10-13 00:06:16 -07:00
hlstriker
ffa5643e48 Enabled entity glowing. Need to extend the functionality a bit to make it worthwhile. Make sure to update your basemod to get the materials needed. 2014-10-13 00:06:15 -07:00
hlstriker
a7c5340a51 Implemented shader editor. 
Add "-shaderedit" to startup line to use it.
See https://developer.valvesoftware.com/wiki/Category:SourceShaderEditor for details.
 2014-10-13 00:06:15 -07:00
hlstriker
a9147a53bd Added HUD message overload that accepts CRecipientFilter. 2014-10-13 00:06:14 -07:00
hlstriker
a629a38627 Fixed players chat not showing to others (it was only showing to themselves). 2014-10-13 00:06:14 -07:00
squeek
8e52a86fd3 First pass at Lua panels, super basic implementation for now 
* Can create new panels from Lua, but pretty much all they can do at the moment is draw a background
 2014-10-13 00:06:13 -07:00
hlstriker
4fb1e2bc98 The start of some of the hammer entities. The code is an absolute mess/unsafe right now, I will clean it up when I'm done testing. 2014-10-13 00:06:13 -07:00
squeek
6a2d44ae76 Added a newline at the end of a console Msg because Msg's without newlines annoy me. 2014-10-13 00:06:12 -07:00
Dexter
845ebcae14 messing with built in location chat 2014-10-13 00:06:12 -07:00
Dexter
e50273e024 spawn only at spawns w/ same teamnum as me, temporary thing until lua is rigged up 
(also doesnt work on first spawn cuz hl2dm code :P)
 2014-10-13 00:06:11 -07:00
Dexter
e9669129a7 add some helper functions for more dynamic active team management 2014-10-13 00:06:11 -07:00
Dexter
c26dad0a15 rename CLASS_<ff class> to FF_CLASS_<class> to avoid confusion with Classify enums 2014-10-13 00:06:10 -07:00
Dexter
6deedf45a1 account for unassigned team on players & use CLASS enums for digging out index for teamlimits 2014-10-13 00:06:10 -07:00
Dexter
1f115eb8c5 team joining is kinda working now woo. use 'team' concommand 2014-10-13 00:06:09 -07:00
squeek
46658bdc5b Hooked up LevelInit and LevelShutdown to the ScriptManagers 
Removed global Lua functions loadfile, load, loadstring, and dofile as they are potentially unsafe
 2014-10-13 00:06:08 -07:00
Dexter
9c56bd60c3 start implementing actual team joinage action extreme 
(added basic con command clientside wrapper that sends to engine->ServerCmd for this)
team finding & joining logic is in the team manager.. not player, might make too much sense!
auto-join is WIP
 2014-10-13 00:06:08 -07:00
squeek
5e5f2a4914 More ScriptManager stuff 
* Split the UIScriptManager and GameScriptManager into their own classes that inherit from ScriptManager so that they can have different implementations of Init, LevelInit, and stuff like that
 * Not many functionality changes, mostly cleanup
 2014-10-13 00:06:07 -07:00
squeek
35bd31cb39 Alias client-only function VarArgs as server-only function UTIL_VarArgs and vice-versa so we can use them in shared code; they both do the exact same thing. 2014-10-13 00:06:07 -07:00
hlstriker
f77368db62 Added/modified HUD message wrappers. 2014-10-13 00:06:06 -07:00