ubergames/rpg-x2
0
0
Fork 0
mirror of https://github.com/UberGames/RPG-X2.git synced 2024-11-24 13:21:37 +00:00
Code Issues Projects Releases Packages Wiki Activity
155 commits 1 branch 0 tags 16 MiB
Commit graph

111 commits

Author SHA1 Message Date
Walter Julius Hennecke
caaa5786b1 Removed old unused code from g_weapon.c 
Backup copy of the code in /old_code/g_weapon.c.
 2012-03-19 11:45:50 +01:00
Walter Julius Hennecke
0acb013a7a Renamed weapons in weapon_t ... 
... to more common names WP_0 to WP_15.
 2012-03-16 13:05:41 +01:00
Walter Julius Hennecke
5732476c65 Forgot to comit those changes 
They are for the new rpgxEF version
 2012-01-24 09:26:54 +01:00
Walter Julius Hennecke
03e1822a02 Added SVF_NOCLIENT to some entities 
Most of them game logic entities such as target_boolean or target_warp.
 2012-01-20 20:53:31 +01:00
Walter Hennecke
3a3a4ac90d Added missing md5.c and md5.h 2012-01-13 13:04:03 +01:00
Harry Young
44910ac294 Prepped g_cmds.c for sql-input (I hope, lol) 
also did a little fun mod for forcekill
Later I will try to possibly write more Command-descriptions and - if I find out how - might do a /help <command>

also had to modify the game-makefile for a missing file again.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2012-01-07 15:48:43 +01:00
Harry Young
5395962f20 Merge branch 'master' of git://github.com/UberGames/RPG-X2.git 2011-12-27 14:51:13 +01:00
Harry Young
614cb686bc fx_plasma 
This should do bit it doesn't, lol

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-27 14:50:34 +01:00
Walter Julius Hennecke
72282734b4 sql 2011-12-27 12:28:54 +01:00
Walter Julius Hennecke
7483478a6f Added missing files 2011-12-20 11:10:34 +01:00
Harry Young
19dc95e05d fx_borg_bolt 
*basically finished it, but I need the current origin of my targets, not the original. Don't know how to get that.
*added a new folder 'testingstuff' for anything we generate for testing various things and put the folder 'maps in there'
*also in there is a test-version of borg2 with a hardcoded fx_borg_bolt at the binary lift (somehow lua will class it as noclass...)
*minor mod to game-makefile that prevented me from compiling

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-17 15:50:02 +01:00
Walter Julius Hennecke
4bc8f3f4d1 sql fatures 2011-12-16 21:41:27 +01:00
Walter Julius Hennecke
bc33c63ed6 Sql features 2011-12-16 21:09:23 +01:00
Walter Julius Hennecke
bac8df4e1f Worked on sql user db functions 2011-12-16 11:43:16 +01:00
Walter Julius Hennecke
1b7a1afe07 Added md5 hash for sql, removed old sql stuff 2011-12-16 11:14:13 +01:00
Walter Julius Hennecke
63cf3982f2 More changes for sql 2011-12-16 10:24:25 +01:00
Walter Julius Hennecke
0fef2e2732 Modified makefiles 
Use SQL=1 do build with sql support.
Use DEBUG=1 do build with debugging symbols.
Example: make SQL=1 DEBUG=1 will build with sql support and debugging symbols.
 2011-12-16 00:51:16 +01:00
Walter Julius Hennecke
ca521fef64 More work on Sql support 2011-12-16 00:41:23 +01:00
Walter Julius Hennecke
9305510524 Worked a bit on the SQL features 
Mysql support droped for now as it can't be linked in statically.
Sqlite is now compiled in statically.
 2011-12-16 00:04:51 +01:00
Harry Young
9b3d21b1af Minor fix for opening stasis_door-AP 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-14 23:36:48 +01:00
Walter Julius Hennecke
3c3dcc5795 func_stasis_door 
Had to split up opening phase and closing phase so events get send to client correctly.
 2011-12-14 13:27:16 +01:00
Walter Julius Hennecke
1236ad50b4 func_stasis_door 
Worked on func_stasis_door ... as it is now it'll crash the game :P
 2011-12-13 13:05:06 +01:00
Walter Julius Hennecke
d0c367a557 func_stasis_door 
Trigger problem resolved. Stil not done with the game side logic.
 2011-12-13 10:38:49 +01:00
Walter Julius Hennecke
09559579cc func_stasis_door 
Found my errors.
There still is a problem with the trigger though.
 2011-12-13 10:31:19 +01:00
Walter Julius Hennecke
daf1201460 Forgot to adjust version 2011-12-13 10:20:22 +01:00
Walter Julius Hennecke
84b478230d More work on func_stasis_door 
It's not working like I want yet. Guess it's better to grab pan and paper
now and do a bit of thinking ...
 2011-12-13 10:19:01 +01:00
Walter Julius Hennecke
43bd3c87dc func_stasis_door 
- Fixed bug leading to crash
- Started to work door togling (just testing out a few things for now)
 2011-12-12 23:59:32 +01:00
Harry Young
ac334633df Manual revert to make sure things are level here. 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-12 21:52:43 +01:00
Harry Young
4d0d25d1ad Fixed different versionnumbers 2011-12-12 19:48:11 +01:00
Harry Young
c9372420c6 Merge branch 'master' of git://github.com/UberGames/RPG-X2.git 
Conflicts:
	game/bg_public.h
 2011-12-12 19:40:09 +01:00
Walter Julius Hennecke
836078764e Critical bugfix 
- Fixed a critical bug in g_spawn.c G_ParseField
 2011-12-12 19:34:23 +01:00
Walter Julius Hennecke
d3685e16d2 Critical and minor bugfixes 
- Fixed critical error in G_ParseField
- Made other minor bugfix

BIG ISSUES: RPG-X is now crashing to desktop without error when loading maps.
I have no clue whats the problem ...
 2011-12-12 18:30:56 +01:00
Walter Julius Hennecke
cf63b37933 Updated version macro 2011-12-12 17:56:22 +01:00
Walter Julius Hennecke
b940920c32 Merge branch 'master' of https://github.com/UberGames/RPG-X2 2011-12-12 17:47:03 +01:00
Walter Julius Hennecke
4f7dc8a382 Removed an unused rpgxEF only var from entitystate_s 2011-12-12 17:46:18 +01:00
Harry Young
5721a7820a Readded cooking_steam and added toggle-functionality to fire, particlefire and electricfire 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-12 13:27:05 +01:00
Harry Young
de20d8ba89 *Reintegrated the schimmery thing and prepped for some other fx. 
--There's a warning (other that '/*') in cgame that I dont know how to resolve
*added floder maps for mapping resources
-- first in is a map for testing all the fx in all their functionality (fxtest)
 2011-12-12 00:36:04 +01:00
Harry Young
f8b8a8179d Fixed crash when trying to kickvote an invalid client 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-10 22:10:31 +01:00
Harry Young
0d1033212e Minor glitch but this one is verified to work ^^ (I simply trashed and reloaded everything to get it running again) 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-10 20:30:19 +01:00
Harry Young
6354e2ee50 had an idea about map_restart, don't know if this works tough... 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-10 20:11:40 +01:00
Harry Young
7125194664 Removals were my mistake. Tought they were redundant with game-lib and mover-lib whereas they actually are not. 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-10 13:08:03 +01:00
Walter Julius Hennecke
db4eedafe1 Did some more work on func_stasis_door 2011-12-10 00:42:24 +01:00
Walter Julius Hennecke
166aa1db94 Have rewritten the spawn function of func_stasis_door. 
Changed the complete setup so areaportal states can be adjusted now.
This entity still needs a lot of work but we are on a good way now.
You don't mind if I work a bit more on this entity do you Harry?
 2011-12-10 00:03:03 +01:00
Harry Young
43d044fe4f Finished the update as good as I could. 
Removed something from entity that is already in game.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-09 15:52:19 +01:00
Harry Young
aee590c176 Added/Updated Lua-descriptions for mover and cinematic (guesstimate) 
will do the rest once I'm back home.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-09 10:41:49 +01:00
Harry Young
77f9f9e147 Added/Updated Lua-descriptions (some are guesstimates, tbc) 
Minor fix in g_spawn.c

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-09 01:58:06 +01:00
Walter Julius Hennecke
65f4ec4f0f A minor fix for func_stasis_door 2011-12-08 19:51:35 +01:00
Walter Julius Hennecke
046c6a4e8e Critical bugfixes ... 
- Fixed errors preventing any map from beeing loaded
- Fix for func_stasis_door ... so they don't crash the game anymore when loading maps containing them.
 2011-12-08 19:30:38 +01:00
Walter Julius Hennecke
c9624b4ff5 Added more functions to lua_refent 2011-12-08 13:51:43 +01:00
Harry Young
3fd27395e8 Defined FX_AddLine3 and other minor things 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-07 00:12:33 +01:00