pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,443 Commits 88 Branches 159 Tags
Commit Graph

12443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
josheb
b9a32185d7 Merge pull request #60 from josheb/master 
CHA scribe logic fix.
 2013-05-12 19:44:07 -07:00
root
0f880177e4 Merge branch 'master' of https://github.com/josheb/Server 2013-05-12 21:36:13 -05:00
root
7683252896 CHA scribe rule logic fix 2013-05-12 21:35:21 -05:00
Kemmler
ca9a1de44c Merge pull request #2 from EQEmu/master 
Sync 2013-05-11
 2013-05-11 21:49:12 -07:00
KimLS
2445576ae8 Merge branch 'master' into lua 2013-05-11 20:35:49 -07:00
KimLS
7648f071f1 More lua work - more mob implementation 2013-05-11 20:34:04 -07:00
KimLS
60c93595f5 Missed a file save 2013-05-11 16:39:22 -07:00
KimLS
70998d25e3 More lua work - changed how i get return values off the stack and do calls 2013-05-11 16:37:03 -07:00
KimLS
fa908040ca Lua work on api - entity and mob, lots more to go 2013-05-11 13:51:57 -07:00
Michael Cook
73a4e87379 FreeBSD support and clean up of unnecessary ifdef FREEBSD 2013-05-11 14:32:14 -04:00
josheb
3a31ad55fb Merge pull request #5 from EQEmu/master 
sync
 2013-05-11 07:03:50 -07:00
KimLS
d1f7935ee2 ...trying out boost with luabind 2013-05-11 01:29:58 -07:00
Arthur Ice
b19755a313 For windows compile, moved definve of va_copy 2013-05-11 00:46:46 -07:00
Arthur Ice
9a139a7604 missed two string conversion functions. Moved them to StringUtil 2013-05-11 00:17:02 -07:00
Arthur Ice
373ff66240 moved string functions from MiscFunctions to StringUtil 2013-05-11 00:05:11 -07:00
Arthur Ice
babd3949f6 Added StringUtil h/cpp which contains StringFormat 2013-05-10 23:18:00 -07:00
Arthur Ice
3521472942 Merge branch 'master' of https://github.com/EQEmu/Server 2013-05-10 22:55:15 -07:00
KimLS
dc045591e4 Lua work - loading works, I think checking for sub works. Calling subs is in the beginning stages and binding is starting 2013-05-10 20:13:35 -07:00
Uleat
9ea71dd94f Merge pull request #58 from EQEmu/botproc 
-- Added Bot primary weapon proc (secondary and ranged already exist)
 2013-05-10 19:38:14 -07:00
Uleat
7a4cac84ac -- Added missing wrapper to bot update message 
-- Added notes to AESpell() update
 2013-05-10 22:24:56 -04:00
KimLS
43d0350870 Cleanup perl parsers 2013-05-09 21:25:50 -07:00
Uleat
c98c115cb6 -- Added Bot primary weapon proc (secondary and ranged already exist) 
-- Added Bard Bot Instrumentation bonuses
-- Added checks to avoid AE Buff casting on enemy mobs
-- Fixed a few typos in 'Vah Shir'-related code
 2013-05-09 20:57:02 -04:00
KimLS
0e4ac63b6b Perl parser works, still needs a little cleanup 2013-05-09 14:52:20 -07:00
j883376
4bdd8b2502 Change space indentation to tabs 2013-05-09 11:37:51 -04:00
j883376
ffcff4aea1 Remove trailing whitespace 2013-05-09 11:13:16 -04:00
josheb
56b15f558c Merge pull request #4 from EQEmu/master 
sync
 2013-05-09 06:19:29 -07:00
af4t
6ea9c9218d Merge branch 'master' of git://github.com/EQEmu/Server 2013-05-09 09:07:16 -04:00
KimLS
b6c0e7c302 perl changes 2013-05-09 03:22:56 -07:00
KimLS
bdcb9d0c00 Merge branch 'master' into lua 2013-05-08 21:04:02 -07:00
KimLS
7a93966158 VS2012 fix + return 0 fix 2013-05-08 21:03:35 -07:00
KimLS
b8adbee4ee Parser stuff, fix for GetSpawnKillCount + item_tick 2013-05-08 21:01:15 -07:00
KimLS
feae79b417 Merge from master 2013-05-08 20:22:40 -07:00
KimLS
bcf9546b2d Partial perl parser rewrite, want to make it cleaner and have it match the interface 2013-05-08 20:18:39 -07:00
Arthur Ice
273cb928bf removed using namespace std 2013-05-08 18:13:33 -07:00
Arthur Ice
7735639e57 Merge branch 'c_11_conversion' of https://github.com/addtheice/Server 2013-05-08 17:40:04 -07:00
Arthur Ice
23c524812d Removed the _MSC_VER special cases for Visual Studio 2008 and lower. 
We no longer support 2008 and lower so these defines will never be used.
 2013-05-08 17:09:13 -07:00
Arthur Ice
c6ca89907c Converted a lot of the char[] stuff internally into std:string 
in addition I switched over to <string> rather than <string.h>
 2013-05-08 17:09:13 -07:00
Kemmler
87a75c6100 Merge pull request #1 from EQEmu/master 
Sync 2013-05-08
 2013-05-08 14:22:30 -07:00
mackal
f6100ed834 Fixed NPC::GetScore and XS_NPC_GetScore 2013-05-08 17:07:49 -04:00
Derision
21a9434f89 Changed dummy strings written into the TaskSelector packet from nullptr to ABCD since the packet size calculation was based on the strings being 4 characters long. 2013-05-08 20:02:55 +01:00
josheb
ea6e239d58 Merge pull request #54 from af4t/master 
VS2010 compatibility adjusts
 2013-05-08 05:46:49 -07:00
af4t
4ee4992330 Merge branch 'master' of git://github.com/EQEmu/Server 2013-05-08 06:07:11 -04:00
Michael Cook
059ecdb50b Fix NULL to nullptr for SQL queries take 2 2013-05-07 18:20:09 -04:00
Michael Cook
0838d4507a Fix NULL to nullptr for SQL queries 2013-05-07 17:41:05 -04:00
af4t
5cda797531 VS2010 compatibility 2013-05-07 15:19:27 -04:00
josheb
308a21e0e2 Merge pull request #51 from josheb/master 
Quest events and customizations
 2013-05-07 05:44:07 -07:00
tabasco
a0a92587b4 Fixing some regressions 2013-05-06 16:24:44 -05:00
josheb
8e49ab9179 Merge pull request #3 from EQEmu/master 
sync
 2013-05-06 14:16:46 -07:00
KimLS
ac1d931b5e Merge from master 2013-05-06 00:05:50 -07:00
Alex
90c7fab452 Merge pull request #50 from j883376/master 
Fix Auto XTargets not clearing on death
 2013-05-05 23:42:14 -07:00