Commit graph

54 commits

Author SHA1 Message Date
Walter Julius Hennecke
4e9772fdca Manual merge possible fix for #2 part 1. 2014-02-16 22:51:37 +01:00
Walter Julius Hennecke
c0f3125d38 Hopefully fixes some splint warnings 2013-05-17 19:57:12 +02:00
Walter Julius Hennecke
555cb0d5cf minor fix 2013-05-17 00:42:09 +02:00
Walter Julius Hennecke
e95593b350 ... 2013-05-17 00:29:07 +02:00
Walter Julius Hennecke
4fe74b8fdf fix for SetClass 2013-05-17 00:23:03 +02:00
Walter Julius Hennecke
2a16df527b more fixes 2013-05-16 23:54:40 +02:00
Walter Julius Hennecke
d5691391fb Updated list module 2013-04-14 22:34:29 +02:00
Walter Julius Hennecke
1e8e349d2b Fixes resulting from code analysis 2013-04-13 01:34:37 +02:00
Walter Julius Hennecke
ae24153bb5 Big documentation update 2013-04-12 23:26:59 +02:00
Walter Julius Hennecke
f144ae5f11 Multiple changes
- added additonal documentation
- modified G_GetEntityByTargetname to use list
- modified G_GetEntityByTarget to use list
- modified G_GetEntityByBmodel to use list
2013-04-11 22:10:45 +02:00
Walter Julius Hennecke
4e08198ead See extented description ...
- modified G_RadiusList to use lists
- modified G_GetNearestEnt to use lists
- modified G_GetNearestPlayer to use lists
2013-04-11 21:50:28 +02:00
Walter Julius Hennecke
214cf3fc47 Multiple changes
- updated documentation
- corrected data type for two list_append calls
2013-04-09 22:40:50 +02:00
Walter Julius Hennecke
f35bd7ec1d Modified some code due to use of container ...
The list now can store C types and and strings directly (without the
need of them to be in a struct).
2013-04-09 22:09:29 +02:00
Walter Julius Hennecke
f8d1bd2419 Bugfix
Added a missing malloc
2013-04-07 00:06:08 +02:00
Walter Julius Hennecke
b58d94864d Added addtional functions ...
- added list_append
- added list_prepend
2013-04-06 22:42:06 +02:00
Walter Julius Hennecke
afe3614b2a Modified list module and sublicensed it 2013-04-06 22:27:08 +02:00
Harry Young
c9a8d31f3d More work on admin UI
I had some issues with the standalone Welcome Page so I modified the Login Page to include this and moved the Admin-Check there as well.
I altered the Defines in ui_admin.c and updated on other positions where required so far (I'll adapt the remainder as time comes)
I enabled subfolders for the Music-UI (I don't see why this is a problem at all)
I the Ingame menu I completely disabled the HC-Butttons.
Added Logout-Ability for userlogion (adapted from adminlogin)

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-03-20 11:33:29 +01:00
Harry Young
3164fdfa33 A lot of stuff!
-replaced target_safezone with target_sone (backwardscompability is in place)
--It now servers for more purposes than just escapepods. Also included in the MSD-System

-Removed list-iteration for safezones.
--They gave me such a hard time and put unneeded limits in place (like one time shots)
--now we loop trough all entities instead and find those with the right criteria and go from there

-For safezones clients are now tagged in the backend (new gclients_t-field)
--only those that aren't taggesd this way will be killed
--Closed FS#30

-First version of shiphealth HUD (FS#8, needs testing)
--There were som modifications made to the full UI as well

-Both Selfdestruct and Shiphealth communication to the client go via command now, the events got removed
-new Version Notation: RPG-X V 2.3 CB 4

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-02-10 00:31:04 +01:00
Harry Young
76c0d8fea6 More work on torpedo relaod command
should be finished now

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-01-12 17:20:27 +01:00
Harry Young
c2e135da16 Added reloadtorpedos-command and som fixes for weapon-fx
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-01-12 02:33:04 +01:00
Harry Young
f3f7345ccd Minor fixes to selfdestruct + audio for terminal count
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-01-09 19:27:36 +01:00
Harry Young
ec431c010a Finished work on selfdestruct
Countdown Clock is working
Overall script is working again
removed some unused stuff
added a few more failsafes
did some finetuning

sometimes the sounds don't trigger but I don't think that is my fault...

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-01-08 13:54:13 +01:00
Walter Julius Hennecke
b99a372ff1 Removed ...
* g_teamautojoin
* g_teamforcebalance
2012-12-22 19:15:53 +01:00
Harry Young
fe6a0f4b7c Removed some unneeded stuff from selfdestruct
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-12-21 11:16:30 +01:00
Walter Julius Hennecke
8f345fbfde Udate to precache files
* updated precache file format
* prevention of duplicate shaders in file generated with the
genPrecacheFile command
2012-12-18 19:02:33 +01:00
Walter Julius Hennecke
a1d826d8fe Some additions
* Fixed precaching on client side
* added generatePrecacheFile command on server side that will generate a
new precache file (not quite done yet but it'll work for now)
* removed some debuging outputs from G_LoadTimedMessages
* fixed check for '}' beeing on the worng place in G_LoadTimedMessages
2012-12-17 19:13:46 +01:00
Walter Julius Hennecke
f776fdf3e3 Added command that generates a .precache file for a map 2012-12-14 20:47:08 +01:00
Walter Julius Hennecke
7bd0864a2d Implemented FS#24 2012-12-09 01:52:36 +01:00
Walter Julius Hennecke
a013c95957 Task FS#4 and Fix
- Implemented Task FS#4
- added a missing } in g_cmds.c
2012-12-09 01:40:02 +01:00
Harry Young
76f66aa58a removed some stuff from g_cmd (selfdestruct)
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-12-08 10:54:36 +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
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
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
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
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 Julius Hennecke
bc1558b36c Cleanup g_cmds.c 2012-11-11 22:41:22 +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
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
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
Walter Julius 'GSIO01' Hennecke
fa51ff5a70 Sync with RPG-X2-rpgxEF Repo 2012-10-15 13:05:45 +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