Commit graph

163 commits

Author SHA1 Message Date
Walter Julius Hennecke
1efd4b40fa Moved luaDefParser and entityDefParser to a new location 2012-12-08 00:38:21 +01:00
Harry Young
c09f67dfd6 Forgot to clean up some stuff
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-12-07 00:15:45 +01:00
Harry Young
29d9180afa Removed stuff from selfdestruct that is no longer required.
did a few other tests and it really only is the communication between server and client.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-12-07 00:10:15 +01:00
Harry Young
65282c20a2 Merge branch 'master' of git@github.com:UberGames/rpgxEF.git 2012-12-06 15:52:51 +01:00
Harry Young
cc4b48e8fa Started to add HUD-Element for Selfdestruct, however...
there seems to be an issue with the way I selected to transfer the countdown duration to the client (via event)
In server side Execution I run by the g_addevent just fine, however on the client side the event is not called.

there is also a new definition for trigger_airlock.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-12-06 15:52:34 +01:00
Walter Hennecke
522b00756f export functions for lyx (WIP) 2012-12-06 09:37:27 +01:00
Walter Hennecke
1abb89ff21 Minor changes to the lua function definitions lexer 2012-12-04 15:14:40 +01:00
Harry Young
1953cfaa25 Merge branch 'master' of git@github.com:UberGames/rpgxEF.git 2012-12-04 00:43:07 +01:00
Harry Young
5d2ecf6520 A few fixes for shiphealth stuff
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-12-04 00:43:04 +01:00
Walter Julius Hennecke
3d4ee1c97e Update entityDefParser and added luaDefParser (WIP)
* README of entityDefParser now contains build instructions for linux,
mac, and windows
* added first version of luaDefParser (for now it just lexes the file
and outputs what it found. In future I want it to output a lyx file)
2012-11-30 12:29:10 +01:00
Walter Hennecke
e97c97d5d3 Added tool that reads entity definitons into a file 2012-11-29 10:17:28 +01:00
Harry Young
75ec1fce7b Finished work on entity definitions update!
On the way merged target_postiton with info_notnull
Also added a failsafe to target_selfdestruct so it can only be commandspawned

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-27 22:57:55 +01:00
Harry Young
fc08de6e3d finished up descriptions in g_misc and g_mover
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-27 10:37:48 +01:00
Harry Young
8e3023c613 more work on definitions
Added a few comments on the way.
remmoved files for func_forcefiled2 and func_roff_mover as they were absolutely never used and were not included in any makefile.
collapsed some functions that were redundant to each other

did some work on misc_portal_camers/surface (untested)
did some very needed updates to the descriptions
redesigned the spawning and initialising of the surface in that it now has a few more failsafes
Added the ability to pause autocycle

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-27 03:04:09 +01:00
Walter Julius Hennecke
460b7da012 Update code/game/lua_mover.c
Added an example for a parseable comment describing a Lua function (mover.AsTrain).
Add some point all comments should look like this. I'm writing a program that'll parse them and convert them into latex.
2012-11-26 11:24:22 +01:00
Harry Young
5500407c65 Finished first version of ui_msd
UI displays status of all systems connected to it's parent target-shiphealth
There is also a slide for relative health
It does not auto update.

Up next I'll try the HUD-Element.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-23 22:56:39 +01:00
Harry Young
8e9348d463 forgot to commit there
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-23 00:12:50 +01:00
Harry Young
940469a4ce Work on MSD-UI
*Fixed Communication between server and UI
-Turned out the CG_Argv() and UI_Argv() couldn't handle 9 requests at once, so I defaulted back to direct trapping.
*Fixed bug that was looking for some Vars in the wrong fields.
*Added a few new shaders to get the alert lights to work. stuff for that will be uploaded tomorrow.
*Implemented alert lights on the MSD-UI (works perfectly)

*Added Description of a new feature to target_shiphealth (Custom MSD-Ship Display)
*Added Alexander Richardson as 2D Artist to credits (I will supply his MSD's for the new system)

*Fixed ui_transporter (It accidently got killed)

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-23 00:12:20 +01:00
Harry Young
63e3ed0928 Started to work on a full Master Systems Display UI
For Head Start I ripped the Transporter UI and associated entities

I have already started to work on it's first display function, the Alert Condition,
however it seems that I am losing my int's somewhere on the path,
probably on handover between cgame and ui sections (ui_atoms.c)

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-20 22:26:46 +01:00
Harry Young
e416f650ea Fix works so I discontinued and removed the borg elevator an the lua debug file
I'm going to make a release of this version for CB now

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-19 19:28:49 +01:00
Walter Julius Hennecke
75f20c6eef Multiple fixes
* made sure Lua GarbageCollector gets rid of finished lua threads (or at
least I hope so)
* changed timed message to be stored in a struct as the list isn't safe
to use with char*
* changed parser and format for timedmessages.cfg
2012-11-19 18:13:03 +01:00
Harry Young
94ffb3ea61 torned think on borg_elevator back off so we can do a beta-release with this.
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-18 01:27:25 +01:00
Harry Young
9d9fff392b Fixed crash, however the entity behaves weired...
added lua-debug-folder to communicate lua-files for debugging via this repo.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-16 13:54:10 +01:00
Harry Young
f1faa5dfa6 Fixed upper->count and g_CallSpawn
Count-values were 0, 1, 2, 3, 4 but shall be 1, 2, 3, 4, 5

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-16 02:36:59 +01:00
Harry Young
404b94b520 Definitions and borg2-elevator
Updated more definitions
Started to work on an entity that manages the 2-part-elevator
Spawnfunc on that works fine (including failsafes)
but thinkfunc buggs out on me (can't say I'm surprised, first time I'm working on trajectories in this way)
I think the problem lies in transfering the hardcoded vectorized speed to the entity.

spawn-nextthink is set to -1 for now.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-16 02:10:01 +01:00
Walter Julius Hennecke
4c1a8d0910 Renamed and moved some functions 2012-11-16 00:58:56 +01:00
Walter Julius Hennecke
b6feda9b2b Renamed and moved RPG-X related g_team.c functions to g_client.c 2012-11-16 00:02:59 +01:00
Walter Julius Hennecke
35303ecc8c Removed the rest of unused team stuff 2012-11-15 23:49:35 +01:00
Walter Julius Hennecke
db0df99793 Removed lots of things
Removed all unused things from g_team.c and related things
2012-11-15 23:43:56 +01:00
Walter Julius Hennecke
973b0e2211 Removes and fixes
* fixed typo in lua_qmath
* removed target_score
* removed some unused stuff from g_team.c (still lots more to remove)
2012-11-15 22:51:47 +01:00
Harry Young
e561731baa More work on definitions.
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-15 06:41:12 +01:00
Harry Young
b18acbbd93 readded crandom
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-14 10:11:51 +01:00
Harry Young
c69d5f03b6 Forgot this file...
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-14 10:09:50 +01:00
Harry Young
b9b61d2955 3 new lua-functions and updated definitions.
*entity.FindMMB(vector origin) that will loop trougt all MMB's and return the one that is matching the input with it's s.origin
*qmath.irandom(int i, int j) and qmath.flrandom(float i, float j) that are returning a random number of their type within the intervall specified by i and j
*started redesigning all the definitions. I'll get back to this once I'm back from work in 4 hrs or so.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-14 10:09:28 +01:00
Harry Young
be557e0052 Bugfix for ui_transporter-stuff
Im my desire to make sure every command was adminprotected I killed the commands communicating with the trigger...
I reverted that and added SQLF_BEAM as a check for restricted destination clearance

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-14 02:45:46 +01:00
Walter Julius Hennecke
0f9ef785f5 Workaround for func_breakables without origin brush
* added lua function SetAngles2 to mover lib
* Added work around for func_breakables without origin brush
* Set angles2 to origin (note determin in Radiant)
* Set n00bcount to approx radius of the entity
* add spawnflag NOORIGIN (512)
2012-11-13 19:39:44 +01:00
Walter Julius Hennecke
71d607d39f Fix for scoreboard 2012-11-13 19:00:08 +01:00
Harry Young
a110797862 Added repairability to MMBRefit
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-13 17:23:43 +01:00
Walter Julius Hennecke
f4e8476e8f modified getOrigin command for better output 2012-11-13 14:35:09 +01:00
Walter Hennecke
0f99d23ae0 Added new TODO 2012-11-13 09:58:15 +01:00
Walter Hennecke
f5fad5b3e8 Trying to fix setting of origins for brush ents without origin brush
Not tested yet ...
2012-11-13 09:54:11 +01:00
Walter Julius Hennecke
6fdbc08b04 Added missing files to project 2012-11-13 00:49:02 +01:00
Walter Julius Hennecke
8275080a34 Removed some gametype specific stuff from cgame
Wasn't used in RPG-X anyway as gametype is always 0 for RPG-X.
2012-11-13 00:47:12 +01:00
Walter Julius Hennecke
24a1b7c062 cleanup g_svcmds.c, g_syscalls.c, g_target.c 2012-11-12 22:02:07 +01:00
Walter Julius Hennecke
e2039624a1 cleanup and fixes
* cleanup g_session.c, g_spawn.c, g_sql.c
* fixed errors in md5 implementation
2012-11-12 21:53:18 +01:00
Walter Julius Hennecke
e57e8d9d27 Cleanup and more
* cleanup: g_missile.c, g_mover.c
* modified list to allow list->destructor to be NULL
2012-11-12 21:33:22 +01:00
Walter Julius Hennecke
e2dfbeec15 Added repair support for misc_model_breakable 2012-11-12 15:09:10 +01:00
Walter Julius Hennecke
32d2c4c077 Cleanup g_misc.c 2012-11-12 12:42:22 +01:00
Walter Julius Hennecke
35f67c3b88 Cleanup g_main.c 2012-11-12 00:05:34 +01:00
Walter Julius Hennecke
a4344295b9 Cleanup g_items.c, g_log.c, g_lua.c 2012-11-11 23:11:37 +01:00
Walter Julius Hennecke
5719413ea4 Cleanup g_fx.c 2012-11-11 23:04:39 +01:00
Walter Julius Hennecke
26631cb58d Cleanup g_combat.c 2012-11-11 22:53:27 +01:00
Walter Julius Hennecke
bc1558b36c Cleanup g_cmds.c 2012-11-11 22:41:22 +01:00
Walter Julius Hennecke
69335bc840 Cleanup g_breakable.c and g_client.c 2012-11-11 18:33:50 +01:00
Walter Julius Hennecke
db993026e3 Cleanup g_active.c
* removed long blocks of commented code
* removed old/unused code
* made functions static where possible
2012-11-11 18:14:20 +01:00
Walter Julius Hennecke
c655f7c5ac See description ...
* Combined several cvars into single cvars
* removed some unsused cvars
2012-11-11 16:54:49 +01:00
Walter Julius Hennecke
babaeeb805 Moved rpg_<weapon>dmg cvars into rpg_dmgFlags
* default value is 63
* flags are: Phaser = 1, Crifle = 2, TR116 = 4, Grenade Launcher = 8,
Quantum Burst = 16, Disruptor = 32
2012-11-11 16:33:28 +01:00
Walter Julius Hennecke
8632e3b72d See description ...
* removed unused cvars and related code
* moved rpg_message cvars into timedmessages.cfg and removed the cvars
* modified list module to support cyclic list access
2012-11-11 13:53:08 +01:00
Walter Julius Hennecke
bf37df807b see description ...
* Fixed repair function for func_breakables
* Added possibility to visualize traces (add flag 2 to value of
g_developer)
* Removed debug message for func_breakables
2012-11-11 00:36:17 +01:00
Walter Julius Hennecke
8f3626b625 Fixed wrong format string 2012-11-10 20:10:21 +01:00
Walter Julius Hennecke
74d3663441 Added code to debug G_Repair 2012-11-10 20:09:13 +01:00
Walter Julius Hennecke
b4fb3ba5d0 Added TODOs and removed unused cvars 2012-11-10 13:38:54 +01:00
Walter Julius Hennecke
bfd0a52b1b Added new Cvar and removed unused Cvars
* Added cvar rpg_spEasterEggs
* Removed some unused Cvars
2012-11-10 13:18:30 +01:00
Harry Young
ed2201873e finished work on Borg-MMBRefit
(had I known only the vinculum was left, lol ^^)

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-10 10:45:47 +01:00
Harry Young
f8ecd98012 Lua Stuff
fixed a bug in game.print that would not make the string appear
added a new function entity.MMBRefit that will fit misc_model_breakables on SP maps only (made sure of that) with splashDamage, splashRadius and material/s.powerups
I will extend and tune this one as nessessary for other models
The Borg Maps already make use of this new feature, along with some minor fixes.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-10 02:42:10 +01:00
Harry Young
d6f95f5e19 Fixes to selfdestruct
selfdestructcountdown wouldn't blow. Moved safezonetrigger to 0.1 secs and at another position, to compensate.
selfdestructcountdown will no longer play no futher audiowarning sounds

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-06 20:22:24 +01:00
Harry Young
7d39fcad2d More work on selfdestruct
Added a new command selfdestructcountdown duration [safezone] [target]
It'll do exactly the same as selfdestruct start with the exception that it'll force the entity to think every 0.1 secs. to not do this accidently It got it's own command.
It uses the cp-command for display and disables admin_centerprint autoamtically.

On a more general selfdestruct note I got rid of those long warning sentences in favour of ^1Self Destruct in %.0f:%2.0f

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-06 19:47:11 +01:00
Harry Young
7f4b5e2fac Cleanup on SQL flag-values
Put the commands for client parameter manipulation and sound/music in one flag each.
Used the now empty flags to add in shiphealth etc. and debugging tools

added missing ')' in selfdestruct command
also fixed a compiler warning for a possibly undefined variable in shiphealth command

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-03 01:59:53 +01:00
Harry Young
59db98a605 minor fix
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-02 23:01:11 +01:00
Harry Young
17484683ab New command safezonelist + fix
New command safezonelist that lists all safezones in existance.
It returns their targetnames, state (safe/unsafe) and theuir shipflag.
Minor fix to target_shiphealth so it now frees than links when there are missing parameters.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-11-02 22:44:12 +01:00
Harry Young
0d2d9aac3d Work on Shiphealth, Safezone, Selfdestruct
Modified all of them to bertter support maps like rpg_runabout with more than one ship
both selfdestruct and shiphealth now allow for a safezones targetname to be added that is freed before called to list
that required modifications to the associated commands.
Now selfdestruct start asks for a safezone as it's 2nd to last argument and requires it if any safezone is spawnflaged as SHIP
shipdamage now has a 2nd argument that specifies the healthEnt it shall deal to. It requires that argument if it finds at least 2 healthEnts
shiphealth now displays the status of all healthEnts that exist and displays it's targetname in line one of the output
There ar also a few other things associated with this (e.g. healthEnt now frees at spawn if it misses required parameters)

Expanded description of target_safezone

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-10-31 20:54:37 +01:00
Harry Young
f5694b17c0 Added a usefunction to safezones that either toggles it 1/0 or adds it to the list 50ms before either entity blows.
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-10-26 14:19:36 +02:00
Walter Julius Hennecke
debc977b22 Forgot to save g_target.c 2012-10-26 13:34:46 +02:00
Walter Julius Hennecke
ca510f36a1 Moved list of self destruct safezone into level locals 2012-10-26 13:32:55 +02:00
Walter Julius Hennecke
2f85e31baf Cleanup (RPG-X) 2012-10-26 13:21:46 +02:00
Walter Julius Hennecke
a090136963 Updated sqlite3 to newer version 2012-10-24 13:14:30 +02:00
Walter Julius Hennecke
b3050ce324 Added missing SVF_CLIENTMASK in g_public.h 2012-10-24 13:00:33 +02:00
Walter Julius Hennecke
5592294ec2 Cleanup (RPG-X) 2012-10-19 13:21:49 +02:00
Walter Julius Hennecke
f2b7356ed4 More reformating and cleanup 2012-10-17 16:26:50 +02:00
Walter Julius Hennecke
14a2f98330 Reformating and cleanup (RPG-X)
- reformated code for better readablility
- removed old /unused code
2012-10-17 16:06:05 +02:00
Walter Julius Hennecke
6d5adbaee0 Cleanup (RPG-X)
- removed unused/old commented code
- removed unused client side cvars
2012-10-17 13:47:28 +02:00
Walter Julius Hennecke
1c5a60cc7b - 2012-10-16 11:32:01 +02:00
Harry Young
f98de9a8e1 Fixes to FX-System
fixed drip-entity (was stowing duration in wrong state-var)
fixed defaultstate for chunks-entity (material was 0 = none, fixed to 1 = metal)
disabled spawnfunction for all non-functional SP-Ports (I might look into them gain... maybe I just need to find their shaders)

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-10-15 14:50:09 +02:00
Walter Julius Hennecke
cde51336e8 Removed old/commented code 2012-10-15 13:13:25 +02:00
Walter Julius 'GSIO01' Hennecke
fa51ff5a70 Sync with RPG-X2-rpgxEF Repo 2012-10-15 13:05:45 +02:00
Walter Julius Hennecke
a4db04e5b1 Fix for linux compile ... 2012-10-08 12:46:02 +02:00
Walter Julius 'GSIO01' Hennecke
b05c3295f2 Important security updates 2012-09-21 17:47:53 +02:00
Walter Julius 'GSIO01' Hennecke
def5d8ffd6 Added missing svFlag to g_public.h 2012-09-18 04:00:07 +02:00
Walter Julius 'GSIO01' Hennecke
f8eab147d4 Fixed some things ...
- fixed some insecure code
- fixed alot of warnings
2012-09-10 21:26:13 +02:00
Walter Julius 'GSIO01' Hennecke
f75168cce5 Fixed some things ...
- fixed some insecure code
- fexed a lot of warnings
2012-09-10 12:55:24 +02:00
Walter Julius 'GSIO01' Hennecke
7f958b7651 Fixed some things ...
- fixed some unsecure code
- fixed lots of warnings
- removed some very long parts of commented code that is not used
anymore
2012-09-09 13:30:56 +02:00
Walter Julius 'GSIO01' Hennecke
725dfe17a1 Sync with RPG-X rpgxEF edition repo 2012-09-09 09:16:07 +02:00
lol
6dab122140 Added a missing file 2012-08-04 22:59:10 +02:00
Walter Julius Hennecke
71e23e32ac ... 2012-08-04 18:22:20 +02:00
Walter Julius Hennecke
0748cb7b59 Fixed compile errors and modified Makefile
- fixed compile errors while compiling the engine
- fixed a warning while compiling the engine
- modified Makefile to compile client, server and shared libs by default
2012-08-04 17:16:01 +02:00
Walter Hennecke
c8ca3f2f37 Updated ReadMes 2012-08-04 15:24:25 +02:00
Walter Julius Hennecke
a39565b783 Integrated RPG-X2 rpgxEF edition into the rpgxEF repo
... not quite content with where the project files lie but it is ok for
now.
... compiling works fine so far (only tested mingw32 right now)
2012-08-04 12:54:37 +02:00
Walter Julius Hennecke
21151db397 Readded external lightmap support 2012-08-01 15:49:12 +02:00
Walter Julius Hennecke
b90a89ea61 Fixes and other
- removed all #ifdefs ELITEFORCE nad #ifdefs XTRA
- changes to fix shader remapping
2012-08-01 15:29:19 +02:00
Walter Julius Hennecke
c44406e24f Fixed wrong value for MAX_MODEL_BITS 2012-08-01 11:56:35 +02:00